Patch the broken cmake sdl2 config

3 files changed, 31 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 44af018c1d43..8e1e7bae88c7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -20,9 +20,11 @@ pkgbase = rbdoom3-bfg-git
 	source = rbdoom3-bfg-git::git+https://github.com/RobertBeckebans/RBDOOM-3-BFG.git
 	source = rbdoom3-bfg-git.desktop
 	source = doom3bfg.png
-	md5sums = SKIP
-	md5sums = f5458e6cc915282aec2406dbdc824f9f
-	md5sums = 86455bb86d4267b447bd882dbde35231
+	source = sdl2-cmake.patch
+	sha256sums = SKIP
+	sha256sums = a651aa2e71a8a525e66173a8f76b907712b73c950c88f5468ccab79f7533361f
+	sha256sums = 0fb6a3bb9b47cad65d5012ba20dc9de3b1487f4ac1908ee847e6087511b7f09e
+	sha256sums = 438993ae976453143d1055fd851e3fd0d48c5309818d485b276e1cfcd6701ce9
 
 pkgname = rbdoom3-bfg-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 1fb09f91f778..c9864696ae3f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,25 +13,27 @@ optdepends=('doom3bfg-data: packaged game data files')
 provides=('rbdoom3-bfg')
 conflicts=('rbdoom-3-bfg')
 install=rbdoom3-bfg-git.install
-source=('rbdoom3-bfg-git::git+https://github.com/RobertBeckebans/RBDOOM-3-BFG.git'
+source=("$pkgname::git+https://github.com/RobertBeckebans/RBDOOM-3-BFG.git"
         'rbdoom3-bfg-git.desktop' 
-        'doom3bfg.png')
-md5sums=('SKIP'
-         'f5458e6cc915282aec2406dbdc824f9f'
-         '86455bb86d4267b447bd882dbde35231')
+        'doom3bfg.png'
+        'sdl2-cmake.patch')
+sha256sums=('SKIP'
+            'a651aa2e71a8a525e66173a8f76b907712b73c950c88f5468ccab79f7533361f'
+            '0fb6a3bb9b47cad65d5012ba20dc9de3b1487f4ac1908ee847e6087511b7f09e'
+            '438993ae976453143d1055fd851e3fd0d48c5309818d485b276e1cfcd6701ce9')
 
 pkgver() {
-  cd "$srcdir/$pkgname"
+  cd "$pkgname"
   printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 prepare() {
-    cd "$srcdir/$pkgname"
-    git revert 988420 -n --no-edit
+    cd "$pkgname"
+    patch -p1 -i "$srcdir/sdl2-cmake.patch"
 }
 
 build() {
-  cd "$srcdir/$pkgname/neo"
+  cd "$pkgname/neo"
   cmake -DCMAKE_INSTALL_PREFIX=/usr \
         -DUSE_SYSTEM_ZLIB=1 \
         -DUSE_SYSTEM_LIBPNG=0 \
diff --git a/sdl2-cmake.patch b/sdl2-cmake.patch
new file mode 100644
index 000000000000..87b0863b7d89
--- /dev/null
+++ b/sdl2-cmake.patch
@@ -0,0 +1,15 @@
+diff --git a/neo/CMakeLists.txt b/neo/CMakeLists.txt
+index 1a36eef..ba149df 100644
+--- a/neo/CMakeLists.txt
++++ b/neo/CMakeLists.txt
+@@ -1599,8 +1599,8 @@ else()
+ 
+ 		if(SDL2)
+ 			find_package(SDL2 REQUIRED)
+-			include_directories(${SDL2_INCLUDE_DIRS})
+-			set(SDLx_LIBRARY ${SDL2_LIBRARIES})
++			include_directories(SDL2::SDL2)
++			set(SDLx_LIBRARY SDL2::SDL2)
+ 		else()
+ 			find_package(SDL REQUIRED)
+ 			include_directories(${SDL_INCLUDE_DIR})