Merge remote-tracking branch 'remotes/Coacher/mpv-verbump-0.16.0'

Pull request: https://github.com/gentoo/gentoo/pull/944

6 files changed, 50 insertions, 76 deletions

diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 58e4f6697c16..e8307fdb6214 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,5 +1,5 @@
-DIST mpv-0.14.0.tar.gz 2872619 SHA256 042937f483603f0c3d1dec11e8f0045e8c27f19eee46ea64d81a3cdf01e51233 SHA512 523bffe87d6743ac67cab090bb5f43363352491f663debf150e204b942daaaa85176f228011e306d58fa4a05ee962d4bc56b6f77ea943e3efe757417ad52b952 WHIRLPOOL b27f8acb21870c4d98e2a39ce78cf0e8923bdac5056adafedd242b687c0532cc51e338b9d5c2046155972adb99fd8f12f7d9ec2e78bdf4ed8ae1a295faedc0e9
 DIST mpv-0.15.0.tar.gz 2849513 SHA256 7d31217ba8572f364fcea2955733f821374ae6d8c6d8f22f8bc63c44c0400bdc SHA512 6f12487ff9bedd6872993189e3359c04ab0de559fd42bfcc5accdbfbd02e0d863cf3d7cfa5cceaedd174a4c16c831914945cf9cf6c918732f72fa44467127332 WHIRLPOOL 92b5a8ff864089bdddffa5941b8afca1433e5732ebe1ba71e326fbeb93475471e25038e73f807b3be01381a2b11ba2bc586cdccdc40bd99509a6fe234d780d9d
+DIST mpv-0.16.0.tar.gz 2877026 SHA256 fc3619de0ede16fbb023ac72589090e8e77fd9d9e03a81adc728105d50ef38ba SHA512 d328dba2cc68bd3ae2e14bfcf2b4f69f076691bb40db77036e716f783d7683fde668b652829106661dfeea46d66b4a7ad61b58610411b69bd5265adea4f20bd6 WHIRLPOOL 09af632453788c9251a595f7ea18a15876c2bab2e393d32e8cc9eebf7e2ecc459873022234a98f97840223c7cb613e05039dbc987f13839d3210f284300ce312
 DIST mpv-0.9.2.tar.gz 2701306 SHA256 c0148f55dbd17705f49bb496d0ce374419de62e1b17195d91409d7727cbd4751 SHA512 4f652a8e78d65b0ef44a06287b05250dfdfbce4cf5a6e21d3b446eedec268d83cf98afcc687272e2da2cfac9e9f69a303847dffdfd45cecdd4273b943ce50967 WHIRLPOOL 1512bacc2ce50e875770c76106a1bb2bc1d0cc5f6e2bdce91ff8c5cfc8bf13ffb48519858a5fa2a7d57880820dc12e5eb20f34ab71eca5d76ec303618da8f3fe
 DIST waf-1.8.12 97567 SHA256 01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b SHA512 8e47112abb134f965f15a27a600b4453cad3075afb5dadc17f2f6dac33d80ec68b679ac0ebc5f8a0245cbd07ae9fc7b899e69afc1bd021cce74e7af2ab457939 WHIRLPOOL c36d37c2d8c08e4048b4800f511611af5cf534304fcb58388ca491ff308bfcbcdd959d153edfd6ff8c118404e7293d8b786e43b07486139bf915a82aa75d792b
 DIST waf-1.8.4 96179 SHA256 f02035fa5d8814f33f19b2b20d43822ddef6bb39b955ca196c2a247a1f9ffaa8 SHA512 3a132d8b1cba0af0e3df046c0204c5df706fae4e0fac41cf74b53f6cdea6210ed798671c7a3cb3fee70573aacab16d4c0cc699cc4b7aa74c8a416346c5513f4c WHIRLPOOL fe8d7f42e5118a1f9490a0c9add1355c969185376b57d0bab024068dd6e7364632d862bf9432e1209165c5313ae843479ef334f4bd6285db05dfebff9a1b640e
