[gentoo-commits] dev/bircoph:master commit in: media-video/mplayer/

[Andrew Savchenko]

commit:     fb319c6503e9b0aff1f6aa20ac5b1c7346e6ca44
Author:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Sat May 28 10:46:58 2016 +0000
Commit:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Sat May 28 10:46:58 2016 +0000
URL:        https://gitweb.gentoo.org/dev/bircoph.git/commit/?id=fb319c65

mplayer: fix some QA issues

 media-video/mplayer/ChangeLog           | 157 --------------------------------
 media-video/mplayer/Manifest            |   4 -
 media-video/mplayer/metadata.xml        |   9 +-
 media-video/mplayer/mplayer-9999.ebuild |  14 +--
 4 files changed, 10 insertions(+), 174 deletions(-)

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
deleted file mode 100644
index 3042f17..0000000
--- a/media-video/mplayer/ChangeLog
+++ /dev/null
@@ -1,157 +0,0 @@
-# ChangeLog for media-video/mplayer
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-# This is ChangeLog for overlay specific changes.
-# Please refer to ChangeLog.portage for changes in portage ebuild.
-# Advanced overlay ebuild is meant to be in sync with portage one,
-# provide additional features and eventually send some of them upstream.
-
-  03 Dec 2014; Andrew Savchenko <bircoph@g.o> mplayer-9999.ebuild:
-  Remove configure options dropped by upstream
-
-  24 Sep 2012; Andrew Savchenko <bircoph@×××××.com>
-  -files/mplayer-live555.patch, mplayer-9999.ebuild:
-  mplayer: live555 is fixed upstream
-
-  23 Sep 2012; Andrew Savchenko <bircoph@×××××.com> mplayer-9999.ebuild:
-  Fully synced with portage tree.
-  Remove hooks for non-live ebuilds: they will not be supported
-  anyway.
-
-  22 Sep 2012; Andrew Savchenko <bircoph@×××××.com>
-  -files/mplayer-x86-sse2.patch, files/mplayer-live555.patch,
-  mplayer-9999.ebuild:
-  SSE2 issue is fixed upstream in FFmpeg.
-  Fix live555 detection in a better, non-intrusive way suggested by
-  Carl Eugen Hoyos.
-
-  07 Sep 2012; Andrew Savchenko <bircoph@×××××.com> mplayer-9999.ebuild,
-  metadata.xml:
-  Add libopus decoder support.
-
-  07 Sep 2012; Andrew Savchenko <bircoph@×××××.com> mplayer-9999.ebuild,
-  +files/mplayer-vesa.patch:
-  Finally make VESA available using libvbe from vesautils.
-  It works!
-
-  06 Sep 2012; Andrew Savchenko <bircoph@×××××.com>
-  +files/mplayer-live555.patch, +files/mplayer-x86-sse2.patch,
-  mplayer-9999.ebuild, metadata.xml:
-  Fix configure test on recent live libraries.
-  Fix build of bundled ffmpeg on non-SSE2 x86 hosts.
-  Remove USE="libav": due to severe incompatibilities between libav
-  and ffmpeg, mplayer now supports only libav.
-  Remove cdio and cddb mutual block: they may be used at the same
-  time now.
-
-  07 Apr 2012; Andrew Savchenko <bircoph@×××××.com> mplayer-9999.ebuild:
-  mplayer: sync with portage
-
-  29 Feb 2012; Andrew Savchenko <bircoph@×××××.com> -portage/ChangeLog-2008,
-  mplayer-9999.ebuild, -portage/ChangeLog, metadata.xml:
-  mplayer: sync with portage
-
-  Remove portage aux directory.
-  To simplify further diffs with tree use sources.gentoo.org:
-  http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-video/mplayer/
-
-  23 Jan 2012; Andrew Savchenko <bircoph@×××××.com> mplayer-9999.ebuild:
-  Ebuild simplifications, cosmetics and minor changes from main tree
-  ebuild.
-
-  23 Jan 2012; Andrew Savchenko <bircoph@×××××.com> mplayer-9999.ebuild:
-  Update and simplify dependencies.
-  Inspired and based on changes from the main portage tree.
-
-  23 Jan 2012; Andrew Savchenko <bircoph@×××××.com> mplayer-9999.ebuild:
-  Twolame and toolame are mutually exclusive. Prefer the former one.
-
-  23 Jan 2012; Andrew Savchenko <bircoph@×××××.com> mplayer-9999.ebuild:
-  Update library requirements, remove custom-cpuopts as upstrem does.
-
-  23 Jan 2012; Andrew Savchenko <bircoph@×××××.com> mplayer-9999.ebuild:
-  Remove esd as esound is to be removed from portage.
-
-  25 Nov 2011; Andrew Savchenko <bircoph@×××××.com> mplayer-9999.ebuild:
-  Sync with portage:
-  - remove v4l1 support;
-  - remove unneeded die calls.
-  Fix documentation build.
-
-  02 Aug 2011; Andrew Savchenko <bircoph@×××××.com> mplayer-9999.ebuild,
-  ChangeLog.portage:
-  Replace deprecated hasq by has.
-
-  06 Jun 2011; Andrew Savchenko <bircoph@×××××.com> mplayer-9999.ebuild:
-  Sync with portage ebuild, but do not unbundle ffmpeg due to both
-  performance and stability reasons. Deselect libav as default.
-
-  19 May 2011; Andrew Savchenko <bircoph@×××××.com> mplayer-9999.ebuild:
-  Make selection between bundled libav and ffmpeg switchable via
-  libav use flag. Left libav as default
-
-  27 Mar 2011; Andrew Savchenko <bircoph@×××××.com> mplayer-9999.ebuild:
-  Use libav as main ffmpeg fork.
-  Sync with upstream, but do not revert REQURIDE_USE for now (no
-  good reason for this).
-
-  Old and good ffmpeg repository is dead now...
-  18 Mar 2011; Andrew Savchenko <bircoph@×××××.com> ChangeLog.portage,
-  mplayer-9999.ebuild:
-  Old and good ffmpeg repository is dead now...
-
-  I tend to use libav fork of ffmpeg as git repository, but for now
-  it doesn't even compile. And I'm not really sure which form to
-  choose: on the one hand, it looks like libav will get better
-  support from mplayer developers; on the other hand ffmpeg repo
-  looks like more active. Of course, anyone is free to select
-  between ffmpeg and libav git repositories. Maybe USE flag should
-  be used for this selection?
-
-  Really, I have all this bikeshed, people should work together,
-  not play in holy wars.
-
-  Fix installation for realcodecs docs and EAPI=4.
-
-  03 Mar 2011; Andrew Savchenko <bircoph@×××××.com> ChangeLog.portage,
-  mplayer-9999.ebuild:
-  Sync with portage ebuild. Minor fixes.
-
-  07 Feb 2011; Andrew Savchenko <bircoph@×××××.com> ChangeLog.portage,
-  mplayer-9999.ebuild:
-  Sync with portage ebuild.
-  Use ffmpeg git.
-
-  17 Jan 2011; Andrew Savchenko <bircoph@×××××.com> ChangeLog.portage,
-  mplayer-9999.ebuild:
-  Sync with portage ebuild.
-
-  15 Jan 2011; Andrew Savchenko <bircoph@×××××.com> ChangeLog.portage,
-  mplayer-9999.ebuild:
-  Sync with portage ebuild:
-  - internal faad2 copy is gone.
-
-  19 Nov 2010; Andrew Savchenko <bircoph@×××××.com> ChangeLog.portage,
-  mplayer-9999.ebuild, metadata.xml:
-  Sync with portage ebuild:
-  - replace media-libs/jpeg -> virtual/jpeg;
-  - improve vpx USE flag description.
-
-  01 Nov 2010; Andrew Savchenko <bircoph@×××××.com> ChangeLog.portage,
-  mplayer-9999.ebuild, metadata.xml:
-  Sync with portage ebuild: add support for mpeg123 and libmpeg2 use flags
-
-  26 Oct 2010; Andrew Savchenko <bircoph@×××××.com> +ChangeLog.portage :
-  Add ChangeLog from the main portage tree.
-
-*mplayer-9999 (18 Oct 2010)
-
-  18 Oct 2010; Andrew Savchenko <bircoph@×××××.com> +mplayer-9999.ebuild:
-  Initial ebuild.
-  This ebuild is intended to be close with portage one, providing
-  (at this moment) the following additional features:
-    - support for tivo (vstream-client);
-    - support for nemesi (libnemesi live ebuild now works fine);
-    - use real binary codecs (in very rare cases when open codecs fail
-      they may be usefull);
-    - restore support for svga video output and svga kernel helper.

diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 0f2c8f2..df02317 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,7 +1,3 @@
-AUX mplayer-vesa.patch 1096 SHA256 b8b501493c5ea6548c9c2d23697098155d090fe0315c79152106d1990d92f322 SHA512 4ebe5ccfcc16d2c2201be0b8ce17b1e1e282d56062453465c79a7f9aedc0bec7b29d7615aaafac82f68c7589b00123df84f9727fe40d6abc07e40dff918fac8d WHIRLPOOL 8a08f34c1475bf941d5eab6c6e3a13648b4b17177d6705c5e7c59f1bf6a9bff5454d187efa950c8fa5379d9f44c84ab5de4318113f0e1d8e1d1e687b28050970
 DIST font-arial-cp1250.tar.bz2 249705 SHA256 423a07e780bb130cd8e4730715545c5d919c248dda595aab7a0a01de3c83fd12 SHA512 4f77ff5ceb8ec6e5d9f8f34d8950a6a6276d1fd5a947772fcbdb6554988b1ea665c12b82f45164f91fb7bd08000cb4afc26fa35beb4c760464160e22b9b8c340 WHIRLPOOL d635f54be65b0ca1047d943b6f6da433cda9fce6ed74fcab993501cf7f6b443eb711e182cd7fff09e553d251b5fd1c60196aa22e8370cba99fa175ed5ecdb47f
 DIST font-arial-iso-8859-1.tar.bz2 234242 SHA256 9730f481764f367c9089d0166fb6ccf9148808ffbbfeca635cf0e6db75765d29 SHA512 a1d03b6f09c48f48b7733f3bc0402ceab239a9abf88b860d852ea9fe69b4da690208a79d6f29d30204f5b37becf10672e8e8c0bfef201846d80ec54df617d029 WHIRLPOOL 8050362b125d3ca98214526cee2fa685e31487d13a6483c765bfc844bdc5e07beeba2c1ba313458096d43a63edd6c5e80b8b388c2792fc0ec7421e4072d8ca25
 DIST font-arial-iso-8859-2.tar.bz2 222208 SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d WHIRLPOOL 08178087b4ea1dfb2250f4673785e31dd876b06af51c51b2bddc172b23e6e33cbc1b2c6b710a317e42dc05486974b26ed0ad3ca50a185567aa77d49bd1e72aee
