gentoo resync : 12.03.2021

3 files changed, 31 insertions, 2 deletions

diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest
index aff16d45efec..a670e0d3d14b 100644
--- a/games-emulation/vbam/Manifest
+++ b/games-emulation/vbam/Manifest
@@ -1,5 +1,6 @@
 AUX vbam-2.1.4-cmake_fix.patch 5436 BLAKE2B 4af1b32f33c99cb66f7b551853fc49a402f860918214efcabb57bd1138bbe2977659fa50432f371cb443456cc0b75cbcd4f917936ae5246e1bb72a8868833cdf SHA512 3d33468003820d83b0a64fd4c086369293757a88c7883eaaf255f3fbc7aa438f08f249345a582b5eeb5269a6bf0bf0df1274aafed54931cafebda4c4c7112247
+AUX vbam-2.1.4-libsdl2-2.0.14.patch 783 BLAKE2B 36d4f89965b5097ec848e5d88b2cb600438baca4c73be0d5897a0b528275e433f596a6bb7fe6fd5a5cb3518ed9d7ff8a6f4166152ba6aa15ef90cff23a6159b5 SHA512 f97772215b857069ef881e859fa846400592c437ee85b5b2fd0f463df8be8f5cb40b322361ffa4718e89ab7460ec96a696c0a5683ef0914b2d901af4aacfaa8c
 DIST vbam-2.1.4.tar.gz 3891574 BLAKE2B 5255fe814ab583c433f273c31b36933c09301330b47b2deefa453453c1d127c29a1b9de2e945e6706b1f9d9ec517444989818f3db329b96c106bf5d51ec71ae3 SHA512 9070715797c6be1648661019f236eb9328eb409f52e80e15aac52d814cf4155cf1ea37c230557c1288f152f0d27d838b11bee38679787a8d5198ca81f173d896
-EBUILD vbam-2.1.4.ebuild 2168 BLAKE2B e30aa9e0541323b3feef7434cdfebbd7f3acd71800feda5714bd81f10c8c2cd0ea06f94f385db08ed4daf3de4b24d4ca1e979bfded45694032848d0e343efb3c SHA512 f9aca9ac2ca38bf62ea45642a95def70e0f1caa3781bc73514caac1efc78b1ad0022b9df91d5172446dafa75233ba8713cb9645d21ff2e6ba4003057a5142474
+EBUILD vbam-2.1.4.ebuild 2217 BLAKE2B 98fa777793850a90ae5fbcf66a216558c7510257416cab28b7704ea6be912bf5bc695a7b702e28108bca86b3d35360410e2b68a042b37841f26283c5654f7af1 SHA512 6492dedea6c134f1a556e49c25fbc08c5ba8ebaa2002aa9234113aefdf905116b0ea83d36fb909f7e3bf5df8abd62da35682f5736ec3eaff27717dea5dd3507e
 EBUILD vbam-9999.ebuild 2119 BLAKE2B 9d3e53a9c113dd5c63bc133e3bd58734fbe8c1c338621a3696d9435be51883b85994fb12f2a417bd82a6764a9641abb5c2002b0172b25de8e1012d0798b75fe6 SHA512 0dea0eda480ad7876c58c665e2d3ecaf3b90d7d20ac2ab4174a7bca529ad654650507b97272939d5a1c9ae87e454b42fa55615554d1d886c89e5c15c9103d5b7
 MISC metadata.xml 479 BLAKE2B e5a7706e8db6c8c05cf4cf691d294c4bd54f3cc7aee5af270cce39c2d924cc81cc97a1b3d3612c1cf95d0b4b485181717d0f0daeef11a21b0c7ce0cf4d9eafda SHA512 6bd2212bd5ae35dd11f35322879f067981cac94c0c2d8f0c87e1e67170b5df245bd3616e5bb076d2892453c8b75537ee15aab49134029c0daa31d89d8aedf1d0
diff --git a/games-emulation/vbam/files/vbam-2.1.4-libsdl2-2.0.14.patch b/games-emulation/vbam/files/vbam-2.1.4-libsdl2-2.0.14.patch
new file mode 100644
index 000000000000..a528a22e506e
--- /dev/null
+++ b/games-emulation/vbam/files/vbam-2.1.4-libsdl2-2.0.14.patch
@@ -0,0 +1,27 @@
+From 619a5cce683ec4b1d03f08f316ba276d8f8cd824 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
+Date: Thu, 31 Dec 2020 00:22:21 +0100
+Subject: [PATCH] SDL: Fix build with SDL 2.0.14 after KMOD_GUI change to enum
+
+Since SDL 2.0.14, KMOD_GUI is no longer a macro but an enum value:
+https://hg.libsdl.org/SDL/rev/15a0bc9612e9
+
+So this code broke as the enum value doesn't satisfy `defined()`.
+---
+ src/sdl/SDL.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/sdl/SDL.cpp b/src/sdl/SDL.cpp
+index ee8ae50a3..082b47c0c 100644
+--- a/src/sdl/SDL.cpp
++++ b/src/sdl/SDL.cpp
+@@ -878,7 +878,8 @@ void sdlInitVideo()
+ 
+     sdlResizeVideo();
+ }
+-#if defined(KMOD_GUI)
++
++#ifndef KMOD_META
+ #define KMOD_META KMOD_GUI
+ #endif
+ 
diff --git a/games-emulation/vbam/vbam-2.1.4.ebuild b/games-emulation/vbam/vbam-2.1.4.ebuild
index b9fd01b61bd3..21f3c2cf4a23 100644
--- a/games-emulation/vbam/vbam-2.1.4.ebuild
+++ b/games-emulation/vbam/vbam-2.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -56,6 +56,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${P}-cmake_fix.patch
+	"${FILESDIR}"/${P}-libsdl2-2.0.14.patch #762208
 )
 
 src_configure() {