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

Collapse All | Expand All

(-)/usr/portage/media-video/mplayer/mplayer-9999.ebuild (-22 / +14 lines)
Lines 62-67 Link Here
62
#	nemesi? ( net-libs/libnemesi )
62
#	nemesi? ( net-libs/libnemesi )
63
RDEPEND+="
63
RDEPEND+="
64
	sys-libs/ncurses
64
	sys-libs/ncurses
65
	app-arch/bzip2
66
	sys-libs/zlib
65
	!bindist? (
67
	!bindist? (
66
		x86? (
68
		x86? (
67
			win32codecs? ( media-libs/win32codecs )
69
			win32codecs? ( media-libs/win32codecs )
Lines 142-148 Link Here
142
	sdl? ( media-libs/libsdl )
144
	sdl? ( media-libs/libsdl )
143
	speex? ( media-libs/speex )
145
	speex? ( media-libs/speex )
144
	svga? ( media-libs/svgalib )
146
	svga? ( media-libs/svgalib )
145
	theora? ( media-libs/libtheora )
147
	theora? ( media-libs/libtheora[encode?] )
146
	truetype? ( ${FONT_RDEPS} )
148
	truetype? ( ${FONT_RDEPS} )
147
	vorbis? ( media-libs/libvorbis )
149
	vorbis? ( media-libs/libvorbis )
148
	xanim? ( media-video/xanim )
150
	xanim? ( media-video/xanim )
Lines 394-408 Link Here
394
	##########
396
	##########
395
	# Codecs #
397
	# Codecs #
396
	##########
398
	##########
397
	# Use internal musepack codecs for SV7 and SV8 support
399
	myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support
398
	myconf+=" --disable-musepack"
399
400
	use a52 || myconf+=" --disable-liba52"
401
	myconf+=" --disable-faad-internal" # always use system media-libs/faad2
400
	myconf+=" --disable-faad-internal" # always use system media-libs/faad2
402
	use dirac || myconf+=" --disable-libdirac-lavc"
401
	use dirac || myconf+=" --disable-libdirac-lavc"
403
	use dts || myconf+=" --disable-libdca"
402
	use dts || myconf+=" --disable-libdca"
404
	use dv || myconf+=" --disable-libdv"
405
	use lzo || myconf+=" --disable-liblzo"
406
	if ! use mp3; then
403
	if ! use mp3; then
407
		myconf+="
404
		myconf+="
408
			--disable-mp3lame
405
			--disable-mp3lame
Lines 410-416 Link Here
410
			--disable-mp3lib
407
			--disable-mp3lib
411
		"
408
		"
412
	fi
409
	fi
413
	use bs2b || myconf+=" --disable-libbs2b"
410
	uses="a52 bs2b dv lzo"
411
	for i in ${uses}; do
412
		use ${i} || myconf+=" --disable-lib${i}"
413
	done
414
	use schroedinger || myconf+=" --disable-libschroedinger-lavc"
414
	use schroedinger || myconf+=" --disable-libschroedinger-lavc"
415
	# Disable opencore-amr with bindist
415
	# Disable opencore-amr with bindist
416
	# https://bugs.gentoo.org/show_bug.cgi?id=299405#c6
416
	# https://bugs.gentoo.org/show_bug.cgi?id=299405#c6
Lines 435-459 Link Here
435
		"
435
		"
436
	fi
436
	fi
437
	# Encoding
437
	# Encoding
438
	uses="faac x264 xvid toolame twolame"
438
	if use encode; then
439
	if use encode; then
439
		uses="faac x264 xvid toolame twolame"
440
		for i in ${uses}; do
440
		for i in ${uses}; do
441
			use ${i} || myconf+=" --disable-${i}"
441
			use ${i} || myconf+=" --disable-${i}"
442
		done
442
		done
443
		use faac || myconf+=" --disable-faac-lavc"
443
		use faac || myconf+=" --disable-faac-lavc"
444
	else
444
	else
445
		myconf+="
445
		myconf+="--disable-faac-lavc"
446
			--disable-faac-lavc
447
			--disable-faac
448
			--disable-x264
449
			--disable-xvid
450
			--disable-x264-lavc
451
			--disable-xvid-lavc
452
			--disable-twolame
453
			--disable-toolame
454
		"
455
		uses="faac x264 xvid toolame twolame"
456
		for i in ${uses}; do
446
		for i in ${uses}; do
447
			myconf+=" --disable-${i}"
457
			use ${i} && elog "Useflag \"${i}\" require \"encode\" useflag enabled to work."
448
			use ${i} && elog "Useflag \"${i}\" require \"encode\" useflag enabled to work."
458
		done
449
		done
459
	fi
450
	fi
Lines 606-611 Link Here
606
		--disable-xss
597
		--disable-xss
607
		--disable-xv
598
		--disable-xv
608
		--disable-xvmc
599
		--disable-xvmc
600
		--disable-x11
609
		"
601
		"
610
		uses="dga dxr3 ggi opengl osdmenu vdpau vidix xinerama xscreensaver xv"
602
		uses="dga dxr3 ggi opengl osdmenu vdpau vidix xinerama xscreensaver xv"
611
		for i in ${uses}; do
603
		for i in ${uses}; do
Lines 640-653 Link Here
640
		local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN"
632
		local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN"
641
		local BUILT_DOCS=""
633
		local BUILT_DOCS=""
642
		for i in ${LINGUAS} ; do
634
		for i in ${LINGUAS} ; do
643
			hasq $i ${ALLOWED_LINGUAS} && BUILT_DOCS+=" $i"
635
			hasq ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=" ${i}"
644
		done
636
		done
645
		if [[ -z $BUILT_DOCS ]]
637
		if [[ -z $BUILT_DOCS ]]
646
		then
638
		then
647
			emake -j1 -C DOCS/xml html-chunked || die "Failed to generate html docs"
639
			emake -j1 -C DOCS/xml html-chunked || die "Failed to generate html docs"
648
		else
640
		else
649
			for i in ${BUILT_DOCS} ; do
641
			for i in ${BUILT_DOCS} ; do
650
				emake -j1 -C DOCS/xml html-chunked-$i || die "Failed to generate html docs for $i"
642
				emake -j1 -C DOCS/xml html-chunked-${i} || die "Failed to generate html docs for ${i}"
651
			done
643
			done
652
		fi
644
		fi
653
	fi
645
	fi

Return to bug 322377