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

mplayer-1.0_pre7-r1.ebuild-vidix.patch (text/plain), 1.48 KB, created by Kalin KOZHUHAROV on 2006-01-03 05:26:41 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 )
@@ -353,13 +354,19 @@
 	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
+	( use svga && use divix ) \
+		&& {
+			eerror "Invalid combination of USE flags"
+			eerror "The combination of +divix and +svga simultaneously is"
+			eerror "NOT supported at this time."
+			eerror
+			eerror "Emerge again with different USE flags"
 
+			exit 1
+		}
+	myconf="${myconf} $(use_enable svga)"
+	myconf="${myconf} $(use_enable vidix)"
+
 	myconf="${myconf} $(use_enable tga)"
 
 	( use xvmc && use nvidia ) \