diff --git a/media-video/mpv/files/mpv-0.14.0-support-GNU-__thread.patch b/media-video/mpv/files/mpv-0.14.0-support-GNU-__thread.patch
deleted file mode 100644
index 6e17314ab7cf..000000000000
--- a/media-video/mpv/files/mpv-0.14.0-support-GNU-__thread.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-For a lengthy discussion see https://github.com/mpv-player/mpv/issues/2631
-
-Upstream commits:
-https://github.com/mpv-player/mpv/commit/1a6f3c56ea6e7bf9928fc99469f8f5da4578f035
-https://github.com/mpv-player/mpv/commit/946bd52a1d1eb561ff8bb516ef6efcd02ca3ea1e
-
-diff --git a/video/out/opengl/common.c b/video/out/opengl/common.c
-index 00cd535..f607c23 100644
---- a/video/out/opengl/common.c
-+++ b/video/out/opengl/common.c
-@@ -606,7 +606,13 @@ int mpgl_validate_backend_opt(struct mp_log *log, const struct m_option *opt,
- }
- 
- #if HAVE_C11_TLS
--static _Thread_local MPGLContext *current_context;
-+#define MP_TLS _Thread_local
-+#elif defined(__GNU__)
-+#define MP_TLS __thread
-+#endif
-+
-+#ifdef MP_TLS
-+static MP_TLS MPGLContext *current_context;
- 
- static void * GLAPIENTRY get_native_display(const char *name)
- {
-diff --git a/wscript b/wscript
-index a5e6914..969d9cc 100644
---- a/wscript
-+++ b/wscript
-@@ -718,7 +718,6 @@ video_output_features = [
-     }, {
-         'name': 'vaapi-egl',
-         'desc': 'VAAPI EGL',
--        'deps': [ 'c11-tls' ], # indirectly
-         'deps_any': [ 'vaapi-x-egl', 'vaapi-wayland' ],
-         'func': check_true,
-     }, {
diff --git a/media-video/mpv/files/mpv-0.16.0-fix-srt-subtitles-on-libav.patch b/media-video/mpv/files/mpv-0.16.0-fix-srt-subtitles-on-libav.patch
new file mode 100644
index 000000000000..4344e78e7ac9
--- /dev/null
+++ b/media-video/mpv/files/mpv-0.16.0-fix-srt-subtitles-on-libav.patch
@@ -0,0 +1,29 @@
+commit 041c9f1782cbed4abf7793f4e72b8b29b2fd9b1b
+Author: wm4 <wm4@nowhere>
+Date:   Mon Feb 29 18:20:27 2016 +0100
+
+    lavc_conv: fix Libav srt subtitles
+    
+    Use the mp_lavc_set_extradata() function instead of setting up the
+    extradata manually. This takes care of the corner case when
+    extradata_len is 0.
+    
+    This apparently fixes #2888.
+
+diff --git a/sub/lavc_conv.c b/sub/lavc_conv.c
+index 3dd6097..7303020 100644
+--- a/sub/lavc_conv.c
++++ b/sub/lavc_conv.c
+@@ -79,11 +79,8 @@ struct lavc_conv *lavc_conv_create(struct mp_log *log, const char *codec_name,
+     avctx = avcodec_alloc_context3(codec);
+     if (!avctx)
+         goto error;
+-    avctx->extradata_size = extradata_len;
+-    avctx->extradata = av_malloc(extradata_len);
+-    if (!avctx->extradata)
++    if (mp_lavc_set_extradata(avctx, extradata, extradata_len) < 0)
+         goto error;
+-    memcpy(avctx->extradata, extradata, extradata_len);
+     if (strcmp(codec_name, "eia_608") == 0)
+         av_dict_set(&opts, "real_time", "1", 0);
+     if (avcodec_open2(avctx, codec, &opts) < 0)
diff --git a/media-video/mpv/files/mpv-fix-include-in-tests.patch b/media-video/mpv/files/mpv-fix-include-in-tests.patch
deleted file mode 100644
index b02011910e5f..000000000000
--- a/media-video/mpv/files/mpv-fix-include-in-tests.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-commit 867334395765ae7d2765e0834f9fd3dd5de53cab
-Author: Ilya Tumaykin <itumaykin@gmail.com>
-Date:   Tue Dec 22 17:10:12 2015 +0300
-
-    tests: fix #include
-
-diff --git a/test/gl_video.c b/test/gl_video.c
-index 253ab35..97fee94 100644
---- a/test/gl_video.c
-+++ b/test/gl_video.c
-@@ -1,5 +1,5 @@
- #include "test_helpers.h"
--#include "video/out/gl_video.h"
-+#include "video/out/opengl/video.h"
- 
- static void test_scale_ambient_lux_limits(void **state) {
-     float x;
diff --git a/media-video/mpv/mpv-0.14.0-r1.ebuild b/media-video/mpv/mpv-0.16.0.ebuild
index 40ccf88d0500..1d18f73ea570 100644
--- a/media-video/mpv/mpv-0.14.0-r1.ebuild
+++ b/media-video/mpv/mpv-0.16.0.ebuild
@@ -28,12 +28,11 @@ DOCS+=( README.md )
 # See Copyright in source tarball and bug #506946. Waf is BSD, libmpv is ISC.
 LICENSE="GPL-2+ BSD ISC"
 SLOT="0"
-# Here 'opengl' stands for GLX, 'egl' stands for any EGL-based output
 IUSE="+alsa archive bluray cdda +cli doc drm dvb +dvd +egl +enca encode gbm
 	+iconv jack jpeg lcms +libass libav libcaca libguess libmpv lua luajit
 	openal +opengl oss pulseaudio raspberry-pi rubberband samba sdl selinux
 	test uchardet v4l vaapi vdpau vf-dlopen wayland +X xinerama +xscreensaver
-	xv zsh-completion"
+	+xv zsh-completion"
 
 REQUIRED_USE="
 	|| ( cli libmpv )
@@ -43,10 +42,9 @@ REQUIRED_USE="
 	lcms? ( || ( opengl egl ) )
 	libguess? ( iconv )
 	luajit? ( lua )
-	opengl? ( X )
 	uchardet? ( iconv )
 	v4l? ( || ( alsa oss ) )
-	vaapi? ( || ( X wayland ) )
+	vaapi? ( || ( gbm X wayland ) )
 	vdpau? ( X )
 	wayland? ( egl )
 	xinerama? ( X )
@@ -76,7 +74,7 @@ COMMON_DEPEND="
 		libguess? ( >=app-i18n/libguess-1.0 )
 		uchardet? ( dev-libs/uchardet )
 	)
-	jack? ( media-sound/jack-audio-connection-kit )
+	jack? ( virtual/jack )
 	jpeg? ( virtual/jpeg:0 )
 	lcms? ( >=media-libs/lcms-2.6:2 )
 	libass? (
@@ -89,12 +87,13 @@ COMMON_DEPEND="
 		luajit? ( dev-lang/luajit:2 )
 	)
 	openal? ( >=media-libs/openal-1.13 )
+	opengl? ( virtual/opengl )
 	pulseaudio? ( media-sound/pulseaudio )
 	rubberband? ( >=media-libs/rubberband-1.8.0 )
 	samba? ( net-fs/samba )
 	sdl? ( media-libs/libsdl2[sound,threads,video,X?,wayland?] )
 	v4l? ( media-libs/libv4l )
-	vaapi? ( >=x11-libs/libva-1.4.0[X?,wayland?] )
+	vaapi? ( >=x11-libs/libva-1.4.0[drm?,X?,wayland?] )
 	wayland? (
 		>=dev-libs/wayland-1.6.0
 		>=x11-libs/libxkbcommon-0.3.0
@@ -103,10 +102,7 @@ COMMON_DEPEND="
 		x11-libs/libX11
 		x11-libs/libXext
 		>=x11-libs/libXrandr-1.2.0
-		opengl? (
-			x11-libs/libXdamage
-			virtual/opengl
-		)
+		opengl? ( x11-libs/libXdamage )
 		vdpau? ( >=x11-libs/libvdpau-0.2 )
 		xinerama? ( x11-libs/libXinerama )
 		xscreensaver? ( x11-libs/libXScrnSaver )
@@ -162,8 +158,7 @@ src_prepare() {
 	cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die
 	chmod +x "${S}"/waf || die
 
-	epatch "${FILESDIR}/${PN}-fix-include-in-tests.patch"
-	epatch "${FILESDIR}/${P}-support-GNU-__thread.patch"
+	epatch "${FILESDIR}/${P}-fix-srt-subtitles-on-libav.patch"
 	epatch_user
 }
 
@@ -183,6 +178,7 @@ src_configure() {
 		--disable-optimize		# Do not add '-O2' to CFLAGS
 		--disable-debug-build	# Do not add '-g' to CFLAGS
 
+		$(use_enable doc html-build)
 		$(use_enable doc pdf-build)
 		$(use_enable vf-dlopen vf-dlopen-filters)
 		$(use_enable zsh-completion zsh-comp)
@@ -208,7 +204,6 @@ src_configure() {
 		--disable-vapoursynth-lazy
 		$(use_enable archive libarchive)
 
-		--enable-libavfilter
 		--enable-libavdevice
 
 		# Audio outputs
@@ -219,9 +214,9 @@ src_configure() {
 		$(use_enable pulseaudio pulse)
 		$(use_enable jack)
 		$(use_enable openal)
+		--disable-opensles
 		$(use_enable alsa)
 		--disable-coreaudio
-		--disable-dsound
 
 		# Video outputs
 		--disable-cocoa
@@ -234,19 +229,21 @@ src_configure() {
 		$(use_enable xv)
 		$(use_enable xinerama)
 		$(use_enable X xrandr)
-		$(use_enable opengl gl-x11)
+		$(usex opengl "$(use_enable X gl-x11)" '--disable-gl-x11')
 		$(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11')
 		$(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm')
 		$(use_enable wayland gl-wayland)
 		$(use_enable vdpau)
 		$(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11')
-		$(use_enable vaapi)		# See below for vaapi-x-egl
+		$(use_enable vaapi)		# See below for vaapi-glx, vaapi-x-egl
 		$(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11')
 		$(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland')
-		$(usex vaapi "$(use_enable opengl vaapi-glx)" '--disable-vaapi-glx')
+		$(usex vaapi "$(use_enable gbm vaapi-drm)" '--disable-vaapi-drm')
 		$(use_enable libcaca caca)
 		$(use_enable jpeg)
+		--disable-android
 		$(use_enable raspberry-pi rpi)
+		$(use_enable opengl desktop-gl)
 
 		# HWaccels
 		$(use_enable vaapi vaapi-hwaccel)
@@ -260,10 +257,11 @@ src_configure() {
 		$(use_enable dvb dvbin)
 	)
 
-	if use vaapi && use X && use egl; then
-		mywafargs+=(--enable-vaapi-x-egl)
-	else
-		mywafargs+=(--disable-vaapi-x-egl)
+	if use vaapi && use X; then
+		mywafargs+=(
+			$(use_enable opengl vaapi-glx)
+			$(use_enable egl vaapi-x-egl)
+		)
 	fi
 
 	# Create reproducible non-live builds
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index f100dc65cc34..6d6d6d8e9acd 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -212,6 +212,7 @@ src_configure() {
 		$(use_enable pulseaudio pulse)
 		$(use_enable jack)
 		$(use_enable openal)
+		--disable-opensles
 		$(use_enable alsa)
 		--disable-coreaudio