gentoo resync : 21.09.2018

6 files changed, 39 insertions, 3 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 3556a1013e39..9867010d3053 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
index 4247baad2f0c..fdcbd1ad4c49 100644
--- a/games-emulation/dolphin/Manifest
+++ b/games-emulation/dolphin/Manifest
@@ -3,5 +3,5 @@ AUX dolphin-5.0-no-pie.patch 1068 BLAKE2B e941c7002b7adaaefc5c9ea2433a1362c1698b
 AUX dolphin-5.0-xgetbv.patch 1137 BLAKE2B d736d25127fae4c552c1e28b0c152037a2c0a16c59dbec873596e1488f9a9872672684f23517c6ceeef0c8b50e0f1914882a1ccd123660e4458fc9e73d1e07bd SHA512 d627829270acc69ed3dc420c57762c6a68713482c29fd0b33a38864558380c5d9547ace9ab054d2892108ccfe7751147e51c0d5495a57d02fa29c02ac93ef391
 DIST dolphin-5.0.zip 41802909 BLAKE2B 57fb7741e86b8b5194c9ccaf99e60be0202429209ce98d08aec4ed1d6f47fb347d9149509de7ac1e4bb28435cba35e357b87cf5d29efe2867706dbb3b903c886 SHA512 36c4f371e066537331a9a8ec4a17befa278465cdebe258e1cbf1157752ba69bff9c1b8a6e8698bbb650aa257bd48b6b42ee9f61357904b09fd01738af8223d3a
 EBUILD dolphin-5.0.ebuild 4610 BLAKE2B f10b2979143b167887758b6d70db658ce0fe4d9c0bdc57ccc87b16b5682ddebd23f9e14d5fb000b250767bd11487fa13e988b76fd6958cfa56a396c2e5adea4e SHA512 d45ab963c14353014fd9178b61ebecdb017e67ea8e99b252712acbd9732ddb31ae5125ffeaef6cd66276b526dc74955904141a88252682cf34ea3df184ac6746
-EBUILD dolphin-9999.ebuild 3913 BLAKE2B 5b704e3f68f5942cbbe11d8b1eeffbc4b614e179cd46120357111380f28338345acbbd65d1360e92ae8f0e137e27af21e01382e484651cbcb1a9567b7274384f SHA512 daec7f5ac7c3e113b18d5c83cfe0e30b09a796d15567472657c5ca38171a6781d9b5d718f822ebf4bf395b6d65e7c2681a584f42b280e23a1ef925dd94dafb21
+EBUILD dolphin-9999.ebuild 3914 BLAKE2B 289f437302c34aa46f11afed3a256f6550ed7a5ee5928661dcb800c5a7cae116717b0acb95e7a125066563fcc2ecc901e12ab3362ccfdf65f6dfd0cace76c603 SHA512 72670f2e9963d69e23df3f326fb8e7ad31f7abfa032044d6bbe0d74007c7f4bcfa9f21ce82b65bf06bc520084e93ee1c35ea77b5e47d21cb2f5ea63f367cd62c
 MISC metadata.xml 825 BLAKE2B 47bce78aa687f194ff5fb0252f3cdaf76336ab5460cdf72ddaa2913f36dd69aa916cbfc7684ae276248e14d092d8107ab67c7d8c37b71bfca15778b171d725f2 SHA512 33a3c378f2ed7fd25a155b29a03dd3b87730e9c910e7b2d35148a7f6eafbb75e96eab0a0f9608a9ae34e1aa2ccb5d6cc849d895cd28912c88193640a8ac5a6b5
diff --git a/games-emulation/dolphin/dolphin-9999.ebuild b/games-emulation/dolphin/dolphin-9999.ebuild
index b22a98646b70..811fc595d328 100644
--- a/games-emulation/dolphin/dolphin-9999.ebuild
+++ b/games-emulation/dolphin/dolphin-9999.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="https://www.dolphin-emu.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="alsa bluetooth discord-presence doc egl +evdev ffmpeg libav log lto profile pulseaudio +qt5 sdl systemd upnp"
+IUSE="alsa bluetooth discord-presence doc egl +evdev ffmpeg libav log lto profile pulseaudio +qt5 -sdl systemd upnp"
 
 RDEPEND="
 	dev-libs/hidapi:0=
