Fixed new ffmpeg header patch for version 0.1.18_alpha. Fixed quoting of PATCHES.

Package-Manager: portage-2.1.5

5 files changed, 91 insertions, 14 deletions

diff --git a/media-plugins/vdr-graphtft/ChangeLog b/media-plugins/vdr-graphtft/ChangeLog
index 1624ef055625..cd3d4f49f08b 100644
--- a/media-plugins/vdr-graphtft/ChangeLog
+++ b/media-plugins/vdr-graphtft/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/vdr-graphtft
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/ChangeLog,v 1.3 2008/04/13 19:01:39 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/ChangeLog,v 1.4 2008/05/15 12:22:21 zzam Exp $
+
+  15 May 2008; Matthias Schwarzott <zzam@gentoo.org>
+  +files/vdr-graphtft-0.1.18_alpha-ffmpeg-0.4.9_p20080326-new_header.diff,
+  vdr-graphtft-0.1.16_alpha.ebuild, vdr-graphtft-0.1.18_alpha.ebuild:
+  Fixed new ffmpeg header patch for version 0.1.18_alpha. Fixed quoting of
+  PATCHES.
 
 *vdr-graphtft-0.1.18_alpha (13 Apr 2008)
 
diff --git a/media-plugins/vdr-graphtft/Manifest b/media-plugins/vdr-graphtft/Manifest
index 8e37a87f5c71..38175e7fab9d 100644
--- a/media-plugins/vdr-graphtft/Manifest
+++ b/media-plugins/vdr-graphtft/Manifest
@@ -6,19 +6,19 @@ AUX ffmpeg-0.4.9_p20080326-new_header.diff 2678 RMD160 5d9a6396444faf7d9536b368c
 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
+AUX vdr-graphtft-0.1.18_alpha-ffmpeg-0.4.9_p20080326-new_header.diff 2651 RMD160 c9449b8ef2dc1d806fbcfd7ef7e95fd1defcc7a9 SHA1 316ac3e328fe4bedc9bb5dc419c9c0b2f554e8be SHA256 1d68415dd3ffafbd3735102ac2407f5b22a7361209869b6fc780d35aa27f0424
 AUX vdr-graphtft-0.1.18_alpha-gentoo.diff 3937 RMD160 4f97eaa37391286819a1483835b6a0fc4980994a SHA1 afdcdbef95c174093d2d08ff6d81ec2263034f20 SHA256 25b9ba6c4f6da4218ed27f7ee0cb35da4e268d844557882ed8f42dba14892ada
 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
 DIST vdr-graphtft-0.1.18.alpha.tar.bz2 243724 RMD160 dbb1c86f945a64eb352dadb3e4e96f677d9b53d4 SHA1 7b92bcdcd3a101d0f0321859735c2cf1308a020f SHA256 8b77a0b7809b32899646a94e03277933340d697c7268ac5c347a89cde212eadf
