Fix building with media-video/ffmpeg-0.4.9_p20070525. Idea from aballier and dvbcut so thanks.

Package-Manager: portage-2.1.2.9

5 files changed, 84 insertions, 5 deletions

diff --git a/media-video/ffmpegthumbnailer/ChangeLog b/media-video/ffmpegthumbnailer/ChangeLog
index 885972c0f88a..8fe9da8e2a88 100644
--- a/media-video/ffmpegthumbnailer/ChangeLog
+++ b/media-video/ffmpegthumbnailer/ChangeLog
@@ -1,6 +1,13 @@
 # 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.18 2007/06/01 11:49:18 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ChangeLog,v 1.19 2007/06/01 20:01:40 drac Exp $
+
+*ffmpegthumbnailer-1.1.1-r1 (01 Jun 2007)
+
+  01 Jun 2007; Samuli Suominen <drac@gentoo.org>
+  +files/ffmpegthumbnailer-1.1.1-ffmpeg.patch,
+  +ffmpegthumbnailer-1.1.1-r1.ebuild:
+  Fix building with media-video/ffmpeg-0.4.9_p20070525.
 
   01 Jun 2007; Samuli Suominen <drac@gentoo.org>
   ffmpegthumbnailer-1.1.1.ebuild:
diff --git a/media-video/ffmpegthumbnailer/Manifest b/media-video/ffmpegthumbnailer/Manifest
index e7b2206e5e26..e272f731a527 100644
--- a/media-video/ffmpegthumbnailer/Manifest
+++ b/media-video/ffmpegthumbnailer/Manifest
@@ -1,12 +1,20 @@
+AUX ffmpegthumbnailer-1.1.1-ffmpeg.patch 858 RMD160 76754bebb75ee40be549c06fa9e525845b50a2f2 SHA1 2f9ef831c8517312666611b206cc8d6f5f0c55f4 SHA256 0fcdf0cab93fca8c41b9699a484b450464e749a5f3cfdeef12bf332750f8b66c
+MD5 ee6775372a7e078f73f66f0633483c11 files/ffmpegthumbnailer-1.1.1-ffmpeg.patch 858
+RMD160 76754bebb75ee40be549c06fa9e525845b50a2f2 files/ffmpegthumbnailer-1.1.1-ffmpeg.patch 858
+SHA256 0fcdf0cab93fca8c41b9699a484b450464e749a5f3cfdeef12bf332750f8b66c files/ffmpegthumbnailer-1.1.1-ffmpeg.patch 858
 DIST ffmpegthumbnailer-1.1.1.tar.gz 80116 RMD160 9793f0126a49321a23adfcaa35c7dc70e85e3c17 SHA1 2e14078f27faf595821315dcdb7f98b8021ddd3d SHA256 80b35f18b07d1409f8d860b36398ae6d11f929b6068ced2439ca53118d36e13e
+EBUILD ffmpegthumbnailer-1.1.1-r1.ebuild 829 RMD160 033bdfbb0e0525f166ea4a62810262708bbc553c SHA1 91e30cd5b97c7049b1ad7034c8042f3dc4d64256 SHA256 26e2758af3bd0d78b4edc0e85e564d115085236aaf1fee4c9541f1bb65f59fbe
+MD5 1e0129b7f8451dee46ee08bf99b82e7d ffmpegthumbnailer-1.1.1-r1.ebuild 829
+RMD160 033bdfbb0e0525f166ea4a62810262708bbc553c ffmpegthumbnailer-1.1.1-r1.ebuild 829
+SHA256 26e2758af3bd0d78b4edc0e85e564d115085236aaf1fee4c9541f1bb65f59fbe ffmpegthumbnailer-1.1.1-r1.ebuild 829
 EBUILD ffmpegthumbnailer-1.1.1.ebuild 720 RMD160 7b07321a8cbe945607a4332b6e25402a7848c7d2 SHA1 b4a274346a771a26735291fb66142d34d69165dc SHA256 449f66361a24663d2b9c4f7a7c3d684165bb51d66b191e5b844f945c10e0986c
 MD5 4359685073caa69cd3d4ca3ef07de68a ffmpegthumbnailer-1.1.1.ebuild 720
 RMD160 7b07321a8cbe945607a4332b6e25402a7848c7d2 ffmpegthumbnailer-1.1.1.ebuild 720
 SHA256 449f66361a24663d2b9c4f7a7c3d684165bb51d66b191e5b844f945c10e0986c ffmpegthumbnailer-1.1.1.ebuild 720
