Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 174721 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/portage/media-video/mplayer/mplayer-1.0_rc2_pre20070321-r4.ebuild (-7 / +14 lines)
Lines 6-13 Link Here
6
6
7
RESTRICT="nostrip"
7
RESTRICT="nostrip"
8
IUSE="3dnow 3dnowext a52 aac aalib alsa altivec amr arts bidi bl bindist cddb
8
IUSE="3dnow 3dnowext a52 aac aalib alsa altivec amr arts bidi bl bindist cddb
9
cpudetection custom-cflags debug dga doc dts dvb cdparanoia directfb dvd dvdnav
9
cpudetection custom-cflags debug dga doc dts dvb cdparanoia directfb dvdnav
10
dv dvdread enca encode esd fbcon ftp gif ggi gtk iconv ipv6 ivtv jack joystick
10
dv enca encode esd fbcon ftp gif ggi gtk iconv ipv6 ivtv jack joystick
11
jpeg libcaca lirc live livecd lzo mad md5sum mmx mmxext mp2 mp3 musepack nas
11
jpeg libcaca lirc live livecd lzo mad md5sum mmx mmxext mp2 mp3 musepack nas
12
unicode vorbis opengl openal oss png pnm quicktime radio rar real rtc samba sdl
12
unicode vorbis opengl openal oss png pnm quicktime radio rar real rtc samba sdl
13
speex srt sse sse2 svga tga theora tivo truetype v4l v4l2 vidix win32codecs X
13
speex srt sse sse2 svga tga theora tivo truetype v4l v4l2 vidix win32codecs X
Lines 60-66 Link Here
60
	dts? ( media-libs/libdts )
60
	dts? ( media-libs/libdts )
61
	dv? ( media-libs/libdv )
61
	dv? ( media-libs/libdv )
62
	dvb? ( media-tv/linuxtv-dvb-headers )
62
	dvb? ( media-tv/linuxtv-dvb-headers )
63
	dvd? ( dvdnav? ( media-libs/libdvdnav ) )
63
	dvdnav? ( media-libs/libdvdnav )
64
	encode? (
64
	encode? (
65
		aac? ( media-libs/faac )
65
		aac? ( media-libs/faac )
66
		mp2? ( media-sound/twolame )
66
		mp2? ( media-sound/twolame )
Lines 209-214 Link Here
209
	# Fix XShape detection
209
	# Fix XShape detection
210
	epatch ${FILESDIR}/${PN}-xshape.patch
210
	epatch ${FILESDIR}/${PN}-xshape.patch
211
211
212
	# configure shows which type [internal,external,from dvdnav] of dvdread
213
	# library we use
214
	epatch ${FILESDIR}/${PN}-dvd-verbose.patch
215
212
}
216
}
213
217
214
src_compile() {
218
src_compile() {
Lines 241-250 Link Here
241
	# upstream's suggestion.  We don't.
245
	# upstream's suggestion.  We don't.
242
	# dvdnav support is known to be buggy, but it is the only option
246
	# dvdnav support is known to be buggy, but it is the only option
243
	# for accessing some DVDs.
247
	# for accessing some DVDs.
244
	if use dvd; then
248
	if use dvdnav; then
245
		use dvdread || myconf="${myconf} --disable-dvdread"
249
		# --enable-dvdnav automagically enable dvdread (not external libdvdread.so)
246
		use dvdnav || myconf="${myconf} --disable-dvdnav"
250
		# and disable internal dvdread/dvdcss
251
		myconf="${myconf} --enable-dvdnav"
247
	else
252
	else
253
		# automagically enable internal dvdread/dvdcss (--disable-dvdread is not needed,
254
		# but it's here for safety reasons)
248
		myconf="${myconf} --disable-dvdnav --disable-dvdread"
255
		myconf="${myconf} --disable-dvdnav --disable-dvdread"
249
	fi
256
	fi
250
257
Lines 546-552 Link Here
546
		depmod -a &>/dev/null || :
553
		depmod -a &>/dev/null || :
547
	fi
554
	fi
548
555
549
	if use dvdnav && use dvd; then
556
	if use dvdnav; then
550
		ewarn "'dvdnav' support in MPlayer is known to be buggy, and will"
557
		ewarn "'dvdnav' support in MPlayer is known to be buggy, and will"
551
		ewarn "break if you are using it in GUI mode.  It is only"
558
		ewarn "break if you are using it in GUI mode.  It is only"
552
		ewarn "included because some DVDs will only play with this feature."
559
		ewarn "included because some DVDs will only play with this feature."

Return to bug 174721