[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/files/0.25.0/, media-video/mpv/
commit: 6d4a8121bbb370d913d7bc7e74e0f563d9cf34da Author: Ilya Tumaykin gmail com> AuthorDate: Sun Jun 11 15:19:49 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Jun 11 16:55:46 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d4a8121 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 media-video/mpv/Manifest | 1 + .../0.25.0/mpv-use-internal-GL-definitions.patch | 100 - .../{mpv-0.25.0.ebuild => mpv-0.25.0-r1.ebuild}| 28 +++--- 3 files changed, 18 insertions(+), 111 deletions(-) diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest index 828195108a3..320adf8a4b5 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 afb0a541647..000 --- 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-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 -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',
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/files/0.25.0/, media-video/mpv/
commit: 8cd64057c30c0a6b62f84e32d8b34ba994e16200 Author: Ilya Tumaykin gmail com> AuthorDate: Thu Apr 27 20:30:03 2017 + Commit: David Seifert gentoo org> CommitDate: Thu May 4 16:28:07 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cd64057 media-video/mpv: verbump to 0.25.0 Gentoo-Bug: 616838 Package-Manager: Portage-2.3.5, Repoman-2.3.2 media-video/mpv/Manifest | 1 + .../0.25.0/mpv-use-internal-GL-definitions.patch | 100 ++ media-video/mpv/mpv-0.25.0.ebuild | 376 + 3 files changed, 477 insertions(+) diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest index 4aeeafdc247..d36d37ce4ba 100644 --- a/media-video/mpv/Manifest +++ b/media-video/mpv/Manifest @@ -1,5 +1,6 @@ DIST mpv-0.18.0.tar.gz 2758960 SHA256 b656638d4f6bce2621baaacb60d8be384aa492fcd86dfd43996aaa2c16fee02b SHA512 5a899ea680b4da6d668a6e77a254e623bafef16f376ee46639e40f151da5a000de84b382f2b07f3a1e87b60fc8e524132767fdf243e36474966af11a88277437 WHIRLPOOL c491e61cb2d7f453cfc23605120048e81c2b7621b8d9591cad6415d3b550f55db6a6c8c6f90d27c7ce214ff89f92a9861d202b457c2de25c5b7de11d8d1d40af DIST mpv-0.22.0.tar.gz 2822645 SHA256 c0f9ac8f0e37a391d19007b333ef8787c2f45d75a0d4401c0098cde52c5082f6 SHA512 6c021bfb79cbedee842bf122ebb29df56e8b1cbfcb038bd54bf6e2f2db2a6550b71fd9fe8998dbd79b4ceeab3fbcab65ec60695f255c5cb36fb1feae17b797c0 WHIRLPOOL 3458dfe646bab65408a7fe45f98ae168f439b4939064b009ba87d0ae08c1f2067bd252558a92f9fdb0822bf5a35b2377bce7f46aeb190d60a4e115394f0506c9 DIST mpv-0.24.0.tar.gz 2835920 SHA256 a41854fa0ac35b9c309ad692aaee67c8d4495c3546f11cb4cdd0a124195d3f15 SHA512 c1d988ccf9e22765822b9ce75c04f155df4fc4bd4c2aa164903eee8947c36f659116c2ab96668a4af31c4f5aeecbf20ce21191c48456d74e138db617a1e34d96 WHIRLPOOL e3a10fc26df124127b819754aedd8bd4ccaa1b9b3764f0deac20eaa8e338e49f09aea25d2b508b8599ce75b0a72fdd3ebcbb9487851cf823c803024e1effc950 +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 new file mode 100644 index 000..afb0a541647 --- /dev/null +++ b/media-video/mpv/files/0.25.0/mpv-use-internal-GL-definitions.patch @@ -0,0 +1,100 @@ +commit 9d80c08441edf3e8da5180fb42eda71878e9c411 +Author: Ilya Tumaykin+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 +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