Add patch to build fine with latest ffmpeg also when failing because of toolchain.

(Portage version: 2.0.53)

4 files changed, 12 insertions, 19 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 790744b12950..4ec72cc33624 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.281 2005/12/16 18:05:41 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.282 2005/12/16 23:21:59 flameeyes Exp $
+
+  16 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
+  xine-lib-1.1.1-r3.ebuild:
+  Add patch to build fine with latest ffmpeg also when failing because of
+  toolchain.
 
 *xine-lib-1.1.1-r3 (16 Dec 2005)
 *xine-lib-1.1.1-r2 (16 Dec 2005)
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index bafa7a5ac4b8..2dafa1bb9204 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,13 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 d769d5b15849e646a28e4df08f2a215d ChangeLog 19558
 MD5 943fd105ac79aeededd17357690d76bc files/CVE-2005-4048.patch 3426
 MD5 9678227c043f04d5e8561cb6ba80d3e6 files/digest-xine-lib-1.0.1-r4 137
 MD5 33da8deb9637be23cd464aba9c5c4ac4 files/digest-xine-lib-1.1.0 137
 MD5 3d6e1d0e96ea02e463d045cd83e2e32f files/digest-xine-lib-1.1.0-r5 138
 MD5 c67420852e94a93aef8edd92271497e0 files/digest-xine-lib-1.1.1-r2 137
-MD5 674191abd0aa33d2c912468714b7c8d0 files/digest-xine-lib-1.1.1-r3 137
+MD5 039c100ab0e757500a35e24d31e9e9ed files/digest-xine-lib-1.1.1-r3 137
 MD5 51e97df2f6ae538ab33a802eafb10457 files/digest-xine-lib-1_rc8-r2 138
 MD5 cd292167e0ca6e7910e1cf32091e3a27 files/xine-lib-formatstring.patch 315
 MD5 40462be9f1caff6326630fc3b93e7105 metadata.xml 330
@@ -15,12 +12,5 @@ MD5 e8e9ff87a88138924d026c3e5c9dd27a xine-lib-1.0.1-r4.ebuild 7482
 MD5 5aa3700abdfbc432b89a5ac75ae9bc03 xine-lib-1.1.0-r5.ebuild 6820
 MD5 3e7009cff141eff5526219bfc185ece9 xine-lib-1.1.0.ebuild 7254
 MD5 4d65d56fb5edc89d1402c048fffa78f8 xine-lib-1.1.1-r2.ebuild 6777
-MD5 662abe62da85db7ba44cc1d2cc0bff75 xine-lib-1.1.1-r3.ebuild 7300
+MD5 ca8463f183e3966d47e4664eb8bee15f xine-lib-1.1.1-r3.ebuild 7207
 MD5 8e8e38d54e416b12108a0597f4d0801f xine-lib-1_rc8-r2.ebuild 5288
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDowIJAiZjviIA2XgRAtBvAJ9duxRsCl2QmFlRnB+C943pd6aTWwCgyXZC
-EihV+uqCwYe5Xg4PpQ1C8dU=
-=NgI5
------END PGP SIGNATURE-----
diff --git a/media-libs/xine-lib/files/digest-xine-lib-1.1.1-r3 b/media-libs/xine-lib/files/digest-xine-lib-1.1.1-r3
index 3d8048790f86..6e6d300c7ddd 100644
--- a/media-libs/xine-lib/files/digest-xine-lib-1.1.1-r3
+++ b/media-libs/xine-lib/files/digest-xine-lib-1.1.1-r3
@@ -1,2 +1,2 @@
 MD5 b1f42602c776bb93e3cbf127e220cbfd xine-lib-1.1.1.tar.gz 7990031
-MD5 3a001cf10c0383c85b95e90f233b0797 xine-lib-patches-19.tar.bz2 7304
+MD5 fafe69bf9283e7e653131dc159f40cdb xine-lib-patches-20.tar.bz2 8385
diff --git a/media-libs/xine-lib/xine-lib-1.1.1-r3.ebuild b/media-libs/xine-lib/xine-lib-1.1.1-r3.ebuild
index edbd0a91d33e..fc795a70d49a 100644
--- a/media-libs/xine-lib/xine-lib-1.1.1-r3.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.1.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.1-r3.ebuild,v 1.1 2005/12/16 18:05:41 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.1-r3.ebuild,v 1.2 2005/12/16 23:21:59 flameeyes Exp $
 
 inherit eutils flag-o-matic toolchain-funcs libtool autotools
 
@@ -8,7 +8,7 @@ inherit eutils flag-o-matic toolchain-funcs libtool autotools
 MY_PKG_SUFFIX=""
 MY_P=${PN}-${PV/_/-}${MY_PKG_SUFFIX}
 
-PATCHLEVEL="19"
+PATCHLEVEL="20"
 
 DESCRIPTION="Core libraries for Xine movie player"
 HOMEPAGE="http://xine.sourceforge.net/"
@@ -56,7 +56,7 @@ RDEPEND="vorbis? ( media-libs/libvorbis )
 	mad? ( media-libs/libmad )
 	imagemagick? ( media-gfx/imagemagick )
 	dts? ( media-libs/libdts )
-	ffmpeg? ( ~media-video/ffmpeg-0.4.9_p20051120 )
+	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20051120 )
 	!=media-libs/xine-lib-0.9.13*"
 
 DEPEND="${RDEPEND}
@@ -83,8 +83,6 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	# This is still experimental patch
-	EPATCH_EXCLUDE="050_all_novell--alsa-resume-fix.patch" \
 	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/patches/
 
 	AT_M4DIR="m4" eautoreconf