diff --git a/games-emulation/ppsspp/Manifest b/games-emulation/ppsspp/Manifest
index 675c1f312ca9..11fc56536151 100644
--- a/games-emulation/ppsspp/Manifest
+++ b/games-emulation/ppsspp/Manifest
@@ -1,5 +1,6 @@
 AUX ppsspp-1.4-O2.patch 1576 BLAKE2B 5831befac76d1a674c0bf453043c1ac36435c76f04ec5bd95885582c9f44c283232a9dbbea629433629d9fbfd5cc1415f5e0f47c50dbbdb9e834891280e98a49 SHA512 39f18c074e56aa823b223a78b099771257b4a5672a41c6d271cee5b817a2a63d17f57ad9f936da41185dae5b4bf2a94cc62cf92596d94b6e0660f1b05bf9ac2f
 AUX ppsspp-1.4.2-assets-lookup.patch 525 BLAKE2B e0614d010e1708cfdfeba376ece25c6bb121e79dae7243988706a80d6ef022ba52286878c9e7c868bbe23aca6c5182ca1e0c6b5baaa6e4b32e2c79eb4febd10f SHA512 9963aad44ce72e9625cdf816bf58743ab8936d8f1fd3c75ac9ddbda5e179cd71fa4d23321c42ba4d56bd472cc016a62430a0c6d8b84792e2851977a5155cbdb1
+AUX ppsspp-1.5.4-ffmpeg-4.patch 1111 BLAKE2B 22478545e76173b2632a1d33d75b3e4ac883331dcb74178b9aafc85fcf5173d81ffb3c8491ff5be4bef7af10660bb62615f9855a6d6ff0c16878fefb89afc198 SHA512 abfd0a1bcb6bcd7fdd116c5f5b0ff6cb2d342bb4aa5231e2d2cf8466ee704a366c4828733b7698a78611cd3f6ac6d9437d9e2eb777a20db609090466fbbd0af4
 DIST ppsspp-1.5.4-assets_lang.tar.gz 347859 BLAKE2B 648915773856a64dafb5d159e0917b4345ff99dba7b7dae4f343ecd81e1d835cb958766ab8928118ae4768564414e3dcceba474e05e99be23d56c9447c59786b SHA512 72983f01c51900fa133ca83d226a5daec78153c9d70fc1ca6233b531f3c5d5da5e307e377560789cecccad7a98ba8f66da104cc4375f51576f90c535dc980b98
 DIST ppsspp-1.5.4-dx9sdk.tar.gz 14582591 BLAKE2B 12a370e262d045bab6f85237160189921e0bc9992726bb60d241c20a5714128995cf110bb5889c530f8cc3497a34645a96ff31b7b61fb3004279f26b15287435 SHA512 2c54b441b0a31f63ecab1bd2ab14254fb2047d35d2765262d43277330a8428fbf4c8848d5f730456a033cf84258f6b60a467213f8339289b3ab83ed7e94c65b7
 DIST ppsspp-1.5.4-ext_SPIRV-Cross.tar.gz 228943 BLAKE2B 0b4ed8a751737bf6fce9fa766f0b8dc0671b49a6adf026c369ebd3776d9d8c23acd08b6d3f41666a6e23410ffb243917a844d9de85e3eca5ce04935421aaca98 SHA512 5fe2f772b571da0627fb9d9c424bea2b4ea1c0563e36ff455ddaf1b92ea3d5ee636e039a0619e0971478ce10e163b45258e9b03d2610c573f74d1cfd08549bb8
@@ -9,6 +10,6 @@ DIST ppsspp-1.5.4-ext_glslang.tar.gz 1944927 BLAKE2B a9bfae046335f8cba72fc92208f
 DIST ppsspp-1.5.4-ffmpeg.tar.gz 311610961 BLAKE2B e01b203ff1f230a27b02dab0596dedbc26e049190fa1607903b70023865c50de4fb7361de33c1bd1c5de305124ea02f2ba9ac854bf2f40f3e79259663cdfa4ec SHA512 d4bdb3c5a13bc64d7b22e38b416355d302a4401a1d8f6bd57a4d8502823dc9a2987df92b8e781ddab6de8ded9b59b268ef1b33f8f43a0be7b1c57d4ffbee6871
 DIST ppsspp-1.5.4-pspautotests.tar.gz 36005395 BLAKE2B fa92d1acb0adfecb23f55132c4e85843c3c04c73e4bc8cfb054cfa8e0b67fe1c03c4a83032892bc534a78a64bf190da00db91fd49df4c3838e5b8d0396cce15b SHA512 1485eace5526f53f6c41200e63d6d5d0ff217f22ec4788d58b33a33c64e344609f95bf2b73a8f35fd395914b33910b38a0348b35b488dadbdd43e24ac0bfed9f
 DIST ppsspp-1.5.4.tar.gz 19008538 BLAKE2B 10ca63a3f05757bd091a66b6563e34b3ca3c9c4df12a0b7796e42776d54997bec581582ee16706d5fb3630ebb8c0bcd1a5c0040856d94330865932b3d1ada2db SHA512 dbf4d2e9cc94a64908d5006ad562da72860fd12dadac66b0bdc6903d4cad4c81436963e24017517aa261440fd15efff6e5cab6ed7801928e107d7982d1604714
