[patch] mplayer-1.0_pre7-r1.ebuild-vidix.patch

mplayer-1.0_pre7-r1.ebuild-vidix.patch (text/plain), 2.80 KB, created by Kalin KOZHUHAROV on 2006-01-03 07:16:54 UTC

Index: mplayer-1.0_pre7-r1.ebuild
===================================================================
--- mplayer-1.0_pre7-r1.ebuild	(revision 57)
+++ mplayer-1.0_pre7-r1.ebuild	(working copy)
@@ -10,7 +10,7 @@
 dvdread edl encode esd fbcon gif ggi gtk i8x0 ipv6 jack joystick jpeg libcaca
 lirc live livecd lzo mad matroska matrox mmx mmxext mythtv nas nls nvidia
 vorbis opengl oss png real rtc samba sdl sse sse2 svga tga theora truetype
-v4l v4l2 win32codecs X xanim xinerama xmms xv xvid xvmc"
+v4l v4l2 vidix win32codecs X xanim xinerama xmms xv xvid xvmc"
 
 BLUV=1.4
 SVGV=1.9.17
@@ -74,6 +74,7 @@
 	samba? ( >=net-fs/samba-2.2.8a )
 	sdl? ( media-libs/libsdl )
 	svga? ( media-libs/svgalib )
+	vidix? ( >=media-libs/vidix-0.9.9.1 )
 	theora? ( media-libs/libtheora )
 	live? ( >=media-plugins/live-2004.07.20 )
 	truetype? ( >=media-libs/freetype-2.1 )
@@ -131,6 +132,7 @@
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 
 pkg_setup() {
+	misused_useflags_warn
 	if use real && use x86; then
 				REALLIBDIR="/opt/RealPlayer/codecs"
 	fi
@@ -179,6 +181,30 @@
 	epatch ${FILESDIR}/${P}-gcc_detection.patch
 }
 
+misused_useflags_warn() {
+	( 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 vidix && ! use svga ) \
+		&& {
+			ewarn
+			ewarn "You will probably need USE=svga as well!"
+			ewarn "RTFM: http://www.mplayerhq.hu/DOCS/HTML/en/video.html#vidix"
+			ewarn
+			ewarn "Consider emerging again with different USE flags!"
+			ewarn
+			sleep 5
+		}
+}
+
 linguas_warn() {
 	ewarn "Language ${LANG[0]} or ${LANG_CC} not avaliable"
 	ewarn "Language set to English"
@@ -352,14 +378,8 @@
 	myconf="${myconf} $(use_enable matrox mga)"
 	myconf="${myconf} $(use_enable opengl gl)"
 	myconf="${myconf} $(use_enable sdl)"
-
-	if use svga
-	then
-		myconf="${myconf} --enable-svga"
-	else
-		myconf="${myconf} --disable-svga --disable-vidix"
-	fi
-
+	myconf="${myconf} $(use_enable vidix)"
+	myconf="${myconf} $(use_enable svga)"
 	myconf="${myconf} $(use_enable tga)"
 
 	( use xvmc && use nvidia ) \
@@ -368,18 +388,6 @@
 	( use xvmc && use i8x0 ) \
 		&& myconf="${myconf} --enable-xvmc --with-xvmclib=I810XvMC"
 
-	( 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."