summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <drac@gentoo.org>2007-09-04 12:22:41 +0000
committerSamuli Suominen <drac@gentoo.org>2007-09-04 12:22:41 +0000
commit6318a6bf2b4256874e44a5e5311f5e3da1174c2c (patch)
tree59a85f0d8d007ad73e16eeebfe4a824a65f26257 /media-libs
parentManifest was broken (diff)
downloadgentoo-2-6318a6bf2b4256874e44a5e5311f5e3da1174c2c.tar.gz
gentoo-2-6318a6bf2b4256874e44a5e5311f5e3da1174c2c.tar.bz2
gentoo-2-6318a6bf2b4256874e44a5e5311f5e3da1174c2c.zip
Fix building with dxr3 support wrt bug #183692. Temporary, but harmless solution until it's cleaned upstream. Thanks aballier
(Portage version: 2.1.3.7)
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/xine-lib/ChangeLog7
-rw-r--r--media-libs/xine-lib/files/xine-lib-1.1.8-dxr3.patch12
-rw-r--r--media-libs/xine-lib/xine-lib-1.1.8.ebuild10
3 files changed, 27 insertions, 2 deletions
diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 4c2ae9e8bedf..457fd20d0cee 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-libs/xine-lib
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.476 2007/09/03 11:38:17 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.477 2007/09/04 12:22:41 drac Exp $
+
+ 04 Sep 2007; Samuli Suominen <drac@gentoo.org>
+ +files/xine-lib-1.1.8-dxr3.patch, xine-lib-1.1.8.ebuild:
+ Fix building with dxr3 support wrt bug #183692. Temporary, but harmless
+ solution until it's cleaned upstream.
*xine-lib-1.1.8 (03 Sep 2007)
diff --git a/media-libs/xine-lib/files/xine-lib-1.1.8-dxr3.patch b/media-libs/xine-lib/files/xine-lib-1.1.8-dxr3.patch
new file mode 100644
index 000000000000..dbe657312dfb
--- /dev/null
+++ b/media-libs/xine-lib/files/xine-lib-1.1.8-dxr3.patch
@@ -0,0 +1,12 @@
+diff -ur xine-lib-1.1.8.orig/src/libffmpeg/ffmpeg_encoder.c xine-lib-1.1.8/src/libffmpeg/ffmpeg_encoder.c
+--- xine-lib-1.1.8.orig/src/libffmpeg/ffmpeg_encoder.c 2007-08-19 02:36:50.000000000 +0300
++++ xine-lib-1.1.8/src/libffmpeg/ffmpeg_encoder.c 2007-09-04 15:04:41.000000000 +0300
+@@ -76,7 +76,7 @@
+ lavc_data_t* this;
+ avcodec_init();
+
+- register_avcodec(&mpeg1video_encoder);
++ avcodec_register_all();
+ lprintf("lavc init , version %x\n", avcodec_version());
+ this = xine_xmalloc(sizeof(lavc_data_t));
+ if (!this) return 0;
diff --git a/media-libs/xine-lib/xine-lib-1.1.8.ebuild b/media-libs/xine-lib/xine-lib-1.1.8.ebuild
index dab0f09c5d8f..8e6519a76750 100644
--- a/media-libs/xine-lib/xine-lib-1.1.8.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.1.8.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-libs/xine-lib/xine-lib-1.1.8.ebuild,v 1.1 2007/09/03 11:38:17 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.8.ebuild,v 1.2 2007/09/04 12:22:40 drac Exp $
inherit eutils flag-o-matic toolchain-funcs libtool autotools
@@ -82,6 +82,14 @@ DEPEND="${RDEPEND}
sys-devel/libtool
nls? ( sys-devel/gettext )"
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+
+ # Bug 183692.
+ epatch "${FILESDIR}"/${P}-dxr3.patch
+}
+
src_compile() {
#prevent quicktime crashing
append-flags -frename-registers -ffunction-sections