[patch] xine-lib-1.0-ebuild.patch

xine-lib-1.0-ebuild.patch (text/plain), 7.99 KB, created by James Stockton on 2004-12-27 10:29:14 UTC

--- xine-lib-1.0.ebuild	2004-12-27 18:05:21.900005912 +0000
+++ /usr/portage/media-libs/xine-lib/xine-lib-1.0.ebuild	2004-12-27 18:13:46.277328904 +0000
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/www/www.gentoo.org/raw_cvs/gentoo-x86/media-libs/xine-lib/xine-lib-1.0.ebuild,v 1.2 2004/12/27 13:01:37 eradicator Exp $
+# $Header: 
 
 inherit eutils flag-o-matic gcc libtool
 
@@ -15,22 +15,19 @@
 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 fb xv xvmc nvidia i8x0 libcaca
-	samba dxr3 vidix png mng"
+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 samba dxr3 vidix png mng"
 
 RDEPEND="oggvorbis? ( media-libs/libvorbis )
 	!amd64? ( X? ( virtual/x11 ) )
 	amd64? ( X? ( || ( x11-base/xorg-x11 >=x11-base/xfree-4.3.0-r6 ) ) )
 	avi? ( x86? ( >=media-libs/win32codecs-0.50 ) )
 	esd? ( media-sound/esound )
-	dvd? ( >=media-libs/libdvdcss-1.2.7 )
+	dvd? ( >=media-libs/libdvdcss-1.2.8 )
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
 	aalib? ( media-libs/aalib )
 	directfb? ( >=dev-libs/DirectFB-0.9.9 dev-util/pkgconfig )
-	gnome? ( >=gnome-base/gnome-vfs-2.0
-			dev-util/pkgconfig )
+	gnome? ( >=gnome-base/gnome-vfs-2.0 dev-util/pkgconfig )
 	>=media-libs/flac-1.0.4
 	sdl? ( >=media-libs/libsdl-1.1.5 )
 	>=media-libs/libfame-0.9.0
@@ -41,15 +38,13 @@
 	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}
 
 pkg_setup() {
 	# Make sure that the older libraries are not installed (bug #15081).
-	if [ `has_version =media-libs/xine-lib-0.9.13*` ]
+	if [ `has_version =media-libs/xine-lib-0.9.*` ]
 	then
 		eerror "Please uninstall older xine libraries.";
 		eerror "The compilation cannot proceed.";
@@ -64,35 +59,19 @@
 	# 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
 
-	# Bad version included... may drop .so
-	#libtoolize --copy --force
-
 	# bug #40317
 	elibtoolize
 
-	# Fix building on amd64, #49569
-	#use amd64 && epatch ${FILESDIR}/configure-64bit-define.patch
-
-	epatch ${FILESDIR}/${PN}-1_rc7-pic.patch
+	use pic && 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() {
@@ -122,18 +101,13 @@
 	local myconf
 
 	# the win32 codec path should ignore $(get_libdir) and always use lib
-	use avi	&& use x86 \
-		&& myconf="${myconf} --with-w32-path=/usr/$(get_libdir)/win32" \
-		|| myconf="${myconf} --disable-asf"
+	use avi	&& use x86 && myconf="${myconf} --with-w32-path=/usr/$(get_libdir)/win32" || myconf="${myconf} --disable-asf"
 
-	use sparc \
-		&& myconf="${myconf} --build=${CHOST}"
+	use sparc && myconf="${myconf} --build=${CHOST}"
 
 	# enable/disable appropiate optimizations on sparc
-	[ "${PROFILE_ARCH}" == "sparc64" -o "${ABI}" == "sparc64" ] \
-		&& myconf="${myconf} --enable-vis"
-	[ "${PROFILE_ARCH}" == "sparc" ] \
-		&& myconf="${myconf} --disable-vis"
+	[ "${PROFILE_ARCH}" == "sparc64" ] && myconf="${myconf} --enable-vis"
+	[ "${PROFILE_ARCH}" == "sparc" ] && myconf="${myconf} --disable-vis"
 
 	# Fix compilation-errors on PowerPC #45393 & #55460 & #68251
 	if use ppc || use ppc64 ; then
@@ -159,76 +133,61 @@
 		myconf="${myconf} --with-caca-prefix=/tmp/non-existant"
 	fi
 
-	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:"
-			eerror "   nvidia, i8x0"
-			eerror ""
-			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 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 ) && {
+		eerror "Invalid combination of USE flags"
+		eerror "When building support for xvmc, you may only"
+		eerror "include support for one video card:"
+		eerror "   nvidia, i8x0"
+		eerror ""
+		eerror "Emerge again with different USE flags"
+
+		exit 1
+	}
+
+	( 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) \
-		$(use_enable X x11) $(use_with X x) \
+		$(use_enable X x11) \
+		$(use_with X x) \
 		$(use_enable vidix) \
 		$(use_enable dxr3) \
 		$(use_with esd) --disable-esdtest \
 		$(use_enable alsa) --disable-alsatest \
 		$(use_with arts) --disable-artstest \
 		$(use_with aalib) \
-		$(use_with oggvorbis ogg) $(use_with oggvorbis vorbis) \
+		$(use_with oggvorbis ogg) \
+		$(use_with oggvorbis vorbis) \
 		$(use_enable ipv6) \
-		$(use_enable directfb) $(use_enable fb) \
+		$(use_enable directfb) \
+		$(use_enable fb) \
+		$(use_enable macos macosx-video) \
+		$(use_enable macos coreaudio) \
 		$(use_enable opengl) \
 		$(use_enable aac faad) \
 		${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"
 }