gentoo resync : 29.10.2017

3 files changed, 25 insertions, 3 deletions

diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 9518d975a216..ebb7c12cafe8 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -3,6 +3,7 @@ AUX mplayer-1.2-get_buffer.patch 12054 SHA256 ffffa0672bead0e97d970e98dc9ed4d1b9
 AUX mplayer-1.2_pre20150730-chan.patch 966 SHA256 d92a18180b023833a748ec4186a5e2914781247f8840d57d41b564cbe06eed48 SHA512 9ea28c193d26feba870283d110a69d42e739696571ac13d40f983b4b6f0c83f01befd12fa7825b2dca10d5f3279d29d71dd07f2f53553f78e88b182fd8250df4 WHIRLPOOL 8368cf41f1c1ca82674fde7ca39c46a7ec95569fd56acde0caba55b848a1a2635ae0b4b8b5e39c9b6f5f79bb6ad6401c2d7920568aee9d0c24e2e2def8a1f5fb
 AUX mplayer-1.2_pre20150730-encode.patch 3022 SHA256 edf081f8704fdf3936be1971d2d1243b684f78772d4c2a9459ad56a2db9c87fa SHA512 c1da3944616205c92926910d93bf9ee39404f46cad07a68df28050aeab88a358480e9cfe09f41af8fa047b623d9400bcebc1a05c6982f704d5164a777e591792 WHIRLPOOL a928b0ff7bf40495a4a34a4f89f7c6cd17d76bf528ecc696828d9dd5b67a9121f455d22fd439d74dbe434b3e6c1c94e572023e694db8510fea3b6581bd95ab72
 AUX mplayer-1.3-CVE-2016-4352.patch 617 SHA256 3fac635945a9327b3e08d6707f7153966908df147b7bf3d06d0b72d2d3215ae5 SHA512 654bfa8368a02669ba249aa0c1a605f285d4d967b7038285df0ba7b83cd034ac3aff933a564fd6f33c7a153267be19d9eb517a52c8f4b53a6f81b6b2c5558512 WHIRLPOOL a7f36dbb623536ceeebdfc11f1389c97d51a7e5afba335345318b867bf2dbed9f8fdcfd695eb41de0b8fe648b3b40a04f61857c2845e43d46d8ad4ed0dfa08d5
+AUX mplayer-1.3-vdpau-x11.patch 543 SHA256 e941130dde42fe4e4221eca35c3b5fe477c136e5ca3735c22e902663b6feea8e SHA512 c0dfdca8075fd8bdad7cde99e163ba5d55e6268883f852917e287eeeace85b06e244b727bd87501c77ff72fce4b6ba317d45694f1086b5cd1a63fe3ca222f805 WHIRLPOOL 2d3eefde487ffe33e2bbe248708b07e61f8b27cfdd60bc1289398f83d55efcb9319b1dc2342d2a827f97066453a21256d5c85d318983a3692021e1998a854cdb
 AUX prepare_mplayer.sh 757 SHA256 ee4c0765b2cbab5bcc99408c4864669647fb0ad42517e0a51a6524c12b55804f SHA512 0add0707e15d58cee331fc82f884a44b29908c503f9ddcbb63dc01e237e2f457f599bae8644ce49f1af2cc7b3183529364ce30e6748889355c17cb96cecee71a WHIRLPOOL a4de2ff8e6ecfe66e41881664a84bc8ad91147e7b559e2ec334f9ad6671d9892de01bddfdba514b9c2b0589956b38d22fc8d2ce6ff00c267bded4bfb6c3ef6f0
 DIST MPlayer-1.2.1.tar.xz 13029936 SHA256 831baf097d899bdfcdad0cb80f33cc8dff77fa52cb306bee5dee6843b5c52b5f SHA512 e6dd6de73ede9743855fab7f7316de2e957ac5a5b8fc8324ef3d57ca9796b0cb03676dee46b3827d932050836d43a6ad08f925cad3d28493a26933dbafdbb506 WHIRLPOOL d8f056a8a1d6cf2a7c99687bec9e34d123f574391df02a29959355c6e44f35f1f9a56ea5f2d0f6d1037d94de0897689429e78aa7e15f29f3df3042bbfc579c72
 DIST MPlayer-1.3.0.tar.xz 13278984 SHA256 3ad0846c92d89ab2e4e6fb83bf991ea677e7aa2ea775845814cbceb608b09843 SHA512 10007e471a941f8a3dabf6149e6e44fc1a364a9ccb5cd08c670fc22560e5053a15f3249e9d3e18cdda06b6b7e77e537026b5d33dc356e928c63747d6ed73dbae WHIRLPOOL 4aaa9609b0c27c0363671e32fb6b7cac8d2c0944c3425c8e76de0250fb76865d5f47c341b11704a0ea980401288d1d28fcd172a5f8469c9713ec37f977bcb088
