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

Package-Manager: portage-2.1.4.4

4 files changed, 98 insertions, 6 deletions

diff --git a/media-plugins/vdr-graphtft/ChangeLog b/media-plugins/vdr-graphtft/ChangeLog
index 10885847bcaf..4665e7dc32f4 100644
--- a/media-plugins/vdr-graphtft/ChangeLog
+++ b/media-plugins/vdr-graphtft/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/vdr-graphtft
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/ChangeLog,v 1.1 2007/12/23 22:05:09 hd_brummy Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/ChangeLog,v 1.2 2008/03/29 13:46:11 hd_brummy Exp $
+
+  29 Mar 2008; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +files/ffmpeg-0.4.9_p20080326-new_header.diff,
+  vdr-graphtft-0.1.16_alpha.ebuild:
+  patch to fix new ffmpeg header structur added; bug #214740
 
 *vdr-graphtft-0.1.16_alpha (23 Dec 2007)
 
diff --git a/media-plugins/vdr-graphtft/Manifest b/media-plugins/vdr-graphtft/Manifest
index 5977c9e9ca76..8bb994813414 100644
--- a/media-plugins/vdr-graphtft/Manifest
+++ b/media-plugins/vdr-graphtft/Manifest
@@ -1,9 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX confd 1233 RMD160 7b0183644d7ff2f2c0488ec10190e40afc11dab3 SHA1 803cf52c0b13cc2b110f8c8706f8fda15bd532a7 SHA256 2ddbe4e535d7f18a002df6760b41f9c24a4cb95695480a210d148bc046582063
+AUX ffmpeg-0.4.9_p20080326-new_header.diff 2678 RMD160 5d9a6396444faf7d9536b368cd7157c535f0bb94 SHA1 aca6ba06d43eda1270b8fc55daaa19076aa860ef SHA256 4328dd8f735eb9606c64ae3dc62ae5ab93c8631566dfc3192b7e7230d5f9233c
 AUX graphtft-fe 995 RMD160 669a22a7bd3d5d7efdf7468f2f1692d118b77a09 SHA1 722a35ee6c93632d669e789897eaed2b48baec41 SHA256 1f97afe93133b38e0a0679baf7abfa85d532d1908801da1cd1c70e5104338107
 AUX rc-addon.sh 319 RMD160 1d0638b87fa0c352efb6a0dcc4cedb9f45fbb29a SHA1 926fb7e8e104ded4ead49d25d0c2f75f0a0ed73b SHA256 12de96dd173d9de415c016178468b20aa293df3ad75b7eb62ba6fc71737ee585
 AUX vdr-graphtft-0.1.16_alpha-gentoo.diff 3460 RMD160 3b262e53a004a986eb0d4d29aad3e38fe0838eeb SHA1 db6308b080bd19549c0dd5ab7c2606a37ea7e8d0 SHA256 c58a38565f2471cfe5f3c99f594393555a4c340e863a9afe4b417c2c3ba7bf31
 DIST DeepBlue-horchi-0.0.6.tar.bz2 1660439 RMD160 8ac510b9a65f8f4becef94519cf77f083709e96e SHA1 108321c1fc2d9e4e4aae650d9b6e842dfd5d6788 SHA256 75ca7ea853ae9fc3a30b656ab0f6599bc09c10d371b76990156ad9491ad2c8ee
 DIST vdr-graphtft-0.1.16.alpha.tar.bz2 234797 RMD160 e5a491b480b37480a9c7574cb74bdc2b14113bbe SHA1 38a0af195c57ab2795ec9d566640018282aced15 SHA256 3ede1f5faeb37add03395a7296fe30ef505eb717c70c2000bfeca383f5b71457
