Updated build

2 files changed, 23 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 71fb80e60b5b..12d2e561d552 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = openloco
 	pkgdesc = An open source re-implementation of Chris Sawyer's Locomotion
-	pkgver = 23.08
+	pkgver = 23.08.1
 	pkgrel = 1
 	url = https://github.com/OpenLoco/OpenLoco
 	arch = i686
@@ -13,8 +13,14 @@ pkgbase = openloco
 	makedepends = lib32-libpng
 	makedepends = lib32-openal
 	makedepends = yaml-cpp
-	makedepends = gendesk
-	source = openloco-23.08.tar.gz::https://github.com/OpenLoco/OpenLoco/archive/refs/tags/v23.08.tar.gz
-	sha256sums = f138131af435eed78bea95711b78d851796ae6945a1673a0febbcf7020f91d86
+	depends = lib32-glibc
+	depends = lib32-gcc-libs
+	depends = lib32-sdl2
+	depends = lib32-libpng
+	depends = lib32-openal
+	source = openloco-23.08.1.tar.gz::https://github.com/OpenLoco/OpenLoco/archive/refs/tags/v23.08.1.tar.gz
+	source = openloco.desktop
+	sha256sums = 2d48d5952ed0bc619dd422cc7012434d59e5910ec5e15364ab1370429921766e
+	sha256sums = 57512f00144c1e0d2cc91c3adbf38460d5ec1223afc27bd16e1271760bce02ae
 
 pkgname = openloco
diff --git a/PKGBUILD b/PKGBUILD
index 99dd64c23512..cd8064edb927 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,34 @@
 pkgname=openloco
 _pkgname=OpenLoco
-pkgver=23.08
+pkgver=23.08.1
 pkgrel=1
 pkgdesc="An open source re-implementation of Chris Sawyer's Locomotion"
 arch=('i686' 'x86_64')
 url="https://github.com/OpenLoco/OpenLoco"
 license=('MIT')
-depends=()
-makedepends=('cmake' 'lib32-glibc' 'lib32-gcc-libs' 'lib32-sdl2' 'lib32-libpng' 'lib32-openal' 'yaml-cpp' 'gendesk')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/${_pkgname}/${_pkgname}/archive/refs/tags/v${pkgver}.tar.gz")
-sha256sums=('f138131af435eed78bea95711b78d851796ae6945a1673a0febbcf7020f91d86')
-
-prepare() {
-    gendesk --pkgname "$pkgname" --pkgdesc "$pkgdesc"
-}
+depends=('sdl2' 'libpng' 'openal')
+makedepends=('cmake' 'sdl2' 'libpng' 'openal' 'yaml-cpp')
+if [[ "$CARCH" = "x86_64" ]]; then
+    depends=('lib32-glibc' 'lib32-gcc-libs' 'lib32-sdl2' 'lib32-libpng' 'lib32-openal')
+    makedepends=('cmake' 'lib32-glibc' 'lib32-gcc-libs' 'lib32-sdl2' 'lib32-libpng' 'lib32-openal' 'yaml-cpp')
+fi
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/${_pkgname}/${_pkgname}/archive/refs/tags/v${pkgver}.tar.gz"
+	"openloco.desktop")
+sha256sums=('2d48d5952ed0bc619dd422cc7012434d59e5910ec5e15364ab1370429921766e'
+            '57512f00144c1e0d2cc91c3adbf38460d5ec1223afc27bd16e1271760bce02ae')
 
 build() {
     cd ${_pkgname}-${pkgver}
-    sed -i  's/option(OPENLOCO_BUILD_TESTS "Build tests" YES)/option(OPENLOCO_BUILD_TESTS "Build tests" NO)/' CMakeLists.txt
-
     [[ -d build ]] && rm -rf build
     mkdir build && cd build
 
     export CXXFLAGS="$CXXFLAGS -m32"
-    cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release ../ -DSTRICT=Off
+    cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DSTRICT=Off -DOPENLOCO_BUILD_TESTS=off ../
     make
 }
 
 package() {
-    install -Dm644 "$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
+    install -Dm644 "${srcdir}/openloco.desktop"			"$pkgdir/usr/share/applications/$pkgname.desktop"
     cd ${_pkgname}-${pkgver}/build
     DESTDIR="$pkgdir" cmake -P cmake_install.cmake --install build
 }