gentoo resync : 25.08.2020

4 files changed, 26 insertions, 4 deletions

diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index 399ce16a713d..8ca1c80df687 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -1,7 +1,8 @@
 AUX libsdl2-2.0.10-static-libs.patch 2388 BLAKE2B 84d6a6fe3a2630ca899aa01c6d16bfa5f43fdd82281e8022db62c30bfed671298f9011bbf2bbb59d6613dd9fe6e118ec71cb98b9d976c96c5d046fea46156d15 SHA512 bab5b6788b1f09f60a2686ce385496b31b6dcc4c5d76fb8abaeb5f2eb4d2fc6cdada8295e555c1f1527a70465452b0263ea54a0eea5f626f3faa266049b25119
-AUX libsdl2-2.0.12-static-libs.patch 2432 BLAKE2B 6ce884b4efee74ad4ac524b381d69bed8ad6ce27571803b23ead53bbc44e4037174c280920f9bc6dd14982d4b040c068eda0b25fdfed66f49ab56b5436276e80 SHA512 b70d23c427957c3abd561824251027379af9094eef77ea50bd9d8ad5fa4aa56edac44dc197b3da6a10f7f5da7244207768665b78e29cc56e585a89ca179491ca
+AUX libsdl2-2.0.12-static-libs.patch 2510 BLAKE2B 2c93b5a9ba38d797281d2d3b13eeb1848b46835e99dec20a325fd6e4e30ff44ae1966292f8b0cf95e3356e6a6d2787e90ea51c47fd92948cba2943c6ecbfb8c3 SHA512 d0f6a3f8282275f9ae63bfb363a357deb804d079be6feeaa0d8c749b79df1ad195da59b0da22f1eae4f527eecd63ceef210f52c1f303229a7aa13b71c3d711b0
+AUX libsdl2-2.0.12-vulkan-headers.patch 536 BLAKE2B 5bc6f494aa3afb6c1176055193505bc091569925f2f31f6e623254fa19df3eeb3fe477b97b4eef1973a3f9961d8f5159cf62aae39b8ab84d178ca5f8cf8346fd SHA512 20a6f433c973bb521d4db19c682b1a063b314405a0f2b68ed88a68030ef2a4ba71a8b84c45c0980c6218f2b9f332cc3cfd1354aebcd0932584169161638e011e
 DIST SDL2-2.0.10.tar.gz 5550762 BLAKE2B b51eb0b256da683586889a648f62363935f5c70b31172999aa9b80bac9f3e761bc34a3fc379c02f5dbc50734cde53743d297ca7f79d30b0272ddf0313c8752af SHA512 f49b869362699b3282f6e82920e59c7fac581bcbf955f18a81cc126293c08093a90df7fcb39517cc8bc32708d2213fe645a42b655d6d811c1386efebb3d3c798
 DIST SDL2-2.0.12.tar.gz 5720162 BLAKE2B 1e50d2d3060c38faadfc6610e3af7b0e54ce880101f8ca441b84431fb5f683cc6353402025be2eecbb8b9f85bb3982c9aea36e96067a97d079d39f9cd44964a0 SHA512 3f1f04af0f3d9dda9c84a2e9274ae8d83ea0da3fc367970a820036cc4dc1dbf990cfc37e4975ae05f0b45a4ffa739c6c19e470c00bf3f2bce9b8b63717b8b317
 EBUILD libsdl2-2.0.10-r1.ebuild 5322 BLAKE2B 7687d35d0c741bf72b64ec3ed3571e386ed9f15a210eccd18a97f65dea4c0808c40cba2e1e26bfba3b3e2e96b972b331db027a8a5f61f36767061ade72116681 SHA512 87ec70467329f2d0d41396628c538a4dc60e072b58398fd8cfbc9b79479654691932d1fc550cc36b48d8ce71c37e4fc8b80b0c8fceb8f4ef2a21f1addbed4d13
