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

["Michael Palimaka" <kensington@gentoo.org>]

commit:     2595477f802151b5a86c441c934de52d4db4271a
Author:     Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Wed Nov  1 20:20:54 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Nov  4 07:30:51 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2595477f

media-video/mpv: bump required ffmpeg/libav versions in 9999

ffmpeg/libav-9999 are now required. Even these are not enough, as mpv
upstream wants everyone to use their custom ffmpeg fork and relies on
changes not yet merged into upstream ffmpeg. See Gentoo bug 635650.

Also drop now obsolete patches, version checks and configure options.

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 media-video/mpv/mpv-9999.ebuild | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index 0323a501e93..5737a81e9ef 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -57,13 +57,12 @@ REQUIRED_USE="
 "
 
 COMMON_DEPEND="
-	!libav? ( >=media-video/ffmpeg-3.2.2:0=[encode?,threads,vaapi?,vdpau?] )
-	libav? ( >=media-video/libav-12:0=[encode?,threads,vaapi?,vdpau?] )
+	!libav? ( ~media-video/ffmpeg-${PV}:0=[encode?,threads,vaapi?,vdpau?] )
+	libav? ( ~media-video/libav-${PV}:0=[encode?,threads,vaapi?,vdpau?] )
 	alsa? ( >=media-libs/alsa-lib-1.0.18 )
 	archive? ( >=app-arch/libarchive-3.0.0:= )
 	bluray? ( >=media-libs/libbluray-0.3.0:= )
 	cdda? ( dev-libs/libcdio-paranoia )
-	cuda? ( >=media-video/ffmpeg-3.3:0 )
 	drm? ( x11-libs/libdrm )
 	dvd? (
 		>=media-libs/libdvdnav-4.2.0
@@ -94,16 +93,8 @@ COMMON_DEPEND="
 	samba? ( net-fs/samba )
 	sdl? ( media-libs/libsdl2[sound,threads,video] )
 	v4l? ( media-libs/libv4l )
-	vaapi? (
-		!libav? ( >=media-video/ffmpeg-3.3:0 )
-		libav? ( >=media-video/libav-13:0 )
-		x11-libs/libva[drm?,X?,wayland?]
-	)
-	vdpau? (
-		!libav? ( >=media-video/ffmpeg-3.3:0 )
-		libav? ( >=media-video/libav-13:0 )
-		x11-libs/libvdpau
-	)
+	vaapi? ( x11-libs/libva[drm?,X?,wayland?] )
+	vdpau? ( x11-libs/libvdpau )
 	wayland? (
 		>=dev-libs/wayland-1.6.0
 		>=x11-libs/libxkbcommon-0.3.0
@@ -140,7 +131,6 @@ RDEPEND="${COMMON_DEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.19.0-make-ffmpeg-version-check-non-fatal.patch"
-	"${FILESDIR}/${PN}-0.23.0-make-libavdevice-check-accept-libav.patch"
 )
 
 pkg_setup() {
@@ -245,8 +235,6 @@ src_configure() {
 
 		# HWaccels:
 		# Automagic Video Toolbox HW acceleration. See Gentoo bug 577332.
-		$(use_enable vaapi vaapi-hwaccel)
-		$(use_enable vdpau vdpau-hwaccel)
 		$(use_enable cuda cuda-hwaccel)
 
 		# TV features: