Disable live plugin as libav can get same functionality and actually works. Fixes bug#414213. Thanks to Nikoli for the patch.

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

4 files changed, 41 insertions, 19 deletions

diff --git a/media-video/mplayer2/ChangeLog b/media-video/mplayer2/ChangeLog
index cdb704da0d33..056cc197131e 100644
--- a/media-video/mplayer2/ChangeLog
+++ b/media-video/mplayer2/ChangeLog
@@ -1,6 +1,11 @@
 # 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.46 2012/05/05 08:58:53 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.47 2012/05/14 10:32:23 scarabeus Exp $
+
+  14 May 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  mplayer2-2.0_p20120309.ebuild, mplayer2-9999.ebuild:
+  Disable live plugin as libav can get same functionality and actually works.
+  Fixes bug#414213. Thanks to Nikoli for the patch.
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> mplayer2-2.0_p20111126.ebuild,
   mplayer2-2.0_p20120309.ebuild, mplayer2-9999.ebuild:
diff --git a/media-video/mplayer2/Manifest b/media-video/mplayer2/Manifest
index fca1b33c64fa..dbc06f34475c 100644
--- a/media-video/mplayer2/Manifest
+++ b/media-video/mplayer2/Manifest
@@ -1,10 +1,30 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST font-arial-cp1250.tar.bz2 249705 RMD160 a2fc7ae07b0d80936ea58e168e1047efccb9eb91 SHA1 ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68 SHA256 423a07e780bb130cd8e4730715545c5d919c248dda595aab7a0a01de3c83fd12
 DIST font-arial-iso-8859-1.tar.bz2 234242 RMD160 666697cd5efd9387057a898c714175e7c2aacbcd SHA1 152c40bf20de34aa8802d7f80d34d673b0b67212 SHA256 9730f481764f367c9089d0166fb6ccf9148808ffbbfeca635cf0e6db75765d29
 DIST font-arial-iso-8859-2.tar.bz2 222208 RMD160 562d4d92c4f5f3d537340fde3ad8d1495ac41acb SHA1 7b99bbe0e9ba89a57eccbea8f93c453c4f268181 SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1
 DIST mplayer2-2.0_p20111126.tar.xz 3349400 RMD160 7ba89e64d3421fba99fd8ed80b5ad66ea324b14f SHA1 0992f7450e84b6c3d55486edc6ca430dee2260a7 SHA256 540229ddaf0ca183c2e18da74713aa3d58713a38a8fcb306a6ce677d6a330d1e
 DIST mplayer2-2.0_p20120309.tar.xz 3328620 RMD160 b8ba6666cc77f3f74e100a843246114c17b06703 SHA1 35465ec3ca1c8196be3aa9938b72261dcb1f1718 SHA256 8a46e0be27dd479c91bde64a35725c6ff668e5a74ab3a56ac3fe29d16f6a0a31
 EBUILD mplayer2-2.0_p20111126.ebuild 16341 RMD160 2251c9526f2f6f30b5a12ae800e626568915b8fd SHA1 8514fe07c434ea41dc41a7a48e41abe137c35e98 SHA256 451f0267595ce80dc2ef1855583152db846d3c30c7d69d3e0194b68594e9ff83
-EBUILD mplayer2-2.0_p20120309.ebuild 16365 RMD160 23bc787821c35f396726d523d15f21ce757a2f52 SHA1 a0fbdc8be3e7925b503d46a672740e7ee2b3493b SHA256 86837744c22c95b2d1cc5d355bb032911abbebc942f2b98c2c28770950d93d40
-EBUILD mplayer2-9999.ebuild 16204 RMD160 a026b8baf61c3732372f93c3bbeb5043c4576229 SHA1 9aeabb6ab133e5d43b23676f771c892412ddccbb SHA256 975203f13f005b41b4436230659335dace125f546c548c09b03de2b61e24c006
-MISC ChangeLog 10773 RMD160 7cc4a79ebafe1d86601edd3f5addaa6d1c480967 SHA1 dcb224242915b0c286bf1bf1977f51dc3a7d9d71 SHA256 79738f2ec3f7110a28db2556cf83e22b66e9ef49028931062cceffdbebadd9b8
+EBUILD mplayer2-2.0_p20120309.ebuild 16347 RMD160 33b98e25b0b72de26c9d1f5d725e81de3c1153bb SHA1 03594dcdcddccf0f5715a67974c54f98cc1fefa4 SHA256 c61c26bf3bcdd26ec162c346911126b4ffdf7dde30ad4bb655366fd9c8bc3282
+EBUILD mplayer2-9999.ebuild 16192 RMD160 6006860acea9b491cc02e6d054fee1e8cc820883 SHA1 a87b67ca5561b50187e082a831ff6034027f3e07 SHA256 b1c4eeea1ccca23249c18002e0fcbab6002411bd4e2eb52965962f29b97b6476
+MISC ChangeLog 11017 RMD160 3ade34f01b0ece30af50a4dfb38fbd605459c92f SHA1 c29677bdd368d4ef5ba3d09d0618a910dfc1d7b9 SHA256 f1910e8337383cb2d9627f4743808b95a44b7f2240d6ae996e709e25fdf3cd68
 MISC metadata.xml 3378 RMD160 6a4498a9229a2159fbf92e19fa0a66c0c07c6653 SHA1 30d1e66878a53977d04a19fae336555c9a720647 SHA256 800d5d6fa1dfab42141e12e0ebcfeb81e10a46c876957ef18d1bc6fb65aac80d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJPsN94AAoJEOSiRoyO7jvoZ9MP/i3M+ilshr1z6QBPVse4BZ+0
