media-video/mpv: backport few patches for the next stable candidate

Also backport recent (mostly cosmetic) changes from the live ebuild.

Package-Manager: Portage-2.3.6, Repoman-2.3.2

3 files changed, 18 insertions, 111 deletions

diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 828195108a38..320adf8a4b58 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,4 +1,5 @@
 DIST mpv-0.18.0.tar.gz 2758960 SHA256 b656638d4f6bce2621baaacb60d8be384aa492fcd86dfd43996aaa2c16fee02b SHA512 5a899ea680b4da6d668a6e77a254e623bafef16f376ee46639e40f151da5a000de84b382f2b07f3a1e87b60fc8e524132767fdf243e36474966af11a88277437 WHIRLPOOL c491e61cb2d7f453cfc23605120048e81c2b7621b8d9591cad6415d3b550f55db6a6c8c6f90d27c7ce214ff89f92a9861d202b457c2de25c5b7de11d8d1d40af
+DIST mpv-0.25.0-patches-r1.tar.xz 8408 SHA256 aa027a4df1e8e5d6612102ab3afdfb93019de5ed868f65d38e967bca76ab41ae SHA512 e9344546283c88a489b517d408cbaf49c3aabc380372e28871b63c91d0b99a3946b2c5511d247e48916671081c8f85dd27e38a552b3f96cc6122c179ab10e928 WHIRLPOOL b4a5871478b284052f66d4fb6229e8b2a0453cbbb92e03c6b39cb821be0def58d7047594e7782972cb50d4089adaf6175b5f1f77329aba3c2c36c8167e33d03d
 DIST mpv-0.25.0.tar.gz 2874584 SHA256 07423ffad6921ec4da32f703cd7fbfb27012301dcb736ac8542ac8e6083b0bce SHA512 eefc574e2995ddf6bd15c9b62986a5ca277c30949b036d57a11bbfb796c11c1e6dd7c313abd91a909dd98ca0f2b0be29ec6b980d0287a5891b42b0ffba926cbf WHIRLPOOL 4c5225040ed8793de5daa00a4bb5cf2754fb877c73055dbe4bed92d9fa1bb3f5e67d341c698658e9f10e183084bbe691c8bbb90960e16358b9ffdaa58b11bf2b
 DIST waf-1.8.12 97567 SHA256 01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b SHA512 8e47112abb134f965f15a27a600b4453cad3075afb5dadc17f2f6dac33d80ec68b679ac0ebc5f8a0245cbd07ae9fc7b899e69afc1bd021cce74e7af2ab457939 WHIRLPOOL c36d37c2d8c08e4048b4800f511611af5cf534304fcb58388ca491ff308bfcbcdd959d153edfd6ff8c118404e7293d8b786e43b07486139bf915a82aa75d792b
 DIST waf-1.9.8 100685 SHA256 167dc42bab6d5bd823b798af195420319cb5c9b571e00db7d83df2a0fe1f4dbf SHA512 e7493767f65deeb38aa162adef22adf60ebbd038410e9cdf4fe6f0de8c43395dbbba14962aa2c3855e1277136085fc22ad12ebfb8ac4e76f16358296039b8ea2 WHIRLPOOL 447b6936b8bd5904d85001a96bdcfd0d517f92ff0a859f8a63efd032a418c1b335578266d0f7ce0c5f71ffc7b81643d18e21c14981502153e2d586a9ce152c3a
