Patch to allow building with old and new ffmpeg still supporting asneeded, using autotools and pkgconfig.

Package-Manager: portage-2.1.3_rc5

8 files changed, 59 insertions, 99 deletions

diff --git a/media-video/ffmpegthumbnailer/ChangeLog b/media-video/ffmpegthumbnailer/ChangeLog
index d02f452d3cf0..f986fcb0bcac 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.21 2007/06/27 11:50:55 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ChangeLog,v 1.22 2007/06/27 14:07:46 drac Exp $
+
+  27 Jun 2007; Samuli Suominen <drac@gentoo.org>
+  -files/ffmpegthumbnailer-1.1.1-ffmpeg.patch,
+  +files/ffmpegthumbnailer-1.1.2-ffmpeg.patch,
+  -files/ffmpegthumbnailer-1.1.2-swscale.patch,
+  -ffmpegthumbnailer-1.1.1-r1.ebuild, ffmpegthumbnailer-1.1.2.ebuild:
+  Patch to allow building with old and new ffmpeg still supporting asneeded,
+  using autotools and pkgconfig.
 
 *ffmpegthumbnailer-1.1.2 (27 Jun 2007)
 
diff --git a/media-video/ffmpegthumbnailer/Manifest b/media-video/ffmpegthumbnailer/Manifest
index 1b904cb2d4cd..dc7212d62253 100644
--- a/media-video/ffmpegthumbnailer/Manifest
+++ b/media-video/ffmpegthumbnailer/Manifest
@@ -1,29 +1,21 @@
-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
-AUX ffmpegthumbnailer-1.1.2-swscale.patch 497 RMD160 79d2f220e701240d5fc7952a9fcc563de1c3924f SHA1 f9db3977f4aa5d0c161459c59097d2b9648e1cff SHA256 3588328ffdcbc047a159d154f78e610150f2ce0426cc2989acb4f743d0110357
-MD5 ca4451e137ca0b0572b145c70d7a8a32 files/ffmpegthumbnailer-1.1.2-swscale.patch 497
-RMD160 79d2f220e701240d5fc7952a9fcc563de1c3924f files/ffmpegthumbnailer-1.1.2-swscale.patch 497
-SHA256 3588328ffdcbc047a159d154f78e610150f2ce0426cc2989acb4f743d0110357 files/ffmpegthumbnailer-1.1.2-swscale.patch 497
+AUX ffmpegthumbnailer-1.1.2-ffmpeg.patch 1110 RMD160 9b4b0bf218e091b2f893067217ebf9009a025f6f SHA1 5857fa27c52a117ac1ad8414bb4c6cffcf0f9758 SHA256 bd534ece192bae0bcd83bc8e11bf7032d06b9e9360d8c5462107e9c290df64b6
+MD5 677073d80d659b3529dc3d95dcc96c50 files/ffmpegthumbnailer-1.1.2-ffmpeg.patch 1110
+RMD160 9b4b0bf218e091b2f893067217ebf9009a025f6f files/ffmpegthumbnailer-1.1.2-ffmpeg.patch 1110
+SHA256 bd534ece192bae0bcd83bc8e11bf7032d06b9e9360d8c5462107e9c290df64b6 files/ffmpegthumbnailer-1.1.2-ffmpeg.patch 1110
 DIST ffmpegthumbnailer-1.1.1.tar.gz 80116 RMD160 9793f0126a49321a23adfcaa35c7dc70e85e3c17 SHA1 2e14078f27faf595821315dcdb7f98b8021ddd3d SHA256 80b35f18b07d1409f8d860b36398ae6d11f929b6068ced2439ca53118d36e13e
 DIST ffmpegthumbnailer-1.1.2.tar.gz 80137 RMD160 74b7b3817b0cd9db50ca664ab01ab5ecad944c3d SHA1 53f2464df719605bd9ae7afca868592b98ebded1 SHA256 cbe626b3d39f887d34f823c862ad25783ab0fef823c933b7fa848197ca752c4c
-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 723 RMD160 9be607d608e8a7342e94aab584d5e23c6a085892 SHA1 c7df811a7205032bb8e09118d5616d56dae3e0f3 SHA256 5b56d6d54e128f9879f9eb55367085484c95f772e30b29b1b9d570a0f1f21b4b
 MD5 222f47f8233211d3458caf031fa6d411 ffmpegthumbnailer-1.1.1.ebuild 723
 RMD160 9be607d608e8a7342e94aab584d5e23c6a085892 ffmpegthumbnailer-1.1.1.ebuild 723
 SHA256 5b56d6d54e128f9879f9eb55367085484c95f772e30b29b1b9d570a0f1f21b4b ffmpegthumbnailer-1.1.1.ebuild 723
