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

Package-Manager: portage-2.1.5_rc5

6 files changed, 38 insertions, 15 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/Manifest b/media-plugins/vdr-dxr3/Manifest
index c93e4aa66db9..3cfc37e1187d 100644
--- a/media-plugins/vdr-dxr3/Manifest
+++ b/media-plugins/vdr-dxr3/Manifest
@@ -3,22 +3,23 @@ Hash: SHA1
 
 AUX vdr-dxr3-0.2.6-polish.patch 4117 RMD160 2be1e14879e692378f1c80568cce546058981fbf SHA1 fb9915785b870d5ce763277b64f3133a2d172ae5 SHA256 4dfb12e14a3af340eb6d60a4357e780f5e0287fcf69c53aa07d628e2f832e71d
 AUX vdr-dxr3-0.2.7-ffmpeg.patch 620 RMD160 18f2ec4d3294caf5576fc1f01865699a06be5c93 SHA1 63f4e96b09f13d460c0c781d35a08a72454de4ee SHA256 ad15fb8f90a34825cbd217a06f2ab2f87e0f94b9d6c48ad68c93332a1cfefa19
+AUX vdr-dxr3-0.2.8-ffmpeg-includes.diff 311 RMD160 eba61cf84c6133d054758f452b108dae795fe7d7 SHA1 48e1acf008344451e2b01a30bd3b3b8a05abc30f SHA256 80b0d5b022d5502ee2b865be246e31140abdf7995a1dde078b9a31e2508dce74
 DIST vdr-dxr3-0.2.6.tgz 76927 RMD160 6e694aa68990aa0fe0e3f4a10f646f1b27c2d2d0 SHA1 0ef5b5aae6f47f9079ca80974ca9dcc26612e20c SHA256 7e00ba405ed95d819ec074603077842ebe873b3048a5afec1c0ba564b8315db9
 DIST vdr-dxr3-0.2.7.tgz 73758 RMD160 bf308ac737cde86a582a4d90e4e44a2d8eb146bd SHA1 2d915322802d520164e31055c6ea2f2870d4d496 SHA256 2f4d895ab34a7c73ba9e8173ca8ba19772eb8225d81ab7a8deded3ba72eb88be
 DIST vdr-dxr3-0.2.8.tgz 75649 RMD160 3ff53821b5a7d0abaf73c09f3a8833724b21e961 SHA1 13d7e3345b8038d3230b87e7c3cb5182a87733c3 SHA256 7f0f6c08f9c2d8a54e78b1acb0bc241488ecec0943d862ae277ce0e20a30d6ea
 DIST vdr-dxr3-20071111.tar.gz 73309 RMD160 fcd3aec30b4201025df5b0a4f08def8f534c358c SHA1 b0541316ea0dbd451a90b3945c4fa9ebaa2caaf1 SHA256 a138a77d74a9472033a36657079f6c7fec20a07d781b5125b0c5b36a19a63ef0
 DIST vdr-dxr3-20080308.tar.gz 73364 RMD160 b0df0ad30dbbe67779a9d181008b0cdf7777d78f SHA1 a96fb6a2124a65e1216ea6e70af093b6b9dbdc3c SHA256 f5ab13bc6fd323589ba3beb378ecbf749f30ee1911a063b2bdf38b5ff2cee5b2
-EBUILD vdr-dxr3-0.2.6.ebuild 865 RMD160 5d0c1e7409fd249e7531d36492ae3df2aef7fa57 SHA1 48bc3bc5aff97d1ed63c2d02a60acae43953f607 SHA256 9619be5b71dc01856eb05594f28fa4d08ff3ed69ead325404bc815f37e562ae5
+EBUILD vdr-dxr3-0.2.6.ebuild 867 RMD160 40921fded0d2f626037d79d6a4eaeeba48efa24b SHA1 fd5e5b87073374e68a459d152c3cd79c567a5c24 SHA256 a82a2267b43df8d26ff5c8a20f8dfcc2360bd818663a72f315d3f5b1b894a395
 EBUILD vdr-dxr3-0.2.7.20071111.ebuild 785 RMD160 301b0c2dfc9ab8e7fb93a5b62d59b6443a389e4f SHA1 3ac71cb0377fe4f32a8a4d3ff935a224fd9ebd23 SHA256 66f155fa8b0b3f94deaab3287354b54b8549d4c40d6d798fc70cc72fd6564aee
 EBUILD vdr-dxr3-0.2.7.20080308.ebuild 794 RMD160 f161ee503054a3a238dc1ab23799b91012457fc3 SHA1 55635550d4db0df8eddc697952f839c9517eb380 SHA256 b96a2b67c84b9933dac517b3004e8b7cfd059566594daae120c13a90f892dc29
-EBUILD vdr-dxr3-0.2.7.ebuild 724 RMD160 202aa2be5d63eef75aa65f8bc40093c0dc95bfad SHA1 f008ee68504b7a0dc5fbee369bc1042710ef88ff SHA256 dbbdd1cfee70b160c58a5c2c4d47baa2edb484e06103edf0a49191a9f42be8e9
-EBUILD vdr-dxr3-0.2.8.ebuild 690 RMD160 186c08edc34242db97151c8b4b0d0ff72ac200b2 SHA1 7e824e5689eb103d0e8c09b0aca9526b55fe9dc7 SHA256 bb407a3f7f790c34f06301123d9f5f11b3b1e831eda594e3b386df57db1bc92d
-MISC ChangeLog 2275 RMD160 8aa1b773cd93be39f8783a0c92585d473219647c SHA1 bfb9fcc135edfd009becf82579c02583fc813de4 SHA256 a5ac12a0806324cc1aa16827eb9252a2db6971b5942e7ec6537c688b94f60c31
+EBUILD vdr-dxr3-0.2.7.ebuild 721 RMD160 ea4719281244e1636638fa8475e3b0b35bce9880 SHA1 5c7f75e09dd0632e8a3955519eb1c93c42938506 SHA256 4125e42d8ba904fdf3c1937c2724ec97959f9f6f853fdcf3cc6d795ddfeca985
+EBUILD vdr-dxr3-0.2.8.ebuild 805 RMD160 60cb7708c1d28d1550f28fabec968b2a91178728 SHA1 7570feed810e711a4b9239184dd0edd48fdf8a1e SHA256 285cd32c20148acb05a5455288e3b24f192bbd66803dc2bec6345a4d413f173d
+MISC ChangeLog 2541 RMD160 e974648e1380df9933e225555cde2c57deaebb92 SHA1 92fc819066df9733b6788a5bad450037f948ac8e SHA256 4c3d1f9a2e4ec273170c060e0d2adc764027238c91c1cc4ced6b9b259e251ebd
 MISC metadata.xml 446 RMD160 ce4153392c311fbba39c47eaed69654dedc7984e SHA1 e573f0fe95c7fae4a6f3bc6f4310b30994221529 SHA256 90dd3564df473a32ef6cd8f3cf6223c0a90a064194102e5b74e79510199bf12c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkf6g54ACgkQt2vP6XvVdOdjOgCgwhX0dLBsdNchZYZixVhZJWps
-6JgAoOHw5kcUTZo9oLOwFmbuW33CIiGz
-=sTrS
+iEYEARECAAYFAkgM1AcACgkQt2vP6XvVdOe2CACg1Yx+bHEdpKMhYFeQCZ03rQ8T
+fS8AnR5XpJ8fqGWjNqYHc61DzpDr2rT7
+=2i/v
 -----END PGP SIGNATURE-----
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
 }