diff --git a/media-video/mpv/files/0.25.0/mpv-use-internal-GL-definitions.patch b/media-video/mpv/files/0.25.0/mpv-use-internal-GL-definitions.patch
deleted file mode 100644
index afb0a5416474..000000000000
--- a/media-video/mpv/files/0.25.0/mpv-use-internal-GL-definitions.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-commit 9d80c08441edf3e8da5180fb42eda71878e9c411
-Author: Ilya Tumaykin <itumaykin@gmail.com>
-Date:   Wed Apr 26 17:43:51 2017 +0300
-
-build: rely on internal GL headers for rpi check
-
-Since mpv ships all the required OpenGL defines now,
-rpi check doesn't need to check system GL headers.
-
-diff --git a/waftools/checks/custom.py b/waftools/checks/custom.py
-index 8ed06e5b2..36b6822be 100644
---- a/waftools/checks/custom.py
-+++ b/waftools/checks/custom.py
-@@ -146,10 +146,6 @@ def check_rpi(ctx, dependency_identifier):
-         check_pkg_config('egl'),
-         check_pkg_config('glesv2'),
-         check_cc(lib=['mmal_core', 'mmal_util', 'mmal_vc_client'], use=['bcm_host']),
--        # We still need all OpenGL symbols, because the vo_opengl code is
--        # generic and supports anything from GLES2/OpenGL 2.1 to OpenGL 4 core.
--        check_statement('GL/gl.h', '(void)GL_RGB32F'),     # arbitrary OpenGL 3.0 symbol
--        check_statement('GL/gl.h', '(void)GL_LUMINANCE16') # arbitrary OpenGL legacy-only symbol
-     ]
-
-     ret = all((fn(ctx, dependency_identifier) for fn in checks))
-
-commit cb25bb5776b30e34ff7aa32c5e0a4f8862774e74
-Author: wm4 <wm4@nowhere>
-Date:   Wed Apr 26 17:09:16 2017 +0200
-
-build: remove checks for libGL
-
-We don't need to link against libGL directly, nor do we need OpenGL
-headers. The only thing we need is the windowing interop stuff, such as
-libEGL.
-
-diff --git a/waftools/checks/custom.py b/waftools/checks/custom.py
-index 36b6822be..a2b4971cd 100644
---- a/waftools/checks/custom.py
-+++ b/waftools/checks/custom.py
-@@ -144,7 +144,6 @@ def check_rpi(ctx, dependency_identifier):
-     checks = [
-         check_pkg_config('bcm_host', uselib_store='bcm_host'),
-         check_pkg_config('egl'),
--        check_pkg_config('glesv2'),
-         check_cc(lib=['mmal_core', 'mmal_util', 'mmal_vc_client'], use=['bcm_host']),
-     ]
-
-diff --git a/wscript b/wscript
-index 7270bf464..a24d4852f 100644
---- a/wscript
-+++ b/wscript
-@@ -610,16 +610,13 @@ video_output_features = [
-         'desc': 'OpenGL X11 EGL Backend',
-         'deps': [ 'x11' ],
-         'groups': [ 'gl' ],
--        'func': check_pkg_config('egl', 'gl'),
-+        'func': check_pkg_config('egl'),
-     } , {
-         'name': '--egl-drm',
-         'desc': 'OpenGL DRM EGL Backend',
-         'deps': [ 'drm', 'gbm' ],
-         'groups': [ 'gl' ],
--        'func': compose_checks(
--            check_pkg_config('egl'),
--            check_pkg_config_cflags('gl')
--        )
-+        'func': check_pkg_config('egl'),
-     } , {
-         'name': '--gl-wayland',
-         'desc': 'OpenGL Wayland Backend',
-@@ -743,7 +740,6 @@ video_output_features = [
-         'deps': ['libdl'],
-         'func': compose_checks(
-             check_cc(lib="EGL"),
--            check_cc(lib="GLESv2"),
-             check_statement('EGL/fbdev_window.h', 'struct fbdev_window test'),
-             check_statement('linux/fb.h', 'struct fb_var_screeninfo test'),
-         ),
-
-commit 010c7d499258c1064189b2d149ae6eca859d9ae1
-Author: wm4 <wm4@nowhere>
-Date:   Wed Apr 26 17:43:23 2017 +0200
-
-vo_opengl: context_drm_egl: remove unnecessary include
-
-Could be broken after the previous commit removed finding the GL include
-dir.
-
-diff --git a/video/out/opengl/context_drm_egl.c b/video/out/opengl/context_drm_egl.c
-index 1852cb76f..e52fec451 100644
---- a/video/out/opengl/context_drm_egl.c
-+++ b/video/out/opengl/context_drm_egl.c
-@@ -27,7 +27,6 @@
- #include <gbm.h>
- #include <EGL/egl.h>
- #include <EGL/eglext.h>
--#include <GL/gl.h>
-
- #include "context.h"
- #include "egl_helpers.h"
diff --git a/media-video/mpv/mpv-0.25.0.ebuild b/media-video/mpv/mpv-0.25.0-r1.ebuild
index dea72559ef18..0bab14bcdf56 100644
--- a/media-video/mpv/mpv-0.25.0.ebuild
+++ b/media-video/mpv/mpv-0.25.0-r1.ebuild
@@ -14,7 +14,10 @@ DESCRIPTION="Media player based on MPlayer and mplayer2"
 HOMEPAGE="https://mpv.io/"
 
 if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="
+		https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~kensington/distfiles/${P}-patches-${PR}.tar.xz
+	"
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 	DOCS=( RELEASE_NOTES )
 else
@@ -22,7 +25,7 @@ else
 	inherit git-r3
 fi
 SRC_URI+=" https://waf.io/waf-${WAF_PV}"
-DOCS+=( README.md )
+DOCS+=( README.md DOCS/{client-api,interface}-changes.rst )
 
 # See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC.
 LICENSE="LGPL-2.1+ GPL-2+ BSD ISC samba? ( GPL-3+ )"
@@ -133,18 +136,10 @@ 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"
-	"${FILESDIR}/${PV}/${PN}-use-internal-GL-definitions.patch"
 )
 
 mpv_check_compiler() {
 	if [[ ${MERGE_TYPE} != "binary" ]]; then
-		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || \
-				( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 5 ) ]]; then
-			die "${PN} requires GCC>=4.5."
-		fi
-		if use opengl && ! tc-has-tls; then
-			die "Your compiler lacks C++11 TLS support. Use GCC>=4.8 or Clang>=3.3."
-		fi
 		if ! tc-is-gcc && use vaapi && use cpu_flags_x86_sse4_1 && \
 				{ has_version '<media-video/ffmpeg-3.3:0' || has_version '<media-video/libav-13:0'; }; then
 			die "${PN} requires GCC for SSE4.1 intrinsics."
