From 9abdbd085ef828b13be57894fb6da4715c4b101a Mon Sep 17 00:00:00 2001 From: Wildan M Date: Sat, 9 May 2026 06:43:32 +0200 Subject: [PATCH] Fix SpaceCadetPinball --- recipes/games/spacecadetpinball/recipe.toml | 13 ++++--------- recipes/games/spacecadetpinball/redox.patch | 13 +++++++++++++ 2 files changed, 17 insertions(+), 9 deletions(-) create mode 100644 recipes/games/spacecadetpinball/redox.patch diff --git a/recipes/games/spacecadetpinball/recipe.toml b/recipes/games/spacecadetpinball/recipe.toml index 2828ce3bc..479590e98 100644 --- a/recipes/games/spacecadetpinball/recipe.toml +++ b/recipes/games/spacecadetpinball/recipe.toml @@ -1,7 +1,8 @@ +# XXX: Do not distribute https://github.com/k4zmu2a/SpaceCadetPinball/issues/1 [source] -git = "https://gitlab.redox-os.org/xTibor/SpaceCadetPinball.git" -upstream = "https://github.com/k4zmu2a/SpaceCadetPinball.git" -branch = "redox" +git = "https://github.com/k4zmu2a/SpaceCadetPinball.git" +rev = "f760f34e5eb49c69d584921c0f3e251a59c62078" +patches = [ "redox.patch" ] [build] template = "custom" @@ -16,11 +17,5 @@ dependencies = [ ] script = """ DYNAMIC_INIT -COOKBOOK_CONFIGURE_FLAGS=( - -DSDL2_INCLUDE_DIR="${COOKBOOK_SYSROOT}/include/SDL2" - -DSDL2_LIBRARY="-lSDL2_mixer -lvorbisfile -lvorbis -logg -lSDL2 -lorbital $("${TARGET}-pkg-config" --libs osmesa)" - -DSDL2_MIXER_INCLUDE_DIR="${COOKBOOK_SYSROOT}/include/SDL2" - -DSDL2_MIXER_LIBRARY="SDL2_mixer" -) cookbook_cmake """ diff --git a/recipes/games/spacecadetpinball/redox.patch b/recipes/games/spacecadetpinball/redox.patch new file mode 100644 index 000000000..6b609acd0 --- /dev/null +++ b/recipes/games/spacecadetpinball/redox.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3578112..3fe166d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -205,7 +205,7 @@ target_link_libraries(SpaceCadetPinball ${SDL2_LIBRARY}) + # Workaround: CMake treats these SDL2_mixer link flags as build targets for some + # reason I was not able to figure out why. I moved these mixer link flags to + # the SDL2 linker flags as a workaround. +-#target_link_libraries(SpaceCadetPinball ${SDL2_MIXER_LIBRARY}) ++target_link_libraries(SpaceCadetPinball ${SDL2_MIXER_LIBRARY}) + + # On Windows, copy DLL to output + if(WIN32)