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

[Alexis Ballier]

commit:     2d771155b7364db76c3253624e0334a41b96c1a5
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  7 08:16:22 2015 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Oct  7 08:16:56 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d771155

media-video/mplayer: drop enca usedep on libass, which has been removed 
upstream.

Package-Manager: portage-2.2.22

 .../{mplayer-9999.ebuild => mplayer-1.2-r1.ebuild}      | 17 ++++++++++++++---
 media-video/mplayer/mplayer-9999.ebuild                 |  2 +-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/media-video/mplayer/mplayer-9999.ebuild 
b/media-video/mplayer/mplayer-1.2-r1.ebuild
similarity index 96%
copy from media-video/mplayer/mplayer-9999.ebuild
copy to media-video/mplayer/mplayer-1.2-r1.ebuild
index 04b762c..33a2fc0 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-1.2-r1.ebuild
@@ -60,7 +60,7 @@ RDEPEND+="
        sys-libs/ncurses:0=
        app-arch/bzip2
        sys-libs/zlib
-       >=media-video/ffmpeg-2.8:0=[vdpau?]
+       >=media-video/ffmpeg-2.6:0=[vdpau?]
        a52? ( media-libs/a52dec )
        aalib? ( media-libs/aalib )
        alsa? ( media-libs/alsa-lib )
@@ -94,7 +94,7 @@ RDEPEND+="
        jpeg? ( virtual/jpeg:0 )
        jpeg2k? ( media-libs/openjpeg:0 )
        ladspa? ( media-libs/ladspa-sdk )
-       libass? ( >=media-libs/libass-0.9.10:=[enca?] )
+       libass? ( >=media-libs/libass-0.9.10:= )
        libcaca? ( media-libs/libcaca )
        libmpeg2? ( media-libs/libmpeg2 )
        lirc? ( app-misc/lirc )
@@ -159,7 +159,7 @@ RDEPEND+="
 SLOT="0"
 LICENSE="GPL-2"
 if [[ ${PV} != *9999* ]]; then
-       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~x86-solaris"
+       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~x86-solaris"
 else
        KEYWORDS=""
 fi
@@ -188,6 +188,11 @@ REQUIRED_USE="
        xvmc? ( xv )"
 RESTRICT="faac? ( bindist )"
 
+PATCHES=(
+       # Work with pulseaudio-6, bug #549680, 
https://trac.mplayerhq.hu/ticket/2241
+       "${FILESDIR}"/${PN}-1.2_pre20150214-pulseaudio-6.0.patch
+)
+
 pkg_setup() {
        if [[ ${PV} == *9999* ]]; then
                elog
@@ -260,6 +265,12 @@ src_prepare() {
 
        # Use sane default for >=virtual/udev-197
        sed -i -e '/default_dvd_device/s:/dev/dvd:/dev/cdrom:' configure || die
+
+       if has_version '>=media-video/ffmpeg-2.9'; then
+               epatch "${FILESDIR}/${PN}-1.2_pre20150730-chan.patch"
+               epatch "${FILESDIR}/${PN}-1.2-get_buffer.patch"
+               epatch "${FILESDIR}/${PN}-1.2_pre20150730-encode.patch"
+       fi
 }
 
 src_configure() {

diff --git a/media-video/mplayer/mplayer-9999.ebuild 
b/media-video/mplayer/mplayer-9999.ebuild
index 04b762c..666fcca 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -94,7 +94,7 @@ RDEPEND+="
        jpeg? ( virtual/jpeg:0 )
        jpeg2k? ( media-libs/openjpeg:0 )
        ladspa? ( media-libs/ladspa-sdk )
-       libass? ( >=media-libs/libass-0.9.10:=[enca?] )
+       libass? ( >=media-libs/libass-0.9.10:= )
        libcaca? ( media-libs/libcaca )
        libmpeg2? ( media-libs/libmpeg2 )
        lirc? ( app-misc/lirc )