-EBUILD ffmpegthumbnailer-1.1.2.ebuild 830 RMD160 ac44fc90a505c44edfb89a4ec225725d576dc04c SHA1 8625de826f4b9834da8c6c0d3b5607c1479a1c60 SHA256 8304cff2ed12813c23a628f179943b4bd296bcebbf24aeb297e4e413a365aab4
-MD5 ac96e333611450dfdc774e5c71978f47 ffmpegthumbnailer-1.1.2.ebuild 830
-RMD160 ac44fc90a505c44edfb89a4ec225725d576dc04c ffmpegthumbnailer-1.1.2.ebuild 830
-SHA256 8304cff2ed12813c23a628f179943b4bd296bcebbf24aeb297e4e413a365aab4 ffmpegthumbnailer-1.1.2.ebuild 830
-MISC ChangeLog 3312 RMD160 1eb12a5f6a6eb5f5a0707f7408712426efb066ed SHA1 41044e599fcd6b17cb019eb6d7324239a28b3d78 SHA256 3b81c6127effbdec9d8a49e4f33919cc12655b30e99f7eb9e19319174ab157e4
-MD5 bf378b83c715b8a060f313c0b318ba57 ChangeLog 3312
-RMD160 1eb12a5f6a6eb5f5a0707f7408712426efb066ed ChangeLog 3312
-SHA256 3b81c6127effbdec9d8a49e4f33919cc12655b30e99f7eb9e19319174ab157e4 ChangeLog 3312
+EBUILD ffmpegthumbnailer-1.1.2.ebuild 869 RMD160 c9ee711b3ebb4b51c608c1db15265dfe788de5f8 SHA1 469cd779e690a06a185e947c8c69ce3c1df97e7d SHA256 76d84885dc8a8981dc0628a740389bf3c703b8c01f414aacbc1939593a8c5451
+MD5 c874fb5ae59e40c70c733b33a1a47a56 ffmpegthumbnailer-1.1.2.ebuild 869
+RMD160 c9ee711b3ebb4b51c608c1db15265dfe788de5f8 ffmpegthumbnailer-1.1.2.ebuild 869
+SHA256 76d84885dc8a8981dc0628a740389bf3c703b8c01f414aacbc1939593a8c5451 ffmpegthumbnailer-1.1.2.ebuild 869
+MISC ChangeLog 3684 RMD160 d6acab9c07d96bd454fc51ed82adf8789955f2a6 SHA1 acf36825d05b753383ca67c7ae0051c38189051d SHA256 198b630ea141d6f0fd73a3df025313be70e0976f15d68cafb7ec3a7dd076c679
+MD5 162b4593363c883caba01ce2f7ff9025 ChangeLog 3684
+RMD160 d6acab9c07d96bd454fc51ed82adf8789955f2a6 ChangeLog 3684
+SHA256 198b630ea141d6f0fd73a3df025313be70e0976f15d68cafb7ec3a7dd076c679 ChangeLog 3684
 MISC metadata.xml 216 RMD160 bf3331e57d3ead68586f1772afbbe4e0a2d6730c SHA1 4d4145f6b821dcd4501d62904bffe8927ce17b0c SHA256 891d6b3e01002001a70ec76ba1fc11af4970298db89286e0fe41c300054fe366
 MD5 1deb82e5c55a640277aa5fb9bb5ee915 metadata.xml 216
 RMD160 bf3331e57d3ead68586f1772afbbe4e0a2d6730c metadata.xml 216
@@ -31,9 +23,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
 MD5 49c0b8527487f1ffc5f59d7718c97a73 files/digest-ffmpegthumbnailer-1.1.2 268
 RMD160 d67db96e56a70da46fea220a2abd49e78b36a31c files/digest-ffmpegthumbnailer-1.1.2 268
 SHA256 2ae381725eb1bbeb37bb8953f53750d3ecccf7309df5f625829db4ef995e7b4d files/digest-ffmpegthumbnailer-1.1.2 268
diff --git a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.1.1-r1.ebuild b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.1.1-r1.ebuild
deleted file mode 100644
index b4d3c9db9aee..000000000000
--- a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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/ffmpegthumbnailer-1.1.2.ebuild b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.1.2.ebuild
index c65d2a9bc3de..a42cd82af668 100644
--- a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.1.2.ebuild
+++ b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.1.2.ebuild
@@ -1,8 +1,8 @@
 # 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.2.ebuild,v 1.1 2007/06/27 11:50:55 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.1.2.ebuild,v 1.2 2007/06/27 14:07:46 drac Exp $
 