-EBUILD mplayer-9999.ebuild 18001 SHA256 d25b991230fb8518f7eb3dd6b55761136f1f40e7e50c9294b3be073a9f46e1d0 SHA512 2bc56a3d56012c5dd7cfc5f3c612e7d30d2a9a0fa70a65125e0f83d00e662a409b2f13324c3053500ceb429ac02a5311c56569982ab5a32d85cbe57f05d1bec3 WHIRLPOOL fef985098b625e217694b243169d4bc00d0e8f1d9a6b287f58c4306a41930b458501cf5daa0bda089378375c294365fe378ffec83a8091f430616000f85e1f6a
-MISC ChangeLog 6247 SHA256 bf7e860feec4a9f0b756771a521c9b831260ea3b169cebbb0079245e841fd4be SHA512 0ccd01d37ee9012299242ea828c337f4e0d7c7e9f76883f1cc07d5400b5f4f4e0400343ef15c012f9cf9d196720ab4489e8855c3c4aa54d7c09a8ca612cd3fde WHIRLPOOL c61cf3a63fbc27071e77bbf436eeec55f69f36957da1a52aef9e8cd6d2c8b211a782cad2a36bb5266376991a2bf517fbbccef45c222e4700e9d4f712bccb7863
-MISC metadata.xml 4113 SHA256 3c529aa3c2c8dd2ab4681e207fea369af601e3abe6572fdc393c29795aeffe20 SHA512 64bd34039ce8ceced951ae44d1eb9d9d465e60dcdc4f64b16c0524d2e965328b7cba8ff0455156190e5424d3a9ba2a1b09b44620fa6485439140858899b8be15 WHIRLPOOL 8c81c2a14bf22d4d255b8c58fa29b9d78a0ec6eec5573be866d1d6cd5e95bfbb564c7972bbbed0a318bebcb7eed6d9150eeb84ecc6bbf0eeb0048978682d1d9e

