Fixing xv stuff in -r1 as well.

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 3740826f9890de3fce85053df93d6a21fb4ab59d..1c8834ae51fd3fefea0e59ae526c4dce6e4dcb71 100644 (file)
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/xine-lib
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.183 2005/01/03 19:46:47 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.184 2005/01/03 20:54:42 chriswhite Exp $
+
+  04 Jan 2005; Chris White <chriswhite@gentoo.org> xine-lib-1_rc8-r1.ebuild:
+  Fixing xv stuff in -r1 as well.
 
   04 Jan 2005; Chris White <chriswhite@gentoo.org>
   +files/xine-lib-configure.ac.patch, xine-lib-1.0.ebuild:

diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index db933a0c2cb1c8a6df4089fab5e63d75c7cda7ba..5ad77ef978b19db13f08e38497a4136a423f2e2c 100644 (file)
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,13 +1,13 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 61dc66044873bedae4be4daaac1dec47 ChangeLog 31017
+MD5 7e9902dfb78a5b64bf022cf1cd5b81e0 ChangeLog 31129
 MD5 af08cabbae4b191018ca153392a86bea metadata.xml 304
 MD5 ecc75a8fa2b8be0fdf376ca2bc1a655f xine-lib-1.0.ebuild 8088
 MD5 4052265429970e0a67ed0d039d770515 xine-lib-1_rc5-r3.ebuild 5473
 MD5 9b1839aa704083ac8bc733e78fe15bd2 xine-lib-1_rc6.ebuild 5401
 MD5 f9634de2e799d22a319aa81a2b38bd1d xine-lib-1_rc7.ebuild 5370
-MD5 2306210065e7e03ea0888389337cddec xine-lib-1_rc8-r1.ebuild 6306
+MD5 1c1e40f53e2ad7b28320fc175f10aec0 xine-lib-1_rc8-r1.ebuild 6464
 MD5 d7d43244f336b4e0826eedf8a3d3dbc1 xine-lib-1_rc8.ebuild 5423
 MD5 bcd5f2b8999f92c2f7215009f5ae1490 files/configure-64bit-define.patch 221
 MD5 1780c88522c9a26856effa70a0e27b50 files/digest-xine-lib-1.0 65
@@ -48,7 +48,7 @@ MD5 d8f3138ae2260f7c98bf46ae7159be11 files/xine-lib-configure.ac.patch 926
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFB2aA4FdQwWVoAgN4RAkl+AKDY0/rXZplqKsR+Nh9FoTqiLkyi6gCdHrXx
-sHZB6+7OG5N44ddqtzz0Et8=
-=eFbl
+iD8DBQFB2bAjFdQwWVoAgN4RAvM2AKDBetRYgbwfQyaVbb8lAbrJATcoewCeLN52
+95pYzdZURKYPAbO2+1b/Rf4=
+=oly4
 -----END PGP SIGNATURE-----

diff --git a/media-libs/xine-lib/xine-lib-1_rc8-r1.ebuild b/media-libs/xine-lib/xine-lib-1_rc8-r1.ebuild
index b890d32e7e1dde61e8654c6edaa7a667d208ea86..fd1436589d2f99aab8d5631f0ed064d2274989c4 100644 (file)
--- a/media-libs/xine-lib/xine-lib-1_rc8-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1_rc8-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_rc8-r1.ebuild,v 1.13 2005/01/02 10:41:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc8-r1.ebuild,v 1.14 2005/01/03 20:54:42 chriswhite Exp $
 
 inherit eutils flag-o-matic gcc libtool
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/xine/${PN}-${PV/_/-}${MY_PKG_SUFFIX}.tar.gz"
 LICENSE="GPL-2"
 SLOT="1"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86"
-IUSE="arts esd avi nls dvd aalib X directfb oggvorbis alsa gnome sdl speex theora ipv6 altivec xv"
+IUSE="arts esd avi nls dvd aalib X directfb oggvorbis alsa gnome sdl speex theora ipv6 altivec xv pic"
 
 RDEPEND="oggvorbis? ( media-libs/libvorbis )
        !amd64? ( X? ( virtual/x11 ) )
@@ -63,10 +63,17 @@ src_unpack() {
        # fixes bad X11 directories
        epatch ${FILESDIR}/${PN}-x11.patch
 
+       # fixes bad xv checking
+       epatch ${FILESDIR}/${PN}-configure.ac.patch
+
        # Fix building on amd64, #49569
        #use amd64 && epatch ${FILESDIR}/configure-64bit-define.patch
 
        use pic && epatch ${FILESDIR}/${PN}-1_rc7-pic.patch
+       if use pic && use x86
+       then
+               epatch ${FILESDIR}/${PN}-hardened-mmx.patch
+       fi
 
        # Fix detection of hppa2.0 and hppa1.1 CHOST
        use hppa && sed -e 's/hppa-/hppa*-linux-/' -i ${S}/configure.ac