summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2012-10-25 12:48:20 +0000
committerAlexis Ballier <aballier@gentoo.org>2012-10-25 12:48:20 +0000
commitbe0980940df98c5247f24ae769233d2576afa1aa (patch)
tree8dee50b7d6a1be968bb8fb7d7bb5ec61b160aaf8 /media-video/mplayer
parentfix build with recent ffmpeg versions (diff)
downloadhistorical-be0980940df98c5247f24ae769233d2576afa1aa.tar.gz
historical-be0980940df98c5247f24ae769233d2576afa1aa.tar.bz2
historical-be0980940df98c5247f24ae769233d2576afa1aa.zip
internal mp3lib is gone, no need to disable it anymore
Package-Manager: portage-2.2.0_alpha141/cvs/Linux x86_64 Manifest-Sign-Key: 0x160F534A
Diffstat (limited to 'media-video/mplayer')
-rw-r--r--media-video/mplayer/ChangeLog5
-rw-r--r--media-video/mplayer/Manifest10
-rw-r--r--media-video/mplayer/mplayer-9999.ebuild8
3 files changed, 10 insertions, 13 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index ebf71f616e5f..cd2a473983cd 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-video/mplayer
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.863 2012/10/21 19:53:57 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.864 2012/10/25 12:48:11 aballier Exp $
+
+ 25 Oct 2012; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+ internal mp3lib is gone, no need to disable it anymore
21 Oct 2012; Anthony G. Basile <blueness@gentoo.org> mplayer-1.1-r1.ebuild:
stable ppc ppc64, bug #394809
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index d860766e6649..0b7b815f7525 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -21,14 +21,14 @@ EBUILD mplayer-1.0_rc4_p20110322-r1.ebuild 20417 SHA256 6041d8cffc438f974c5dbe4a
EBUILD mplayer-1.0_rc4_p20120213.ebuild 17809 SHA256 6cc016d7af8980f09044137a18e2ae4b698710fc0de16ccd6da8ecd74649b30d SHA512 15c3f093de1e09fda757618dad9e8bcacec39aa126ab25a4a2afb8704a93a37c1dbe37954218deb103ea46dd9120fec90bb36863348c977a02af5f0b9cbfc952 WHIRLPOOL 64d77e04a94bbc15b2b6e5995f580852f69e4904bf4cd7422e36137f6d33ec41c3aafc99f0981855f6772b8e9d47656f26201deff55af76f460f839e0e93ee11
EBUILD mplayer-1.0_rc4_p20120405.ebuild 17909 SHA256 b299103dbaa39026133d2e985d61de2b5ea46c692ad8031098e92b34f88beef7 SHA512 79a76c4ddde85c2cf3a4d77bb2530c82f1bd023ea9ec6f25c3700bce542540130a309fcfad5a879910f036b1c739c4628a0d492c7fb479847cc280e3881b1c63 WHIRLPOOL 606cbfc2f8d709e4abb1bfe5a7ce9cccbab3a1354dc8564f9376832855ecb945b2974058c618564e93c5c083ef633e76da53503baff8a342930786efc9a5abe6
EBUILD mplayer-1.1-r1.ebuild 18184 SHA256 a99b86538daf6122e79dd4079de800444d8fdfebae82ef80106d8050d37b2f68 SHA512 66616fa47a81b841c39ef0935036c2ff444132c0a246a086ed0c394f6cb682699ff3538bf21b1a032e09e53b29d825e2e697bd7990dc1fdcc6565f66635bbd75 WHIRLPOOL aea6eabc7c5ff86a13d7bf9c6b46219aad479267ba76483ebad09a322e5244aa220e5d327a0761ff8728945b81baa48497b1a7108eae344d3a89d888ba99fe41
-EBUILD mplayer-9999.ebuild 18015 SHA256 293b6222ee6e7a35cd770fac67ebbf4f5d20b99a3c8e11e856912e67d25390f4 SHA512 d74a45b7711cc6cf809c5c623636df1fc48e6bd5644862a100ef48c3b6507e2b5c96c0384f12d8025ca616e2681ae87d2163bd28436bf2e5de02435ba543a3d3 WHIRLPOOL 1d9b73610b3373f3a8a1cbbab12a70b1039f64c0723216cac771b462dac943d5edacb6f7cef774ff4bc4a23aa5fc85ef70d436b7b85d332e1e63e08d7c77b627
-MISC ChangeLog 43871 SHA256 7a7256f025ae59aafe9036cd6891164ca7147668c15db33b30dfc2d85319385a SHA512 e22efe85714debcd8a58924251ad38efa6e93561550434faeb2be32f7783189074c1ab60913aafa384a74cbbce85facbe7647c92ce5c2e639d11e3a2e8e63c2d WHIRLPOOL 0469c271173e7fcaccd13ceddc61c723a10d19b9e1f5f4f0f714625fde031fac84e758260b71d1a11d24a41e60aef248fd52bbabcd88c5bd6b1d083eca70fcb5
+EBUILD mplayer-9999.ebuild 17671 SHA256 5c53e6df8311dc6f9720dff36bc1398c98081f30d20f353233461b9b1cbe038b SHA512 dfd6379a1b3c5cab08db0df0f85620879611631af9c324179b6810a0448626f061163928a0e3455c3974f4dbd12989576b05cfdd01f74834eb3af619cc10285d WHIRLPOOL 5462428f499009a637b9a84263b83b1b08c868a4b704a83884676448dbcd88833383ca9e924cc90667d0b444818b4f45adde23d69ac113ec5cd662949cd99fb4
+MISC ChangeLog 44002 SHA256 12fcc02c92c9d093b465d423bd50ac7ae8d0614aa518495cff606af9b1a72631 SHA512 39cb0721d7634710214c1cd11dda440f647ae4be90f06c7c4c90f53441d978278d58aa1050f87fc91a76c05a3084cda0ab023973aca5714fc93bf3639dde4da2 WHIRLPOOL b49b178d1b58c683b84a0c3ba9860d55a3031a3794121f650f4d4d4388afc7e291b9238ee26a202c56ad9f851b6ab92666944ecea4afdddb31feebfd5ccbfb42
MISC ChangeLog-2008 107064 SHA256 d9949e0e21fd6fd00f1417201455ee399240ef1010dcf56611ac0fc1f6f9505b SHA512 622543b379b4c44f5845566b4e697bd92dd3e864e2f01a1b0f303c8ae5c7fb5de24839f6503765d51b4a3bfa777d175a7e410383e62ef2bbacf3e87cdc28c705 WHIRLPOOL e731af47505ffa646c92386dfb14acaffc2bb14ab4da74520c0b4dbc15ca5c20aacadbb53c4b91ba8d126a75bf7d2fb61877eeda354064e20c48cf4137bf6a74
MISC metadata.xml 3656 SHA256 c24294ec6e43cde01922b7b2d705e35a8a85fd2d8aca70a291f00ee0d10b9b1b SHA512 95ca63129536cbff57226cbaa7cec1a954fa3e562a96df80cf920099896bc207b19967d671f8bbb824751d0fed28f218a2cecd297c6851704cab70bc8d4e06d9 WHIRLPOOL 03a16ba10f4c4ee2995565ea0bb55dd963bc142dac7fb2addd1ce4a71a5ce2d660289cad9d65e1b9eb48649be64359bb74cb1d19ac69aada252c4b769bef4f89
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEAREIAAYFAlCEUpYACgkQl5yvQNBFVTV9wACgohnUPIVH3TnuK+zg2JSwM4Ox
-aekAn3aFGTlr/TSmZYr53tUhL3oHRzQV
-=pebY
+iEYEAREIAAYFAlCJNQ0ACgkQvFcC4BYPU0oP9gCghvyM+eXJZ4+XeDXM5Kvjdl/A
+sEIAnAkUM7Hkobci0SyMGoQlTsPnrGsl
+=VTTY
-----END PGP SIGNATURE-----
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 4da9dd281240..ba3da7623d46 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-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/mplayer/mplayer-9999.ebuild,v 1.133 2012/06/21 08:10:42 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.134 2012/10/25 12:48:11 aballier Exp $
EAPI=4
@@ -369,12 +369,6 @@ src_configure() {
myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support
myconf+=" --disable-libmpeg2-internal" # always use system media-libs/libmpeg2
use dts || myconf+=" --disable-libdca"
- # Disable internal mp3lib, bug #384849
- # Samuli Suominen: Looks like MPlayer in Portage is using internal mp3lib by
- # default, where as mpg123 upstream has incorporated all the optimizations
- # from mplayer's mp3lib in libmpg123 and more.
- # It makes very little sense to use the internal copy as default anymore.
- myconf+=" --disable-mp3lib"
if ! use mp3; then
myconf+="
--disable-mp3lame