Drop monolithic X11 support, no more need for VIDEO_CARDS support, XvMCW is used every time. Simplify the ebuild notably.

(Portage version: 2.1.1)

2 files changed, 22 insertions, 94 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 9b3bd00869d3..b591f36ae877 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/xine-lib
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.399 2006/09/09 00:39:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.400 2006/09/10 00:05:50 flameeyes Exp $
+
+  10 Sep 2006; Diego Pettenò <flameeyes@gentoo.org>
+  xine-lib-1.1.3_pre20060831.ebuild:
+  Drop monolithic X11 support, no more need for VIDEO_CARDS support, XvMCW is
+  used every time. Simplify the ebuild notably.
 
   09 Sep 2006; Diego Pettenò <flameeyes@gentoo.org>
   xine-lib-1.1.3_pre20060831.ebuild:
diff --git a/media-libs/xine-lib/xine-lib-1.1.3_pre20060831.ebuild b/media-libs/xine-lib/xine-lib-1.1.3_pre20060831.ebuild
index c7090d97320b..ff1f42f7ded8 100644
--- a/media-libs/xine-lib/xine-lib-1.1.3_pre20060831.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.1.3_pre20060831.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.1.3_pre20060831.ebuild,v 1.7 2006/09/09 00:39:35 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.3_pre20060831.ebuild,v 1.8 2006/09/10 00:05:50 flameeyes Exp $
 
 inherit eutils flag-o-matic toolchain-funcs libtool autotools
 
@@ -26,27 +26,17 @@ LICENSE="GPL-2"
 SLOT="1"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
-IUSE_VIDEO_CARDS="video_cards_nvidia video_cards_via video_cards_i810"
-
 IUSE="aalib libcaca arts esd win32codecs nls dvd X directfb vorbis alsa
 gnome sdl speex theora ipv6 altivec opengl aac fbcon xv xvmc
 samba dxr3 vidix mng flac oss v4l xinerama vcd a52 mad imagemagick dts
-debug modplug ${IUSE_VIDEO_CARDS}"
+debug modplug"
 
 RDEPEND="vorbis? ( media-libs/libvorbis )
-	X? ( || ( (
-			x11-libs/libXext
-			x11-libs/libX11 )
-		<virtual/x11-7 ) )
-	xv? ( || ( x11-libs/libXv <virtual/x11-7 ) )
-	xvmc? (
-		|| ( x11-libs/libXvMC <virtual/x11-7 )
-		video_cards_nvidia? ( || ( x11-drivers/nvidia-drivers
-			x11-drivers/nvidia-legacy-drivers media-video/nvidia-glx ) )
-		video_cards_via? ( || ( x11-drivers/xf86-video-via <virtual/x11-7 ) )
-		video_cards_i810? ( || ( x11-drivers/xf86-video-i810 <virtual/x11-7 ) )
-	)
-	xinerama? ( || ( x11-libs/libXinerama <virtual/x11-7 ) )
+	X? ( x11-libs/libXext
+		 x11-libs/libX11 )
+	xv? ( x11-libs/libXv )
+	xvmc? ( x11-libs/libXvMC )
+	xinerama? ( x11-libs/libXinerama )
 	win32codecs? ( >=media-libs/win32codecs-0.50 )
 	esd? ( media-sound/esound )
 	dvd? ( >=media-libs/libdvdcss-1.2.7 )
@@ -75,15 +65,12 @@ RDEPEND="vorbis? ( media-libs/libvorbis )
 	!=media-libs/xine-lib-0.9.13*"
 
 DEPEND="${RDEPEND}
-	X? ( || ( (
-			x11-libs/libXt
-			x11-proto/xextproto
-			x11-proto/xproto
-			x11-proto/videoproto
-			x11-proto/xf86vidmodeproto
-			xinerama? ( x11-proto/xineramaproto ) )
-		<virtual/x11-7 )
-		)
+	X? ( x11-libs/libXt
+		 x11-proto/xextproto
+		 x11-proto/xproto
+		 x11-proto/videoproto
+		 x11-proto/xf86vidmodeproto
+		 xinerama? ( x11-proto/xineramaproto ) )
 	v4l? ( virtual/os-headers )
 	dev-util/pkgconfig
 	nls? ( sys-devel/gettext )"