@@ -165,6 +160,7 @@ src_prepare() {
 	cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die
 	chmod +x "${S}"/waf || die
 	default_src_prepare
+	eapply "${WORKDIR}/${PV}"
 }
 
 src_configure() {
@@ -310,13 +306,15 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	local rv softvol_0_18_1=0 osc_0_21_0=0 opengl_0_25_0=0
+	local rv softvol_0_18_1=0 osc_0_21_0=0 txtsubs_0_24_0=0 opengl_0_25_0=0
 
 	for rv in ${REPLACING_VERSIONS}; do
 		version_compare ${rv} 0.18.1
 		[[ $? -eq 1 ]] && softvol_0_18_1=1
 		version_compare ${rv} 0.21.0
 		[[ $? -eq 1 ]] && osc_0_21_0=1
+		version_compare ${rv} 0.24.0
+		[[ $? -eq 1 ]] && txtsubs_0_24_0=1
 		version_compare ${rv} 0.25.0
 		[[ $? -eq 1 ]] && ! use opengl && opengl_0_25_0=1
 	done
@@ -339,6 +337,14 @@ pkg_postinst() {
 		elog
 	fi
 
+	if [[ ${txtsubs_0_24_0} -eq 1 ]]; then
+		elog "Since version 0.24.0 subtitles with .txt extension aren't autoloaded."
+		elog "If you want to restore the previous behaviour, please refer to"
+		elog
+		elog "https://wiki.gentoo.org/wiki/Mpv#Subtitles_with_.txt_extension_in_0.24.0"
+		elog
+	fi
+
 	if [[ ${opengl_0_25_0} -eq 1 ]]; then
 		elog "Since version 0.25.0 the 'opengl' USE flag is mapped to"
 		elog "the 'opengl' video output and no longer explicitly requires"