-EBUILD ppsspp-1.5.4-r2.ebuild 3233 BLAKE2B baa7b7cb231951984b6400920566379e0e2faac001b8585246bcc67129653485bc02f2d53a56a2dd6577d4057f91980662d1b9cd7a59a3346237bf78dc7b1690 SHA512 c7474663c24d239a8cf8ed0f62bfdd8a457e015bb10edb06b81e6c9cf3d8433fe3f3418aa7465edb287f634c7f9cc777e17cabeb13ff77d78f51cb55ef7b1474
+EBUILD ppsspp-1.5.4-r2.ebuild 3268 BLAKE2B 6f0af25ce0f76e2819f36ed5b8a5a87565fafc3823612eee19365a9ef846fedaa046dd88a0d2c3de84127536c3f7333d95c90e87cf17921dca6a79de0dcc9f29 SHA512 d03a8522dc47335662129ef2e486a4ad805dada2ff6a6739565a69ace189e7be8df77acf4ccb81f45acdb46a0a7b177fe54a8f733b996aa0e276f0ce6c6cffb0
 EBUILD ppsspp-9999.ebuild 2254 BLAKE2B e2a927117109fc0d30c4e05c21847dc3738e73061a3906e68a1f4dcd7c81d490c892ac48c7d7997e531e2bd5d4b7fc97466acadfee0487d1775f99dfc49f20c7 SHA512 3ed95f0f27c4f6988ff78f81fcafe32f48964d5fbebcc40b48260d311d8be2c117313ee08b7a4f5f7b372b6b9b712fa7e1d488595d59f9881291021a193d42a4
 MISC metadata.xml 487 BLAKE2B 2b141f160af50cfa70e6c8cff123db36bea9c29ea4f96d3f25092d71fa0a1c061f6db7f5c4c012ced2165c6da9649b21aadcf417de0ae2e4a6c9217f03a6d700 SHA512 043e4876c162ea66401fdeefc9e40e4cd2b7f86c9262635a0039e5df37b1a992785cccfcd9eefe04b4375dfe9c406e5e0a79f7348fabc683ce8f40897e444358
diff --git a/games-emulation/ppsspp/files/ppsspp-1.5.4-ffmpeg-4.patch b/games-emulation/ppsspp/files/ppsspp-1.5.4-ffmpeg-4.patch
new file mode 100644
index 000000000000..d738d4bc56c3
--- /dev/null
+++ b/games-emulation/ppsspp/files/ppsspp-1.5.4-ffmpeg-4.patch
@@ -0,0 +1,34 @@
+From 70c54a7d1ab15c0cf84a205b944db7e0339242e0 Mon Sep 17 00:00:00 2001
+From: Greg V <greg@unrelenting.technology>
+Date: Sat, 21 Apr 2018 16:44:45 +0300
+Subject: [PATCH] Fix build with ffmpeg 4.0
+
+---
+ Core/HLE/sceMpeg.cpp | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/Core/HLE/sceMpeg.cpp b/Core/HLE/sceMpeg.cpp
+index 592320515e..ae309d7b2e 100644
+--- a/Core/HLE/sceMpeg.cpp
++++ b/Core/HLE/sceMpeg.cpp
+@@ -884,13 +884,16 @@ class H264Frames{
+ 		}
+ 	};
+ #ifndef USE_FFMPEG
+-#define FF_INPUT_BUFFER_PADDING_SIZE 16
++#define AV_INPUT_BUFFER_PADDING_SIZE 16
++#endif
++#ifndef AV_INPUT_BUFFER_PADDING_SIZE
++#define AV_INPUT_BUFFER_PADDING_SIZE FF_INPUT_BUFFER_PADDING_SIZE
+ #endif
+ 	void addpadding(){
+-		u8* str = new u8[size + FF_INPUT_BUFFER_PADDING_SIZE];
++		u8* str = new u8[size + AV_INPUT_BUFFER_PADDING_SIZE];
+ 		memcpy(str, stream, size);
+-		memset(str + size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
+-		size += FF_INPUT_BUFFER_PADDING_SIZE;
++		memset(str + size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
++		size += AV_INPUT_BUFFER_PADDING_SIZE;
+ 		delete[] stream;
+ 		stream = str;
+ 	}
diff --git a/games-emulation/ppsspp/ppsspp-1.5.4-r2.ebuild b/games-emulation/ppsspp/ppsspp-1.5.4-r2.ebuild
index 04fc2542f6a5..4e7f8f7f0271 100644
--- a/games-emulation/ppsspp/ppsspp-1.5.4-r2.ebuild
+++ b/games-emulation/ppsspp/ppsspp-1.5.4-r2.ebuild
@@ -49,6 +49,7 @@ DEPEND="${RDEPEND}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.4.2-assets-lookup.patch
 	"${FILESDIR}"/${PN}-1.4-O2.patch
+	"${FILESDIR}"/${P}-ffmpeg-4.patch
 )
 
 src_unpack() {