gentoo resync : 13.03.2018

6 files changed, 33 insertions, 4 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 69ecc96c0c51..b2fc0b103176 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 04679742c120..b46239f9b589 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -13,7 +13,7 @@ EBUILD ffmpeg-3.2.6.ebuild 15078 BLAKE2B 5d8e389481ae3ddbd2848fedc7292cdb2131b2c
 EBUILD ffmpeg-3.2.7.ebuild 15083 BLAKE2B 313da834e164cca1c3fd1fdef6fb0094aefd8b2f752e28895a292221e5005b5d496e480a9dffc779790ee4036121e18fea8ded2eacd5c9e34aa51fc335c11688 SHA512 2645eada5e381a5df2b3972dee7435f51dea461f4535796ededcc4f705979b289c48c289f3384bb58bbe1b6f64dadfda10e2c9d1674bf00d566dfe107f52a42e
 EBUILD ffmpeg-3.3.4.ebuild 16107 BLAKE2B 2dabd381f934dde36e6a1cd25c9c44a93a702bc09f41718649a4bf7139eb18b7854b93350e3b46df1be87fe5f1421683f24a3173431b69901527b7cc63bb97db SHA512 ed129a8ee9f66bed5c2ab724114ed77ad345e7dec13f541ede5371ca442352b2e16666a715c30bac967210464d970bd4728c7753bd08dd542478d43da83b598b
 EBUILD ffmpeg-3.3.5.ebuild 16109 BLAKE2B 53b38d47499dc3ec2d9cf5864ef35999032894dc100d935221ef34294610c980d058288c3ff177b4e4ecd21933426cc57a60611133bf74db9065a09bffcb8f11 SHA512 5a3d8e7d84d0cbe1e23918263be4ef1f379f563c81be266d7e7a8333674f056f69db6e3f88fb8e0521a7f4944fd427c5e91f66b277a19b7029834be9810aa616
-EBUILD ffmpeg-3.3.6.ebuild 16110 BLAKE2B 492962189eec0bb5fd7c3443134506412bc24ae336673e7012fe8aa69552914d585680ef54800bcfd554c790784d9053d80d6b0326a015f4b9e3a063bf1d761c SHA512 c8fc85a9e31ab47ceebf304c14ed041cc58f1d6bf3775c273804084c1fa1af88c7d96a34dc9761c34b76defdda4ac228b9273b2a92297ac3da64beb6aaa47f7a
+EBUILD ffmpeg-3.3.6.ebuild 16108 BLAKE2B 24663130944a76332e0525a2a420cb08892668a7e86843495ab5cedabe3aeef2c9d801a8c7a5159b75daa33a9d20dc517a3ad5afdb9ef727f2d08b26f4a05f5e SHA512 42982b555e3a3f33a07fdde67deec7db8c05b6c10cb36bcacd2e01e2a98696d6ad240df2fa44e64e50926c52ae7659e105b353897fa9474d2d7357db54e877be
 EBUILD ffmpeg-3.4.2.ebuild 15729 BLAKE2B b2b84197b20a1b904aa91d4c48b5a7597a25f6911e3d70349cb0595861a6bb2efeb05392a527bd522e5950cd2ef8f8b9d58d75eef60a385401bea22e1bbe53b9 SHA512 a01935dd9c4708bc4b60cc47e57957ab0e65d9ac581aca153fe63362b7d17bc93e5c1f18278d2e7b95952ca4ef5e73d915478a27fb71aa2469885f78679608f7
 EBUILD ffmpeg-9999.ebuild 16143 BLAKE2B 49ca772a2c31acd5eca8d5a9a4388ac9a609925c6925bf5f0d528dd731fe64517f7e8a2317199ce5fbc44dc13879736973a55c54870fe084778b18089df39ff3 SHA512 e08a1fb0622a5ba42810721a80e69566c007147ce426c54b677ee86a8759681caf7ecfe2944133bf03d527f10f8580d1ee5c0c7e4e4495dc7f6e3c12c44842ea
 MISC metadata.xml 5749 BLAKE2B 1ff5bfe813e5dda3fb09ccdd7383adeceb2599ce173680eb917b7d088af6dd5f8d2434cb7a353b3f9dbf2d5ec3ecc05e3d4afab832e644d5aa7e5f9fe7e9082e SHA512 f635920b77f6e186f1a80a6a9a989a0d0876e915573d29f120631fc871bb65709d1fa9e1c29b4d5be3039465b8ea69ca966fc87435ff2a42cace5575fb92d435
