Readded fixes that I made to the rc8-r1 ebuild that were not included in the 1.0...

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index c16e4809ece1f16ad006f3ce4c334e938407ac8a..176c0ac089571f1269030b4593ced3278f86b8ac 100644 (file)
--- 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.170 2004/12/27 04:05:33 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.171 2004/12/27 13:01:37 eradicator Exp $
+
+  27 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xine-lib-1.0.ebuild:
+  Readded fixes that I made to the rc8-r1 ebuild that were not included in the
+  1.0 ebuild. Made the xvmc logic more elegant. Fixed IUSE.
 
 *xine-lib-1.0 (27 Dec 2004)
 

diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 53add89c955f1e91eb7b49200f98e29555807d69..d2c23c9e227dd830e641a6302db02279ee87aa4c 100644 (file)
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,38 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 60a8ddde743317c160dfa2e127562fbf ChangeLog 28767
 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 7b14f0e8c5222de8df9e0dac4c5d10c4 xine-lib-1_rc8-r1.ebuild 6265
 MD5 d9591aa743f1cbe61c93c98846b139b2 xine-lib-1_rc8.ebuild 5380
-MD5 f6f43d20a9588c6e2b4983e23890e81e xine-lib-1.0.ebuild 6875
+MD5 7b14f0e8c5222de8df9e0dac4c5d10c4 xine-lib-1_rc8-r1.ebuild 6265
+MD5 8600bfef55ea547657ee57f740b7a23e ChangeLog 28987
+MD5 50581e3834b0a03f1d6e89c607836582 xine-lib-1.0.ebuild 8137
+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
@@ -40,13 +29,24 @@ 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
 MD5 1780c88522c9a26856effa70a0e27b50 files/digest-xine-lib-1.0 65
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBz4obFdQwWVoAgN4RAtu/AJ486j+Lgifm+UGkSsugvq0mke3xfwCcDfoe
-6vtDGDgtPur+i7L2JfAVfyg=
-=kbp9
+iD8DBQFB0Ae/ArHZZzCEUG0RArQ+AJ9ka0XbRgvMxs293UXf9RdZeHcDHwCeMpY4
+T70fUvlYbzq7Xjrv104HlfA=
+=lMCO
 -----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 c30da2d43bba624544b4ba9ebd7effac6d71fa9c..0ed41b8dd0e8ba7ec0a8a4e58ecbeefdb935c718 100644 (file)
--- 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.1 2004/12/27 04:05:33 chriswhite Exp $
+# $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 $
 
 inherit eutils flag-o-matic gcc libtool
 
@@ -16,7 +16,7 @@ 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 opengl aac pic fb xvmc nvidia i8x0 libcaca
+       theora ipv6 altivec opengl aac fb xv xvmc nvidia i8x0 libcaca
        samba dxr3 vidix png mng"
 
 RDEPEND="oggvorbis? ( media-libs/libvorbis )
@@ -41,6 +41,8 @@ RDEPEND="oggvorbis? ( media-libs/libvorbis )
        png? ( media-libs/libpng )
        mng? ( media-libs/libmng )"
 DEPEND="${RDEPEND}
+       >=sys-devel/automake-1.7
+       >=sys-devel/autoconf-2.59
        nls? ( sys-devel/gettext )"
 
 S=${WORKDIR}/${MY_P}
