Fix bug 173692.

Package-Manager: portage-2.1.2.3

5 files changed, 73 insertions, 15 deletions

diff --git a/media-video/ffmpegthumbnailer/ChangeLog b/media-video/ffmpegthumbnailer/ChangeLog
index 03b4be338ecc..88721b3a8176 100644
--- a/media-video/ffmpegthumbnailer/ChangeLog
+++ b/media-video/ffmpegthumbnailer/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/ffmpegthumbnailer
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ChangeLog,v 1.6 2007/04/03 17:12:32 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ChangeLog,v 1.7 2007/04/13 13:55:09 drac Exp $
+
+*ffmpegthumbnailer-1.1-r1 (13 Apr 2007)
+
+  13 Apr 2007; Samuli Suominen <drac@gentoo.org>
+  +files/ffmpegthumbnailer-1.1-inttypes.patch,
+  +ffmpegthumbnailer-1.1-r1.ebuild:
+  Fix compilation with new ffmpeg for bug 173692, thanks to ebfe
+  <knabberknusperhaus AT yahoo.de>
 
   03 Apr 2007; Gustavo Zacarias <gustavoz@gentoo.org>
   ffmpegthumbnailer-1.1.ebuild:
diff --git a/media-video/ffmpegthumbnailer/Manifest b/media-video/ffmpegthumbnailer/Manifest
index eba6eb81409e..d71e8ca44d6d 100644
--- a/media-video/ffmpegthumbnailer/Manifest
+++ b/media-video/ffmpegthumbnailer/Manifest
@@ -1,19 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX ffmpegthumbnailer-1.1-int.patch 335 RMD160 7c971e123bfb435ce79f78aa573a6e902522ce56 SHA1 228e96dd393264c8899e51557ee299fcb808a729 SHA256 e55a264ea8a71aeebb6a74615b1d1b740d23aa17a78e4e59452256e420cad5b4
 MD5 ea8d3967b3b1eaf09c650edc1646deff files/ffmpegthumbnailer-1.1-int.patch 335
 RMD160 7c971e123bfb435ce79f78aa573a6e902522ce56 files/ffmpegthumbnailer-1.1-int.patch 335
 SHA256 e55a264ea8a71aeebb6a74615b1d1b740d23aa17a78e4e59452256e420cad5b4 files/ffmpegthumbnailer-1.1-int.patch 335
+AUX ffmpegthumbnailer-1.1-inttypes.patch 508 RMD160 ae0b00983ced61a80402bde236c437b6f201976f SHA1 476b4bbea1f3bac6f433f7e179a1b41e70c19e1d SHA256 e1a6e9f9f62b115e4150d0804007844374de19ed788e8982ec34dcfaf6a05265
+MD5 ccc099e50d7e4228bd5f466345e81438 files/ffmpegthumbnailer-1.1-inttypes.patch 508
+RMD160 ae0b00983ced61a80402bde236c437b6f201976f files/ffmpegthumbnailer-1.1-inttypes.patch 508
+SHA256 e1a6e9f9f62b115e4150d0804007844374de19ed788e8982ec34dcfaf6a05265 files/ffmpegthumbnailer-1.1-inttypes.patch 508
 DIST ffmpegthumbnailer-1.1.tar.gz 79940 RMD160 4ac4fd4dd19dd8d1e30d7157d08a216003d97f23 SHA1 16642b5d10bf42e28da70f484ce22be6a7ba8aa9 SHA256 6c9ab042d06ae183332117914521f4be323dd33aedf888efc4308d8b54679cf6
+EBUILD ffmpegthumbnailer-1.1-r1.ebuild 811 RMD160 32d5adbfec6b8819405b8c90b4c46162ce323562 SHA1 d12bb672829362d4f405b349e935c5f154a3777c SHA256 eda45ddda77e525abf186676e1f026ee935185348405a2ebe2429624f7d0faf9
+MD5 d16f3dd857ff127c2f892bed3535c3b8 ffmpegthumbnailer-1.1-r1.ebuild 811
+RMD160 32d5adbfec6b8819405b8c90b4c46162ce323562 ffmpegthumbnailer-1.1-r1.ebuild 811
+SHA256 eda45ddda77e525abf186676e1f026ee935185348405a2ebe2429624f7d0faf9 ffmpegthumbnailer-1.1-r1.ebuild 811
 EBUILD ffmpegthumbnailer-1.1.ebuild 789 RMD160 030296b8ee28c72bf1b1fd82ac6381083d863114 SHA1 350cdcf638dc4ffa4948e8ea237c99431da23cf4 SHA256 757f55d1495520406e338f5dffdd58ef0a565c1e7bc0338734f7111c37d52ae7
 MD5 a48883d8d0441347747554bd0a000dcc ffmpegthumbnailer-1.1.ebuild 789
 RMD160 030296b8ee28c72bf1b1fd82ac6381083d863114 ffmpegthumbnailer-1.1.ebuild 789
 SHA256 757f55d1495520406e338f5dffdd58ef0a565c1e7bc0338734f7111c37d52ae7 ffmpegthumbnailer-1.1.ebuild 789