-EBUILD vdr-graphtft-0.1.16_alpha.ebuild 2312 RMD160 29fb9a941c195fe4cb55d204aeadbffcf2755eab SHA1 35f8f36f123c0ba52e58248f9d93db61be624df2 SHA256 9c505faa61990801df80a74f2885d942d6cfee55f37d9ece67066d5e98c384ba
-MISC ChangeLog 616 RMD160 d65a99e991c2c8f30bb327821b5725c063a366a0 SHA1 6b734e2baa228c48708e7f76cb23f4825c8e7379 SHA256 552c671323337b166c7a79b2ed86e9f48c93d8a88d8d6a83d415606cf796e9b9
+EBUILD vdr-graphtft-0.1.16_alpha.ebuild 2441 RMD160 5bd90a700b4430ba30dcdf14f6784df88dfee1ee SHA1 d54949d9179ffdcc81efbe395cf75617b8ad4647 SHA256 cbbd6d6e38141269f96b8c5f655d4c745f4287819e530e2b156e9753006e08da
+MISC ChangeLog 818 RMD160 d9ca333aa40164d23005a1d6ecd929bcb2316f65 SHA1 f55033b48e1e28f78e05ecaac10177b5960eb6dc SHA256 82f0879b6a34fa97ee8c962932e220563c59b05bec8ba354d100b2e429ab9f86
 MISC metadata.xml 262 RMD160 7546813a650c87e871e1803630eec93651cf171b SHA1 50f15b18b32db880cb94fa98480e865252f12e0e SHA256 e50bacec7fb98fb225d1d709825110afe8c6e04960458ec53758da0f067a18ff
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+Comment: added by hd_brummy@gentoo.org
+
+iD8DBQFH7kgtdn07HTTCgIoRAg4wAJ4t3E7AakotrSdMIOP2lsVAtNFkQgCdE5r0
+cj4D4uJrr7vi43fpc7HUHps=
+=P9nM
+-----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-graphtft/files/ffmpeg-0.4.9_p20080326-new_header.diff b/media-plugins/vdr-graphtft/files/ffmpeg-0.4.9_p20080326-new_header.diff
new file mode 100644
index 000000000000..660cb9fbb639
--- /dev/null
+++ b/media-plugins/vdr-graphtft/files/ffmpeg-0.4.9_p20080326-new_header.diff
@@ -0,0 +1,71 @@
+new ffmpeg header structur
+https://bugs.gentoo.org/show_bug.cgi?id=214740
+Joerg Bornkessel <hd_brummy@gentoo.org> 29 Mar 2008
+diff -Naur graphtft-0.1.16.alpha.orig/imlibrenderer/dvbrenderer/mpeg2encoder.c graphtft-0.1.16.alpha/imlibrenderer/dvbrenderer/mpeg2encoder.c
+--- graphtft-0.1.16.alpha.orig/imlibrenderer/dvbrenderer/mpeg2encoder.c	2008-03-29 14:28:15.000000000 +0100
++++ graphtft-0.1.16.alpha/imlibrenderer/dvbrenderer/mpeg2encoder.c	2008-03-29 14:30:07.000000000 +0100
+@@ -23,10 +23,10 @@
+ 
+ extern "C" 
+ {
+-#include <avcodec.h>
++#include <libavcodec/avcodec.h>
+ 
+ #ifdef HAVE_SWSCALE
+-#  include <swscale.h>
++#  include <libswscale/swscale.h>
+ #endif
+ }
+ 
+diff -Naur graphtft-0.1.16.alpha.orig/imlibrenderer/fbrenderer/fbrenderer.c graphtft-0.1.16.alpha/imlibrenderer/fbrenderer/fbrenderer.c
+--- graphtft-0.1.16.alpha.orig/imlibrenderer/fbrenderer/fbrenderer.c	2008-03-29 14:28:15.000000000 +0100
++++ graphtft-0.1.16.alpha/imlibrenderer/fbrenderer/fbrenderer.c	2008-03-29 14:30:33.000000000 +0100
+@@ -31,7 +31,7 @@
+ #include <stdlib.h>
+ 
+ #include <fbrenderer.h>
+-#include <avcodec.h>
++#include <libavcodec/avcodec.h>
+ //#include <mpeg2decoder.h>
+ #include <common.h>
+ #include <setup.h>
+diff -Naur graphtft-0.1.16.alpha.orig/imlibrenderer/fbrenderer/mpeg2decoder.c graphtft-0.1.16.alpha/imlibrenderer/fbrenderer/mpeg2decoder.c
+--- graphtft-0.1.16.alpha.orig/imlibrenderer/fbrenderer/mpeg2decoder.c	2008-03-29 14:28:15.000000000 +0100
++++ graphtft-0.1.16.alpha/imlibrenderer/fbrenderer/mpeg2decoder.c	2008-03-29 14:31:00.000000000 +0100
+@@ -23,10 +23,10 @@
+ 
+ extern "C" 
+ {
+-#include <avcodec.h>
++#include <libavcodec/avcodec.h>
+ 
+ # ifdef HAVE_SWSCALE
+-#  include <swscale.h>
++#  include <libswscale/swscale.h>
+ # endif
+ }
+ 
+diff -Naur graphtft-0.1.16.alpha.orig/imlibrenderer/fbrenderer/mpeg2decoder.h graphtft-0.1.16.alpha/imlibrenderer/fbrenderer/mpeg2decoder.h
+--- graphtft-0.1.16.alpha.orig/imlibrenderer/fbrenderer/mpeg2decoder.h	2008-03-29 14:28:15.000000000 +0100
++++ graphtft-0.1.16.alpha/imlibrenderer/fbrenderer/mpeg2decoder.h	2008-03-29 14:31:14.000000000 +0100
+@@ -19,7 +19,7 @@
+ 
+ extern "C"
+ {
+-#include <avcodec.h>
++#include <libavcodec/avcodec.h>
+ }
+ #include <vdr/plugin.h>
+ #include <vdr/ringbuffer.h>
+diff -Naur graphtft-0.1.16.alpha.orig/Makefile graphtft-0.1.16.alpha/Makefile
+--- graphtft-0.1.16.alpha.orig/Makefile	2008-03-29 14:28:15.000000000 +0100
++++ graphtft-0.1.16.alpha/Makefile	2008-03-29 14:28:32.000000000 +0100
+@@ -11,7 +11,7 @@
+ # You will need ffmpeg for dvb/fb-devices and for softmpeg, 
+ # so install it and set path below:
+ 
+-FFMDIR = /usr/include/ffmpeg
++FFMDIR = /usr/include
+ 
+ #
+ # Install imlib2 and uncomment the lines
diff --git a/media-plugins/vdr-graphtft/vdr-graphtft-0.1.16_alpha.ebuild b/media-plugins/vdr-graphtft/vdr-graphtft-0.1.16_alpha.ebuild
index 80bf14a53fd7..8166f8dfc6f2 100644
--- a/media-plugins/vdr-graphtft/vdr-graphtft-0.1.16_alpha.ebuild
+++ b/media-plugins/vdr-graphtft/vdr-graphtft-0.1.16_alpha.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/vdr-graphtft-0.1.16_alpha.ebuild,v 1.1 2007/12/23 22:05:09 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/vdr-graphtft-0.1.16_alpha.ebuild,v 1.2 2008/03/29 13:46:11 hd_brummy Exp $
 
 MY_PV="${PV/_alpha/.alpha}"
 MY_P="${PN}-${MY_PV}"
@@ -53,6 +53,10 @@ src_unpack() {
 		sed -i Makefile -e "s:#HAVE_SWSCALE:HAVE_SWSCALE:"
 	fi
 
+	if has_version ">=media-video/ffmpeg-0.4.9_p20080326" ; then
+		epatch "${FILESDIR}/ffmpeg-0.4.9_p20080326-new_header.diff"
+	fi
+
 	use directfb && sed -i Makefile \
 		-e "s:#HAVE_DFB = 1:HAVE_DFB = 1:"