patch to fix new ffmpeg header structur added; bug #214740

Package-Manager: portage-2.1.4.4

7 files changed, 45 insertions, 182 deletions

diff --git a/media-plugins/vdr-image/ChangeLog b/media-plugins/vdr-image/ChangeLog
index 7a08ea1fbbf9..fafa607437be 100644
--- a/media-plugins/vdr-image/ChangeLog
+++ b/media-plugins/vdr-image/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/vdr-image
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/ChangeLog,v 1.23 2008/03/18 22:19:06 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/ChangeLog,v 1.24 2008/03/29 14:12:38 hd_brummy Exp $
+
+  29 Mar 2008; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -files/vdr-image-0.2.6-gentoo.diff,
+  +files/ffmpeg-0.4.9_p20080326-new_header.diff, -vdr-image-0.2.6-r1.ebuild,
+  -vdr-image-0.2.7.ebuild, vdr-image-0.2.7-r1.ebuild:
+  patch to fix new ffmpeg header structur added; bug #214740
 
   18 Mar 2008; Joerg Bornkessel <hd_brummy@gentoo.org>
   -files/vdr-image-0.2.4-gentoo.diff, -files/vdr-image-0.2.5-gentoo.diff,
diff --git a/media-plugins/vdr-image/Manifest b/media-plugins/vdr-image/Manifest
index de15cab5dbbc..057c79319b78 100644
--- a/media-plugins/vdr-image/Manifest
+++ b/media-plugins/vdr-image/Manifest
@@ -1,22 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX ffmpeg-0.4.9_p20080326-new_header.diff 857 RMD160 a4e2be97fbae740679ff0e2c891a52f270b37077 SHA1 9de1beee1b4177b5f8794a591aca91058a6669f4 SHA256 7697bd1a44409ef2412014f902bd70711786f55dadebcc4d219edc7d11493865
 AUX rc-addon.sh 672 RMD160 592ca37b35e4056b013585704ea2cf637e5dcae3 SHA1 769a5577a6849c77ac4bd32277aea5210996d393 SHA256 1d8a77095882d5b63ddeec7b422cd775b883b8ade3504a22e79d2e463f3eeb17
-AUX vdr-image-0.2.6-gentoo.diff 3497 RMD160 29973423e45e4211a69bff6dca01915a82aa2479 SHA1 30d7bbd7d33cb5672101a4aee1b893e9226ec858 SHA256 64cd28a8513bccfef99d3ab3f007e3df29aa255c2f1663dd89a3c9d104229903
 AUX vdr-image-0.2.7-gentoo.diff 3497 RMD160 29973423e45e4211a69bff6dca01915a82aa2479 SHA1 30d7bbd7d33cb5672101a4aee1b893e9226ec858 SHA256 64cd28a8513bccfef99d3ab3f007e3df29aa255c2f1663dd89a3c9d104229903
 AUX vdr-image-0.2.7-new-ffmpeg.diff 9296 RMD160 64dbe6234470e3abce06d9193077591f6b50dfe1 SHA1 072f470cf6cd340d8538fa5d644de183a09a47c8 SHA256 4205844b08f29cfda5871c6b09374415fbb4b2789387910e1d2a13abb761ec85
-DIST vdr-image-0.2.6.tar.gz 119780 RMD160 8ca292ad56bbcbf465079429ae278d50a18f8004 SHA1 c60ef9f55d2bf4e6992c991c2160044e9a6caefb SHA256 d98d4edf9b838f06501ce5ea854e1ad492cfe4a3dd29378ff913e1591644595f
 DIST vdr-image-0.2.7.tar.gz 120080 RMD160 7fb93dff5740e5fdf317f0d7b6d666023eb9b3b9 SHA1 7281bb0f2530bb43a6291bfc62e44b43753478b5 SHA256 2e2c57164498e53241486a46542fd38294ece0120438b054539b137cfdafb93f
