[patch] mplayer-1.0_rc2_pre20070321-r4.ebuild.patch

mplayer2.patch (text/plain), 2.33 KB, created by Yaroslav Isakov on 2007-04-15 21:54:06 UTC

--- /usr/portage/media-video/mplayer/mplayer-1.0_rc2_pre20070321-r4.ebuild	2007-04-09 20:36:36.000000000 +0400
+++ /usr/local/portage/media-video/mplayer/mplayer-1.0_rc2_pre20070321-r5.ebuild	2007-04-15 15:06:33.000000000 +0400
@@ -6,8 +6,8 @@
 
 RESTRICT="nostrip"
 IUSE="3dnow 3dnowext a52 aac aalib alsa altivec amr arts bidi bl bindist cddb
-cpudetection custom-cflags debug dga doc dts dvb cdparanoia directfb dvd dvdnav
-dv dvdread enca encode esd fbcon ftp gif ggi gtk iconv ipv6 ivtv jack joystick
+cpudetection custom-cflags debug dga doc dts dvb cdparanoia directfb dvdnav
+dv enca encode esd fbcon ftp gif ggi gtk iconv ipv6 ivtv jack joystick
 jpeg libcaca lirc live livecd lzo mad md5sum mmx mmxext mp2 mp3 musepack nas
 unicode vorbis opengl openal oss png pnm quicktime radio rar real rtc samba sdl
 speex srt sse sse2 svga tga theora tivo truetype v4l v4l2 vidix win32codecs X
@@ -60,7 +60,7 @@
 	dts? ( media-libs/libdts )
 	dv? ( media-libs/libdv )
 	dvb? ( media-tv/linuxtv-dvb-headers )
-	dvd? ( dvdnav? ( media-libs/libdvdnav ) )
+	dvdnav? ( media-libs/libdvdnav )
 	encode? (
 		aac? ( media-libs/faac )
 		mp2? ( media-sound/twolame )
@@ -209,6 +209,10 @@
 	# Fix XShape detection
 	epatch ${FILESDIR}/${PN}-xshape.patch
 
+	# configure shows which type [internal,external,from dvdnav] of dvdread
+	# library we use
+	epatch ${FILESDIR}/${PN}-dvd-verbose.patch
+
 }
 
 src_compile() {
@@ -241,10 +245,13 @@
 	# upstream's suggestion.  We don't.
 	# dvdnav support is known to be buggy, but it is the only option
 	# for accessing some DVDs.
-	if use dvd; then
-		use dvdread || myconf="${myconf} --disable-dvdread"
-		use dvdnav || myconf="${myconf} --disable-dvdnav"
+	if use dvdnav; then
+		# --enable-dvdnav automagically enable dvdread (not external libdvdread.so)
+		# and disable internal dvdread/dvdcss
+		myconf="${myconf} --enable-dvdnav"
 	else
+		# automagically enable internal dvdread/dvdcss (--disable-dvdread is not needed,
+		# but it's here for safety reasons)
 		myconf="${myconf} --disable-dvdnav --disable-dvdread"
 	fi
 
@@ -546,7 +553,7 @@
 		depmod -a &>/dev/null || :
 	fi
 
-	if use dvdnav && use dvd; then
+	if use dvdnav; then
 		ewarn "'dvdnav' support in MPlayer is known to be buggy, and will"
 		ewarn "break if you are using it in GUI mode.  It is only"
 		ewarn "included because some DVDs will only play with this feature."