v23.12

2 files changed, 45 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 37b915bb6296..97d8c89fb865 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,31 @@
 pkgbase = openloco
 	pkgdesc = An open source re-implementation of Chris Sawyer's Locomotion
-	pkgver = 23.11
+	pkgver = 23.12
 	pkgrel = 1
 	url = https://github.com/OpenLoco/OpenLoco
-	arch = i686
 	arch = x86_64
+	arch = i686
 	license = MIT
 	makedepends = cmake
-	makedepends = lib32-glibc
-	makedepends = lib32-gcc-libs
-	makedepends = lib32-sdl2
-	makedepends = lib32-libpng
-	makedepends = lib32-openal
 	makedepends = yaml-cpp
-	depends = lib32-glibc
-	depends = lib32-gcc-libs
-	depends = lib32-sdl2
-	depends = lib32-libpng
-	depends = lib32-openal
-	source = openloco-23.11.tar.gz::https://github.com/OpenLoco/OpenLoco/archive/refs/tags/v23.11.tar.gz
+	makedepends = gtest
+	makedepends = fmt
+	makedepends = git
+	depends = sdl2
+	depends = libpng
+	depends = openal
+	options = !lto
+	source = openloco-23.12.tar.gz::https://github.com/OpenLoco/OpenLoco/archive/refs/tags/v23.12.tar.gz
 	source = openloco.desktop
-	sha256sums = b2e769b46c3d045ff761ee52e4ae2128b4e6eb86ca6896f5663db8cefc11c51b
+	sha256sums = 92c9e63503440e83c8332183878c41a7e7c03104f2be2c73c8cf92d228c783e4
 	sha256sums = 57512f00144c1e0d2cc91c3adbf38460d5ec1223afc27bd16e1271760bce02ae
+	depends_x86_64 = lib32-glibc
+	depends_x86_64 = lib32-gcc-libs
+	depends_x86_64 = lib32-sdl2
+	depends_x86_64 = lib32-libpng
+	depends_x86_64 = lib32-openal
+	depends_x86_64 = lib32-yaml-cpp
+	depends_x86_64 = lib32-fmt
+	makedepends_x86_64 = lib32-gtest
 
 pkgname = openloco
diff --git a/PKGBUILD b/PKGBUILD
index 2bce4efe259d..16271a7041e7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,38 @@
+# Maintainer: Fabio 'Lolix' Loli <fabio.loli@disroot.org> -> https://github.com/FabioLolix
+# Contributor: Mr.Smith1974
+
 pkgname=openloco
-_pkgname=OpenLoco
-pkgver=23.11
+pkgver=23.12
 pkgrel=1
 pkgdesc="An open source re-implementation of Chris Sawyer's Locomotion"
-arch=('i686' 'x86_64')
+arch=(x86_64 i686)
 url="https://github.com/OpenLoco/OpenLoco"
-license=('MIT')
-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=('b2e769b46c3d045ff761ee52e4ae2128b4e6eb86ca6896f5663db8cefc11c51b'
+license=(MIT)
+depends=(sdl2 libpng openal)
+depends_x86_64+=(lib32-glibc lib32-gcc-libs lib32-sdl2 lib32-libpng lib32-openal lib32-yaml-cpp lib32-fmt)
+makedepends=(cmake yaml-cpp gtest fmt git)
+makedepends_x86_64+=(lib32-gtest)
+options=(!lto)
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/OpenLoco/OpenLoco/archive/refs/tags/v${pkgver}.tar.gz"
+	    "openloco.desktop")
+sha256sums=('92c9e63503440e83c8332183878c41a7e7c03104f2be2c73c8cf92d228c783e4'
             '57512f00144c1e0d2cc91c3adbf38460d5ec1223afc27bd16e1271760bce02ae')
 
 build() {
-    cd ${_pkgname}-${pkgver}
-    [[ -d build ]] && rm -rf build
-    mkdir build && cd build
+  export CXXFLAGS="$CXXFLAGS -m32"
+  cmake -G "Unix Makefiles" -B build -S "OpenLoco-${pkgver}" -Wno-dev \
+    -DCMAKE_BUILD_TYPE=None \
+    -DCMAKE_INSTALL_PREFIX=/usr
 
-    export CXXFLAGS="$CXXFLAGS -m32"
-    cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DSTRICT=Off -DOPENLOCO_BUILD_TESTS=off ../
-    make
+  cmake --build build
 }
 
-package() {
-    install -Dm644 "${srcdir}/openloco.desktop"			"$pkgdir/usr/share/applications/$pkgname.desktop"
-    cd ${_pkgname}-${pkgver}/build
-    DESTDIR="$pkgdir" cmake -P cmake_install.cmake --install build
+check() {
+  ctest --test-dir build --output-on-failure
 }
 
+package() {
+  install -Dm644 "openloco.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
+  DESTDIR="${pkgdir}" cmake --install build
+  install -D "OpenLoco-${pkgver}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}