patch upstreamed

3 files changed, 14 insertions, 54 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 97e8ab1c17fd..20237b6487a4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = openjk-git
 	pkgdesc = Open Source Jedi Knight II + III Engine
-	pkgver = r3645.52030235f
+	pkgver = r3661.ec5fa44a8
 	pkgrel = 1
 	url = https://github.com/JACoders/OpenJK
-	arch = i686
 	arch = x86_64
 	license = GPL2
 	makedepends = cmake
@@ -21,7 +20,6 @@ pkgbase = openjk-git
 	source = openjkmp.desktop
 	source = openja.desktop
 	source = openjo.desktop
-	source = sdl2-cmake.patch
 	sha256sums = SKIP
 	sha256sums = 3e9d36b3f982cc29fb3e4385ddc46e431be9fa045b32a811346f4254fa8d372c
 	sha256sums = 0e82e720777eeb2043c2c25cdbce702c6d4ca077543aedfe51e5c4e96cf03969
@@ -29,7 +27,6 @@ pkgbase = openjk-git
 	sha256sums = d3ad7dd270e57d36a22caef21bff17f2eb4acb0ad9087f6a17ca4a0bf9c566fc
 	sha256sums = 698792f86b75311a5c96d0b1310d97e242107559d341ea23a705f259e20a5ec2
 	sha256sums = 08812c7d1791b86a842401ecc54f29117d3d8b77369ad04db520561d57df41dd
-	sha256sums = 2e1af0df37e69553731e1e18e10483735f31463a6dd856ae26aebb50ae97a734
 
 pkgname = openjk-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 460fece4611a..c79a6f07055a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,19 @@
 # Maintainer: Zanny <lordzanny@gmail.com>
-# Maintainer: Pavel Lymarev <x-user at bk dot ru>
+# Contributor: Pavel Lymarev <x-user at bk dot ru>
 # Contributor: Jameson Pugh <imntreal@gmail.com>
 # Contributor: Rene Schoebel (wesley) <schoebel.r at gmail dot com>
 
 pkgname='openjk-git'
-pkgver=r3645.52030235f
+pkgver=r3661.ec5fa44a8
 pkgrel=1
 pkgdesc="Open Source Jedi Knight II + III Engine"
-arch=('i686' 'x86_64')
+arch=(x86_64)
 url="https://github.com/JACoders/OpenJK"
-license=('GPL2')
-depends=('sdl2' 'libjpeg' 'libpng')
-makedepends=('cmake' 'git' 'libpng')
-provides=('openjk')
-conflicts=('openjk')
+license=(GPL2)
+depends=(sdl2 libjpeg libpng)
+makedepends=(cmake git libpng)
+provides=(openjk)
+conflicts=(openjk)
 source=(
   "${pkgname}::git+https://github.com/JACoders/OpenJK.git"
   'openjkmp.png'
@@ -22,7 +22,7 @@ source=(
   'openjkmp.desktop'
   'openja.desktop'
   'openjo.desktop'
-  'sdl2-cmake.patch')
+)
 sha256sums=(
   'SKIP'
   '3e9d36b3f982cc29fb3e4385ddc46e431be9fa045b32a811346f4254fa8d372c'
@@ -31,7 +31,6 @@ sha256sums=(
   'd3ad7dd270e57d36a22caef21bff17f2eb4acb0ad9087f6a17ca4a0bf9c566fc'
   '698792f86b75311a5c96d0b1310d97e242107559d341ea23a705f259e20a5ec2'
   '08812c7d1791b86a842401ecc54f29117d3d8b77369ad04db520561d57df41dd'
-  '2e1af0df37e69553731e1e18e10483735f31463a6dd856ae26aebb50ae97a734'
 )
 
 pkgver() {
@@ -42,33 +41,23 @@ pkgver() {
     "$(git rev-parse --short HEAD)"
 }
 
-prepare() {
-    cd "$pkgname"
-    patch -p1 -i "$srcdir/sdl2-cmake.patch"
-}
-
 build() {
-  cd "$pkgname"
 
-  mkdir -p build
-  cd build
-  cmake ..                                        \
-    -DCMAKE_BUILD_TYPE=Release                    \
+  cmake -B build -S "$pkgname" \
+    -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX="/opt/${pkgname/-git}" \
     -DBuildJK2SPEngine=on \
     -DBuildJK2SPGame=on \
     -DBuildJK2SPRdVanilla=on
-  make
+  cmake --build build
 }
 
 package() {
-  cd "$pkgname/build"
+  DESTDIR="$pkgdir" cmake --install build
 
   _jkarch="${CARCH}"
   echo "${_jkarch}"
 
-  make DESTDIR="${pkgdir}" install
-
   install -m 755 -d "${pkgdir}/usr/bin"
 
   for _bin in 'openjk' 'openjk_sp' 'openjkded'; do
diff --git a/sdl2-cmake.patch b/sdl2-cmake.patch
deleted file mode 100644
index 940b201b4cee..000000000000
--- a/sdl2-cmake.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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()