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

(Portage version: 2.1.3_rc5)

7 files changed, 47 insertions, 76 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/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