From 99d8c6a9bba104ad8eb558a1a1b1a8a1909903db Mon Sep 17 00:00:00 2001
From: Josh Megnauth <jo.sh@tutanota.com>
Date: Mon, 18 Nov 2024 23:59:29 -0500
Subject: [PATCH] Update OpenJazz
* Switch to TOML
* Bump version to latest
---
recipes/games/openjazz/recipe.sh | 35 ------------------------------
recipes/games/openjazz/recipe.toml | 32 +++++++++++++++++++++++++++
2 files changed, 32 insertions(+), 35 deletions(-)
delete mode 100644 recipes/games/openjazz/recipe.sh
create mode 100644 recipes/games/openjazz/recipe.toml
diff --git a/recipes/games/openjazz/recipe.sh b/recipes/games/openjazz/recipe.sh
deleted file mode 100644
index d16191cfc..000000000
--- a/recipes/games/openjazz/recipe.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#TODO: support cmake version 20231028
-VERSION=20190106
-TAR="https://github.com/AlisterT/openjazz/releases/download/${VERSION}/openjazz-${VERSION}.tar.xz"
-TAR_SHA256="91341adcc4908db12aad6b82d2fb0125429a26585f65d7eb32d403656313eaab"
-BUILD_DEPENDS=(sdl1 liborbital zlib)
-
-function recipe_version {
- echo "$VERSION"
- skip=1
-}
-
-function recipe_build {
- sysroot="$(realpath ../sysroot)"
- export CFLAGS="-I$sysroot/include -UUSE_SOCKETS -UUSE_SDL_NET"
- export CPPFLAGS="$CFLAGS"
- export LDFLAGS="-L$sysroot/lib -static"
- touch INSTALL NEWS README AUTHORS ChangeLog COPYING
- autoreconf -fvi
- autoconf
- wget -O build-aux/config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false"
- ./configure --build=${BUILD} --host=${HOST} --prefix=''
- "$REDOX_MAKE" -j"$($NPROC)" V=1
- skip=1
-}
-
-function recipe_clean {
- "$REDOX_MAKE" clean
- skip=1
-}
-
-function recipe_stage {
- dest="$(realpath $1)"
- "$REDOX_MAKE" DESTDIR="$dest" install
- skip=1
-}
diff --git a/recipes/games/openjazz/recipe.toml b/recipes/games/openjazz/recipe.toml
new file mode 100644
index 000000000..47098190a
--- /dev/null
+++ b/recipes/games/openjazz/recipe.toml
@@ -0,0 +1,32 @@
+[source]
+tar = "https://github.com/AlisterT/openjazz/archive/refs/tags/20240919.tar.gz"
+blake3 = "c419066dd7bf50510c5ef0746fc47450ab8f5a17a0010a1bc0ad67d0e63538da"
+
+[build]
+template = "custom"
+dependencies = [
+ "liborbital",
+ "libiconv",
+ "sdl1",
+ "zlib",
+]
+script = """
+export CFLAGS="${CFLAGS} -I${COOKBOOK_SYSROOT}/include"
+export CXXFLAGS="${CXXFLAGS} -I${COOKBOOK_SYSROOT}/include"
+
+COOKBOOK_CONFIGURE="cmake"
+COOKBOOK_CONFIGURE_FLAGS=(
+ -DCMAKE_BUILD_TYPE=Release
+ -DCMAKE_CROSSCOMPILING=ON
+ -DCMAKE_CXX_COMPILER="${TARGET}-g++"
+ -DCMAKE_C_COMPILER="${TARGET}-gcc"
+ -DCMAKE_INSTALL_PREFIX="/"
+ -DCMAKE_VERBOSE_MAKEFILE=ON
+ -DLEGACY_SDL=ON
+ -DSDL_LIBRARY="-lSDL -lorbital"
+ -DNETWORK=ON
+ "${COOKBOOK_SOURCE}"
+)
+
+cookbook_configure
+"""
--
GitLab