-MISC ChangeLog 2771 RMD160 cfeed92cb418bf6c721bbb67bfadd04b6195ee6b SHA1 4b6c14dc9fed71d4def3a22ae1e93f7dea093402 SHA256 6eef2607b0c3454ffb029e03af3ad761691612674f734d9f443bce68012371be
-MD5 01a58687cdd18b731195fb2adf000cc4 ChangeLog 2771
-RMD160 cfeed92cb418bf6c721bbb67bfadd04b6195ee6b ChangeLog 2771
-SHA256 6eef2607b0c3454ffb029e03af3ad761691612674f734d9f443bce68012371be ChangeLog 2771
+MISC ChangeLog 3005 RMD160 40a1a036fca80dc7c31bcd1ae1125a59d884aa78 SHA1 26c5b262ab705d42c7b78a1ebb3fac5e0b6cd936 SHA256 7fb42cfd596ded1e6deb804efa6b86512c4d798d4978a6eb57a79c2a0972377b
+MD5 3618218a5bcf45a10fb5505a1b90ecfe ChangeLog 3005
+RMD160 40a1a036fca80dc7c31bcd1ae1125a59d884aa78 ChangeLog 3005
+SHA256 7fb42cfd596ded1e6deb804efa6b86512c4d798d4978a6eb57a79c2a0972377b ChangeLog 3005
 MISC metadata.xml 216 RMD160 bf3331e57d3ead68586f1772afbbe4e0a2d6730c SHA1 4d4145f6b821dcd4501d62904bffe8927ce17b0c SHA256 891d6b3e01002001a70ec76ba1fc11af4970298db89286e0fe41c300054fe366
 MD5 1deb82e5c55a640277aa5fb9bb5ee915 metadata.xml 216
 RMD160 bf3331e57d3ead68586f1772afbbe4e0a2d6730c metadata.xml 216
@@ -14,3 +22,6 @@ SHA256 891d6b3e01002001a70ec76ba1fc11af4970298db89286e0fe41c300054fe366 metadata
 MD5 97f412393acae5430febdc66b6f678ce files/digest-ffmpegthumbnailer-1.1.1 268
 RMD160 45148b5f2d23750061eacfc6b977e4ac24e3c4c6 files/digest-ffmpegthumbnailer-1.1.1 268
 SHA256 7eeea6beac40c1d6f8ab3e8b2742a299802b777c2374b8b6cce5a32cac20c828 files/digest-ffmpegthumbnailer-1.1.1 268
+MD5 97f412393acae5430febdc66b6f678ce files/digest-ffmpegthumbnailer-1.1.1-r1 268
+RMD160 45148b5f2d23750061eacfc6b977e4ac24e3c4c6 files/digest-ffmpegthumbnailer-1.1.1-r1 268
+SHA256 7eeea6beac40c1d6f8ab3e8b2742a299802b777c2374b8b6cce5a32cac20c828 files/digest-ffmpegthumbnailer-1.1.1-r1 268
diff --git a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.1.1-r1.ebuild b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..b4d3c9db9aee
--- /dev/null
+++ b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.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.1-r1.ebuild,v 1.1 2007/06/01 20:01:40 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="~alpha ~amd64 ~hppa ~ia64 ~ppc ~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}-ffmpeg.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.1-r1 b/media-video/ffmpegthumbnailer/files/digest-ffmpegthumbnailer-1.1.1-r1
new file mode 100644
index 000000000000..23e8eba30ccd
--- /dev/null
+++ b/media-video/ffmpegthumbnailer/files/digest-ffmpegthumbnailer-1.1.1-r1
@@ -0,0 +1,3 @@
+MD5 d1758d11def56f3d7367947f87606c27 ffmpegthumbnailer-1.1.1.tar.gz 80116
+RMD160 9793f0126a49321a23adfcaa35c7dc70e85e3c17 ffmpegthumbnailer-1.1.1.tar.gz 80116
+SHA256 80b35f18b07d1409f8d860b36398ae6d11f929b6068ced2439ca53118d36e13e ffmpegthumbnailer-1.1.1.tar.gz 80116
diff --git a/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-1.1.1-ffmpeg.patch b/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-1.1.1-ffmpeg.patch
new file mode 100644
index 000000000000..f92a896b04e5
--- /dev/null
+++ b/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-1.1.1-ffmpeg.patch
@@ -0,0 +1,29 @@
+diff -ur ffmpegthumbnailer-1.1.1.orig/src/moviedecoder.cpp ffmpegthumbnailer-1.1.1/src/moviedecoder.cpp
+--- ffmpegthumbnailer-1.1.1.orig/src/moviedecoder.cpp	2007-05-07 21:05:11.000000000 +0300
++++ ffmpegthumbnailer-1.1.1/src/moviedecoder.cpp	2007-06-01 22:47:21.000000000 +0300
+@@ -3,7 +3,10 @@
+ 
+ #include <assert.h>
+ #include <iostream>
++
++extern "C" {
+ #include <ffmpeg/swscale.h>
++}
+ 
+ using namespace std;
+ 
+diff -ur ffmpegthumbnailer-1.1.1.orig/src/moviedecoder.h ffmpegthumbnailer-1.1.1/src/moviedecoder.h
+--- ffmpegthumbnailer-1.1.1.orig/src/moviedecoder.h	2007-05-07 20:49:26.000000000 +0300
++++ ffmpegthumbnailer-1.1.1/src/moviedecoder.h	2007-06-01 22:41:01.000000000 +0300
+@@ -7,8 +7,11 @@
+ 

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

++
++extern "C" {
+ #include <ffmpeg/avcodec.h>

+ #include <ffmpeg/avformat.h>
++}
+ 
+ typedef unsigned char byte;

+