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

(Portage version: 2.1.3.19)

3 files changed, 27 insertions, 4 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/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:'
 }