Fix building with current ffmpeg, was trying to use function from internal headers. Also keyword ~amd64.

Package-Manager: portage-2.1.3.19

4 files changed, 39 insertions, 12 deletions

diff --git a/media-plugins/vdr-dxr3/ChangeLog b/media-plugins/vdr-dxr3/ChangeLog
index d5e1f25c9885..4e637258327a 100644
--- a/media-plugins/vdr-dxr3/ChangeLog
+++ b/media-plugins/vdr-dxr3/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/vdr-dxr3
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-dxr3/ChangeLog,v 1.7 2007/05/12 15:13:36 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-dxr3/ChangeLog,v 1.8 2007/11/08 18:04:39 drac Exp $
+
+  08 Nov 2007; Samuli Suominen <drac@gentoo.org>
+  +files/vdr-dxr3-0.2.7-ffmpeg.patch, vdr-dxr3-0.2.7.ebuild:
+  Fix building with current ffmpeg, was trying to use function from internal
+  headers. Also keyword ~amd64.
 
 *vdr-dxr3-0.2.7 (12 May 2007)
 
diff --git a/media-plugins/vdr-dxr3/Manifest b/media-plugins/vdr-dxr3/Manifest
index eae4867aa7fc..4b2072b8d456 100644
--- a/media-plugins/vdr-dxr3/Manifest
+++ b/media-plugins/vdr-dxr3/Manifest
@@ -2,20 +2,24 @@ AUX vdr-dxr3-0.2.6-polish.patch 4117 RMD160 2be1e14879e692378f1c80568cce54605898
 MD5 ee47972522a4c3225ccd49923063a8cb files/vdr-dxr3-0.2.6-polish.patch 4117
 RMD160 2be1e14879e692378f1c80568cce546058981fbf files/vdr-dxr3-0.2.6-polish.patch 4117
 SHA256 4dfb12e14a3af340eb6d60a4357e780f5e0287fcf69c53aa07d628e2f832e71d files/vdr-dxr3-0.2.6-polish.patch 4117
+AUX vdr-dxr3-0.2.7-ffmpeg.patch 620 RMD160 18f2ec4d3294caf5576fc1f01865699a06be5c93 SHA1 63f4e96b09f13d460c0c781d35a08a72454de4ee SHA256 ad15fb8f90a34825cbd217a06f2ab2f87e0f94b9d6c48ad68c93332a1cfefa19
+MD5 94cb9739fabd3db8c53864baf49e3d72 files/vdr-dxr3-0.2.7-ffmpeg.patch 620
+RMD160 18f2ec4d3294caf5576fc1f01865699a06be5c93 files/vdr-dxr3-0.2.7-ffmpeg.patch 620
+SHA256 ad15fb8f90a34825cbd217a06f2ab2f87e0f94b9d6c48ad68c93332a1cfefa19 files/vdr-dxr3-0.2.7-ffmpeg.patch 620
 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
 EBUILD vdr-dxr3-0.2.6.ebuild 868 RMD160 18d1d76ebc3f40568193870c0a96830dbe5c4013 SHA1 ea6ec4dddbacd47de9a16bfd96910d76eadb6fbe SHA256 cd7f0c184a7a4159d0743abcfe012e5d306c3aae2ba499bd425e6af09255d7eb
 MD5 36f1000c97fb321f3b9f44d1139066f6 vdr-dxr3-0.2.6.ebuild 868
 RMD160 18d1d76ebc3f40568193870c0a96830dbe5c4013 vdr-dxr3-0.2.6.ebuild 868
 SHA256 cd7f0c184a7a4159d0743abcfe012e5d306c3aae2ba499bd425e6af09255d7eb vdr-dxr3-0.2.6.ebuild 868
-EBUILD vdr-dxr3-0.2.7.ebuild 675 RMD160 84cbcd305fa6a5717051a093e012329255e61bf6 SHA1 312ac9ba19b5b373c8536cc166e470fb8f1f862b SHA256 879bef6625cddee9d604cd75cb6f80a962a569a3e9acdc109e7e9d882d5f7979
-MD5 5c0d757d9b92a33c9f31aef128013971 vdr-dxr3-0.2.7.ebuild 675
-RMD160 84cbcd305fa6a5717051a093e012329255e61bf6 vdr-dxr3-0.2.7.ebuild 675
-SHA256 879bef6625cddee9d604cd75cb6f80a962a569a3e9acdc109e7e9d882d5f7979 vdr-dxr3-0.2.7.ebuild 675
-MISC ChangeLog 1223 RMD160 bac6f9ec9c238daa54e33d1b16c406eb4e1360e7 SHA1 6843c909f8c0e3209e41d775185bdbf78863d71e SHA256 d104a354c34f802d290ef5eeb0103ad4e12b742456b031ca055bf95926a961fb
-MD5 e06d80ac5de43fdefa2858c4b84028ad ChangeLog 1223
-RMD160 bac6f9ec9c238daa54e33d1b16c406eb4e1360e7 ChangeLog 1223
-SHA256 d104a354c34f802d290ef5eeb0103ad4e12b742456b031ca055bf95926a961fb ChangeLog 1223
+EBUILD vdr-dxr3-0.2.7.ebuild 720 RMD160 5a94eee076291d28bd7fcea686a526ab5a94ff78 SHA1 99a23f25a9e123f2c877938cd0bc18e86419e5d9 SHA256 0db943bea652d313b50d814d46dcfb1c1465a29a5b30403b7ff7487c31460eda
+MD5 7548c4348f406326bd9549c4bcc41d64 vdr-dxr3-0.2.7.ebuild 720
+RMD160 5a94eee076291d28bd7fcea686a526ab5a94ff78 vdr-dxr3-0.2.7.ebuild 720
+SHA256 0db943bea652d313b50d814d46dcfb1c1465a29a5b30403b7ff7487c31460eda vdr-dxr3-0.2.7.ebuild 720
+MISC ChangeLog 1443 RMD160 925ac8c6165082c562ab35d8a521f2bde860f042 SHA1 68a9326972fc3025ede9f91d644acc1e5f0e1b6a SHA256 37fe0ddec1d77da5a7f29c7a48c50550c303e49860aaee0bcf3ad80214da1195
+MD5 1a5ca6a7a5607d069e6a4c15ba35e46c ChangeLog 1443
+RMD160 925ac8c6165082c562ab35d8a521f2bde860f042 ChangeLog 1443
+SHA256 37fe0ddec1d77da5a7f29c7a48c50550c303e49860aaee0bcf3ad80214da1195 ChangeLog 1443
 MISC metadata.xml 446 RMD160 ce4153392c311fbba39c47eaed69654dedc7984e SHA1 e573f0fe95c7fae4a6f3bc6f4310b30994221529 SHA256 90dd3564df473a32ef6cd8f3cf6223c0a90a064194102e5b74e79510199bf12c
 MD5 631e87e582056e322a68c1a340fbdfc5 metadata.xml 446
 RMD160 ce4153392c311fbba39c47eaed69654dedc7984e metadata.xml 446
diff --git a/media-plugins/vdr-dxr3/files/vdr-dxr3-0.2.7-ffmpeg.patch b/media-plugins/vdr-dxr3/files/vdr-dxr3-0.2.7-ffmpeg.patch
new file mode 100644
index 000000000000..ee96e8d95af6
--- /dev/null
+++ b/media-plugins/vdr-dxr3/files/vdr-dxr3-0.2.7-ffmpeg.patch
@@ -0,0 +1,16 @@
+diff -ur dxr3-0.2.7.orig/dxr3ffmpeg.c dxr3-0.2.7/dxr3ffmpeg.c
+--- dxr3-0.2.7.orig/dxr3ffmpeg.c	2007-01-07 23:57:12.000000000 +0200
++++ dxr3-0.2.7/dxr3ffmpeg.c	2007-11-08 19:55:00.000000000 +0200
+@@ -28,8 +28,10 @@
+ cDxr3Ffmpeg::cDxr3Ffmpeg()
+ {
+     avcodec_init();
+-    // Register only codec(s) we'll need.
+-    register_avcodec(&mp2_decoder);
++    // Only the MP2 decoder would be needed, but individual registration of
++    // codecs bundled with ffmpeg itself does not appear to be really supported
++    // as of ffmpeg 2007-07-xx and later.
++    avcodec_register_all();
+ }
+ 
+ // ==================================
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 752e4a5fc816..c5224c6aea73 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
 # 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.2 2007/07/10 23:08:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-dxr3/vdr-dxr3-0.2.7.ebuild,v 1.3 2007/11/08 18:04:39 drac Exp $
 
 inherit vdr-plugin
 
@@ -10,16 +10,18 @@ SRC_URI="mirror://sourceforge/dxr3plugin/${P}.tgz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-video/em8300-libraries
 		>=media-video/vdr-1.3.42
 		media-video/ffmpeg"
 
+PATCHES="${FILESDIR}/${P}-ffmpeg.patch"
+
 src_unpack() {
 	vdr-plugin_src_unpack
 
-	cd ${S}
+	cd "${S}"
 	sed -i Makefile -e 's:^FFMDIR =.*$:FFMDIR=/usr/include/ffmpeg:'
 }