Merge with mplayer1 ebuild. Thanks to nikoli for the patchset.

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

3 files changed, 60 insertions, 106 deletions

diff --git a/media-video/mplayer2/ChangeLog b/media-video/mplayer2/ChangeLog
index 408bf8c63ebb..92a07947c3ff 100644
--- a/media-video/mplayer2/ChangeLog
+++ b/media-video/mplayer2/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer2
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.54 2012/05/22 16:44:06 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.55 2012/06/12 09:05:10 scarabeus Exp $
+
+  12 Jun 2012; Tomáš Chvátal <scarabeus@gentoo.org> mplayer2-9999.ebuild:
+  Merge with mplayer1 ebuild. Thanks to nikoli for the patchset.
 
   22 May 2012; Diego E. Pettenò <flameeyes@gentoo.org>
   mplayer2-2.0_p20120309.ebuild, mplayer2-9999.ebuild:
diff --git a/media-video/mplayer2/Manifest b/media-video/mplayer2/Manifest
index c512d3c1df87..85f6a3621c49 100644
--- a/media-video/mplayer2/Manifest
+++ b/media-video/mplayer2/Manifest
@@ -6,17 +6,23 @@ DIST font-arial-iso-8859-1.tar.bz2 234242 RMD160 666697cd5efd9387057a898c714175e
 DIST font-arial-iso-8859-2.tar.bz2 222208 RMD160 562d4d92c4f5f3d537340fde3ad8d1495ac41acb SHA1 7b99bbe0e9ba89a57eccbea8f93c453c4f268181 SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1
 DIST mplayer2-2.0_p20120309.tar.xz 3328620 RMD160 b8ba6666cc77f3f74e100a843246114c17b06703 SHA1 35465ec3ca1c8196be3aa9938b72261dcb1f1718 SHA256 8a46e0be27dd479c91bde64a35725c6ff668e5a74ab3a56ac3fe29d16f6a0a31
 EBUILD mplayer2-2.0_p20120309.ebuild 16447 RMD160 4b789fbe70a133f200928adedf0fcab851764257 SHA1 6c724be31a602895a6d1b01077f40826131f6754 SHA256 7ab68666f9a9988408564060b2bc9909e9a103778c610914e540eb491f356a18
