Fixed Xv path issue as per bug #75387.

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 8e2a1fb94f6ecc923fa2879a8e244115038fc0b5..6731ca7c247fce0f6dd34a28e33951b61d74fa99 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-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.165 2004/12/23 21:20:52 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.166 2004/12/24 04:25:55 chriswhite Exp $
+
+  24 Dec 2004; Chris White <chriswhite@gentoo.org> xine-lib-1_rc8-r1.ebuild:
+  Fixed Xv path issue as per bug #75387.
 
   23 Dec 2004; Simon Stelling <blubb@gentoo.org> xine-lib-1_rc8-r1.ebuild:
   stable on amd64; bug #74475

diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index db991447f1a834444c1e0dfdee30b9a2dcfb745a..f7117c9078472dff46c84fd85f5d979086d9770b 100644 (file)
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,10 +1,13 @@
-MD5 cbe702cd253bc0fb09410de8cf669f5f ChangeLog 28036
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5b840f21929f96a86e005e3128e866cc ChangeLog 28160
 MD5 af08cabbae4b191018ca153392a86bea metadata.xml 304
 MD5 b25152bddc933afdf390149b07f2ff43 xine-lib-1_rc5-r3.ebuild 5473
 MD5 a53b6f55661ef41e343932ceb7108cc3 xine-lib-1_rc6.ebuild 5358
 MD5 d2d62f59048715eaf85d88a90842729d xine-lib-1_rc7.ebuild 5327
 MD5 d9591aa743f1cbe61c93c98846b139b2 xine-lib-1_rc8.ebuild 5380
-MD5 dcd0f1fbfa28dc2a0f1c7cdc91d04a30 xine-lib-1_rc8-r1.ebuild 5496
+MD5 57bfe5d908fa622f554cb057c2e543b0 xine-lib-1_rc8-r1.ebuild 5522
 MD5 bcd5f2b8999f92c2f7215009f5ae1490 files/configure-64bit-define.patch 221
 MD5 044cbe825fc480693aec675808e4c679 files/digest-xine-lib-1_rc5-r3 67
 MD5 082b3ed1c96543704d604199047b1dee files/digest-xine-lib-1_rc6 68
@@ -35,6 +38,13 @@ MD5 aa54582a91933533008c1211dcbcfb35 files/xine-lib-disable-directfb.patch 4169
 MD5 3cbdef8aa211184b96474addb4f7c5d6 files/xine-lib-gcc34.patch 423
 MD5 dcb0c79c0bb106397aad42f6d936627d files/xineconfig.patch-0.9.13 601
 MD5 98bc17778384589bba027ff136956fec files/digest-xine-lib-1_rc8 67
-MD5 98bc17778384589bba027ff136956fec files/digest-xine-lib-1_rc8-r1 67
 MD5 54088d42a9e9980285a96b7e2cce19cf files/djb_demux_aiff.patch 559
 MD5 5d2c3c00bf3ae9a89dfcaa8b5c5b17a2 files/xine-lib-x11.patch 703
+MD5 98bc17778384589bba027ff136956fec files/digest-xine-lib-1_rc8-r1 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBy5pgFdQwWVoAgN4RAqLBAKDtP8Y6OPKxQXW33rZV3xp2qimt5gCfbGqM
+rc3c52FkX4bWhJHlxSpmSnI=
+=CdWj
+-----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 d7b325efa0f5093381bb9d2873a739a5efc62062..ba9d75ef2a8c5fabf6d1d7b444f1443604c1305b 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-2004 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.6 2004/12/23 21:20:52 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc8-r1.ebuild,v 1.7 2004/12/24 04:25:55 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 ~hppa ~ia64 ppc ppc64 ~sparc x86"
-IUSE="arts esd avi nls dvd aalib X directfb oggvorbis alsa gnome sdl speex theora ipv6 altivec"
+IUSE="arts esd avi nls dvd aalib X directfb oggvorbis alsa gnome sdl speex theora ipv6 altivec xv"
 
 RDEPEND="oggvorbis? ( media-libs/libvorbis )
        !amd64? ( X? ( virtual/x11 ) )
@@ -119,7 +119,7 @@ src_compile() {
        [ "${PROFILE_ARCH}" == "sparc" ] \
                && myconf="${myconf} --disable-vis"
 
-       myconf="${myconf} --with-xv-path=/usr/X11R6/$(get_libdir)"
+       use xv && myconf="${myconf} --with-xv-path=/usr/X11R6/$(get_libdir)"
 
        # Fix compilation-errors on PowerPC #45393 & #55460 & #68251
        if use ppc || use ppc64 ; then
@@ -153,7 +153,7 @@ src_compile() {
                $(use_enable sdl sdltest) \
                $(use_enable ipv6) \
                $(use_enable directfb) \
-               --enable-shared-xv \
+               $(use_enable xv shared-xv) \
                ${myconf} || die "Configure failed"
 
        emake -j1 || die "Parallel make failed"