Arch Linux User Repository

This patch fixes PKGBUILD. Bundled sol2 is used, as it contains patch for lua 5.5 support.

diff --git i/PKGBUILD w/PKGBUILD
index ce56cd2..590f53f 100644
--- i/PKGBUILD
+++ w/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Sebastian Wiesner <sebastian@swsnr.de>
 # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 pkgname=ja2-stracciatella-git
-pkgver=v0.21.0.r4.g2b8c65901
+pkgver=v0.22.0.r422.g2cb67fa19
 pkgrel=1
 pkgdesc='Jagged Alliance 2 Stracciatella'
 arch=('x86_64')
@@ -9,24 +9,20 @@ url="https://github.com/ja2-stracciatella/ja2-stracciatella"
 license=('custom')
 conflicts=('ja2-stracciatella')
 provides=('ja2-stracciatella')
-depends=('sdl2' 'sdl2>2.0.6' 'lua53')
+depends=('sdl2' 'sdl2>2.0.6' 'lua')
 optdepends=('fltk: GUI launcher')
-makedepends=('git' 'cargo' 'cmake' 'ninja' 'string-theory' 'sol2' 'fltk')
-_magic_enum_ver='0.8.2'
+makedepends=('git' 'cargo' 'cmake' 'ninja' 'magic_enum' 'string-theory' 'fltk')
 # This is version 0.11.9; miniaudio doesn't do tags apparently
 _miniaudio_commit='4dfe7c4c31df46e78d9a1cc0d2d6f1aef5a5d58c'
 source=(
     'git+https://github.com/ja2-stracciatella/ja2-stracciatella.git'
     # Header-only dependencies of JA2
-    "magic_enum_${_magic_enum_ver}.hpp::https://github.com/Neargye/magic_enum/releases/download/v${_magic_enum_ver}/magic_enum.hpp"
     "https://github.com/mackron/miniaudio/archive/${_miniaudio_commit}.tar.gz"
 )
 sha256sums=('SKIP'
-    'f34487663db05b10acae7077dd0b5cf5794112a379567322e251ef0068875dc4'
-    '76c154a60e320ae2054ac0e93480f2dffc12a5129bdb2ed4a62e0cce8d345c36')
+            '76c154a60e320ae2054ac0e93480f2dffc12a5129bdb2ed4a62e0cce8d345c36')
 b2sums=('SKIP'
-    'fe1e7197ba5e638feffc845a08838a56806a1cdecbf6c6f357338dc57ba72a6b489049edd46e8d38ace560a07d002856d290b958fad6fd72f8e6e95ee3f54adc'
-    'c579cb515633aaf947112ba66223ef2041e3d15aa66ca262b6afaa8a90f032a90ad06599ce16be4fc8b05ddab3b51e7e2dce8d66852ccb6fb0c7ae55cc94deb3')
+        'c579cb515633aaf947112ba66223ef2041e3d15aa66ca262b6afaa8a90f032a90ad06599ce16be4fc8b05ddab3b51e7e2dce8d66852ccb6fb0c7ae55cc94deb3')

 pkgver() {
     # shellcheck disable=SC2312
@@ -37,18 +33,15 @@ pkgver() {
 build() {
     cd "${srcdir}" || return 1

-    mkdir -p "${srcdir}/magic_enum"
-    cp "${srcdir}/magic_enum_${_magic_enum_ver}.hpp" "${srcdir}/magic_enum/magic_enum.hpp"

     cmake -GNinja -B build -S "${srcdir}/ja2-stracciatella" \
         -DCMAKE_BUILD_TYPE='None' \
         -DCMAKE_INSTALL_PREFIX='/usr' \
         -DEXTRA_DATA_DIR=/usr/share/ja2 \
         -DLOCAL_LUA_LIB=OFF \
-        -DLOCAL_SOL_LIB=OFF \
+        -DLOCAL_SOL_LIB=ON \
         -DLOCAL_STRING_THEORY_LIB=OFF \
         -DLOCAL_MAGICENUM_LIB=OFF \
-        -DMAGICENUM_INCLUDE_DIR="${srcdir}/magic_enum" \
         -DLOCAL_MINIAUDIO_LIB=OFF \
         -DMINIAUDIO_INCLUDE_DIR="${srcdir}/miniaudio-${_miniaudio_commit}" \
         -DWITH_UNITTESTS=OFF \

Does not build anymore. Newer magic_enum library than 0.8.2 is needed.

-- Checking for module 'magic_enum>=0.9.7'
--   Package 'magic_enum' not found
CMake Error at /usr/share/cmake/Modules/FindPkgConfig.cmake:1093 (message):
  The following required packages were not found:

   - magic_enum>=0.9.7

Call Stack (most recent call first):
  /usr/share/cmake/Modules/FindPkgConfig.cmake:1166 (_pkg_check_modules_internal)
  dependencies/lib-magic_enum/CMakeLists.txt:20 (pkg_check_modules)

PS: I could also help with maintaining this PKGBUILD if you like.

Would you mind to add depends on fltk, lua and rapidjson, and build with system libraries? Upstream supports building against system libraries since a few months; this would reduce build times.

I have a patch at hand, with this change and some other small improvements. Would you be interested?

i second the request by @MessedUpHare. maybe put it into optdepends

If fltk is not installed, the launcher is not built - please add this as a dependency or optional dependency.