@@ -11,7 +12,7 @@ DIST font-arial-iso-8859-1.tar.bz2 234242 SHA256 9730f481764f367c9089d0166fb6ccf
 DIST font-arial-iso-8859-2.tar.bz2 222208 SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d WHIRLPOOL 08178087b4ea1dfb2250f4673785e31dd876b06af51c51b2bddc172b23e6e33cbc1b2c6b710a317e42dc05486974b26ed0ad3ca50a185567aa77d49bd1e72aee
 EBUILD mplayer-1.2.1-r1.ebuild 17429 SHA256 96024a2fc6ec79a8c8fc32c9fb2173e4287d10807f6371961b3c95aaeaf81b75 SHA512 b36f8bfb7eb246787af2779b27d3cd17825a5f9e944a12c71a751615567b0f4a1015ca344b4e4a4bc64acdb52fb99dd1462a867505b24792472f5919fa6389c3 WHIRLPOOL 8f8e334b08ff302eeeb164f0aa48f052ce144a108e1f5de9ff2e37bcdb1e721d20c91cb823a4f7b11d0e6191c75d7c7c19b88ea36a822ef00e3b9b1eabfad97b
 EBUILD mplayer-1.3.0-r2.ebuild 17194 SHA256 1424b2b4087e9f83d60f37a8f1fccae9f9818ef6372b1713670b08dda6b28ef9 SHA512 ec49627e9094314b6595a501c6057e5f0643b3035e92edebc6a2d778260a78c2553962b0cd72f56b290ceb80dffee891362786db18c2e948d295452eb0a9009d WHIRLPOOL 53a194edac6cf2520f9c4180f4f0741ce938a9c23fde391eb5cbc8452fe8be5b739e51c08cfd4587b35085b37142d26386b1424c90d25e3a6247a0ae8a12c393