diff --git a/media-video/ffmpeg/ffmpeg-3.3.6.ebuild b/media-video/ffmpeg/ffmpeg-3.3.6.ebuild
index 87eac94f303a..ad5b411cc743 100644
--- a/media-video/ffmpeg/ffmpeg-3.3.6.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.3.6.ebuild
@@ -54,7 +54,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 # Options to use as use_enable in the foo[:bar] form.
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index ecbb338f9e5d..7cc7fdae830d 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -2,6 +2,7 @@ AUX mpv-0.19.0-make-ffmpeg-version-check-non-fatal.patch 1456 BLAKE2B 0d360a6470
 AUX mpv-0.23.0-make-libavdevice-check-accept-libav.patch 694 BLAKE2B 655bf30240ac95f63385bd3bb3c5c9da264aedfb20c2e4abbf43d17dbdb9f5f7a79c6b8d056f6bec32144be87a23b88f0722d6193ad216771bd9e220ef7efa76 SHA512 15861e0f27598c626a5f39319b473483d5d1cec26ca2aad928f6cc751568d7c6eab9bac479665677da92c5c962a3060a8b7cc02899390702e7fed370c28d9a6e
 AUX mpv-0.25.0-fix-float-comparisons-in-tests.patch 2096 BLAKE2B 88cfe962f3c9901e39837a8c890d0d07f362f3f5b2c1d9adc6cadffddb19bf38b918c76bdeb1d634a62ad09115c1d4adcfe218a3202843542d1d751e60e1d449 SHA512 46fdb40f0eafc9fdbf180d0334de5b57a3949b4479835750462414a996272da3ae816d62f58fc986f448045e4e8f8121cebbad19a0a031c589f5ed346a210875
 AUX mpv-0.27.0-add-missing-link-flags-for-rpi.patch 988 BLAKE2B 2dc3c70dbb0565db93fbaa9852e37afd1d953e896bb820095afdac8bc8d1bba52fca07173a63d306990e7c72611afb40e22a21d1bc8293b69691d4f5252c2753 SHA512 bb204c5910d927d3dd159fe17f8edecbbc80a9d36b60d83f08d10181e019fcb140a701d2b3d4c6436d08ef0ebe95fb81bb5d7467c2b63a1b098ba412defeea32
+AUX mpv-9999-make-ffmpeg-version-check-non-fatal.patch 1461 BLAKE2B e87177c8e726d2599a7037734c4128a4ebdfee5a17a15287f61ae70d880cd4262418396efcd976beca9cfcfbb84158051e217eb2be793208e72f0513a3256f9b SHA512 26c3020cb1f531611358d2a16bea3e26926292abb4b40694f4357c4d36d2bee17edbf317f9068c7364cda35cc6e27e2fe9d23a284b1da8d136bed2f1e0cea64d
 DIST mpv-0.25.0-patches-r2.tar.xz 11036 BLAKE2B 09fdd566c5fcca290829c536c9e41b655e254d64e63714281119d62e6963f07f8d384eccb3f8ea6ccb2a9b63a60e19bb7ff1fd4b8e4ccccdc9b1fd8e58a7c628 SHA512 fc8d2a23dff27131d2c18d3f91861ec6e6d5240e6531d1a04c06ebef8d5467250c4f131d9faee802842e1ea485dbf350b43a3eebcc13c230cd45ff875fc855e2
 DIST mpv-0.25.0.tar.gz 2874584 BLAKE2B c64321b50fd635f82bbcbce5cdefee1d0da011558cebdacd3339aaa14162f659c955bea75341ed21096eea5b689e4c1ca4d2d97feff1f4026044ddd61bdd9944 SHA512 eefc574e2995ddf6bd15c9b62986a5ca277c30949b036d57a11bbfb796c11c1e6dd7c313abd91a909dd98ca0f2b0be29ec6b980d0287a5891b42b0ffba926cbf
 DIST mpv-0.27.2-patches-r0.tar.xz 6564 BLAKE2B c02efea40e0b19d60eaa49520988464fbf4c9221108cbf19021934dc0cb0a975dab148ec1ea03753d81b8035173e3e5bd74b262ab5675d9fc5dce4a0f75ea37c SHA512 d1c955c32082338f5c7f1cd8268471ca0ac6dcd817c5fe39fb82f0e8bd3babf6f2f954d4ce52e9be786e5527df75cc6f4f3de8106a3517c8a1d8e39be1b4ebbd
