From bcc7d2dcdef14592ae254214728c77a7c5aaf3b0 Mon Sep 17 00:00:00 2001 From: Ribbon Date: Wed, 12 Aug 2026 23:46:05 -0300 Subject: [PATCH] Improve and update recipe TODOs --- recipes/cosmic/cosmic-settings/recipe.toml | 2 +- recipes/cosmic/cosmic-store/recipe.toml | 2 +- recipes/demos/dynamic-example/recipe.toml | 8 ++------ recipes/emulators/libretro-super/recipe.toml | 4 ++-- recipes/emulators/retroarch/recipe.toml | 14 +++++++------ recipes/games/game-2048/recipe.toml | 1 + recipes/other/book/recipe.toml | 2 +- recipes/other/cookbook/recipe.toml | 3 ++- recipes/other/website/recipe.toml | 1 + recipes/wip/files/tree/recipe.toml | 2 +- .../games/math/cosmic-ext-2048/recipe.toml | 1 + recipes/wip/games/math/tuxmath/recipe.toml | 1 - recipes/wip/games/math/twozero48/recipe.toml | 2 +- .../syobonaction/01_redox.patch | 0 .../{ => platform}/syobonaction/recipe.toml | 0 .../games/puzzle/crossword-tui/recipe.toml | 6 ++---- .../wip/libs/sdl/libx11-compat/recipe.toml | 20 +++++++++++++++++++ 17 files changed, 44 insertions(+), 25 deletions(-) rename recipes/wip/games/{ => platform}/syobonaction/01_redox.patch (100%) rename recipes/wip/games/{ => platform}/syobonaction/recipe.toml (100%) create mode 100644 recipes/wip/libs/sdl/libx11-compat/recipe.toml diff --git a/recipes/cosmic/cosmic-settings/recipe.toml b/recipes/cosmic/cosmic-settings/recipe.toml index 031d06bb9..66d2ddd8f 100644 --- a/recipes/cosmic/cosmic-settings/recipe.toml +++ b/recipes/cosmic/cosmic-settings/recipe.toml @@ -1,7 +1,7 @@ [source] git = "https://github.com/pop-os/cosmic-settings.git" branch = "master" - +shallow_clone = true [build] template = "custom" dependencies = [ diff --git a/recipes/cosmic/cosmic-store/recipe.toml b/recipes/cosmic/cosmic-store/recipe.toml index 49057398e..0e68c93a6 100644 --- a/recipes/cosmic/cosmic-store/recipe.toml +++ b/recipes/cosmic/cosmic-store/recipe.toml @@ -1,6 +1,6 @@ [source] git = "https://github.com/pop-os/cosmic-store.git" - +shallow_clone = true [build] template = "custom" dependencies = [ diff --git a/recipes/demos/dynamic-example/recipe.toml b/recipes/demos/dynamic-example/recipe.toml index 20358b17c..22156ac2e 100644 --- a/recipes/demos/dynamic-example/recipe.toml +++ b/recipes/demos/dynamic-example/recipe.toml @@ -1,9 +1,5 @@ [source] git = "https://gitlab.redox-os.org/redox-os/dynamic-example.git" - +shallow_clone = true [build] -template = "custom" -script = """ -DYNAMIC_INIT -cookbook_cargo -""" \ No newline at end of file +template = "cargo" diff --git a/recipes/emulators/libretro-super/recipe.toml b/recipes/emulators/libretro-super/recipe.toml index b75ec6271..4694f971d 100644 --- a/recipes/emulators/libretro-super/recipe.toml +++ b/recipes/emulators/libretro-super/recipe.toml @@ -1,12 +1,13 @@ [source] git = "https://github.com/jackpot51/libretro-super.git" - +shallow_clone = true [build] template = "custom" dependencies = [ "zlib", ] script = """ +DYNAMIC_INIT CORES=( snes9x ) @@ -18,7 +19,6 @@ popd rsync -av --delete "${COOKBOOK_SOURCE}/" ./ export platform=Redox -export STATIC_LINKING=1 ./libretro-build.sh "${CORES[@]}" ./libretro-install.sh "${COOKBOOK_STAGE}/share/libretro" """ diff --git a/recipes/emulators/retroarch/recipe.toml b/recipes/emulators/retroarch/recipe.toml index d2257e929..15822ce1a 100644 --- a/recipes/emulators/retroarch/recipe.toml +++ b/recipes/emulators/retroarch/recipe.toml @@ -1,5 +1,7 @@ +#TODO: fix linking error [source] git = "https://github.com/jackpot51/retroarch.git" +shallow_clone = true script = """ ./fetch-submodules.sh """ @@ -18,24 +20,24 @@ script = """ rsync -av --delete "${COOKBOOK_SOURCE}/" ./ # For now, we will statically link with the snes9x libretro -mkdir -pv "${COOKBOOK_SYSROOT}/lib" -cp -v "${COOKBOOK_SYSROOT}/share/libretro/snes9x_libretro.a" "${COOKBOOK_SYSROOT}/lib/libretro.a" +#mkdir -pv "${COOKBOOK_SYSROOT}/lib" +#cp -v "${COOKBOOK_SYSROOT}/share/libretro/snes9x_libretro.a" "${COOKBOOK_SYSROOT}/lib/libretro.a" COOKBOOK_CONFIGURE_FLAGS=( --host="${TARGET}" --prefix="/" --disable-builtinzlib # conflicts with zlib --disable-discord # does not link - --disable-dylib - --disable-dynamic + #--disable-dylib + #--disable-dynamic --disable-netplaydiscovery # missing ifaddrs.h --disable-thread_storage # crash in pthread_setspecific called by sthread_tls_set --disable-threads # prevents hang - --enable-opengl + #--enable-opengl # can't find header --enable-sdl2 --enable-ssl --enable-zlib - --with-libretro="-lretro -lstdc++ -lz" + #--with-libretro="-lretro -lstdc++ -lz" ) cookbook_configure """ diff --git a/recipes/games/game-2048/recipe.toml b/recipes/games/game-2048/recipe.toml index f1ff19de1..4022979b8 100644 --- a/recipes/games/game-2048/recipe.toml +++ b/recipes/games/game-2048/recipe.toml @@ -1,3 +1,4 @@ +#TODO: fix rustc-serialize crate error, update? [source] git = "https://gitlab.redox-os.org/redox-os/2048-rs.git" #git_upstream = "https://github.com/pierrechevalier83/2048-rs.git" diff --git a/recipes/other/book/recipe.toml b/recipes/other/book/recipe.toml index dee8082a6..b7c4ba86c 100644 --- a/recipes/other/book/recipe.toml +++ b/recipes/other/book/recipe.toml @@ -1,6 +1,6 @@ [source] git = "https://gitlab.redox-os.org/redox-os/book.git" - +shallow_clone = true [build] template = "custom" script = """ diff --git a/recipes/other/cookbook/recipe.toml b/recipes/other/cookbook/recipe.toml index fc90bfb42..01b68d613 100644 --- a/recipes/other/cookbook/recipe.toml +++ b/recipes/other/cookbook/recipe.toml @@ -1,9 +1,10 @@ [source] git = "https://gitlab.redox-os.org/redox-os/redox.git" - +shallow_clone = true [build] template = "custom" script = """ +DYNAMIC_INIT cookbook_cargo mkdir -pv "${COOKBOOK_STAGE}/home/user/cookbook" diff --git a/recipes/other/website/recipe.toml b/recipes/other/website/recipe.toml index 5dc7f9372..328b6a6e8 100644 --- a/recipes/other/website/recipe.toml +++ b/recipes/other/website/recipe.toml @@ -1,5 +1,6 @@ [source] git = "https://gitlab.redox-os.org/redox-os/website" +shallow_clone = true [build] template = "custom" script = """ diff --git a/recipes/wip/files/tree/recipe.toml b/recipes/wip/files/tree/recipe.toml index b3d0b9049..9ef163e35 100644 --- a/recipes/wip/files/tree/recipe.toml +++ b/recipes/wip/files/tree/recipe.toml @@ -1,4 +1,4 @@ -#TODO compile and test +#TODO can't find make target [source] tar = "https://gitlab.com/OldManProgrammer/unix-tree/-/archive/2.3.2/unix-tree-2.3.2.tar.bz2" [build] diff --git a/recipes/wip/games/math/cosmic-ext-2048/recipe.toml b/recipes/wip/games/math/cosmic-ext-2048/recipe.toml index 6f113f747..8221d975d 100644 --- a/recipes/wip/games/math/cosmic-ext-2048/recipe.toml +++ b/recipes/wip/games/math/cosmic-ext-2048/recipe.toml @@ -10,5 +10,6 @@ mkdir -pv "${COOKBOOK_STAGE}"/usr/share/icons cp -rv "${COOKBOOK_SOURCE}"/res/io.github.Kartonrealista.cosmic-ext-2048.desktop "${COOKBOOK_STAGE}"/usr/share/applications cp -rv "${COOKBOOK_SOURCE}"/res/io.github.Kartonrealista.cosmic-ext-2048.metainfo.xml "${COOKBOOK_STAGE}"/usr/share/metainfo cp -rv "${COOKBOOK_SOURCE}"/res/icons/hicolor "${COOKBOOK_STAGE}"/usr/share/icons +DYNAMIC_INIT cookbook_cargo """ diff --git a/recipes/wip/games/math/tuxmath/recipe.toml b/recipes/wip/games/math/tuxmath/recipe.toml index e67e18734..846ad6b30 100644 --- a/recipes/wip/games/math/tuxmath/recipe.toml +++ b/recipes/wip/games/math/tuxmath/recipe.toml @@ -4,7 +4,6 @@ git = "https://github.com/tux4kids/tuxmath" shallow_clone = true script = """ -DYNAMIC_INIT autotools_recursive_regenerate """ [build] diff --git a/recipes/wip/games/math/twozero48/recipe.toml b/recipes/wip/games/math/twozero48/recipe.toml index 69ffbf4df..6778c4e5d 100644 --- a/recipes/wip/games/math/twozero48/recipe.toml +++ b/recipes/wip/games/math/twozero48/recipe.toml @@ -1,4 +1,4 @@ -#TODO compile and test +#TODO compiled but not tested [source] git = "https://github.com/de-sh/twozero48" shallow_clone = true diff --git a/recipes/wip/games/syobonaction/01_redox.patch b/recipes/wip/games/platform/syobonaction/01_redox.patch similarity index 100% rename from recipes/wip/games/syobonaction/01_redox.patch rename to recipes/wip/games/platform/syobonaction/01_redox.patch diff --git a/recipes/wip/games/syobonaction/recipe.toml b/recipes/wip/games/platform/syobonaction/recipe.toml similarity index 100% rename from recipes/wip/games/syobonaction/recipe.toml rename to recipes/wip/games/platform/syobonaction/recipe.toml diff --git a/recipes/wip/games/puzzle/crossword-tui/recipe.toml b/recipes/wip/games/puzzle/crossword-tui/recipe.toml index e79c78f4d..468af75e8 100644 --- a/recipes/wip/games/puzzle/crossword-tui/recipe.toml +++ b/recipes/wip/games/puzzle/crossword-tui/recipe.toml @@ -2,10 +2,8 @@ [source] git = "https://github.com/matrixfrog/crossword" [build] -template = "custom" -script = """ -cookbook_cargo_packages crosstui -""" +template = "cargo" +cargopackages = ["crosstui"] [package] dependencies = [ "crosshare-data" diff --git a/recipes/wip/libs/sdl/libx11-compat/recipe.toml b/recipes/wip/libs/sdl/libx11-compat/recipe.toml new file mode 100644 index 000000000..ac3f05a8d --- /dev/null +++ b/recipes/wip/libs/sdl/libx11-compat/recipe.toml @@ -0,0 +1,20 @@ +#TODO compile and test +[source] +git = "https://github.com/sysprog21/libx11-compat" +shallow_clone = true +[build] +template = "custom" +dependencies = [ + "sdl2", + "sdl2-ttf", + "pixman", +] +script = """ +rsync -av --delete "${COOKBOOK_SOURCE}/" ./ +DYNAMIC_INIT +MAKEFLAGS=( + SDL_BACKEND=sdl2 +) +"${COOKBOOK_MAKE}" -j "${COOKBOOK_MAKE_JOBS}" "${MAKEFLAGS[@]}" \ +"${COOKBOOK_MAKE}" install examples DESTDIR="${COOKBOOK_STAGE}/usr" +"""