-EBUILD mplayer-1.3.0-r3.ebuild 17291 SHA256 7299fe0a625eddc967c549992a6f3e93e5f00ffe1121d60acae792e15f17cdb3 SHA512 c7090f69590d7fb36a702c9ee93e5d252ba5bf015d25408806e0fcc64bc87dd822052cd63e3ed3d2627b9ff9dbeb7e3424c80065a8aa22dbc44c2b7a33857814 WHIRLPOOL 6999865997bbda05c0bdf0de812991761436a44759dfc274f42bc08035d0e4dbfc6a8e69281717db159a7208ad3128e5c1f1687849cdb835321de89776fa1357
+EBUILD mplayer-1.3.0-r3.ebuild 17342 SHA256 9282558e9c29f23a2cd0fd22c7dd0473a0edd2462015653e794ab2fe17f04fdc SHA512 5bb5222df9ba043dd5ab7d251a5bb5f749274bd78d95b3fa535a104d5d196da134ac423fd8010d17df81d5b4a0707d37ce998033659bc48713b949a98e3f495d WHIRLPOOL eae711f3deefb5e6172ebc7de4e40a609f0461125b937a9d7494631faceeeb17f2402f55821a6c5b6dcfea04870bdf37132cb823962801d69514cf1d1349f1b3
 EBUILD mplayer-9999.ebuild 17206 SHA256 a8ce728287a09091c4d2917a3e91bc686e31eb7cb5bfbbbef6716d97ea64735e SHA512 b99dacae704b960366f0406bb5e99a9a34a3b454b29ce538ac8a46af48ecb86929ef0c59a80fd67b9187309fb7cca608a1385b6a229238fb114d0b2ebc9a723a WHIRLPOOL 1d23c6754b0c21f3eb3b515396a4a1dc4d2bcb3dee1b2472b38edf91fd987f31b7ee5fb7f229529f826a502d7ae4643b9d57df300cfcc21477a2c4aeb4591f47
 MISC ChangeLog 10735 SHA256 6c3dcfc43705566e97c1761d41f94e41aa26a6a1d7893c25b14e635979e2d267 SHA512 97d8be790bbc844cb59784d2b87dbf9ad0125e69949e502373a7e3cf230d6b5a964eea20b06648efc67634768af865ee5639aff155b61f4eecfa13e08ac93a73 WHIRLPOOL 28daecebbcea2937847c7c1122971327454dcc05ed41b01f1b4a79586c2d5d3db93226ed0ecf4870a2d43061d39192eb63b5fc05ef207ce9408c8b7873d5aa62
 MISC ChangeLog-2008 107064 SHA256 d9949e0e21fd6fd00f1417201455ee399240ef1010dcf56611ac0fc1f6f9505b SHA512 622543b379b4c44f5845566b4e697bd92dd3e864e2f01a1b0f303c8ae5c7fb5de24839f6503765d51b4a3bfa777d175a7e410383e62ef2bbacf3e87cdc28c705 WHIRLPOOL e731af47505ffa646c92386dfb14acaffc2bb14ab4da74520c0b4dbc15ca5c20aacadbb53c4b91ba8d126a75bf7d2fb61877eeda354064e20c48cf4137bf6a74
diff --git a/media-video/mplayer/files/mplayer-1.3-vdpau-x11.patch b/media-video/mplayer/files/mplayer-1.3-vdpau-x11.patch
new file mode 100644
index 000000000000..ae21941a8aa1
--- /dev/null
+++ b/media-video/mplayer/files/mplayer-1.3-vdpau-x11.patch
@@ -0,0 +1,19 @@
+r37932 | al | 2017-04-20 01:06:04 +0200 (Thu, 20 Apr 2017) | 6 lines
+
+vo_vdpau: Explicitly include header vdpau_x11.h
+
+The include from inside libavcodec/vdpau.h was removed in FFmpeg
+commit d40e181bec22014a9ea312ab6837f7f0bc4f9e42 .
+
+Index: libvo/vo_vdpau.c
+===================================================================
+--- libvo/vo_vdpau.c	(revision 37931)
++++ libvo/vo_vdpau.c	(revision 37932)
+@@ -34,6 +34,7 @@
+ 
+ #include <stdio.h>
+ #include <strings.h>
++#include <vdpau/vdpau_x11.h>
+ 
+ #include "config.h"
+ #include "sub/ass_mp.h"
diff --git a/media-video/mplayer/mplayer-1.3.0-r3.ebuild b/media-video/mplayer/mplayer-1.3.0-r3.ebuild
index ef36667a3189..9283124a63f6 100644
--- a/media-video/mplayer/mplayer-1.3.0-r3.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r3.ebuild
@@ -156,9 +156,9 @@ RDEPEND+="
 SLOT="0"
 LICENSE="GPL-2"
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 else
-	KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 x86"
+	KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 x86"
 fi
 
 # faac codecs are nonfree
@@ -185,6 +185,8 @@ REQUIRED_USE="
 	xvmc? ( xv )"
 RESTRICT="faac? ( bindist )"
 
+PATCHES=( "${FILESDIR}/${PN}-1.3-vdpau-x11.patch" )
+
 pkg_setup() {
 	if [[ ${PV} == *9999* ]]; then
 		elog