Added a new XvMC patch to fix bug #90776. Using a patch tarball instead of having files in FILESDIR.

(Portage version: 2.0.51.20-r5)

6 files changed, 19 insertions, 37 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 3c061351db88..5a241ee8024e 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,15 @@
 # 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.217 2005/04/26 20:43:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.218 2005/04/29 02:07:06 flameeyes Exp $
+
+*xine-lib-1.0.1-r1 (29 Apr 2005)
+
+  29 Apr 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -files/xine-lib-1.0.1-configurebis.patch, -xine-lib-1.0.1.ebuild,
+  +xine-lib-1.0.1-r1.ebuild:
+  Added a patch to fix that XvMC thing which got more b0rked with 1.0.1 
+  release, fixes #90776. Moved patches on an external tarball without 
+  having to have them in FILESDIR.
 
   26 Apr 2005; Diego Pettenò <flameeyes@gentoo.org>
   -files/xine-lib-0.9.12-r2-directfb.patch, -files/xineconfig.patch-0.9.13,
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index ff1042ef472a..4d0936179531 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -5,10 +5,11 @@ MD5 9415e56720946429be1cd7c6142f4351 xine-lib-1.0-r3.ebuild 7578
 MD5 79cd4ff146e065a636eae4001b6d0b6a xine-lib-1.0-r4.ebuild 7845
 MD5 608df6c363782352259ef57c5d5eef9f ChangeLog 6515
 MD5 029b5cc3a3ba4559d1407612a326180a xine-lib-1_rc6-r2.ebuild 5696
-MD5 85466bc61737b8faccdbd4e25eb86bb8 xine-lib-1.0.1.ebuild 7696
+MD5 2d2c65f20cee11c1e79769f4ba66942f xine-lib-1.0.1-r1.ebuild 7240
 MD5 98bc17778384589bba027ff136956fec files/digest-xine-lib-1_rc8-r1 67
 MD5 54088d42a9e9980285a96b7e2cce19cf files/djb_demux_aiff.patch 559
 MD5 e35c6e1b7a7cd3f4e268b1fb876cbeb5 files/protect-CFLAGS.patch-1_rc6 316
+MD5 245075896f5326e86a1cbcf5464fdce9 files/digest-xine-lib-1.0.1-r1 136
 MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-1_rc6-2.6.patch 594
 MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc6-configure-sparc.patch 587
 MD5 b3b75486422c6ccab706f2ff4cf7c4eb files/xine-lib-1_rc6-mmx.patch 391
diff --git a/media-libs/xine-lib/files/digest-xine-lib-1.0.1 b/media-libs/xine-lib/files/digest-xine-lib-1.0.1
deleted file mode 100644
index adeba592b3f2..000000000000
--- a/media-libs/xine-lib/files/digest-xine-lib-1.0.1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 9be804b337c6c3a2e202c5a7237cb0f8 xine-lib-1.0.1.tar.gz 7774954
-MD5 1f9cfafa77379c30720616718e139010 xine-lib-1.0.1-configure-checks.patch.bz2 3018
diff --git a/media-libs/xine-lib/files/digest-xine-lib-1.0.1-r1 b/media-libs/xine-lib/files/digest-xine-lib-1.0.1-r1
new file mode 100644
index 000000000000..d389d94f0601
--- /dev/null
+++ b/media-libs/xine-lib/files/digest-xine-lib-1.0.1-r1
@@ -0,0 +1,2 @@
+MD5 9be804b337c6c3a2e202c5a7237cb0f8 xine-lib-1.0.1.tar.gz 7774954
+MD5 fc795150da9e8d19dc97decca71a4935 xine-lib-patches-1.tar.bz2 7543
diff --git a/media-libs/xine-lib/files/xine-lib-1.0.1-configurebis.patch b/media-libs/xine-lib/files/xine-lib-1.0.1-configurebis.patch
deleted file mode 100644
index f60574bb4fd6..000000000000
--- a/media-libs/xine-lib/files/xine-lib-1.0.1-configurebis.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -x '*~' -ur xine-lib-1.0.1-configure/configure.ac xine-lib-1.0.1-configure-bis/configure.ac
---- xine-lib-1.0.1-configure/configure.ac	2005-04-26 21:41:10.965118216 +0200
-+++ xine-lib-1.0.1-configure-bis/configure.ac	2005-04-26 21:39:19.363084304 +0200
-@@ -1039,7 +1039,9 @@
- dnl ---------------------------------------------
- AC_ARG_ENABLE([speex],
-   AC_HELP_STRING([--disable-speex], [do not build speex support]),
--  [with_speex=$enableval], [with_flac=yes])
-+  [with_speex=$enableval], [with_speex=yes])
-+
-+no_speex=yes
- 
- if test "x$with_speex" = "xyes"; then
-   PKG_CHECK_MODULES(SPEEX, speex, [
diff --git a/media-libs/xine-lib/xine-lib-1.0.1.ebuild b/media-libs/xine-lib/xine-lib-1.0.1-r1.ebuild
index f992e8bef498..76c9d2336661 100644
--- a/media-libs/xine-lib/xine-lib-1.0.1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.0.1-r1.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.0.1.ebuild,v 1.2 2005/04/26 20:08:28 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.0.1-r1.ebuild,v 1.1 2005/04/29 02:07:06 flameeyes Exp $
 
 inherit eutils flag-o-matic gcc libtool
 
@@ -8,10 +8,12 @@ inherit eutils flag-o-matic gcc libtool
 MY_PKG_SUFFIX=""
 MY_P=${PN}-${PV/_/-}${MY_PKG_SUFFIX}
 
+PATCHLEVEL="1"
+
 DESCRIPTION="Core libraries for Xine movie player"
 HOMEPAGE="http://xine.sourceforge.net/"
 SRC_URI="mirror://sourceforge/xine/${MY_P}.tar.gz
-	http://dev.gentoo.org/~flameeyes/distfiles/${P}-configure-checks.patch.bz2"
+	http://dev.gentoo.org/~flameeyes/distfiles/${PN}-patches-${PATCHLEVEL}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="1"
@@ -56,20 +58,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	# Adds --disable- params
-	epatch ${DISTDIR}/${P}-configure-checks.patch.bz2
-	epatch ${FILESDIR}/${P}-configurebis.patch
-
-	# plasmaroo: Kernel 2.6 headers patch
-	epatch ${FILESDIR}/${PN}-1_rc7-2.6.patch
-
-	epatch ${FILESDIR}/${PN}-1_rc7-pic.patch
-
-	# Fix detection of sparc64 systems
-	use sparc && epatch ${FILESDIR}/xine-lib-1_rc7-configure-sparc.patch
-
-	# Fix support for gcc 4
-	epatch ${FILESDIR}/${PN}-gcc4.patch
+	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/${PV}/
 
 	elibtoolize
 
@@ -82,9 +71,6 @@ src_unpack() {
 	automake -afc || die "automake failed"
 	autoconf || die "autoconf failed"
 
-	# Fix detection of hppa2.0 and hppa1.1 CHOST
-	use hppa && sed -e 's/hppa-/hppa*-linux-/' -i ${S}/configure
-
 	libtoolize --copy --force || die "libtoolize failed"
 }