-EBUILD mplayer2-9999.ebuild 16335 RMD160 86f89f8044727c113fe4d689948f1b69a8f64ff2 SHA1 98a633f393ff5b44bd6b3f04b7c3512286790d3f SHA256 61bd37644b34538a1ba8b27544b124d32ddc0f8d0efa3f93aae50784ed882bac
-MISC ChangeLog 11928 RMD160 daa9039ad1c3b6dd2b47f2e8959a2f8fdae1aee1 SHA1 a2d8f52a9be73e83cea4ca89a4c5b8db653a2985 SHA256 790a59ef89662b8ae9fb2e6555da8b536e12506a018f316b5102fd4e51216e87
+EBUILD mplayer2-9999.ebuild 14684 RMD160 bc1ed9918e1456032f5a38d747d1fa965134558f SHA1 a4751a76d71157a4f4ee3b60b25502d82d064274 SHA256 f9fb562f6ebeb3e370c9f0da28ec877f26e4a0468cc807ee378170070f62ad99
+MISC ChangeLog 12071 RMD160 814e232f49276e62c433750fb9de29a11a218c70 SHA1 b294a31d346922892f469ebc021954bea3374783 SHA256 ec1173a7e3b9dcc0f7dea3a8734789a691696308fcc24b97c5f5bd7b530ab08d
 MISC metadata.xml 3386 RMD160 d649f9d6347153847ed20cf81cb8e736bc81392f SHA1 9c7102eaf4971692c73dce29cb484a1614ef2ca9 SHA256 fe217ff1539e639cef66f44dee4a7955c89b6fd310253e10152c0653adb83376
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPu8JcAAoJEBzRPIrUMBNCF4IIAKHv+wnsfd2HGxQsHxbe4q4M
-Jg7OAdg3c8TK8dDR8YHg95YO0Zu1hXPp51HjsIwvPS+82TaPf8gQmkixiCCrdDfa
-tlhHXFThGhQNA2bX3hCuMw0Ncmn+8G8o2zt5y+GM4Tbf6moRI9FAngOy8r66l4si
-dsyCDyzr2T8eMmjHULyUtxBBiPKcaUqh0oNtMPY87luaFex3uAGWPf+/0b8Aj0CZ
-/jlFObCxHXhlCyN7wwbahLNE5lod9TXUH5BcFS7schAngOTrC/3+bdK5zxjo+FWk
-lSMsKyNxSRpZ2dLbtztcsaZadIEMHfW2UjMPXOcuTzKzoKyUUPtAkGZuMVJo4OQ=
-=ma8B
+iQIcBAEBAgAGBQJP1wZPAAoJEOSiRoyO7jvoxmsP/i2ST5lyxmQL3dzzqPS0coxg
+7lP8qTaZXEdCfdXfcLTAWkFSu4cJb47RJUD1Pp3qhMUatcOoIDsPqQGrTJl2usCm
+E0kvL/qVsLEXLzh9N+a+KfKdu5NU2En9jfLj7IlAAocFAb7Y65UWbMg7TQPZbVaa
+EZi+SKW+8+9550dPdIa7IgtzSr/4cetnXMratNYK/7NqXDcNMGBCXGCqsx5oTlBX
+hugG19ryit/8JW4g/C16ohna1aRvrzeO1R552y13aCeKayV+aKGBwvT8FVSDe4YU
+sXg9s0JYMkJU8ZXl5bydVPrVD6t8I7X+O7ZlNOfisPmV8+SKad072beNyRZVRF4u
+PgAyNinU7YaXv/qlaz0gFV4mPZVBmiOpmlbJVScdYqa5mhGKVCsSmc3F7nUgjG+J
+FDOoLwSLiiu+fxnpFI6a86jCsMNgEdnUnvOVHl93nNlv8+ksKVXSYLMiLv4BA7Og
+6WyufEuk8N5rdyG9HBwzWpzy2XCcxefrtzaeWL29ZeLqKHDrISeZlMKizDm6YMsQ
+bROPgTqCuKEjyxM//9b1UsQV0NgSpGBZmgewZLmTkEIX9kLQVEkhnyeBbN25D8BU
+zUalhyT03HJxYqLW55+v2Au05430D9Pe0KL2MFjXzup19MujPuNcV83IfM+4r6VQ
+rKejM/zieUKdOs2mOEQa
+=BiAv
 -----END PGP SIGNATURE-----
diff --git a/media-video/mplayer2/mplayer2-9999.ebuild b/media-video/mplayer2/mplayer2-9999.ebuild
index 0859a29bb909..b3d01b2c0531 100644
--- a/media-video/mplayer2/mplayer2-9999.ebuild
+++ b/media-video/mplayer2/mplayer2-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.36 2012/05/22 16:44:06 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.37 2012/06/12 09:05:10 scarabeus Exp $
 
 EAPI=4
 
@@ -32,40 +32,42 @@ if [[ ${PV} == *9999* ]]; then
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
 fi
-IUSE="3dnow 3dnowext +a52 aalib +alsa altivec aqua +ass bidi bindist bl bluray
-	bs2b cddb +cdio cpudetection custom-cpuopts debug directfb doc +dts +dv dvb
-	+dvd +dvdnav dxr3 +enca +faad fbcon ftp gif ggi +iconv ipv6 jack joystick
-	jpeg kernel_linux ladspa libcaca lirc mad md5sum +mmx mmxext mng +mp3 nas
-	+network nut +opengl oss png pnm portaudio postproc pulseaudio pvr +quicktime
-	radio +rar +real +rtc samba +shm sdl +speex sse sse2 ssse3 tga +theora +truetype
-	+unicode v4l vdpau +vorbis win32codecs +X xanim xinerama +xscreensaver +xv
-	xvid"
+IUSE="+a52 aalib +alsa aqua +ass bidi bindist bl bluray bs2b cddb +cdio
+	cpudetection debug directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +faad
+	fbcon ftp gif ggi +iconv ipv6 jack joystick jpeg kernel_linux ladspa
+	libcaca lirc mad md5sum mng +mp3 nas +network nut +opengl oss png pnm
+	portaudio postproc pulseaudio pvr +quicktime radio +rar +real +rtc samba
+	sdl +speex tga +theora +truetype +unicode v4l vdpau +vorbis win32codecs +X
+	xanim xinerama +xscreensaver +xv xvid"
 IUSE+=" symlink"
 