@@ -97,17 +84,6 @@ src_unpack() {
 	WANT_AUTOMAKE="1.9" AT_M4DIR="m4" eautoreconf
 }
 
-# check for the X11 path for a given library
-get_x11_dir() {
-	if [[ -f "${ROOT}/usr/$(get_libdir)/$1" ]]; then
-		echo "${ROOT}/usr/$(get_libdir)"
-	elif [[ -f "${ROOT}/usr/$(get_libdir)/xorg/$1" ]]; then
-		echo "${ROOT}/usr/$(get_libdir)/xorg"
-	elif [[ -f "${ROOT}/usr/X11R6/$(get_libdir)/$1" ]]; then
-		echo "${ROOT}/usr/X11R6/$(get_libdir)"
-	fi
-}
-
 src_compile() {
 	#prevent quicktime crashing
 	append-flags -frename-registers -ffunction-sections
@@ -132,51 +108,6 @@ src_compile() {
 	# The default CFLAGS (-O) is the only thing working on hppa.
 	use hppa && unset CFLAGS
 
-	if ! use xvmc; then
-		myconf="${myconf} --disable-xvmc"
-	else
-		count="0"
-		if use video_cards_nvidia; then
-			count="`expr ${count} + 1`"
-			xvmclib="XvMCNVIDIA"
-		fi
-
-		if use video_cards_i810; then
-			count="`expr ${count} + 1`"
-			xvmclib="I810XvMC"
-		fi
-
-		if use video_cards_via; then
-			count="`expr ${count} + 1`"
-			xvmclib="viaXvMC"
-		fi
-
-		if [[ "${count}" -gt "1" ]]; then
-			eerror "Invalid combination of USE flags"
-			eerror "When building support for xvmc, you may only include support"
-			eerror "for none or one of the following VIDEO_CARDS:"
-			eerror ""
-			eerror "nvidia i810 via"
-			eerror ""
-			eerror "XvMC support will try to link against libXvMCW."
-		elif [[ -n "${xvmclib}" ]]; then
-			xvmcconf="--with-xvmc-lib=${xvmclib} --with-xxmc-lib=${xvmclib}"
-			xvmcdir=$(get_x11_dir libXvMC.so)
-
-			[[ -z ${xvmcdir} ]] && die "Unable to find libXvMC.so."
-
-			myconf="${myconf} ${xvmcconf} --with-xvmc-path=${xvmcdir} --with-xxmc-path=${xvmcdir}"
-		fi
-	fi
-
-	if use xv; then
-		xvdir=$(get_x11_dir libXv.so)
-
-		[[ -z ${xvdir} ]] && die "Unable to find libXv.so. Did you set USE=\"xv\" when you emerged xorg-x11?"
-
-		myconf="${myconf} --with-xv-path=${xvdir}"
-	fi
-
 	econf \
 		$(use_enable gnome) \
 		$(use_enable nls) \
@@ -206,6 +137,7 @@ src_compile() {
 		$(use_enable aalib) \
 		$(use_enable libcaca caca) \
 		$(use_enable sdl) \
+		$(use_enable xvmc) \
 		\
 		$(use_enable oss) \
 		$(use_enable alsa) \
@@ -220,6 +152,7 @@ src_compile() {
 		--without-pulseaudio \
 		--disable-optimizations \
 		${myconf} \
+		--with-xv-path=/usr/$(get_libdir) \
 		--with-w32-path=/usr/lib/win32 \
 		--enable-fast-install \
 		--disable-dependency-tracking || die "econf failed"
@@ -233,15 +166,5 @@ src_install() {
 	dodoc AUTHORS ChangeLog README TODO doc/README* doc/faq/faq.txt
 	dohtml doc/faq/faq.html doc/hackersguide/*.html doc/hackersguide/*.png
 
-	rm -rf ${D}/usr/share/doc/xine
-}
-
-pkg_postinst() {
-	if use win32codecs && ! use asf; then
-		elog "You choose to build win32codecs support but disabled ASF"
-		elog "demuxer. This way you'll have support for win32codecs in"
-		elog "formats like AVI or Matroska, but not in WMV/WMA files."
-		elog ""
-		elog "To be able to play WMV/WMA files, please add asf useflag."
-	fi
+	rm -rf "${D}/usr/share/doc/xine"
 }