Patch broken sdl2 configure

3 files changed, 39 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index be2125cf32ac..97e8ab1c17fd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -21,6 +21,7 @@ pkgbase = openjk-git
 	source = openjkmp.desktop
 	source = openja.desktop
 	source = openjo.desktop
+	source = sdl2-cmake.patch
 	sha256sums = SKIP
 	sha256sums = 3e9d36b3f982cc29fb3e4385ddc46e431be9fa045b32a811346f4254fa8d372c
 	sha256sums = 0e82e720777eeb2043c2c25cdbce702c6d4ca077543aedfe51e5c4e96cf03969
@@ -28,6 +29,7 @@ pkgbase = openjk-git
 	sha256sums = d3ad7dd270e57d36a22caef21bff17f2eb4acb0ad9087f6a17ca4a0bf9c566fc
 	sha256sums = 698792f86b75311a5c96d0b1310d97e242107559d341ea23a705f259e20a5ec2
 	sha256sums = 08812c7d1791b86a842401ecc54f29117d3d8b77369ad04db520561d57df41dd
+	sha256sums = 2e1af0df37e69553731e1e18e10483735f31463a6dd856ae26aebb50ae97a734
 
 pkgname = openjk-git
 
diff --git a/PKGBUILD b/PKGBUILD
index ef4260fcb753..460fece4611a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -21,7 +21,8 @@ source=(
   'openjo.png'
   'openjkmp.desktop'
   'openja.desktop'
-  'openjo.desktop')
+  'openjo.desktop'
+  'sdl2-cmake.patch')
 sha256sums=(
   'SKIP'
   '3e9d36b3f982cc29fb3e4385ddc46e431be9fa045b32a811346f4254fa8d372c'
@@ -30,23 +31,24 @@ sha256sums=(
   'd3ad7dd270e57d36a22caef21bff17f2eb4acb0ad9087f6a17ca4a0bf9c566fc'
   '698792f86b75311a5c96d0b1310d97e242107559d341ea23a705f259e20a5ec2'
   '08812c7d1791b86a842401ecc54f29117d3d8b77369ad04db520561d57df41dd'
+  '2e1af0df37e69553731e1e18e10483735f31463a6dd856ae26aebb50ae97a734'
 )
 
 pkgver() {
-	cd "${pkgname}"
-
-  printf "r%s.%s"                  \
-    "$(git rev-list --count HEAD)" \
+    cd "$pkgname"
+    
+    printf "r%s.%s"                  \
+    "$(git rev-list --count HEAD)"   \
     "$(git rev-parse --short HEAD)"
 }
 
 prepare() {
-    cd "${pkgname}"
-    git revert 5203023 -n --no-edit 
+    cd "$pkgname"
+    patch -p1 -i "$srcdir/sdl2-cmake.patch"
 }
 
 build() {
-  cd "${pkgname}"
+  cd "$pkgname"
 
   mkdir -p build
   cd build
@@ -60,7 +62,7 @@ build() {
 }
 
 package() {
-  cd "${pkgname}/build"
+  cd "$pkgname/build"
 
   _jkarch="${CARCH}"
   echo "${_jkarch}"
diff --git a/sdl2-cmake.patch b/sdl2-cmake.patch
new file mode 100644
index 000000000000..940b201b4cee
--- /dev/null
+++ b/sdl2-cmake.patch
@@ -0,0 +1,26 @@
+diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
+index 3c844d1e7..6f60c1d2e 100644
+--- a/code/CMakeLists.txt
++++ b/code/CMakeLists.txt
+@@ -90,6 +90,8 @@ if(BuildSPEngine OR BuildJK2SPEngine)
+ 			)
+ 	else()
+ 		find_package(SDL2 REQUIRED CONFIG)
++		get_target_property(SDL2_INCLUDE_DIRS SDL2::SDL2 INTERFACE_INCLUDE_DIRECTORIES)
++		get_target_property(SDL2_LIBRARIES SDL2::SDL2 IMPORTED_LOCATION_NOCONFIG)
+ 		set(SPEngineIncludeDirectories ${SPEngineIncludeDirectories} ${SDL2_INCLUDE_DIRS})
+ 		set(SPEngineLibraries ${SPEngineLibraries} ${SDL2_LIBRARIES})
+ 	endif()
+diff --git a/codemp/CMakeLists.txt b/codemp/CMakeLists.txt
+index a55ddf789..be3765cd2 100644
+--- a/codemp/CMakeLists.txt
++++ b/codemp/CMakeLists.txt
+@@ -397,6 +397,8 @@ if(BuildMPEngine)
+ 			)
+ 	else()
+ 		find_package(SDL2 REQUIRED CONFIG)
++		get_target_property(SDL2_INCLUDE_DIRS SDL2::SDL2 INTERFACE_INCLUDE_DIRECTORIES)
++		get_target_property(SDL2_LIBRARIES SDL2::SDL2 IMPORTED_LOCATION_NOCONFIG)
+ 		set(MPEngineIncludeDirectories ${MPEngineIncludeDirectories} ${SDL2_INCLUDE_DIRS})
+ 		set(MPEngineLibraries ${MPEngineLibraries} ${SDL2_LIBRARIES})
+ 	endif()