@@ -11,5 +12,5 @@ DIST waf-1.9.8 100685 BLAKE2B b335115b7ba5af4f8f49fc4da7967fa20e0633bfc7de7ad28f
 EBUILD mpv-0.25.0-r2.ebuild 10902 BLAKE2B fa9ae811c53d01d32b8288696436783f9cf434d04255c45ae5efb73d68821afe5bfc3a2548fde646e11b35b4329ca61fc4bf3d18e7277538274a10440cde9069 SHA512 00c1edd4c77e859fc03d8cbadfefa7278bceb94d788d1306478fbf7b7535225c15e6dc65058eccf8251b9e6f3a4f9ce7ba04bfbc2065ccff13416fc5a32ebb7b
 EBUILD mpv-0.27.2.ebuild 10486 BLAKE2B a583f569c6750d7e4daa06fa61caedadb1b0b6ac1213ff0020b5a80a456716f46e10b9b6f365e2d1ac41ec09734e5444db880d89498a104045ceffb2c18ff4dc SHA512 d1c8610722510c4995b5e2ebf9dfe70f67eb2d9ffd9a6fb9c9c112136833920165c5d9ad59304e84a219518a560813df75baecc0ec8471f173a7ac6807872508
 EBUILD mpv-0.28.2.ebuild 10152 BLAKE2B 6db64e6256c2d495cd90418d61829b57d362209ad8ab8c7c1ae3d41ea6df7bf1b3d605ca3f86ab67131ac5358dafb438563e6956ff11d1120f62ca1da8069fce SHA512 f2195ec248b398e4733d416e259f36a707bdf17f873ad6be52c01ce986f359ab3defad5bdcade5c57609e6403ee8e47f93a3e3ae54732e14f3beb492e803bad6
-EBUILD mpv-9999.ebuild 10005 BLAKE2B af956f671b10b3789ae90d4a673acb6dd44d32c7e83a2b69c39c0db2f628fcd49d6b886a104ba6c13e001a4287b93cc11f81de38e644df3be9bc360a06e3e81b SHA512 17bd0ddbcc8cfff1397bf9bc115f2996d67386b5c9e32a103cbda91e37f223d19ad10b3331a725af84a2008b9685624e4612f0be46ce2cadc6d42bb30f5a73e9
+EBUILD mpv-9999.ebuild 9997 BLAKE2B c9946ff0c3cf13f047b6f504fea3704d9ec0cfe30487f8af0707de892fefc9f3b42bc51d4f745b8e55961bd653680767dbb76fda27d802920c962b8c00925c25 SHA512 96e3219f1ec63ecbd5d0015eb2113561ec77a9cf3798f3291177b9dd3a8779865332952efdbbdeb98f7d05e9e9d2817264412944c42bc24b2fa21d1296253f28
 MISC metadata.xml 2376 BLAKE2B c585e5f1e6e5c91ad9c3ad25de75bde9f01188950bafdf016c2f3b55a5cc74e48775667e173962178f13bbae5b40d2a386144bba7343ec21a2b60f2ee9c1c6c7 SHA512 8da450ad8b003eacfc8aab85b8774206163305750c559e4e7e4e8a56b4e3c398f9cea970430b37d26069c6ec333a4ae860c012a63d702dfb24dc65089edaa604
diff --git a/media-video/mpv/files/mpv-9999-make-ffmpeg-version-check-non-fatal.patch b/media-video/mpv/files/mpv-9999-make-ffmpeg-version-check-non-fatal.patch
new file mode 100644
index 000000000000..1594617fba9a
--- /dev/null
+++ b/media-video/mpv/files/mpv-9999-make-ffmpeg-version-check-non-fatal.patch
@@ -0,0 +1,28 @@
+player: make ffmpeg/libav version check non-fatal
+
+We already enforce mpv rebuilds when ffmpeg/libav SONAME changes.
+
+diff --git a/player/main.c b/player/main.c
+index 5a3fe4c1b7..8cfbb09c56 100644
+--- a/player/main.c
++++ b/player/main.c
+@@ -429,13 +429,12 @@ int mp_initialize(struct MPContext *mpctx, char **options)
+         // Distro maintainers who patch this out should be aware that mpv
+         // intentionally ignores ABI in some places where it's not possible to
+         // get by without violating it.
+-        print_libav_versions(mpctx->log, MSGL_FATAL);
+-        MP_FATAL(mpctx, "\nmpv was compiled against a different version of "
+-                 "FFmpeg/Libav than the shared\nlibrary it is linked against. "
+-                 "This is most likely a broken build and could\nresult in "
+-                 "misbehavior and crashes.\n\nmpv does not support this "
+-                 "configuration and will not run - rebuild mpv instead.\n");
+-        return -1;
++        print_libav_versions(mpctx->log, MSGL_WARN);
++        MP_WARN(mpctx, "\nmpv was compiled against a different version of "
++                "FFmpeg/Libav than the shared\nlibrary it is linked against. "
++                "This could result in misbehavior and crashes.\n\n"
++                "Upstream does not support this configuration.\n"
++                "Please rebuild mpv in case of any problems.\n");
+     }
+
+     if (!mpctx->playlist->first && !opts->player_idle_mode)
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index e273db3d080b..302641687d69 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -132,7 +132,7 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.19.0-make-ffmpeg-version-check-non-fatal.patch"
+	"${FILESDIR}/${P}-make-ffmpeg-version-check-non-fatal.patch"
 )
 
 src_prepare() {