From 6cb82f452b6fffefa942b3c408ed1ce1872b455a Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Tue, 28 Dec 2004 02:32:12 +0000 Subject: [PATCH] Removing --enable-shared-xv as it actually enables the static one... Removing --disable-alsatest as it results in alsa not being used. --- media-libs/xine-lib/ChangeLog | 7 ++++++- media-libs/xine-lib/Manifest | 10 +++++----- media-libs/xine-lib/xine-lib-1.0.ebuild | 13 ++++++------- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog index 176c0ac08957..181d9968045d 100644 --- a/media-libs/xine-lib/ChangeLog +++ b/media-libs/xine-lib/ChangeLog @@ -1,6 +1,11 @@ # 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.171 2004/12/27 13:01:37 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.172 2004/12/28 02:32:12 eradicator Exp $ + + 27 Dec 2004; Jeremy Huddleston + xine-lib-1.0.ebuild: + Removing --enable-shared-xv as it actually enables the static one... + Removing --disable-alsatest as it results in alsa not being used. 27 Dec 2004; Jeremy Huddleston xine-lib-1.0.ebuild: diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest index d2c23c9e227d..b6d70a6966b0 100644 --- a/media-libs/xine-lib/Manifest +++ b/media-libs/xine-lib/Manifest @@ -5,8 +5,8 @@ MD5 af08cabbae4b191018ca153392a86bea metadata.xml 304 MD5 d2d62f59048715eaf85d88a90842729d xine-lib-1_rc7.ebuild 5327 MD5 d9591aa743f1cbe61c93c98846b139b2 xine-lib-1_rc8.ebuild 5380 MD5 7b14f0e8c5222de8df9e0dac4c5d10c4 xine-lib-1_rc8-r1.ebuild 6265 -MD5 8600bfef55ea547657ee57f740b7a23e ChangeLog 28987 -MD5 50581e3834b0a03f1d6e89c607836582 xine-lib-1.0.ebuild 8137 +MD5 b6c179ad420daeea42984862ed428b49 ChangeLog 29207 +MD5 6f1cc385510bd845d4a1c0127e9d3541 xine-lib-1.0.ebuild 8015 MD5 b25152bddc933afdf390149b07f2ff43 xine-lib-1_rc5-r3.ebuild 5473 MD5 a53b6f55661ef41e343932ceb7108cc3 xine-lib-1_rc6.ebuild 5358 MD5 bcd5f2b8999f92c2f7215009f5ae1490 files/configure-64bit-define.patch 221 @@ -46,7 +46,7 @@ MD5 1780c88522c9a26856effa70a0e27b50 files/digest-xine-lib-1.0 65 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (GNU/Linux) -iD8DBQFB0Ae/ArHZZzCEUG0RArQ+AJ9ka0XbRgvMxs293UXf9RdZeHcDHwCeMpY4 -T70fUvlYbzq7Xjrv104HlfA= -=lMCO +iD8DBQFB0MW2ArHZZzCEUG0RAo9oAJ9GkhQ+YCzXuB0jCDKzsBl453gmoACfSOKZ +C9OebSlBd6mZ4lZnixDkFXw= +=Upbl -----END PGP SIGNATURE----- diff --git a/media-libs/xine-lib/xine-lib-1.0.ebuild b/media-libs/xine-lib/xine-lib-1.0.ebuild index 0ed41b8dd0e8..53de523e96e4 100644 --- a/media-libs/xine-lib/xine-lib-1.0.ebuild +++ b/media-libs/xine-lib/xine-lib-1.0.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.0.ebuild,v 1.2 2004/12/27 13:01:37 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.0.ebuild,v 1.3 2004/12/28 02:32:12 eradicator Exp $ inherit eutils flag-o-matic gcc libtool @@ -195,11 +195,11 @@ src_compile() { if use xv; then if [ -f "${ROOT}/usr/$(get_libdir)/libXv.so" ]; then - myconf="${myconf} --enable-shared-xv --with-xv-path=${ROOT}/usr/$(get_libdir)" + myconf="${myconf} --with-xv-path=${ROOT}/usr/$(get_libdir)" elif [ -f "${ROOT}/usr/$(get_libdir)/libXv.a" ]; then myconf="${myconf} --enable-static-xv --with-xv-path=${ROOT}/usr/$(get_libdir)" elif [ -f "${ROOT}/usr/X11R6/$(get_libdir)/libXv.so" ]; then - myconf="${myconf} --enable-shared-xv --with-xv-path=${ROOT}/usr/X11R6/$(get_libdir)" + myconf="${myconf} --with-xv-path=${ROOT}/usr/X11R6/$(get_libdir)" elif [ -f "${ROOT}/usr/X11R6/$(get_libdir)/libXv.a" ]; then myconf="${myconf} --enable-static-xv --with-xv-path=${ROOT}/usr/X11R6/$(get_libdir)" else @@ -214,7 +214,7 @@ src_compile() { $(use_enable vidix) \ $(use_enable dxr3) \ $(use_with esd) --disable-esdtest \ - $(use_enable alsa) --disable-alsatest \ + $(use_enable alsa) \ $(use_with arts) --disable-artstest \ $(use_with aalib) \ $(use_with oggvorbis ogg) $(use_with oggvorbis vorbis) \ @@ -233,14 +233,13 @@ src_compile() { } src_install() { - # portage 2.0.50's einstall is broken for handling libdir - make DESTDIR=${D} install || die "Install failed" + make DESTDIR="${D}" install || die "Install failed" # Xine's makefiles install some file incorrectly. (Gentoo bug #8583, #16112). dodir /usr/share/xine/libxine1/fonts mv ${D}/usr/share/*.xinefont.gz ${D}/usr/share/xine/libxine1/fonts/ - dodoc AUTHORS ChangeLog INSTALL README TODO + dodoc AUTHORS ChangeLog README TODO cd ${S}/doc dodoc dataflow.dia README* } -- 2.26.2