@@ -62,9 +64,6 @@ src_unpack() {
        # plasmaroo: Kernel 2.6 headers patch
        epatch ${FILESDIR}/${PN}-1_rc7-2.6.patch
 
-       # force 32 bit userland
-       [ ${ARCH} = "sparc" ] && epatch ${FILESDIR}/${PN}-1_rc8-configure-sparc.patch
-
        # fixes bad X11 directories
        epatch ${FILESDIR}/${PN}-x11.patch
 
@@ -77,10 +76,23 @@ src_unpack() {
        # Fix building on amd64, #49569
        #use amd64 && epatch ${FILESDIR}/configure-64bit-define.patch
 
-       use pic && epatch ${FILESDIR}/${PN}-1_rc7-pic.patch
+       epatch ${FILESDIR}/${PN}-1_rc7-pic.patch
 
        # Fix detection of hppa2.0 and hppa1.1 CHOST
        use hppa && sed -e 's/hppa-/hppa*-linux-/' -i ${S}/configure
+
+       # Fix detection of sparc64 systems
+       use sparc && epatch ${FILESDIR}/xine-lib-1_rc7-configure-sparc.patch
+
+       # Makefile.ams and configure.ac get patched, so we need to rerun
+       # autotools
+       export WANT_AUTOCONF=2.5
+       export WANT_AUTOMAKE=1.7
+       aclocal -I m4
+       libtoolize --copy --force
+       autoheader
+       automake -a -f -c
+       autoconf
 }
 
 src_compile() {
@@ -118,7 +130,7 @@ src_compile() {
                && myconf="${myconf} --build=${CHOST}"
 
        # enable/disable appropiate optimizations on sparc
-       [ "${PROFILE_ARCH}" == "sparc64" ] \
+       [ "${PROFILE_ARCH}" == "sparc64" -o "${ABI}" == "sparc64" ] \
                && myconf="${myconf} --enable-vis"
        [ "${PROFILE_ARCH}" == "sparc" ] \
                && myconf="${myconf} --disable-vis"
@@ -147,18 +159,8 @@ src_compile() {
                myconf="${myconf} --with-caca-prefix=/tmp/non-existant"
        fi
 
-       use nvidia \
-               && xvmclib="XvMCNVIDIA"
-       use i8x0 \
-               && xvmclib="I810XvMC"
-
-       use xvmc \
-               && myconf="${myconf} --with-xvmc-path=/usr/X11R6/$(get_libdir)
-               --with-xxmc-path=/usr/X11R6/$(get_libdir) --with-xvmc-lib=$xvmclib
-               --with-xxmc-lib=$xvmclib"
-
-       ( use xvmc && use nvidia && use i8x0 ) \
-               && {
+       if use xvmc; then
+               if use nvidia && use i8x0; then
                        eerror "Invalid combination of USE flags"
                        eerror "When building support for xvmc, you may only"
                        eerror "include support for one video card:"
@@ -167,16 +169,44 @@ src_compile() {
                        eerror "Emerge again with different USE flags"
 
                        exit 1
-               }
+               elif use nvidia; then
+                       xvmclib="XvMCNVIDIA"
+               elif use i8x0; then
+                       xvmclib="I810XvMC"
+               else
+                       ewarn "You tried to build with xvmc support."
+                       ewarn "No supported graphics hardware was specified."
+                       ewarn ""
+                       ewarn "No xvmc support will be included."
+                       ewarn "Please one appropriate USE flag and re-emerge:"
+                       ewarn "   nvidia or i8x0"
+               fi
+
+               if [ -n "${xvmclib}" ]; then
+                       if [ -f "${ROOT}/usr/$(get_libdir)/libXvMC.so" -o -f "${ROOT}/usr/$(get_libdir)/libXvMC.a" ]; then
+                               myconf="${myconf} --with-xvmc-path=${ROOT}/usr/$(get_libdir) --with-xxmc-path=${ROOT}/usr/$(get_libdir) --with-xvmc-lib=${xvmclib} --with-xxmc-lib=${xvmclib}"
+                       elif [ -f "${ROOT}/usr/X11R6/$(get_libdir)/libXvMC.so" -o -f "${ROOT}/usr/X11R6/$(get_libdir)/libXvMC.a" ]; then
+                               myconf="${myconf} --with-xvmc-path=${ROOT}/usr/X11R6/$(get_libdir) --with-xxmc-path=${ROOT}/usr/X11R6/$(get_libdir) --with-xvmc-lib=${xvmclib} --with-xxmc-lib=${xvmclib}"
+                       else
+                               ewarn "Couldn't find libXvMC.  Disabling xvmc support."
+                       fi
+               fi
+       fi
+
+       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
 
-       ( use xvmc && ! use nvidia && ! use i8x0 ) && {
-               ewarn "You tried to build with xvmc support."
-               ewarn "No supported graphics hardware was specified."
-               ewarn ""
-               ewarn "No xvmc support will be included."
-               ewarn "Please one appropriate USE flag and re-emerge:"
-               ewarn "   nvidia or i8x0"
-       }
 
        econf \
                $(use_enable nls) \
@@ -190,17 +220,15 @@ src_compile() {
                $(use_with oggvorbis ogg) $(use_with oggvorbis vorbis) \
                $(use_enable ipv6) \
                $(use_enable directfb) $(use_enable fb) \
-               $(use_enable macos macosx-video) $(use_enable macos coreaudio) \
                $(use_enable opengl) \
                $(use_enable aac faad) \
-               #$(use_with ffmpeg external-ffmpeg) \
-               #$(use_with dvdnav external-dvdnav) \
                ${myconf} \
-               --libdir=/usr/$(get_libdir) \
-               --with-xv-path=/usr/X11R6/$(get_libdir) \
-               --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/$(get_libdir) \
                --disable-sdltest || die "Configure failed"
 
+               #$(use_with ffmpeg external-ffmpeg) \
+               #$(use_with dvdnav external-dvdnav) \
+               #$(use_enable macos macosx-video) $(use_enable macos coreaudio) \
+
        emake -j1 || die "Parallel make failed"
 }