-VIDEO_CARDS="s3virge mga tdfx vesa"
+CPU_FEATURES="3dnow 3dnowext altivec mmx mmxext shm sse sse2 ssse3"
+for x in ${CPU_FEATURES}; do
+	IUSE+=" ${x}"
+done
+
+VIDEO_CARDS="s3virge mga tdfx"
 for x in ${VIDEO_CARDS}; do
 	IUSE+=" video_cards_${x}"
 done
 
 # bindist does not cope with win32codecs, which are nonfree
-REQUIRED_USE="bindist? ( !win32codecs )
+REQUIRED_USE="
+	ass? ( truetype )
+	bindist? ( !win32codecs )
 	cddb? ( cdio network )
 	dvdnav? ( dvd )
-	radio? ( || ( dvb v4l ) )
 	dxr3? ( X )
 	ggi? ( X )
 	opengl? ( X )
+	radio? ( || ( dvb v4l ) )
+	truetype? ( iconv )
 	vdpau? ( X )
 	xinerama? ( X )
 	xscreensaver? ( X )
 	xv? ( X )
 "
 
-FONT_RDEPS="
-	virtual/ttf-fonts
-	media-libs/fontconfig
-	>=media-libs/freetype-2.2.1:2
-"
 # Rar: althrought -gpl version is nice, it cant do most functions normal rars can
 #	nemesi? ( net-libs/libnemesi )
 RDEPEND+="
@@ -94,7 +96,7 @@ RDEPEND+="
 	a52? ( media-libs/a52dec )
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
-	ass? ( ${FONT_RDEPS} >=media-libs/libass-0.9.10[enca?,fontconfig] )
+	ass? ( >=media-libs/libass-0.9.10[enca?,fontconfig] )
 	bidi? ( dev-libs/fribidi )
 	bluray? ( media-libs/libbluray )
 	bs2b? ( media-libs/libbs2b )
@@ -136,7 +138,11 @@ RDEPEND+="
 	sdl? ( media-libs/libsdl )
 	speex? ( media-libs/speex )
 	theora? ( media-libs/libtheora )
-	truetype? ( ${FONT_RDEPS} )
+	truetype? (
+		media-libs/fontconfig
+		>=media-libs/freetype-2.2.1:2
+		virtual/ttf-fonts
+	)
 	vorbis? ( media-libs/libvorbis )
 	xanim? ( media-video/xanim )
 	xvid? ( media-libs/xvid )
@@ -185,23 +191,6 @@ pkg_setup() {
 		ewarn "disabling this use flag."
 	fi
 
-	if use custom-cpuopts; then
-		ewarn
-		ewarn "You are using the custom-cpuopts flag which will"
-		ewarn "specifically allow you to enable / disable certain"
-		ewarn "CPU optimizations."
-		ewarn
-		ewarn "Most desktop users won't need this functionality, but it"
-		ewarn "is included for corner cases like cross-compiling and"
-		ewarn "certain profiles. If unsure, disable this flag and MPlayer"
-		ewarn "will automatically detect and use your available CPU"
-		ewarn "optimizations."
-		ewarn
-		ewarn "Using this flag means your build is unsupported, so"
-		ewarn "please make sure your CPU optimization use flags (3dnow"
-		ewarn "3dnowext mmx mmxext sse sse2 ssse3) are properly set."
-	fi
-
 	einfo "For various format support you need to enable the support on your ffmpeg package:"
 	einfo "    media-video/libav or media-video/ffmpeg"
 }