-MISC ChangeLog 1007 RMD160 c15833cf73d850f677456431844f278e51b39f4e SHA1 b8d1bc25b824154805fc9f3965d50d092eb778ca SHA256 04ec1c1da3abc9e4432f53fa011bf247dba9dffdb59ba5c797225377a907c09b
-MD5 3bf05568449188e54990c4deffb0199b ChangeLog 1007
-RMD160 c15833cf73d850f677456431844f278e51b39f4e ChangeLog 1007
-SHA256 04ec1c1da3abc9e4432f53fa011bf247dba9dffdb59ba5c797225377a907c09b ChangeLog 1007
+MISC ChangeLog 1277 RMD160 08f8f600bbd660550a2fd3e21e629473fd4d0e58 SHA1 4959cffc18763d1eaffc6d70581672b85fb7ca94 SHA256 0c6327e85933ec4b2e3cce2027f8b61518847b13f14b95c92bf0efca47672ba7
+MD5 bc4161bd52eec09154dfd89462fabf41 ChangeLog 1277
+RMD160 08f8f600bbd660550a2fd3e21e629473fd4d0e58 ChangeLog 1277
+SHA256 0c6327e85933ec4b2e3cce2027f8b61518847b13f14b95c92bf0efca47672ba7 ChangeLog 1277
 MISC metadata.xml 216 RMD160 bf3331e57d3ead68586f1772afbbe4e0a2d6730c SHA1 4d4145f6b821dcd4501d62904bffe8927ce17b0c SHA256 891d6b3e01002001a70ec76ba1fc11af4970298db89286e0fe41c300054fe366
 MD5 1deb82e5c55a640277aa5fb9bb5ee915 metadata.xml 216
 RMD160 bf3331e57d3ead68586f1772afbbe4e0a2d6730c metadata.xml 216
@@ -21,10 +26,6 @@ SHA256 891d6b3e01002001a70ec76ba1fc11af4970298db89286e0fe41c300054fe366 metadata
 MD5 26f098688ea2d5a90351c0c70f985008 files/digest-ffmpegthumbnailer-1.1 262
 RMD160 fbafd8a4bd44ca47a449fd0963ee6dbe429032ae files/digest-ffmpegthumbnailer-1.1 262
 SHA256 af1ffb4d5d1640d05986f92118d38d8b253072be040ec2e354236441a1d24fd9 files/digest-ffmpegthumbnailer-1.1 262
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6-ecc01.6 (GNU/Linux)
-
-iD8DBQFGEosJKRy60XGEcJIRAj5GAJ97I2c4AfuMiln0pHCoBHVZXXvksQCaAkIg
-0GbZ4eAeOF4WtS7ecTB+yks=
-=J+vO
------END PGP SIGNATURE-----
+MD5 26f098688ea2d5a90351c0c70f985008 files/digest-ffmpegthumbnailer-1.1-r1 262
+RMD160 fbafd8a4bd44ca47a449fd0963ee6dbe429032ae files/digest-ffmpegthumbnailer-1.1-r1 262
+SHA256 af1ffb4d5d1640d05986f92118d38d8b253072be040ec2e354236441a1d24fd9 files/digest-ffmpegthumbnailer-1.1-r1 262
diff --git a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.1-r1.ebuild b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.1-r1.ebuild
new file mode 100644
index 000000000000..97bd974ca27b
--- /dev/null
+++ b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.1-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.1-r1.ebuild,v 1.1 2007/04/13 13:55:09 drac Exp $
+
+inherit eutils
+
+DESCRIPTION="Lightweight video thumbnailer that can be used by file managers"
+HOMEPAGE="http://code.google.com/p/ffmpegthumbnailer"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="media-libs/libpng
+	>=media-video/ffmpeg-0.4.9_p20070330"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-inttypes.patch
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS ChangeLog README TODO
+}
diff --git a/media-video/ffmpegthumbnailer/files/digest-ffmpegthumbnailer-1.1-r1 b/media-video/ffmpegthumbnailer/files/digest-ffmpegthumbnailer-1.1-r1
new file mode 100644
index 000000000000..b3a505f69562
--- /dev/null
+++ b/media-video/ffmpegthumbnailer/files/digest-ffmpegthumbnailer-1.1-r1
@@ -0,0 +1,3 @@
+MD5 20c6b80dbbcf7a2f73d8879dc9c94c93 ffmpegthumbnailer-1.1.tar.gz 79940
+RMD160 4ac4fd4dd19dd8d1e30d7157d08a216003d97f23 ffmpegthumbnailer-1.1.tar.gz 79940
+SHA256 6c9ab042d06ae183332117914521f4be323dd33aedf888efc4308d8b54679cf6 ffmpegthumbnailer-1.1.tar.gz 79940
diff --git a/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-1.1-inttypes.patch b/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-1.1-inttypes.patch
new file mode 100644
index 000000000000..ae3370e00146
--- /dev/null
+++ b/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-1.1-inttypes.patch
@@ -0,0 +1,17 @@
+diff -ur ffmpegthumbnailer-1.1.orig/src/moviedecoder.h ffmpegthumbnailer-1.1/src/moviedecoder.h
+--- ffmpegthumbnailer-1.1.orig/src/moviedecoder.h	2007-02-24 16:14:47.000000000 +0200
++++ ffmpegthumbnailer-1.1/src/moviedecoder.h	2007-04-13 16:48:13.000000000 +0300
+@@ -1,8 +1,11 @@
++#define __STDC_CONSTANT_MACROS
++#define INT64_C
++
++#include <inttypes.h>
++
+ #ifndef MOVIEDECODER_H

+ #define MOVIEDECODER_H

+ 

+-#define EMULATE_INTTYPES

+-

+ #include <string>
+ #include <vector>

+ #include <ffmpeg/avcodec.h>