-EBUILD vdr-graphtft-0.1.16_alpha.ebuild 2449 RMD160 6b1589038d5cbf39d48d3792ba6955f358687077 SHA1 3e233d621359e2f5fe4227b44cd7daf5e2bf5b77 SHA256 bed6f260fdc80b6e321b8538ca28e77e5bf8199bed1d7b3a663d60c5441bf2ba
-EBUILD vdr-graphtft-0.1.18_alpha.ebuild 2542 RMD160 180203fff0bc779cd6a7b0eac9f7ddbc55614b54 SHA1 5d6d0d753a451320f9f38a22bf242e4cdb361fb8 SHA256 bdd09bc9723f01674e3e14a2f0a7d127ba51c39d61a0d70df59815e54d9d44a4
-MISC ChangeLog 1086 RMD160 c21a96580b6a4b7e3bfadc718e7d25efa1e0bbad SHA1 464ae9059e97809ebad3d49669bd6732144a63e1 SHA256 f8236c89b18b63f04304e168d6f82141901e977e0f51950857278cdb82e5ffc4
+EBUILD vdr-graphtft-0.1.16_alpha.ebuild 2446 RMD160 efebe45e49bd081e9286b9944b7a79d10d265575 SHA1 298d44c42840a0bc7748769dedb166d35c4286c8 SHA256 0ecf885c4a188e777a1b1999d705fc5af7f4b766b24fd06ba3583efb6f6a7bab
+EBUILD vdr-graphtft-0.1.18_alpha.ebuild 2544 RMD160 0e2efbc90c9e556e47643646da14b74a3ab1b9b8 SHA1 49b016548391b9760d3fcf83758fa1581bff0a97 SHA256 13aca81ac1fc545573cbf4c2cc954e9b52c1afd2851838419d031f8920803175
+MISC ChangeLog 1366 RMD160 be9ec8a77344589463000b746dea0ef80cbb194e SHA1 b9bf7f12f1c9d44b3c2f729b858e0cb9acff2983 SHA256 84067fc7a61914e54041c6394bdeedadde85ed934b83d9e953add1615d26c6d8
 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
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFIAlikdn07HTTCgIoRAvgcAJ9U44/y7gzRspXtezfddc3kf2MhAwCfdcVy
-ZkmXX3n+6qKtTfL4mHMOl1U=
-=0ATW
+iEYEARECAAYFAkgsKwcACgkQt2vP6XvVdOcEOACgxzTLP5f0jVqFnkFgHJbBr84O
+zJ4AoOQbeyy4L138h7lHOdO0C1lbimop
+=UIOY
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.1.18_alpha-ffmpeg-0.4.9_p20080326-new_header.diff b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.1.18_alpha-ffmpeg-0.4.9_p20080326-new_header.diff
new file mode 100644
index 000000000000..8de41953d1b4
--- /dev/null
+++ b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.1.18_alpha-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 <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 9cc0338525cd..b70c5743b669 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-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.3 2008/04/13 19:01:39 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/vdr-graphtft-0.1.16_alpha.ebuild,v 1.4 2008/05/15 12:22:21 zzam Exp $
 
 MY_PV="${PV/_alpha/.alpha}"
 MY_P="${PN}-${MY_PV}"
@@ -26,7 +26,7 @@ DEPEND=">=media-video/vdr-1.4.7-r9
 		directfb? ( dev-libs/DirectFB )
 		graphtft-fe? ( $(qt4_min_version 4.0.0) )"
 
-PATCHES="${FILESDIR}/${P}-gentoo.diff"
+PATCHES=("${FILESDIR}/${P}-gentoo.diff")
 
 S="${WORKDIR}/graphtft-${MY_PV}"
 
diff --git a/media-plugins/vdr-graphtft/vdr-graphtft-0.1.18_alpha.ebuild b/media-plugins/vdr-graphtft/vdr-graphtft-0.1.18_alpha.ebuild
index 98a7e8417255..ca3bf00557da 100644
--- a/media-plugins/vdr-graphtft/vdr-graphtft-0.1.18_alpha.ebuild
+++ b/media-plugins/vdr-graphtft/vdr-graphtft-0.1.18_alpha.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-graphtft/vdr-graphtft-0.1.18_alpha.ebuild,v 1.1 2008/04/13 19:01:39 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/vdr-graphtft-0.1.18_alpha.ebuild,v 1.2 2008/05/15 12:22:21 zzam Exp $
 
 MY_PV="${PV/_alpha/.alpha}"
 MY_P="${PN}-${MY_PV}"
@@ -26,7 +26,7 @@ DEPEND=">=media-video/vdr-1.4.7-r9
 		directfb? ( dev-libs/DirectFB )
 		graphtft-fe? ( $(qt4_min_version 4.0.0) )"
 
-PATCHES="${FILESDIR}/${P}-gentoo.diff"
+PATCHES=("${FILESDIR}/${P}-gentoo.diff")
 
 S="${WORKDIR}/graphtft-${MY_PV}"
 
@@ -55,7 +55,7 @@ src_unpack() {
 	fi
 
 	if has_version ">=media-video/ffmpeg-0.4.9_p20080326" ; then
-		epatch "${FILESDIR}/ffmpeg-0.4.9_p20080326-new_header.diff"
+		epatch "${FILESDIR}/${P}-ffmpeg-0.4.9_p20080326-new_header.diff"
 	fi
 
 	use directfb && sed -i Makefile \