-EBUILD vdr-image-0.2.6-r1.ebuild 1439 RMD160 9c6c8265c2be23b74c6f72a28a814952d1cd0be4 SHA1 b8f32436d667b33e1feb8afa3e9eaa80621f77b9 SHA256 329d5bb9e4218090751b61a200797fe2e1de80fda6965b629378f9af37b9f776
-EBUILD vdr-image-0.2.7-r1.ebuild 1672 RMD160 8c8b06c2515f67b41b618052bba8e01aa6431d3f SHA1 889eeae69f5f57ba24c2cc684a7b3a329226bc36 SHA256 fbbe273ef698697df69d7a2e79aa3fd468ac05195b862d63c75449928caa58b5
-EBUILD vdr-image-0.2.7.ebuild 1436 RMD160 0fb68169acf8be87fe2c009e0d109ba3809a2c6b SHA1 5c94dc34ada604a194e4332ae8be09d357cedc4b SHA256 ea15a37631c407fdde13d972818558259e96ad47b42928404da144475f2c21d8
-MISC ChangeLog 3923 RMD160 9d8111a77ad16efb59d1574673f120aa32dedb09 SHA1 a2e7423a2e2da3f9d130eba50e256e206196f83c SHA256 982b52f4d0119baed47713a4dc3ffa8936301c9db735e2f6d8c4b6f08b130b99
+EBUILD vdr-image-0.2.7-r1.ebuild 1801 RMD160 9816bfe70f67c8ea2f0e29c2684a2449738cdbac SHA1 8d0bdb26fce58f2b2faaef85e2fdbf28cb2b1b51 SHA256 060c28833743526f6d6bc7d1222bb00da7c128742fc581dcba8d599adfc37267
+MISC ChangeLog 4209 RMD160 da7fe2e60701beddfce55fd474c9a89d7eea1484 SHA1 593579f3e0abf86e721d03a9d485501e5b41dea5 SHA256 6ea8c0337229c8bb6264680e3ef2d24a52c3f2199d64dbe33e122a07fa4bbdc2
 MISC metadata.xml 435 RMD160 502170f1dbcc66a3742ba91c1790d2e46d7ef6a1 SHA1 e8df8ce5ac5a7cfae27a1e2808d7ae682a89ed0c SHA256 2339bf531037284f03317b33d6fcf743c6ffe74bd48c916e2db2e34c569f6bee
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFH4D1qdn07HTTCgIoRAvoQAJ9FqHdRXp2w5DWBL/8tpyOHNb/h5wCgp7Re
-XJfTrLymQyb9xNj6BuZxcpM=
-=kMft
+iD8DBQFH7k5hdn07HTTCgIoRAljVAKCTuwSINfvmdhgioYLTNsfBWDfsuACglP9j
+hg4wFcsX6odVGWbhAn4qcGo=
+=xvI4
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-image/files/ffmpeg-0.4.9_p20080326-new_header.diff b/media-plugins/vdr-image/files/ffmpeg-0.4.9_p20080326-new_header.diff
new file mode 100644
index 000000000000..06033e552c79
--- /dev/null
+++ b/media-plugins/vdr-image/files/ffmpeg-0.4.9_p20080326-new_header.diff
@@ -0,0 +1,27 @@
+new ffmpeg header structur
+https://bugs.gentoo.org/show_bug.cgi?id=214740
+Joerg Bornkessel <hd_brummy@gentoo.org> 29 Mar 2008
+diff -Naur image-0.2.7.orig/liboutput/encode.c image-0.2.7/liboutput/encode.c
+--- image-0.2.7.orig/liboutput/encode.c	2008-03-29 14:56:45.000000000 +0100
++++ image-0.2.7/liboutput/encode.c	2008-03-29 14:57:06.000000000 +0100
+@@ -31,7 +31,7 @@
+ #ifdef FFMDIR
+ #include <swscale.h>
+ #else
+-#include <ffmpeg/swscale.h>
++#include <libswscale/swscale.h>
+ #endif
+ #endif
+ }
+diff -Naur image-0.2.7.orig/liboutput/encode.h image-0.2.7/liboutput/encode.h
+--- image-0.2.7.orig/liboutput/encode.h	2008-03-29 14:56:45.000000000 +0100
++++ image-0.2.7/liboutput/encode.h	2008-03-29 14:57:21.000000000 +0100
+@@ -29,7 +29,7 @@
+ #ifdef FFMDIR
+ #include <avcodec.h>
+ #else
+-#include <ffmpeg/avcodec.h>
++#include <libavcodec/avcodec.h>
+ #endif 
+ }
+ 
diff --git a/media-plugins/vdr-image/files/vdr-image-0.2.6-gentoo.diff b/media-plugins/vdr-image/files/vdr-image-0.2.6-gentoo.diff
deleted file mode 100644
index 6f07df90090d..000000000000
--- a/media-plugins/vdr-image/files/vdr-image-0.2.6-gentoo.diff
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -Naur image-0.2.5.orig/control-image.c image-0.2.5/control-image.c
---- image-0.2.5.orig/control-image.c	2006-03-06 13:53:36.131134750 +0100
-+++ image-0.2.5/control-image.c	2006-03-06 13:57:06.248266250 +0100
-@@ -617,7 +617,7 @@
-       return osContinue;
-       
-     // Load additional Commands
--    pCmd->Load(AddDirectory(cPlugin::ConfigDirectory(g_szConfigDirectory), "imagecmds.conf"));
-+    pCmd->Load(AddDirectory(cPlugin::ConfigDirectory(g_szConfigDirectory), "image/imagecmds.conf"));
-   
-     if(pCmd->Count() <= 0)  {
-       delete pCmd;
-diff -Naur image-0.2.5.orig/examples/imagecmds.conf image-0.2.5/examples/imagecmds.conf
---- image-0.2.5.orig/examples/imagecmds.conf	2006-03-06 13:53:36.131134750 +0100
-+++ image-0.2.5/examples/imagecmds.conf	2006-03-06 14:10:06.753044750 +0100
-@@ -20,3 +20,5 @@
- Rotate JPEG picture lossless by 90 degrees to the right  : jpegtran -rotate 90 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s
- Rotate JPEG picture lossless by 90 degrees to the left   : jpegtran -rotate 270 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s
- Delete picture                                          ?: rm -f %s
-+Change burn template                                     : echo ln -fs '%s' '/usr/share/vdr/burn/menu-bg.png' | /bin/bash
-+Change burn template (button)                            : echo ln -fs '%s' '/usr/share/vdr/burn/menu-button.png' | /bin/bash
-diff -Naur image-0.2.5.orig/examples/imagecmds.conf.DE image-0.2.5/examples/imagecmds.conf.DE
---- image-0.2.5.orig/examples/imagecmds.conf.DE	2006-03-06 13:53:36.131134750 +0100
-+++ image-0.2.5/examples/imagecmds.conf.DE	2006-03-06 14:09:52.112129750 +0100
-@@ -11,6 +11,8 @@
- Informationen über das Bild                              : identify -verbose
- Größe des Bildes                                         : du -chs %s
- Exif Informationen des JPEG-Bildes ausgeben              : jpegtopnm -dumpexif %s >/dev/null 2> $CONVERT_TEMPDIR/exif.tmp && cat $CONVERT_TEMPDIR/exif.tmp && rm -f $CONVERT_TEMPDIR/exif.tmp
--Rotatiere JPEG Bildes verlustlos um 90° nach Rechts      : jpegtran -rotate 90 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s
--Rotatiere JPEG Bildes verlustlos um 90° nach Links       : jpegtran -rotate 270 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s
-+Rotiere JPEG Bildes verlustlos um 90° nach Rechts		 : jpegtran -rotate 90 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s
-+Rotiere JPEG Bildes verlustlos um 90° nach Links       	 : jpegtran -rotate 270 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s
- Lösche Bild                                             ?: rm -f %s
-+Hintergrund vdr-burn ändern                              : echo ln -fs '%s' '/usr/share/vdr/burn/menu-bg.png' | /bin/bash
-+Button vdr-burn ändern                             		 : echo ln -fs '%s' '/usr/share/vdr/burn/menu-button.png' | /bin/bash
-diff -Naur image-0.2.5.orig/image.c image-0.2.5/image.c
---- image-0.2.5.orig/image.c	2006-03-06 13:53:36.143135500 +0100
-+++ image-0.2.5/image.c	2006-03-06 13:57:59.203575750 +0100
-@@ -107,7 +107,7 @@
-     return false;
-   }
- 
--  ImageSources.Load(AddDirectory(ConfigDirectory(g_szConfigDirectory),  "imagesources.conf"));
-+  ImageSources.Load(AddDirectory(ConfigDirectory(g_szConfigDirectory),  "image/imagesources.conf"));
-   if(ImageSources.Count()<1) {
-     esyslog("imageplugin: you must have defined at least one source in imagesources.conf");
-     return false;
diff --git a/media-plugins/vdr-image/vdr-image-0.2.6-r1.ebuild b/media-plugins/vdr-image/vdr-image-0.2.6-r1.ebuild
deleted file mode 100644
index 86a7bb9314bb..000000000000
--- a/media-plugins/vdr-image/vdr-image-0.2.6-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/vdr-image-0.2.6-r1.ebuild,v 1.6 2007/07/10 23:08:59 mr_bones_ Exp $
-
-inherit vdr-plugin eutils
-
-DESCRIPTION="Video Disk Recorder Image Plugin"
-HOMEPAGE="http://vdr-image.berlios.de/"
-SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="exif"
-
-DEPEND=">=media-video/vdr-1.3.38
-	>=media-video/ffmpeg-0.4.8
-	>=media-libs/netpbm-10.0
-	exif? ( media-libs/libexif )"
-
-RDEPEND="${DEPEND}
-	>=media-tv/gentoo-vdr-scripts-0.2.2"
-
-VDRPLUGIN_MAKE_TARGET="all -j1"
-
-src_unpack() {
-
-	vdr-plugin_src_unpack
-
-	epatch ${FILESDIR}/${P}-gentoo.diff
-
-	use !exif && sed -i "s:#WITHOUT_LIBEXIF:WITHOUT_LIBEXIF:" Makefile
-}
-
-src_install() {
-
-	vdr-plugin_src_install
-
-	insinto /etc/vdr/imagecmds
-	newins examples/imagecmds.conf imagecmds.example.conf
-	newins examples/imagecmds.conf.DE imagecmds.example.conf.de
-
-	insinto /etc/vdr/plugins/image
-	doins examples/imagesources.conf
-
-	into /usr/share/vdr/image
-	dobin scripts/imageplugin.sh
-	newbin scripts/mount.sh mount-image.sh
-}
-
-pkg_postinst() {
-
-	vdr-plugin_pkg_postinst
-
-	echo
-	elog "Also check /etc/vdr/plugins/image/imagesources.conf"
-	echo
-	elog "Multilanguage will automaticly supported, just take a look in"
-	elog "/etc/vdr/imagecmds/* how it works"
-	elog "By the moment only EN + DE"
-	echo
-}
diff --git a/media-plugins/vdr-image/vdr-image-0.2.7-r1.ebuild b/media-plugins/vdr-image/vdr-image-0.2.7-r1.ebuild
index 72ebb163d7f3..255bd0e6a808 100644
--- a/media-plugins/vdr-image/vdr-image-0.2.7-r1.ebuild
+++ b/media-plugins/vdr-image/vdr-image-0.2.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/vdr-image-0.2.7-r1.ebuild,v 1.4 2008/03/18 22:19:06 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/vdr-image-0.2.7-r1.ebuild,v 1.5 2008/03/29 14:12:38 hd_brummy Exp $
 
 inherit vdr-plugin eutils
 
@@ -36,6 +36,10 @@ src_unpack() {
 	if has_version "<=media-video/ffmpeg-0.4.9_p20061016"; then
 		VDRPLUGIN_MAKE_TARGET="${VDRPLUGIN_MAKE_TARGET} WITHOUT_SWSCALER=1"
 	fi
+
+	if has_version ">=media-video/ffmpeg-0.4.9_p20080326" ; then
+		epatch "${FILESDIR}/ffmpeg-0.4.9_p20080326-new_header.diff"
+	fi
 }
 
 src_install() {
diff --git a/media-plugins/vdr-image/vdr-image-0.2.7.ebuild b/media-plugins/vdr-image/vdr-image-0.2.7.ebuild
deleted file mode 100644
index b33ffbe7bc1c..000000000000
--- a/media-plugins/vdr-image/vdr-image-0.2.7.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/vdr-image-0.2.7.ebuild,v 1.5 2007/07/10 23:08:59 mr_bones_ Exp $
-
-inherit vdr-plugin eutils
-
-DESCRIPTION="Video Disk Recorder Image Plugin"
-HOMEPAGE="http://vdr-image.berlios.de/"
-SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="exif"
-
-DEPEND=">=media-video/vdr-1.3.38
-	>=media-video/ffmpeg-0.4.8
-	>=media-libs/netpbm-10.0
-	exif? ( media-libs/libexif )"
-
-RDEPEND="${DEPEND}
-	>=media-tv/gentoo-vdr-scripts-0.2.2"
-
-VDRPLUGIN_MAKE_TARGET="all -j1"
-
-src_unpack() {
-
-	vdr-plugin_src_unpack
-
-	epatch ${FILESDIR}/${P}-gentoo.diff
-
-	use !exif && sed -i "s:#WITHOUT_LIBEXIF:WITHOUT_LIBEXIF:" Makefile
-}
-
-src_install() {
-
-	vdr-plugin_src_install
-
-	insinto /etc/vdr/imagecmds
-	newins examples/imagecmds.conf imagecmds.example.conf
-	newins examples/imagecmds.conf.DE imagecmds.example.conf.de
-
-	insinto /etc/vdr/plugins/image
-	doins examples/imagesources.conf
-
-	into /usr/share/vdr/image
-	dobin scripts/imageplugin.sh
-	newbin scripts/mount.sh mount-image.sh
-}
-
-pkg_postinst() {
-
-	vdr-plugin_pkg_postinst
-
-	echo
-	elog "Also check /etc/vdr/plugins/image/imagesources.conf"
-	echo
-	elog "Multilanguage will automaticly supported, just take a look in"
-	elog "/etc/vdr/imagecmds/* how it works"
-	elog "By the moment only EN + DE"
-	echo
-}