+Ekcyz+gVpwJKfLF82ejg5p6vtZFyBEg6XJUKAzifuBNY2uyr8sDFULEWE9Mvkd5Z
+hQxzbVR0ZwQsao71UP5nmIflwDrtL6EHQP+gygLvPsExVfXtEyjPafuI4c8ZDC6+
+IiOMgqxdBsv5KfAzFAzVmNK8FqkI2DcTaaVBhJsyYeKLhlK4B85jrjlKOzNvP7Ts
+LyEh0NBNjkxMg0832v6E4zM0qEB9qNbNzfU3jG59gB53DPdPgulhmNo9HBhFP08A
+smiI7+It37rTIWoT9ze2Vvy1DTBLiWeTI3yFPhc24NDnVf/w1P/O7AxVTTaixwRY
+2lSDwdieRuuCbaDCOsVfqjFFaD3GP8zg/5meugN85VY9w7hKE7aDAU4UR19dMzwC
+YCngwrNwYaCp34jKsYk8soT/r3XabL0LVFEE5Keqezx3YmsWFXcI/nSzhP1d7daI
+lfrVIj2YyFzhSdkxyM9m4S/5EQ6MN7MeqdtOcfYmBGKJ1LHX7n675jj51lAa1zCa
+6s6kLhKLLNHkqYY3HuhPF0Elds6jRmgUPvVq0zKm7NmyO3xAAPJqCBOfs1dQ87kJ
+fJaJTm7gemP+vNKLor8vTbAeiWl6Nch7R6Pi8QfQDaHjIL2SqJlAxBkA4BIlLKzD
+a0jGAtMX4A8a/RdpqOjp
+=Um/0
+-----END PGP SIGNATURE-----
diff --git a/media-video/mplayer2/mplayer2-2.0_p20120309.ebuild b/media-video/mplayer2/mplayer2-2.0_p20120309.ebuild
index 11c71ef30fdf..97c1593bb093 100644
--- a/media-video/mplayer2/mplayer2-2.0_p20120309.ebuild
+++ b/media-video/mplayer2/mplayer2-2.0_p20120309.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-2.0_p20120309.ebuild,v 1.4 2012/05/05 08:58:53 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20120309.ebuild,v 1.5 2012/05/14 10:32:23 scarabeus Exp $
 
 EAPI=4
 
@@ -35,7 +35,7 @@ fi
 IUSE="3dnow 3dnowext +a52 aalib +alsa altivec aqua +ass bidi bindist bl
 bluray bs2b cddb +cdio cdparanoia 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 live
+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 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
@@ -118,7 +118,6 @@ RDEPEND+="
 	ladspa? ( media-libs/ladspa-sdk )
 	libcaca? ( media-libs/libcaca )
 	lirc? ( app-misc/lirc )
-	live? ( media-plugins/live )
 	mad? ( media-libs/libmad )
 	mng? ( media-libs/libmng )
 	mp3? ( media-sound/mpg123 )
@@ -355,7 +354,6 @@ src_configure() {
 	myconf+=" --disable-musepack" # deprecated, libavcodec Musepack decoder is preferred
 	use dts || myconf+=" --disable-libdca"
 	use mp3 || myconf+=" --disable-mpg123"
-	use live && myconf+=" --enable-live"
 	uses="a52 bs2b dv vorbis"
 	for i in ${uses}; do
 		use ${i} || myconf+=" --disable-lib${i}"
@@ -364,6 +362,7 @@ src_configure() {
 	for i in ${uses}; do
 		use ${i} || myconf+=" --disable-${i}"
 	done
+	myconf+=" --disable-live" # >=live-2012 are broken
 
 	#################
 	# Binary codecs #
diff --git a/media-video/mplayer2/mplayer2-9999.ebuild b/media-video/mplayer2/mplayer2-9999.ebuild
index f2916447d676..eabbb731ac63 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.30 2012/05/05 08:58:53 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.31 2012/05/14 10:32:23 scarabeus Exp $
 
 EAPI=4
 
@@ -32,14 +32,13 @@ 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 live
-mad md5sum +mmx mmxext mng +mp3 nas +network nut +opengl oss png pnm 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="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 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+=" symlink"
 
 VIDEO_CARDS="s3virge mga tdfx vesa"
@@ -116,7 +115,6 @@ RDEPEND+="
 	ladspa? ( media-libs/ladspa-sdk )
 	libcaca? ( media-libs/libcaca )
 	lirc? ( app-misc/lirc )
-	live? ( media-plugins/live )
 	mad? ( media-libs/libmad )
 	mng? ( media-libs/libmng )
 	mp3? ( media-sound/mpg123 )
@@ -351,7 +349,6 @@ src_configure() {
 	myconf+=" --disable-musepack" # deprecated, libavcodec Musepack decoder is preferred
 	use dts || myconf+=" --disable-libdca"
 	use mp3 || myconf+=" --disable-mpg123"
-	use live && myconf+=" --enable-live"
 	uses="a52 bs2b dv vorbis"
 	for i in ${uses}; do
 		use ${i} || myconf+=" --disable-lib${i}"
@@ -360,6 +357,7 @@ src_configure() {
 	for i in ${uses}; do
 		use ${i} || myconf+=" --disable-${i}"
 	done
+	myconf+=" --disable-live" # >=live-2012 are broken
 
 	#################
 	# Binary codecs #