diff --git a/media-video/mplayer/metadata.xml b/media-video/mplayer/metadata.xml
index df0510a..496b4a0 100644
--- a/media-video/mplayer/metadata.xml
+++ b/media-video/mplayer/metadata.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
-<maintainer>
-	<email>media-video@g.o</email>
+<maintainer type="person">
+  <email>bircoph@g.o</email>
+  <name>Andrew Savchenko</name>
 </maintainer>
 <use>
-	<flag name="3dnowext">Enable 3dnowext cpu instructions</flag>
 	<flag name="amr">Enables Adaptive Multi-Rate format support</flag>
 	<flag name="bl">Blinkenlights video output</flag>
 	<flag name="bluray">Enable playback of Blu-ray filesystems</flag>
@@ -23,7 +22,6 @@
 	<flag name="libmpeg2">Build support for mpeg2 over media-libs/libmpeg2 rather than using ffmpeg.</flag>
 	<flag name="live">Enables live.com streaming media support</flag>
 	<flag name="md5sum">Enables md5sum video output</flag>
-	<flag name="mmxext">Enables mmx2 support</flag>
 	<flag name="mng">MNG input support</flag>
 	<flag name="mpg123">Enable support for mp3 decoding over media-sound/mpg123.</flag>
 	<flag name="nemesi">Enable Nemesi Streaming Media support</flag>
@@ -42,7 +40,6 @@
 	<flag name="shm">Enable support for shm</flag>
 	<flag name="svga">SVGA video output</flag>
 	<flag name="svga-helper">Use SVGA kernel helper for userspace access</flag>
-	<flag name="ssse3">faster floating point optimization for SSSE3 capable chips (Intel Core 2 and later chips)</flag>
 	<flag name="tga">Enables Targa video output</flag>
 	<flag name="tivo">Enables vstream client support for TiVo streams</flag>
 	<flag name="toolame">Enable toolame MPEG-2 encoding</flag>

diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index be029de..f578e19 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 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 $
+# $Id$
 
 EAPI=4
 
 ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
 
-inherit base eutils flag-o-matic git-2 multilib subversion toolchain-funcs ${SVN_ECLASS}
+inherit eutils flag-o-matic git-2 multilib subversion toolchain-funcs ${SVN_ECLASS}
 
-IUSE="3dnow 3dnowext +a52 aalib +alsa altivec amr aqua bidi bindist bl bluray
+IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext +a52 aalib +alsa altivec amr aqua bidi bindist bl bluray
 bs2b cddb +cdio cdparanoia cpudetection debug dga +dirac
 directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +encode -external-ffmpeg faac +faad fbcon
 ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
-+libass libcaca libmpeg2 lirc +live lzo mad md5sum +mmx mmxext mng +mp3 mpg123 nas nemesi
++libass libcaca libmpeg2 lirc +live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng +mp3 mpg123 nas nemesi
 +network nut openal +opengl opus +osdmenu oss png pnm pulseaudio pvr +quicktime
-radio +rar +real +rtc rtmp samba +shm +schroedinger sdl +speex sse sse2 ssse3 svga svga-helper
+radio +rar +real +rtc rtmp samba +shm +schroedinger sdl +speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3 svga svga-helper
 tga +theora tivo +tremor +truetype toolame +twolame +unicode v4l vdpau vidix
 +vorbis vpx win32codecs +X +x264 xanim xinerama +xscreensaver +xv +xvid xvmc
 zoran"
@@ -56,7 +56,7 @@ RDEPEND+="
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
 	amr? ( media-libs/opencore-amr )
-	libass? ( ${FONT_RDEPS} >=media-libs/libass-0.9.10[enca?] )
+	libass? ( ${FONT_RDEPS} >=media-libs/libass-0.9.10[enca(+)?] )
 	bidi? ( dev-libs/fribidi )
 	bluray? ( >=media-libs/libbluray-0.2.1 )
 	bs2b? ( media-libs/libbs2b )