-EBUILD libsdl2-2.0.12-r1.ebuild 5517 BLAKE2B e81244895403f9f2810a035cdc7c1d808d91470ef3bdae217c0ee0a30a53324eeb60b30e68dbd054fc0aace6db4262199cc87c9518033ee6656d1a7c7bcba681 SHA512 6f82ea56826b361f7a051cbaf5f164540d39ba57d49c541c79ec99a90dd3818854ef51a643fe581e1550bbdbd038a29183d24dde6c4c676723ac6fae1662dd0a
+EBUILD libsdl2-2.0.12-r1.ebuild 5509 BLAKE2B f4dd277ea64d32fed4c241c11124d92d8ebbd183043bdcbd1956a174da8b80f0cd5adafc3926d1456f7313dd8610270ad3f6383446f63af36c2583a75a2c18cf SHA512 d61320d2b4708238d1c6a058484794127ed3a5f8964f8d51e9c64002aba28c9bc0ee9f50bbd9e5d3ae0a51342c348a146704066c53a8860a1b789d2d5bb3ba81
 MISC metadata.xml 1658 BLAKE2B 5c902cca2bed60d10864bd4d3524035b9472599f63a5a739348231c2471a01f40dd99ba49b63b710cffbfa51c870f06a1aa5a1d56a6a5dc6a2a3059550506443 SHA512 7c832d7bc52638ad658c4b53ffc1faf34486d551728240007b8af5f569dfa893a076df9b7ecc118c29795d1792b55e953401b2dbf81d831d002fc0cb0f28687c
diff --git a/media-libs/libsdl2/files/libsdl2-2.0.12-static-libs.patch b/media-libs/libsdl2/files/libsdl2-2.0.12-static-libs.patch
index 595d8a51fd39..f80dc6c222ca 100644
--- a/media-libs/libsdl2/files/libsdl2-2.0.12-static-libs.patch
+++ b/media-libs/libsdl2/files/libsdl2-2.0.12-static-libs.patch
@@ -1,3 +1,7 @@
+Fix --disable-static.
+
+Bug: https://bugzilla.libsdl.org/show_bug.cgi?id=1431
+
 --- SDL2-2.0.12/configure.ac
 +++ SDL2-2.0.12/configure.ac
 @@ -3751,7 +3751,7 @@
diff --git a/media-libs/libsdl2/files/libsdl2-2.0.12-vulkan-headers.patch b/media-libs/libsdl2/files/libsdl2-2.0.12-vulkan-headers.patch
new file mode 100644
index 000000000000..717e5b5db38e
--- /dev/null
+++ b/media-libs/libsdl2/files/libsdl2-2.0.12-vulkan-headers.patch
@@ -0,0 +1,17 @@
+Fix building against the latest Vulkan headers.
+
+Bug: https://bugs.gentoo.org/721954
+Bug: https://bugzilla.libsdl.org/show_bug.cgi?id=5227
+
+--- a/src/video/SDL_vulkan_utils.c      2020-03-10 21:36:18.000000000 -0400
++++ b/src/video/SDL_vulkan_utils.c      2020-06-14 21:49:15.780898839 -0400
+@@ -85,7 +85,9 @@
+     case VK_ERROR_INVALID_SHADER_NV:
+         return "VK_ERROR_INVALID_SHADER_NV";
+     case VK_RESULT_MAX_ENUM:
++#if VK_HEADER_VERSION < 140
+     case VK_RESULT_RANGE_SIZE:
++#endif
+         break;
+     }
+     if(result < 0)
diff --git a/media-libs/libsdl2/libsdl2-2.0.12-r1.ebuild b/media-libs/libsdl2/libsdl2-2.0.12-r1.ebuild
index cae1b46a7eb3..9f707ba4274a 100644
--- a/media-libs/libsdl2/libsdl2-2.0.12-r1.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.12-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.libsdl.org/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 
 IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus gles2 haptic jack +joystick kms libsamplerate nas opengl oss pulseaudio +sound static-libs +threads tslib udev +video video_cards_vc4 vulkan wayland X xinerama xscreensaver"
 REQUIRED_USE="
@@ -80,8 +80,8 @@ MULTILIB_WRAPPED_HEADERS=(
 )
 
 PATCHES=(
-	# https://bugzilla.libsdl.org/show_bug.cgi?id=1431
 	"${FILESDIR}"/${PN}-2.0.12-static-libs.patch
+	"${FILESDIR}"/${PN}-2.0.12-vulkan-headers.patch
 )
 
 S="${WORKDIR}/${MY_P}"