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

(Portage version: 2.1.5)

4 files changed, 83 insertions, 6 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/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 \