From: Jeremy Huddleston Date: Sun, 26 Dec 2004 21:05:15 +0000 (+0000) Subject: Xv detection now works with newer xorg-x11 versions (/usr/lib instead of /usr/X11R6... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d7d811ffd9ac672f956626d600aeceda9bbd6acf;p=gentoo.git Xv detection now works with newer xorg-x11 versions (/usr/lib instead of /usr/X11R6/lib). Using shared libXv by default. --- diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog index 5ad5749e024a..d01f2922916d 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.167 2004/12/26 03:03:11 chriswhite Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.168 2004/12/26 21:05:15 eradicator Exp $ + + 26 Dec 2004; Jeremy Huddleston + xine-lib-1_rc8-r1.ebuild: + Xv detection now works with newer xorg-x11 versions (/usr/lib instead of + /usr/X11R6/lib). Using shared libXv by default. 26 Dec 2004; Chris White xine-lib-1_rc8-r1.ebuild: Fixing bug #69856. diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest index ee7a8e582b07..43aa33c9b44f 100644 --- a/media-libs/xine-lib/Manifest +++ b/media-libs/xine-lib/Manifest @@ -1,37 +1,26 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 6fb7610863b59f442956c19dfba2aeb0 ChangeLog 28259 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 cb60e0c8c41802098a6f05ecd0ce21de xine-lib-1_rc8-r1.ebuild 5469 MD5 d9591aa743f1cbe61c93c98846b139b2 xine-lib-1_rc8.ebuild 5380 +MD5 b2df7cec54f3697240428c8e4c6a0508 xine-lib-1_rc8-r1.ebuild 6122 +MD5 6a7bc1bac46755176dd49d409bf3e9e0 ChangeLog 28470 +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 -MD5 044cbe825fc480693aec675808e4c679 files/digest-xine-lib-1_rc5-r3 67 -MD5 082b3ed1c96543704d604199047b1dee files/digest-xine-lib-1_rc6 68 +MD5 b3b75486422c6ccab706f2ff4cf7c4eb files/xine-lib-1_rc6-mmx.patch 391 +MD5 bf2bb27a1f0433ea77571175f2b59885 files/xine-lib-1_rc6-pic.patch 2655 MD5 98e135f240fada719668b012c77b40be files/digest-xine-lib-1_rc7 67 -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 a52bac7d568413597e0c7932b164e58c files/xine-lib-1_rc7-2.6.patch 594 +MD5 044cbe825fc480693aec675808e4c679 files/digest-xine-lib-1_rc5-r3 67 +MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc7-configure-sparc.patch 587 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 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 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 5ddf5d90566965b047828407dcc0f5d1 files/xine-lib-1rc4-libtool1.5.6.shrext_cmds.patch 331 @@ -39,12 +28,23 @@ MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-2.6.patch 594 MD5 0cf698a9ff87a3595140d92df7b900b6 files/xine-lib-configure.patch 342 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 dcb0c79c0bb106397aad42f6d936627d files/xineconfig.patch-0.9.13 601 +MD5 e35c6e1b7a7cd3f4e268b1fb876cbeb5 files/protect-CFLAGS.patch-1_rc5-r1 316 +MD5 54088d42a9e9980285a96b7e2cce19cf files/djb_demux_aiff.patch 559 +MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc5-configure-sparc.patch 587 +MD5 ff56a363d07445735a05afe1dc7f6f56 files/xine-lib-1_rc5-vcd_overflow.patch 1754 +MD5 082b3ed1c96543704d604199047b1dee files/digest-xine-lib-1_rc6 68 +MD5 e35c6e1b7a7cd3f4e268b1fb876cbeb5 files/protect-CFLAGS.patch-1_rc6 316 +MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-1_rc6-2.6.patch 594 +MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc6-configure-sparc.patch 587 +MD5 a11a93cf97cecb7c1c2b24e11a5419ae files/xine-lib-1_rc6-ffmpeg.patch 1279 +MD5 98bc17778384589bba027ff136956fec files/digest-xine-lib-1_rc8 67 +MD5 98bc17778384589bba027ff136956fec files/digest-xine-lib-1_rc8-r1 67 +MD5 5d2c3c00bf3ae9a89dfcaa8b5c5b17a2 files/xine-lib-x11.patch 703 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (GNU/Linux) -iD8DBQFBzi3lFdQwWVoAgN4RAq6xAJwL614/reY8n40TmRBWlSAPR9q0TQCffyZy -K5hG8wef5JnGQEurqRZQebs= -=vsGS +iD8DBQFBzyeVArHZZzCEUG0RAqaVAJ46z1R8aXcS15H1qG4mRli/YeCBZQCfYejW +6oMhPjJVcBwrLuurluOMDmo= +=XGmH -----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 a27831680ce8..5ca99dd2f190 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-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.8 2004/12/26 03:03:11 chriswhite Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc8-r1.ebuild,v 1.9 2004/12/26 21:05:15 eradicator Exp $ inherit eutils flag-o-matic gcc libtool @@ -56,7 +56,7 @@ src_unpack() { epatch ${FILESDIR}/${PN}-1_rc7-2.6.patch # force 32 bit userland - [ ${ARCH} = "sparc" ] && epatch ${FILESDIR}/${P}-configure-sparc.patch + [ ${ARCH} = "sparc" ] && epatch ${FILESDIR}/xine-lib-1_rc7-configure-sparc.patch # fixes #74475 security bug epatch ${FILESDIR}/djb_demux_aiff.patch @@ -118,7 +118,20 @@ src_compile() { [ "${PROFILE_ARCH}" == "sparc" ] \ && myconf="${myconf} --disable-vis" - use xv && myconf="${myconf} --with-xv-path=/usr/X11R6/$(get_libdir)" + # 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