@@ -283,14 +272,8 @@ src_configure() {
 	#
 	# use external libdvdcss, dvdread and dvdnav
 	myconf+=" --disable-dvdread-internal --disable-libdvdcss-internal"
-	if use dvd; then
-		use dvdnav || myconf+=" --disable-dvdnav"
-	else
-		myconf+="
-			--disable-dvdnav
-			--disable-dvdread
-		"
-	fi
+	use dvd || myconf+=" --disable-dvdread"
+	use dvdnav || myconf+=" --disable-dvdnav"
 
 	#############
 	# Subtitles #
@@ -298,15 +281,8 @@ src_configure() {
 	# SRT/ASS/SSA (subtitles) requires freetype support
 	# freetype support requires iconv
 	# iconv optionally can use unicode
-	if ! use ass && ! use truetype; then
-		myconf+=" --disable-freetype"
-		if ! use iconv; then
-			myconf+="
-				--disable-iconv
-				--charset=noconv
-			"
-		fi
-	fi
+	use truetype || myconf+=" --disable-freetype"
+	use iconv || myconf+=" --disable-iconv --charset=noconv"
 	use iconv && use unicode && myconf+=" --charset=UTF-8"
 
 	#####################################
@@ -440,16 +416,9 @@ src_configure() {
 	# Platform specific flags, hardcoded on amd64 (see below)
 	use cpudetection && myconf+=" --enable-runtime-cpudetection"
 
-	# Turning off CPU optimizations usually will break the build.
-	# However, this use flag, if enabled, will allow users to completely
-	# specify which ones to use. If disabled, mplayer will automatically
-	# enable all CPU optimizations that the host build supports.
-	if use custom-cpuopts; then
-		uses="3dnow 3dnowext altivec mmx mmxext shm sse sse2 ssse3"
-		for i in ${uses}; do
-			myconf+=" $(use_enable ${i})"
-		done
-	fi
+	for i in ${CPU_FEATURES}; do
+		myconf+=" $(use_enable ${i})"
+	done
 
 	use debug && myconf+=" --enable-debug=3"
 
@@ -458,40 +427,16 @@ src_configure() {
 		append-ldflags -nopie
 	fi
 
-	is-flag -O? || append-flags -O2
-
-	# workaround bug, x86 just has too few registers, see c.f.
-	# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=402950#44
-	# and 32-bits OSX, bug 329861
-	if [[ ${CHOST} == i?86-* ]] ; then
-		use debug || append-flags -fomit-frame-pointer
-	fi
-
 	###########################
 	# X enabled configuration #
 	###########################
-	myconf+=" --disable-dga1 --disable-dga2"
-	if use X; then
-		uses="dxr3 ggi xinerama xv"
-		for i in ${uses}; do
-			use ${i} || myconf+=" --disable-${i}"
-		done
-		use opengl || myconf+=" --disable-gl"
-		use vdpau || myconf+=" --disable-vdpau"
-		use video_cards_vesa || myconf+=" --disable-vesa"
-		use xscreensaver || myconf+=" --disable-xss"
-	else
-		myconf+="
-			--disable-dxr3
-			--disable-ggi
-			--disable-gl
-			--disable-vdpau
-			--disable-xinerama
-			--disable-xss
-			--disable-xv
-			--disable-x11
-		"
-	fi
+	myconf+=" --disable-dga1 --disable-dga2 --disable-vesa"
+	uses="dxr3 ggi vdpau xinerama xv"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	use opengl || myconf+=" --disable-gl"
+	use xscreensaver || myconf+=" --disable-xss"
 
 	############################
 	# OSX (aqua) configuration #
@@ -563,7 +508,7 @@ src_install() {
 		dohtml -r "${S}"/DOCS/HTML/*
 	fi
 
-	if ! use ass && ! use truetype; then
+	if ! use truetype; then
 		dodir /usr/share/${PN}/fonts
 		# Do this generic, as the mplayer people like to change the structure
 		# of their zips ...