From 14a20325d4d773f4752c8077feddcaecd44a02bf Mon Sep 17 00:00:00 2001 From: Chris White Date: Thu, 6 Jan 2005 20:36:45 +0000 Subject: [PATCH] xv support is patched in xine-lib, and it no longer requires the use flag. Removing that as well as the logic, as the logic breaks stuff. --- media-libs/xine-lib/ChangeLog | 8 ++- media-libs/xine-lib/Manifest | 60 ++++++++++---------- media-libs/xine-lib/xine-lib-1_rc8-r1.ebuild | 19 +------ 3 files changed, 39 insertions(+), 48 deletions(-) diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog index 0ec370afa846..3ac8e96a0843 100644 --- a/media-libs/xine-lib/ChangeLog +++ b/media-libs/xine-lib/ChangeLog @@ -1,6 +1,12 @@ # 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.189 2005/01/06 09:25:45 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.190 2005/01/06 20:36:45 chriswhite Exp $ + +*xine-lib-1_rc8-r1 (07 Jan 2005) + + 07 Jan 2005; Chris White xine-lib-1_rc8-r1.ebuild: + xv support is patched in xine-lib, and it no longer requires the use flag. + Removing that as well as the logic, as the logic breaks stuff. 06 Jan 2005; Jeremy Huddleston -xine-lib-1_rc5-r3.ebuild, -xine-lib-1_rc6.ebuild, -xine-lib-1_rc7.ebuild, diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest index 24afca076cb6..8b294e6ee893 100644 --- a/media-libs/xine-lib/Manifest +++ b/media-libs/xine-lib/Manifest @@ -1,49 +1,49 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +MD5 c9e0884056502ba91f7009fec57350fa ChangeLog 1243 +MD5 af08cabbae4b191018ca153392a86bea metadata.xml 304 MD5 424d1fa88b2c772b3d393db78232fb65 xine-lib-1.0.ebuild 8073 -MD5 9f2c1755efbee2e9605f6fba4db54c69 xine-lib-1_rc8-r1.ebuild 6468 MD5 7967d53ed184e69355e1d9e5a27cb8b7 xine-lib-1_rc6-r1.ebuild 5712 -MD5 6e64ba0a225267de9602cef3ea24aecc ChangeLog 989 -MD5 af08cabbae4b191018ca153392a86bea metadata.xml 304 +MD5 7c6058d5fb9d29157744592280f2d3d7 xine-lib-1_rc8-r1.ebuild 5751 MD5 bcd5f2b8999f92c2f7215009f5ae1490 files/configure-64bit-define.patch 221 -MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc5-configure-sparc.patch 587 -MD5 ddf48f1eb00a6985b6fba5fff9386ad0 files/xine-lib-hardened-mmx.patch 2558 -MD5 5d3bbb085af2a8dcaa429c1376a52c50 files/xine-lib-1-rc4-sparc_missing_include.patch 464 +MD5 1780c88522c9a26856effa70a0e27b50 files/digest-xine-lib-1.0 65 +MD5 082b3ed1c96543704d604199047b1dee files/digest-xine-lib-1_rc6-r1 68 +MD5 98bc17778384589bba027ff136956fec files/digest-xine-lib-1_rc8-r1 67 +MD5 54088d42a9e9980285a96b7e2cce19cf files/djb_demux_aiff.patch 559 MD5 5e99bec89f5cc4f0d00bcd61430d67cb files/protect-CFLAGS.patch-1_rc2 597 MD5 060bcd1d4a4ffa427139a7f188272e01 files/protect-CFLAGS.patch-1_rc3 597 MD5 060bcd1d4a4ffa427139a7f188272e01 files/protect-CFLAGS.patch-1_rc4 597 +MD5 e35c6e1b7a7cd3f4e268b1fb876cbeb5 files/protect-CFLAGS.patch-1_rc5-r1 316 MD5 e35c6e1b7a7cd3f4e268b1fb876cbeb5 files/protect-CFLAGS.patch-1_rc6 316 -MD5 5ddf5d90566965b047828407dcc0f5d1 files/xine-lib-1rc4-libtool1.5.6.shrext_cmds.patch 331 -MD5 aa54582a91933533008c1211dcbcfb35 files/xine-lib-disable-directfb.patch 4169 -MD5 b3b75486422c6ccab706f2ff4cf7c4eb files/xine-lib-1_rc6-mmx.patch 391 +MD5 beea8b4dacbd153e4c6b06e57ee711d2 files/xine-lib-0.9.12-r2-directfb.patch 746 +MD5 279ee4d06acc78adef09fe7ae4a64980 files/xine-lib-0.9.13-kxine.patch 9041 +MD5 5d3bbb085af2a8dcaa429c1376a52c50 files/xine-lib-1-rc4-sparc_missing_include.patch 464 +MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc5-configure-sparc.patch 587 +MD5 ff56a363d07445735a05afe1dc7f6f56 files/xine-lib-1_rc5-vcd_overflow.patch 1754 +MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-1_rc6-2.6.patch 594 MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc6-configure-sparc.patch 587 -MD5 e35c6e1b7a7cd3f4e268b1fb876cbeb5 files/protect-CFLAGS.patch-1_rc5-r1 316 -MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-2.6.patch 594 +MD5 a11a93cf97cecb7c1c2b24e11a5419ae files/xine-lib-1_rc6-ffmpeg.patch 1279 +MD5 b3b75486422c6ccab706f2ff4cf7c4eb files/xine-lib-1_rc6-mmx.patch 391 +MD5 bf2bb27a1f0433ea77571175f2b59885 files/xine-lib-1_rc6-pic.patch 2655 +MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-1_rc7-2.6.patch 594 MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc7-configure-sparc.patch 587 +MD5 b3b75486422c6ccab706f2ff4cf7c4eb files/xine-lib-1_rc7-mmx.patch 391 MD5 bf2bb27a1f0433ea77571175f2b59885 files/xine-lib-1_rc7-pic.patch 2655 -MD5 dcb0c79c0bb106397aad42f6d936627d files/xineconfig.patch-0.9.13 601 -MD5 279ee4d06acc78adef09fe7ae4a64980 files/xine-lib-0.9.13-kxine.patch 9041 -MD5 082b3ed1c96543704d604199047b1dee files/digest-xine-lib-1_rc6-r1 68 -MD5 98bc17778384589bba027ff136956fec files/digest-xine-lib-1_rc8-r1 67 +MD5 5ddf5d90566965b047828407dcc0f5d1 files/xine-lib-1rc4-libtool1.5.6.shrext_cmds.patch 331 +MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-2.6.patch 594 MD5 0cf698a9ff87a3595140d92df7b900b6 files/xine-lib-configure.patch 342 -MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-1_rc7-2.6.patch 594 -MD5 ff56a363d07445735a05afe1dc7f6f56 files/xine-lib-1_rc5-vcd_overflow.patch 1754 -MD5 bf2bb27a1f0433ea77571175f2b59885 files/xine-lib-1_rc6-pic.patch 2655 +MD5 aa54582a91933533008c1211dcbcfb35 files/xine-lib-disable-directfb.patch 4169 +MD5 3cbdef8aa211184b96474addb4f7c5d6 files/xine-lib-gcc34.patch 423 MD5 5d2c3c00bf3ae9a89dfcaa8b5c5b17a2 files/xine-lib-x11.patch 703 -MD5 beea8b4dacbd153e4c6b06e57ee711d2 files/xine-lib-0.9.12-r2-directfb.patch 746 -MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-1_rc6-2.6.patch 594 -MD5 54088d42a9e9980285a96b7e2cce19cf files/djb_demux_aiff.patch 559 -MD5 a11a93cf97cecb7c1c2b24e11a5419ae files/xine-lib-1_rc6-ffmpeg.patch 1279 -MD5 3704271d4339b919569b4ea416a4c34e files/xine-lib-1_rc8-configure.ac.patch 2825 +MD5 dcb0c79c0bb106397aad42f6d936627d files/xineconfig.patch-0.9.13 601 +MD5 ddf48f1eb00a6985b6fba5fff9386ad0 files/xine-lib-hardened-mmx.patch 2558 MD5 d8f3138ae2260f7c98bf46ae7159be11 files/xine-lib-configure.ac.patch 926 -MD5 3cbdef8aa211184b96474addb4f7c5d6 files/xine-lib-gcc34.patch 423 -MD5 b3b75486422c6ccab706f2ff4cf7c4eb files/xine-lib-1_rc7-mmx.patch 391 -MD5 1780c88522c9a26856effa70a0e27b50 files/digest-xine-lib-1.0 65 +MD5 3704271d4339b919569b4ea416a4c34e files/xine-lib-1_rc8-configure.ac.patch 2825 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.9.10 (GNU/Linux) +Version: GnuPG v1.2.6 (GNU/Linux) -iD8DBQFB3XxXI1lqEGTUzyQRAhKuAKDK6MVJk4mykqii2tYYJ7AC4u2pxQCdGNYk -LcdwxrGP0UFKJQTNzVxNXqg= -=/Uex +iD8DBQFB3aBQFdQwWVoAgN4RApv7AJ99ztaIPtudTOBJQ4AQ4r2xZGut8gCffern +0RT6NjYzfzAO+5NdfZf+Pa0= +=sGrt -----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 7b2da6eae899..9d7826e7792e 100644 --- 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.16 2005/01/04 17:41:02 chriswhite Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc8-r1.ebuild,v 1.17 2005/01/06 20:36:45 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 mips" -IUSE="arts esd avi nls dvd aalib X directfb oggvorbis alsa gnome sdl speex theora ipv6 altivec xv pic" +IUSE="arts esd avi nls dvd aalib X directfb oggvorbis alsa gnome sdl speex theora ipv6 altivec pic" RDEPEND="oggvorbis? ( media-libs/libvorbis ) !amd64? ( X? ( virtual/x11 ) ) @@ -131,21 +131,6 @@ src_compile() { [ "${PROFILE_ARCH}" == "sparc" ] \ && myconf="${myconf} --disable-vis" - # Adding extra logic here to deal with newer xorg-x11 ebuilds - 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)" - 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)" - elif [ -f "${ROOT}/usr/X11R6/$(get_libdir)/libXv.a" ]; then - myconf="${myconf} --enable-static-xv --with-xv-path=${ROOT}/usr/X11R6/$(get_libdir)" - else - myconf="${myconf} --enable-shared-xv" - fi - fi - # Fix compilation-errors on PowerPC #45393 & #55460 & #68251 if use ppc || use ppc64 ; then append-flags -U__ALTIVEC__ -- 2.26.2