Added patch for new header location in ffmpeg-0.4.9_p20080326, Bug #218094. Fixed quoting.

(Portage version: 2.1.5_rc5)

5 files changed, 30 insertions, 8 deletions

diff --git a/media-plugins/vdr-dxr3/ChangeLog b/media-plugins/vdr-dxr3/ChangeLog
index 1446edf540cc..ab6069b769bb 100644
--- a/media-plugins/vdr-dxr3/ChangeLog
+++ b/media-plugins/vdr-dxr3/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/vdr-dxr3
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-dxr3/ChangeLog,v 1.13 2008/04/07 20:27:04 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-dxr3/ChangeLog,v 1.14 2008/04/21 17:50:46 zzam Exp $
+
+  21 Apr 2008; Matthias Schwarzott <zzam@gentoo.org>
+  +files/vdr-dxr3-0.2.8-ffmpeg-includes.diff, vdr-dxr3-0.2.6.ebuild,
+  vdr-dxr3-0.2.7.ebuild, vdr-dxr3-0.2.8.ebuild:
+  Added patch for new header location in ffmpeg-0.4.9_p20080326, Bug
+  #218094. Fixed quoting.
 
 *vdr-dxr3-0.2.8 (07 Apr 2008)
 
diff --git a/media-plugins/vdr-dxr3/files/vdr-dxr3-0.2.8-ffmpeg-includes.diff b/media-plugins/vdr-dxr3/files/vdr-dxr3-0.2.8-ffmpeg-includes.diff
new file mode 100644
index 000000000000..3ecec25f0f3a
--- /dev/null
+++ b/media-plugins/vdr-dxr3/files/vdr-dxr3-0.2.8-ffmpeg-includes.diff
@@ -0,0 +1,12 @@
+diff -ru dxr3-0.2.8-orig/dxr3ffmpeg.h dxr3-0.2.8/dxr3ffmpeg.h
+--- dxr3-0.2.8-orig/dxr3ffmpeg.h	2008-04-21 18:03:49.828681287 +0200
++++ dxr3-0.2.8/dxr3ffmpeg.h	2008-04-21 18:04:04.978681786 +0200
+@@ -24,7 +24,7 @@
+ 
+ extern "C"
+ {
+-#include <avcodec.h>
++#include <libavcodec/avcodec.h>
+ }
+ 
+ #include <string.h>
diff --git a/media-plugins/vdr-dxr3/vdr-dxr3-0.2.6.ebuild b/media-plugins/vdr-dxr3/vdr-dxr3-0.2.6.ebuild
index 13f5519bd344..e06249557847 100644
--- a/media-plugins/vdr-dxr3/vdr-dxr3-0.2.6.ebuild
+++ b/media-plugins/vdr-dxr3/vdr-dxr3-0.2.6.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-dxr3/vdr-dxr3-0.2.6.ebuild,v 1.6 2007/11/08 18:06:23 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-dxr3/vdr-dxr3-0.2.6.ebuild,v 1.7 2008/04/21 17:50:46 zzam Exp $
 
 inherit vdr-plugin
 
@@ -17,7 +17,7 @@ DEPEND="media-video/em8300-libraries
 		>=media-video/vdr-1.3.36
 		media-video/ffmpeg"
 
-PATCHES="${FILESDIR}/${P}-polish.patch"
+PATCHES=("${FILESDIR}/${P}-polish.patch")
 
 src_unpack() {
 	vdr-plugin_src_unpack
diff --git a/media-plugins/vdr-dxr3/vdr-dxr3-0.2.7.ebuild b/media-plugins/vdr-dxr3/vdr-dxr3-0.2.7.ebuild
index 4bb0ec9cf0d9..2eea3f711f3f 100644
--- a/media-plugins/vdr-dxr3/vdr-dxr3-0.2.7.ebuild
+++ b/media-plugins/vdr-dxr3/vdr-dxr3-0.2.7.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-dxr3/vdr-dxr3-0.2.7.ebuild,v 1.4 2007/11/11 19:31:17 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-dxr3/vdr-dxr3-0.2.7.ebuild,v 1.5 2008/04/21 17:50:46 zzam Exp $
 
 inherit vdr-plugin
 
@@ -17,7 +17,7 @@ DEPEND="media-video/em8300-libraries
 		>=media-video/vdr-1.3.42
 		media-video/ffmpeg"
 
-PATCHES="${FILESDIR}/${P}-ffmpeg.patch"
+PATCHES=("${FILESDIR}/${P}-ffmpeg.patch")
 
 src_unpack() {
 	vdr-plugin_src_unpack
diff --git a/media-plugins/vdr-dxr3/vdr-dxr3-0.2.8.ebuild b/media-plugins/vdr-dxr3/vdr-dxr3-0.2.8.ebuild
index 4e95c52fe9b9..48d06535ed82 100644
--- a/media-plugins/vdr-dxr3/vdr-dxr3-0.2.8.ebuild
+++ b/media-plugins/vdr-dxr3/vdr-dxr3-0.2.8.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-dxr3/vdr-dxr3-0.2.8.ebuild,v 1.1 2008/04/07 20:27:04 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-dxr3/vdr-dxr3-0.2.8.ebuild,v 1.2 2008/04/21 17:50:46 zzam Exp $
 
 inherit vdr-plugin versionator
 
@@ -22,4 +22,8 @@ src_unpack() {
 
 	cd "${S}"
 	sed -i Makefile -e 's:^FFMDIR =.*$:FFMDIR=/usr/include/ffmpeg:'
+
+	if has_version ">=media-video/ffmpeg-0.4.9_p20080326"; then
+		epatch "${FILESDIR}/${P}-ffmpeg-includes.diff"
+	fi
 }