summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2010-10-10 09:04:02 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2010-10-10 09:04:02 +0000
commit173b4d9a6cea6bf2ef2a4fd5611607aae8a90ea8 (patch)
treeead6ed5d88070ce82a92cc29f03edbe6edb56b22 /media-video/mplayer
parentAutomated update of use.local.desc (diff)
downloadhistorical-173b4d9a6cea6bf2ef2a4fd5611607aae8a90ea8.tar.gz
historical-173b4d9a6cea6bf2ef2a4fd5611607aae8a90ea8.tar.bz2
historical-173b4d9a6cea6bf2ef2a4fd5611607aae8a90ea8.zip
Always disable internal libmpeg2, update changelog.
Package-Manager: portage-2.2_rc91/cvs/Linux x86_64
Diffstat (limited to 'media-video/mplayer')
-rw-r--r--media-video/mplayer/ChangeLog10
-rw-r--r--media-video/mplayer/Manifest4
-rw-r--r--media-video/mplayer/mplayer-9999.ebuild3
3 files changed, 13 insertions, 4 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index f2c446e6ac7e..5ddd323b8b3a 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for media-video/mplayer
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.759 2010/10/01 02:44:10 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.760 2010/10/10 09:04:02 scarabeus Exp $
+
+ 10 Oct 2010; Tomáš Chvátal <scarabeus@gentoo.org> mplayer-9999.ebuild:
+ Always disable internal libmpeg2.
+
+ 10 Oct 2010; Tomáš Chvátal <scarabeus@gentoo.org> mplayer-9999.ebuild,
+ metadata.xml:
+ Ebuild cleanup. Drop gmplayer useflag. Introduce rtmpdump useflag. Thanks
+ to Andrew Savchenko. Fixes bug #336021 and bug #337284.
01 Oct 2010; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
fix configure options for external ffmpeg
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index eb6e5d1b7c95..f63ba8ed4a8b 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -10,6 +10,6 @@ DIST svgalib_helper-1.9.17-mplayer.tar.gz 7583 RMD160 927ff34f187e4fa9528e2e4820
EBUILD mplayer-1.0_rc4_p20091026-r1.ebuild 18995 RMD160 fa5ca9232abb6950549ca6c2451dac48df3ebd62 SHA1 32f991515d16adacd04d0f4e11a601de0ea0e972 SHA256 72ae257b4c3d903d3fef8953691f39b256a64c6ffa3b62711c5a341ec2b20d82
EBUILD mplayer-1.0_rc4_p20100506.ebuild 20273 RMD160 e55bf61b411d66b2b8f26c237feb3217415df44e SHA1 7bee75c501fadb2fe7a2c406e441faf3ac0bf638 SHA256 3eb7a7cc77d11c17bd6641be595d9037b24ac19096eefc7807dd661562baba14
EBUILD mplayer-1.0_rc4_p20100612.ebuild 20255 RMD160 f3e11ef97eed0f62f507ca209bfdcc9edbbf853d SHA1 39deee8a1ffcb78f6795319f5c1bad89e1ff08be SHA256 4dac0c77e803da44f86b15080d924b87f3c4dc4037c167bbf86c4241e2e0c5e6
-EBUILD mplayer-9999.ebuild 19178 RMD160 ba712873e21a16478310b6db730faec5b6aade55 SHA1 9b8d70fbb80812e6d044a02f8641cb4648108f14 SHA256 d5ecceb721fe038d1db81ff75adb85e9988dd7e94144cd62e9bb36beb5857122
-MISC ChangeLog 133603 RMD160 75241baecedd04a7318ef2ac91d1d570aa5bda5b SHA1 cc64753844ae96b65a07b0f2059221b40ad97f03 SHA256 cc72bde3828463b23cdf4612340664bd146fa6852bd7ac186f38907798d7f0bd
+EBUILD mplayer-9999.ebuild 19246 RMD160 5551c3ad19abe4a3cf97f118108a37eff58681bc SHA1 4e19f080e230dd40230d133ad7268b7f72e6e55d SHA256 8979a85f80cc10b53512127bde4548699c5670d996e36e3fe7de406a30e0f663
+MISC ChangeLog 133944 RMD160 b086618a30957f5947dc8454c49a0e435d9b691e SHA1 1f2367d92a8b988f1e685a6126f368341788da73 SHA256 67df5f58ad29746eb225acb0d25c257bb3d8f3ea1b6d316675110b302f1dab12
MISC metadata.xml 3667 RMD160 af0ab93fc70c06dc43870f65461ee62c4d84ddd3 SHA1 2c10e08f18bc8338a331c28bed5c7fd929496117 SHA256 3e69ab7339d1499dbbbe38e22a65b8fc74bee9ad235c80744fbab10efc76a108
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 42e360527e99..4e16737beebb 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 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.77 2010/10/10 08:49:51 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.78 2010/10/10 09:04:02 scarabeus Exp $
EAPI="2"
@@ -381,6 +381,7 @@ src_configure() {
##########
myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support
myconf+=" --disable-faad-internal" # always use system media-libs/faad2
+ myconf+=" --disable-libmpeg2-internal" # always use system version
use dirac || myconf+=" --disable-libdirac-lavc"
use dts || myconf+=" --disable-libdca"
if ! use mp3; then