-inherit eutils
+inherit autotools eutils
 
 DESCRIPTION="Lightweight video thumbnailer that can be used by file managers"
 HOMEPAGE="http://code.google.com/p/ffmpegthumbnailer"
@@ -14,13 +14,15 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="media-libs/libpng
-	>=media-video/ffmpeg-0.4.9_p20070616-r1"
-DEPEND="${RDEPEND}"
+	>=media-video/ffmpeg-0.4.9_p20070330"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-swscale.patch
+	epatch "${FILESDIR}"/${P}-ffmpeg.patch
+	eautoreconf
 }
 
 src_install() {
diff --git a/media-video/ffmpegthumbnailer/files/digest-ffmpegthumbnailer-1.1.1-r1 b/media-video/ffmpegthumbnailer/files/digest-ffmpegthumbnailer-1.1.1-r1
deleted file mode 100644
index 23e8eba30ccd..000000000000
--- a/media-video/ffmpegthumbnailer/files/digest-ffmpegthumbnailer-1.1.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index f92a896b04e5..000000000000
--- a/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-1.1.1-ffmpeg.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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;

- 

diff --git a/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-1.1.2-ffmpeg.patch b/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-1.1.2-ffmpeg.patch
new file mode 100644
index 000000000000..2e825bf07a8c
--- /dev/null
+++ b/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-1.1.2-ffmpeg.patch
@@ -0,0 +1,31 @@
+diff -ur ffmpegthumbnailer-1.1.2.orig/configure.ac ffmpegthumbnailer-1.1.2/configure.ac
+--- ffmpegthumbnailer-1.1.2.orig/configure.ac	2007-06-01 23:49:10.000000000 +0300
++++ ffmpegthumbnailer-1.1.2/configure.ac	2007-06-27 16:49:30.000000000 +0300
+@@ -6,8 +6,14 @@
+ AC_PROG_CXX
+ AC_PROG_INSTALL
+ 
+-AC_CONFIG_FILES([
+-	Makefile
+-	src/Makefile
++PKG_CHECK_MODULES(FFMPEG, libavutil libavformat libavcodec libswscale, HAVE_FFMPEG=yes, AC_MSG_ERROR([
++Could not find ffmpeg. Please update PKG_CONFIG_PATH to point at ffmpeg include directory.
++])
++)
++
++AC_SUBST(FFMPEG_LIBS)
++
++AC_OUTPUT([
++        Makefile
++        src/Makefile
+ ])
+-AC_OUTPUT
+diff -ur ffmpegthumbnailer-1.1.2.orig/src/Makefile.am ffmpegthumbnailer-1.1.2/src/Makefile.am
+--- ffmpegthumbnailer-1.1.2.orig/src/Makefile.am	2007-06-01 23:47:05.000000000 +0300
++++ ffmpegthumbnailer-1.1.2/src/Makefile.am	2007-06-27 16:02:56.000000000 +0300
+@@ -7,4 +7,4 @@
+ 							pngwriter.h pngwriter.cpp \
+ 							stringoperations.h stringoperations.cpp
+ 
+-ffmpegthumbnailer_LDADD = -lavutil -lavcodec -lavformat -lpng
++ffmpegthumbnailer_LDADD = @FFMPEG_LIBS@ -lpng
diff --git a/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-1.1.2-swscale.patch b/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-1.1.2-swscale.patch
deleted file mode 100644
index a0a4c412cd37..000000000000
--- a/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-1.1.2-swscale.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -ur ffmpegthumbnailer-1.1.2.orig/src/Makefile.am ffmpegthumbnailer-1.1.2/src/Makefile.am
---- ffmpegthumbnailer-1.1.2.orig/src/Makefile.am	2007-06-01 23:47:05.000000000 +0300
-+++ ffmpegthumbnailer-1.1.2/src/Makefile.am	2007-06-27 14:26:54.000000000 +0300
-@@ -7,4 +7,4 @@
- 							pngwriter.h pngwriter.cpp \
- 							stringoperations.h stringoperations.cpp
- 
--ffmpegthumbnailer_LDADD = -lavutil -lavcodec -lavformat -lpng
-+ffmpegthumbnailer_LDADD = -lavutil -lavcodec -lavformat -lswscale -lpng