Manual merge current head with recipe descriptions MR

CONTRIBUTING.md

@@ -27,7 +27,7 @@ When making a contribution you agree to the following terms:
 
 ## AI Policy
 
-Redox OS does not accept contributions generated by LLMs ([Large Language Models](https://en.wikipedia.org/wiki/Large_language_model)), sometimes also referred to as "AI". This policy is not open to discussion, any content submitted that is clearly labelled as LLM-generated (including issues, merge requests, and merge request descriptions) will be immediately closed, and any attempt to bypass this policy will result in a ban from the project.
+Redox OS does not accept contributions generated by LLMs ([Large Language Models](https://en.wikipedia.org/wiki/Large_language_model)), sometimes also referred to as "AI".
 
 ## Chat
 

Cargo.toml

@@ -48,7 +48,7 @@ redoxer = { git = "https://gitlab.redox-os.org/redox-os/redoxer.git", default-fe
 regex = "1.11"
 serde = { version = "1", features = ["derive"] }
 termion = "4"
-toml = "0.8"
+toml = "1"
 walkdir = "2.3.1"
 ansi-to-tui = { version = "8", optional = true }
 strip-ansi-escapes = { version = "0.2.1", optional = true }

config/base.toml

@@ -174,22 +174,6 @@ path = "/share"
 data = "usr/share"
 symlink = true
 
-## legacy orbital directories
-[[files]]
-path = "/ui"
-data = "usr/share/ui"
-symlink = true
-
-[[files]]
-path = "/usr/share/ui/fonts"
-data = "/usr/share/fonts"
-symlink = true
-
-[[files]]
-path = "/usr/share/ui/icons"
-data = "/usr/share/icons"
-symlink = true
-
 ## /var
 [[files]]
 path = "/var"

config/desktop-contain.toml

@@ -29,5 +29,5 @@ sandbox_schemes = ["file"]
 files = ["file:/dev/null"]
 rofiles = ["file:/etc/passwd", "file:/etc/hostname", "file:/etc/localtime"]
 dirs = ["file:/tmp"]
-rodirs = ["file:/bin", "file:/ui"]
+rodirs = ["file:/bin"]
 """

config/x86_64/ci.toml

@@ -100,6 +100,7 @@ generaluser-gs = {}
 gettext = {}
 gigalomania = {}
 git = {}
+gimp = {}
 glib = {}
 glutin = {}
 gnu-binutils = {}
@@ -109,6 +110,7 @@ goaccess = {}
 gobject-introspection = {}
 gitoxide = {}
 gstreamer = {}
+gzip = {}
 harfbuzz = {}
 hicolor-icon-theme = {}
 helix = {}
@@ -256,6 +258,7 @@ rustual-boy = {}
 rusty-checkers = {}
 rusty-rain = {}
 rvvm = {}
+scriptisto = {}
 scummvm = {}
 sdl-gfx = {}
 sdl1 = {}

flake.nix

@@ -86,7 +86,8 @@
               # with FSTOOLS_IN_PODMAN=1 these are not needed
               # without it, the installer fails to link FUSE somehow
               #fuse
-              qemu_kvm
+              qemu_kvm # for host arch
+              qemu
             ];
 
             LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath buildInputs;

mk/ci.mk

@@ -58,14 +58,14 @@ ifeq ($(PODMAN_BUILD),1)
 else
 	$(MAKE) PREFIX_BINARY=0 \
 		"prefix/$(TARGET)/gcc-install.tar.gz" \
-		"prefix/$(TARGET)/relibc-install.tar.gz" \
 		"prefix/$(TARGET)/rust-install.tar.gz" \
-		"prefix/$(TARGET)/clang-install.tar.gz"
+		"prefix/$(TARGET)/clang-install.tar.gz" \
+		"prefix/$(TARGET)/relibc-install.tar.gz"
 	rm -rf "build/toolchain/$(HOST_TARGET)/$(TARGET)"
 	mkdir -p "build/toolchain/$(HOST_TARGET)/$(TARGET)"
 	cp "prefix/$(TARGET)/gcc-install.tar.gz" "build/toolchain/$(HOST_TARGET)/$(TARGET)/gcc-install.tar.gz"
-	cp "prefix/$(TARGET)/relibc-install.tar.gz" "build/toolchain/$(HOST_TARGET)/$(TARGET)/relibc-install.tar.gz"
 	cp "prefix/$(TARGET)/rust-install.tar.gz" "build/toolchain/$(HOST_TARGET)/$(TARGET)/rust-install.tar.gz"
 	cp "prefix/$(TARGET)/clang-install.tar.gz" "build/toolchain/$(HOST_TARGET)/$(TARGET)/clang-install.tar.gz"
+	cp "prefix/$(TARGET)/relibc-install.tar.gz" "build/toolchain/$(HOST_TARGET)/$(TARGET)/relibc-install.tar.gz"
 	cd "build/toolchain/$(HOST_TARGET)/$(TARGET)" && sha256sum -b * > SHA256SUM
 endif

mk/prefix.mk

@@ -99,6 +99,8 @@ $(PREFIX)/relibc-install.tar.gz: $(PREFIX)/sysroot
 	tar \
 		--create \
 		--gzip \
+		--sort=name \
+		--mtime='@0' \
 		--file "$@" \
 		--directory="$<" \
 		.
@@ -205,10 +207,14 @@ $(PREFIX)/%.tar.gz: $(PREFIX)/%
 	tar \
 		--create \
 		--gzip \
+		--sort=name \
+		--mtime='@0' \
 		--file "$@" \
 		--directory="$<" \
 		.
 
+PREFIX_FETCH_TAG=$(PREFIX)/fetch.tag
+
 # BUILD GCC ---------------------------------------------------
 $(PREFIX)/libtool-install: | $(FSTOOLS_TAG) $(CONTAINER_TAG)
 ifeq ($(PODMAN_BUILD),1)
@@ -228,7 +234,26 @@ else
 	mv "$@.partial" "$@"
 endif
 
-$(PREFIX)/binutils-install: | $(PREFIX)/libtool-install $(FSTOOLS_TAG) $(CONTAINER_TAG)
+# libtool may be used during autoconf, so this depends after building libtool
+# it is fine to skip this, but this is used to fail early if sources fail due to autoconf
+$(PREFIX_FETCH_TAG): | $(PREFIX)/libtool-install $(FSTOOLS_TAG) $(CONTAINER_TAG)
+ifeq ($(PODMAN_BUILD),1)
+	$(PODMAN_RUN) make $@
+else
+	@echo "\033[1;36;49mFetching prefix sources\033[0m"
+	rm -f "$@"
+	export $(PREFIX_CONFIG) COOKBOOK_LIBTOOL_DIR=$(LIBTOOL_PATH) PATH="$(ROOT)/$(PREFIX)/libtool-install/bin:$$PATH" \
+		COOKBOOK_HOST_SYSROOT=/usr COOKBOOK_CROSS_TARGET=$(TARGET) COOKBOOK_CROSS_GNU_TARGET=$(GNU_TARGET) && \
+	$(REPO_BIN) fetch host:binutils-gdb host:gcc13 host:llvm21 relibc
+ifneq ($(PREFIX_USE_UPSTREAM_RUST_COMPILER),1)
+	export $(PREFIX_CONFIG) COOKBOOK_LIBTOOL_DIR=$(LIBTOOL_PATH) PATH="$(ROOT)/$(PREFIX)/libtool-install/bin:$$PATH" \
+		COOKBOOK_HOST_SYSROOT=/usr COOKBOOK_CROSS_TARGET=$(TARGET) COOKBOOK_CROSS_GNU_TARGET=$(GNU_TARGET) && \
+	$(REPO_BIN) fetch host:wasi-libc host:rust
+endif
+	touch "$@"
+endif
+
+$(PREFIX)/binutils-install: | $(PREFIX_FETCH_TAG)
 ifeq ($(PODMAN_BUILD),1)
 	$(PODMAN_RUN) make $@
 else
@@ -243,7 +268,7 @@ else
 	mv "$@.partial" "$@"
 endif
 
-$(PREFIX)/gcc-freestanding-install: $(PREFIX)/binutils-install | $(PREFIX)/libtool-install $(FSTOOLS_TAG) $(CONTAINER_TAG)
+$(PREFIX)/gcc-freestanding-install: $(PREFIX)/binutils-install | $(PREFIX_FETCH_TAG)
 ifeq ($(PODMAN_BUILD),1)
 	$(PODMAN_RUN) make $@
 else
@@ -263,7 +288,7 @@ else
 	mv "$@.partial" "$@"
 endif
 
-$(PREFIX)/relibc-freestanding-install: $(PREFIX)/gcc-freestanding-install | $(FSTOOLS_TAG) $(CONTAINER_TAG)
+$(PREFIX)/relibc-freestanding-install: $(PREFIX)/gcc-freestanding-install | $(PREFIX_FETCH_TAG)
 ifeq ($(PODMAN_BUILD),1)
 	$(PODMAN_RUN) make $@
 else
@@ -280,7 +305,7 @@ else
 	mv "$@.partial" "$@"
 endif
 
-$(PREFIX)/gcc-install: $(PREFIX)/relibc-freestanding-install | $(PREFIX)/libtool-install $(FSTOOLS_TAG) $(CONTAINER_TAG)
+$(PREFIX)/gcc-install: $(PREFIX)/relibc-freestanding-install | $(PREFIX)/libtool-install $(PREFIX_FETCH_TAG)
 ifeq ($(PODMAN_BUILD),1)
 	$(PODMAN_RUN) make $@
 else
@@ -399,7 +424,7 @@ endif
 # BUILD RUST ---------------------------------------------------
 else
 
-$(PREFIX)/wasip1-libc-install: $(PREFIX)/clang-install | $(FSTOOLS_TAG) $(CONTAINER_TAG)
+$(PREFIX)/wasip1-libc-install: $(PREFIX)/clang-install | $(PREFIX_FETCH_TAG)
 ifeq ($(PODMAN_BUILD),1)
 	$(PODMAN_RUN) make $@
 else
@@ -416,7 +441,7 @@ else
 # TODO: Cache from WASIP1_LIBC_TARGET is currently not cleared.
 endif
 
-$(PREFIX)/rust-install: | $(PREFIX)/wasip1-libc-install $(PREFIX)/gcc-install $(FSTOOLS_TAG) $(CONTAINER_TAG)
+$(PREFIX)/rust-install: | $(PREFIX)/wasip1-libc-install $(PREFIX)/gcc-install $(PREFIX_FETCH_TAG)
 ifeq ($(PODMAN_BUILD),1)
 	$(PODMAN_RUN) make $@
 else
@@ -435,7 +460,7 @@ endif
 endif
 
 # BUILD CLANG ---------------------------------------------------
-$(PREFIX)/clang-install: | $(PREFIX)/gcc-install $(FSTOOLS_TAG) $(CONTAINER_TAG)
+$(PREFIX)/clang-install: | $(PREFIX)/gcc-install $(PREFIX_FETCH_TAG)
 ifeq ($(PODMAN_BUILD),1)
 	$(PODMAN_RUN) make $@
 else
@@ -451,7 +476,9 @@ else
 	cp -r "$(LLD_TARGET)/stage/usr/". "$@.partial"
 	rm -rf "$@.partial/lib/"*.a
 	echo "--sysroot=$(ROOT)/$(PREFIX)/gcc-install" > "$@.partial/bin/$(GNU_TARGET).cfg"
+	ln -s clang-21 "$@.partial/bin/wasm32-wasip1-clang"
 	ln -s clang-21 "$@.partial/bin/$(GNU_TARGET)-clang"
+	ln -s clang++ "$@.partial/bin/$(GNU_TARGET)-clang++"
 	export PATH="$(ROOT)/$@.partial/bin:$$PATH" $(PREFIX_CONFIG) \
 		COOKBOOK_HOST_SYSROOT=/usr COOKBOOK_CROSS_TARGET=$(HOST_TARGET) && \
 		$(REPO_BIN) cook llvm-rt21

mk/qemu.mk

@@ -5,6 +5,9 @@ QEMUFLAGS?=-d guest_errors -name "Redox OS $(ARCH)"
 netboot?=no
 redoxer?=no
 VGA_SUPPORTED=no
+# for qemu-relative firmware search
+QEMU_PATH?=$(shell command -v $(QEMU))
+QEMU_BASE_DIR?=$(shell if [ $(QEMU_PATH) ]; then realpath $$(dirname $(QEMU_PATH))/..; fi)
 
 ifeq ($(ARCH),i586)
 	audio?=ac97
@@ -39,8 +42,7 @@ else ifeq ($(ARCH),x86_64)
 		ifeq ($(FIRMWARE),)
 			PFLASH0=$(firstword \
 				$(wildcard /usr/share/qemu/edk2-x86_64-code.fd) \
-				$(wildcard /run/libvirt/nix-ovmf/edk2-x86_64-code.fd) \
-				$(wildcard /opt/homebrew/opt/qemu/share/qemu/edk2s-x86_64-code.fd) \
+				$(wildcard $(QEMU_BASE_DIR)/share/qemu/edk2-x86_64-code.fd) \
 			)
 		endif
 	endif
@@ -78,9 +80,9 @@ else ifeq ($(ARCH),aarch64)
 			ifeq ($(FIRMWARE),)
 				PFLASH0=$(firstword \
 					$(wildcard /usr/share/qemu/edk2-aarch64-code.fd) \
-					$(wildcard /run/libvirt/nix-ovmf/edk2-aarch64-code.fd) \
-					$(wildcard /opt/homebrew/opt/qemu/share/qemu/edk2-aarch64-code.fd) \
+					$(wildcard $(QEMU_BASE_DIR)/share/qemu/edk2-aarch64-code.fd) \
 				)
+				PFLASH0_NEEDED=yes
 			endif
 		else
 			FIRMWARE=$(BUILD)/qemu_uboot.rom
@@ -112,16 +114,16 @@ else ifeq ($(ARCH),riscv64gc)
 		$(wildcard /usr/share/qemu-efi-riscv64/RISCV_VIRT_CODE.fd) \
 		$(wildcard /usr/share/edk2/riscv/RISCV_VIRT_CODE.fd) \
 		$(wildcard /usr/share/qemu/edk2-riscv-code.fd) \
-		$(wildcard /run/libvirt/nix-ovmf/edk2-riscv-code.fd) \
-		$(wildcard /opt/homebrew/opt/qemu/share/qemu/edk2-riscv-code.fd) \
+		$(wildcard $(QEMU_BASE_DIR)/share/qemu/edk2-riscv-code.fd) \
 	)
+	PFLASH0_NEEDED=yes
 	PFLASH1=$(firstword \
 		$(wildcard /usr/share/qemu-efi-riscv64/RISCV_VIRT_VARS.fd) \
 		$(wildcard /usr/share/edk2/riscv/RISCV_VIRT_VARS.fd) \
 		$(wildcard /usr/share/qemu/edk2-riscv-vars.fd) \
-		$(wildcard /run/libvirt/nix-ovmf/edk2-riscv-vars.fd) \
-		$(wildcard /opt/homebrew/opt/qemu/share/qemu/edk2-riscv-vars.fd) \
+		$(wildcard $(QEMU_BASE_DIR)/share/qemu/edk2-riscv-vars.fd) \
 	)
+	PFLASH1_NEEDED=yes
 	ifneq ($(usb),no)
 		QEMUFLAGS+=-device qemu-xhci -device usb-kbd -device usb-tablet
 	endif
@@ -358,8 +360,13 @@ qemu-deps: $(BUILD)/fw_vars.bin
 .PRECIOUS: $(BUILD)/fw_vars.bin
 $(BUILD)/fw_vars.bin: $(PFLASH1)
 	cp "$<" "$@"
+	chmod +w "$@"
 endif
 
+qemu-deps:
+	$(if $(PFLASH0_NEEDED),$(if $(PFLASH0),,$(error UEFI firmware needed but not found)),)
+	$(if $(PFLASH1_NEEDED),$(if $(PFLASH1),,$(error UEFI variables needed but not found)),)
+
 $(EXTRA_DISK):
 	truncate -s 1g $@
 

recipes/archives/lz4/recipe.toml

@@ -4,7 +4,6 @@ description = "Compression library and tools, lz4 format"
 [source]
 tar = "https://github.com/lz4/lz4/releases/download/v1.10.0/lz4-1.10.0.tar.gz"
 blake3 = "3e69fd475e7852e17594985528b5232afeba7d3d56cfebe2e89071768b2ab36a"
-patches = ["redox.patch"]
 
 [build]
 template = "custom"

recipes/archives/lz4/redox.patch

@@ -1,34 +0,0 @@
-diff '--color=auto' -ruwN source/programs/util.h source-new/programs/util.h
---- source/programs/util.h	2024-07-21 13:29:49.000000000 -0400
-+++ source-new/programs/util.h	2024-12-13 02:21:03.032769559 -0500
-@@ -52,6 +52,9 @@
- #include <time.h>         /* time */
- #include <limits.h>       /* INT_MAX */
- #include <errno.h>
-+#if defined(_REDOX)
-+#  include <sys/time.h>  /* utimes */
-+#endif
- 
- 
- 
-@@ -239,12 +242,20 @@
-         timebuf.modtime = statbuf->st_mtime;
-         res += utime(filename, &timebuf);  /* set access and modification times */
- #else
-+        #if defined(_REDOX)
-+            struct timeval timebuf[2];
-+            memset(timebuf, 0, sizeof(timebuf));
-+            timebuf[0].tv_usec = UTIME_NOW;
-+            timebuf[1].tv_sec = statbuf->st_mtime;
-+            res += utimes(filename, timebuf);
-+        #else
-         struct timespec timebuf[2];
-         memset(timebuf, 0, sizeof(timebuf));
-         timebuf[0].tv_nsec = UTIME_NOW;
-         timebuf[1].tv_sec = statbuf->st_mtime;
-         res += utimensat(AT_FDCWD, filename, timebuf, 0);  /* set access and modification times */
- #endif
-+#endif
-     }
- 
- #if !defined(_WIN32)

recipes/archives/xz/recipe.toml

@@ -17,7 +17,6 @@ COOKBOOK_CONFIGURE_FLAGS+=(
     --disable-lzmainfo
     --disable-xz
     --disable-xzdec
-    --enable-threads=no
 )
 cookbook_configure
 """

recipes/core/uutils/recipe.toml

@@ -19,7 +19,7 @@ script = """
 DYNAMIC_INIT
 export RUSTONIG_DYNAMIC_LIBONIG=1
 # TODO: upstream changes, consider using feat_require_unix_core if relibc is ready?
-CARGO_PROFILE_RELEASE_LTO=thin cookbook_cargo --no-default-features --features feat_os_unix_redox,kill,nice --bin coreutils
+CARGO_PROFILE_RELEASE_LTO=thin cookbook_cargo --no-default-features --features feat_os_unix_redox,kill,nice,nproc --bin coreutils
 
 BINS=(
     '['

recipes/cosmic/cosmic-edit/manifest

@@ -1,6 +1,6 @@
 name=COSMIC Text Editor
 binary=/bin/cosmic-edit
-icon=/usr/share/ui/icons/apps/accessories-text-editor.png
+icon=/usr/share/icons/apps/accessories-text-editor.png
 accept=*.asm
 accept=*.c
 accept=*.conf

recipes/cosmic/cosmic-files/manifest

@@ -1,5 +1,5 @@
 name=COSMIC File Manager
 binary=/bin/cosmic-files
-icon=/usr/share/ui/icons/apps/system-file-manager.png
+icon=/usr/share/icons/apps/system-file-manager.png
 author=Jeremy Soller
 description=COSMIC File Manager

recipes/cosmic/cosmic-reader/manifest

@@ -1,6 +1,6 @@
 name=COSMIC Reader
 binary=/bin/cosmic-reader
-icon=/usr/share/ui/icons/apps/accessories-text-editor.png
+icon=/usr/share/icons/apps/accessories-text-editor.png
 accept=*.pdf
 accept=*.epub
 accept=*.cbz

recipes/cosmic/cosmic-term/manifest

@@ -1,5 +1,5 @@
 name=COSMIC Terminal
 binary=/bin/cosmic-term
-icon=/usr/share/ui/icons/apps/utilities-terminal.png
+icon=/usr/share/icons/apps/utilities-terminal.png
 author=Jeremy Soller
 description=COSMIC Terminal

recipes/dev/lua54/recipe.toml

@@ -4,6 +4,9 @@ description = "Lua programming language, PUC-Rio distribution, version 5.4"
 [source]
 tar = "https://lua.org/ftp/lua-5.4.7.tar.gz"
 blake3 = "e51c2f347e3185479d5ff95cae8ac77511db486853269443c56bedaa0a6ae629"
+patches = [
+    "redox.patch"
+]
 
 [build]
 template = "custom"

recipes/dev/lua54/redox.patch

@@ -0,0 +1,12 @@
+diff -ruwN source/src/ldo.c source-new/src/ldo.c
+--- source/src/ldo.c	2024-06-13 22:15:09.000000000 +0000
++++ source-new/src/ldo.c	2026-09-30 05:11:35.697677914 +0000
+@@ -60,7 +60,7 @@
+ 	try { a } catch(...) { if ((c)->status == 0) (c)->status = -1; }
+ #define luai_jmpbuf		int  /* dummy variable */
+ 
+-#elif defined(LUA_USE_POSIX)				/* }{ */
++#elif defined(LUA_USE_POSIX) && !defined(__redox__)	/* }{ */
+ 
+ /* in POSIX, try _longjmp/_setjmp (more efficient) */
+ #define LUAI_THROW(L,c)		_longjmp((c)->b, 1)

recipes/dev/patch/01_no_rlimit.patch

@@ -1,35 +0,0 @@
-diff -ru source/lib/getdtablesize.c source-new/lib/getdtablesize.c
---- source/lib/getdtablesize.c	2015-03-06 16:31:45.000000000 -0800
-+++ source-new/lib/getdtablesize.c	2017-08-08 19:33:33.993874985 -0700
-@@ -106,15 +106,6 @@
- int
- getdtablesize (void)
- {
--  struct rlimit lim;
--
--  if (getrlimit (RLIMIT_NOFILE, &lim) == 0
--      && 0 <= lim.rlim_cur && lim.rlim_cur <= INT_MAX
--      && lim.rlim_cur != RLIM_INFINITY
--      && lim.rlim_cur != RLIM_SAVED_CUR
--      && lim.rlim_cur != RLIM_SAVED_MAX)
--    return lim.rlim_cur;
--
-   return INT_MAX;
- }
- 
-Only in source-new/lib: getdtablesize.c.orig
-diff -ru source/src/safe.c source-new/src/safe.c
---- source/src/safe.c	2015-03-06 16:34:20.000000000 -0800
-+++ source-new/src/safe.c	2017-08-08 19:33:53.447430811 -0700
-@@ -92,11 +92,7 @@
- 
- static void init_dirfd_cache (void)
- {
--  struct rlimit nofile;
--
-   max_cached_fds = 8;
--  if (getrlimit (RLIMIT_NOFILE, &nofile) == 0)
--    max_cached_fds = MAX (nofile.rlim_cur / 4, max_cached_fds);
- 
-   cached_dirfds = hash_initialize (max_cached_fds,
- 				   NULL,

recipes/dev/patch/recipe.toml

@@ -5,9 +5,8 @@ description = "Tool to apply a diff file to an original"
 tar = "https://ftp.gnu.org/gnu/patch/patch-2.7.6.tar.xz"
 blake3 = "d46d14c12aa4ea51e356bf92091c368fd871e1d770b94bc29027886737aecd5f"
 patches = [
-    "01_no_rlimit.patch",
-    "02_no_chown.patch",
-    "03_renameat2.patch",
+    "01_no_chown.patch",
+    "02_renameat2.patch",
 ]
 script = """
 wget -O build-aux/config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false"

recipes/dev/python312/redox.patch

@@ -120,6 +120,18 @@ diff -ruwN source/Modules/_cryptmodule.c source-new/Modules/_cryptmodule.c
      if (crypt_result == NULL) {
          return PyErr_SetFromErrno(PyExc_OSError);
      }
+diff -ruwN source/Modules/fcntlmodule.c source-new/Modules/fcntlmodule.c
+--- source/Modules/fcntlmodule.c	2025-10-09 11:07:00.000000000 +0000
++++ source-new/Modules/fcntlmodule.c	2026-10-15 10:21:56.351900218 +0000
+@@ -159,7 +159,7 @@
+        in their unsigned long ioctl codes this will break and need
+        special casing based on the platform being built on.
+      */
+-    int arg = 0;
++    char* arg = 0;
+     int ret;
+     Py_buffer pstr;
+     char *str;
 diff -ruwN source/Modules/resource.c source-new/Modules/resource.c
 --- source/Modules/resource.c	2025-10-09 18:07:00.000000000 +0700
 +++ source-new/Modules/resource.c	2025-12-09 22:14:30.781035339 +0700

recipes/dev/rust/recipe.toml

@@ -33,9 +33,6 @@ sed -i "s|TARGET|${TARGET}|g" config.toml
 else
 
 DYNAMIC_INIT
-# Linker flags for stage2 compiler (host -> target)
-ARCH="${TARGET%%-*}"
-export CARGO_TARGET_${ARCH^^}_UNKNOWN_REDOX_RUSTFLAGS="${RUSTFLAGS}" # Rust
 # Hack for Rust errorneusly running `llvm-config --version` on cross compiled llvm-config
 cat "${COOKBOOK_ROOT}/bin/${TARGET}-llvm-config" > "${COOKBOOK_SYSROOT}/bin/llvm-config"
 # Hack for Rust stage1 being dynamically linked with LLVM in prefix toolchain

recipes/dev/wasi-libc/recipe.toml

@@ -10,5 +10,5 @@ shallow_clone = true
 template = "custom"
 compiler = "clang"
 script = """
-cookbook_cmake
+cookbook_cmake -DCMAKE_LINK_DEPENDS_USE_LINKER=FALSE
 """

recipes/emulators/dosbox/manifest

@@ -1,4 +1,4 @@
 name=DOSBox
 category=Games
 binary=/bin/dosbox
-icon=/usr/share/ui/icons/apps/dosbox.png
+icon=/usr/share/icons/apps/dosbox.png

recipes/games/classicube/manifest

@@ -1,4 +1,4 @@
 name=ClassiCube
 category=Games
 binary=/usr/games/classicube/ClassiCube
-icon=/usr/share/ui/icons/apps/classicube.png
+icon=/usr/share/icons/apps/classicube.png

recipes/games/eduke32/manifest

@@ -1,4 +1,4 @@
 name=EDuke32
 category=Games
 binary=/usr/games/eduke32
-icon=/usr/share/ui/icons/apps/eduke32.png
+icon=/usr/share/icons/apps/eduke32.png

recipes/games/freedoom/recipe.toml

@@ -20,7 +20,7 @@ do
     echo "name=$game" | sed 's/freedoom/FreeDOOM: Phase /' | sed 's/doom1/DOOM (Shareware)/' > "${COOKBOOK_STAGE}/usr/share/ui/apps/$game"
     echo "category=Games" >> "${COOKBOOK_STAGE}/usr/share/ui/apps/$game"
     echo "binary=/usr/games/$game" >> "${COOKBOOK_STAGE}/usr/share/ui/apps/$game"
-    echo "icon=/usr/share/ui/icons/apps/$game.png" >> "${COOKBOOK_STAGE}/usr/share/ui/apps/$game"
+    echo "icon=/usr/share/icons/apps/$game.png" >> "${COOKBOOK_STAGE}/usr/share/ui/apps/$game"
 
     cp -v "${COOKBOOK_SOURCE}/$game.png" "${COOKBOOK_STAGE}/usr/share/icons/apps/$game.png"
 done

recipes/games/gigalomania/manifest

@@ -1,4 +1,4 @@
 name=Gigalomania
 category=Games
 binary=/usr/games/gigalomania/gigalomania
-icon=/usr/share/ui/icons/apps/gigalomania.png
+icon=/usr/share/icons/apps/gigalomania.png

recipes/games/neverball/manifest-neverball

@@ -1,4 +1,4 @@
 name=Neverball
 category=Games
 binary=/usr/games/neverball/neverball
-icon=/usr/share/ui/icons/apps/neverball.png
+icon=/usr/share/icons/apps/neverball.png

recipes/games/neverball/manifest-neverputt

@@ -1,4 +1,4 @@
 name=Neverputt
 category=Games
 binary=/usr/games/neverball/neverputt
-icon=/usr/share/ui/icons/apps/neverputt.png
+icon=/usr/share/icons/apps/neverputt.png

recipes/games/openttd-openmsx/recipe.toml

@@ -7,6 +7,6 @@ git = "https://gitlab.redox-os.org/redox-os/openttd-openmsx.git"
 [build]
 template = "custom"
 script = """
-mkdir -pv "${COOKBOOK_STAGE}/share/games/openttd/baseset/openmsx"
-cp -Rv "${COOKBOOK_SOURCE}"/* "${COOKBOOK_STAGE}/share/games/openttd/baseset/openmsx"
+mkdir -pv "${COOKBOOK_STAGE}/usr/share/games/openttd/baseset/openmsx"
+cp -Rv "${COOKBOOK_SOURCE}"/* "${COOKBOOK_STAGE}/usr/share/games/openttd/baseset/openmsx"
 """

recipes/games/openttd-opensfx/recipe.toml

@@ -7,6 +7,6 @@ git = "https://gitlab.redox-os.org/redox-os/openttd-opensfx.git"
 [build]
 template = "custom"
 script = """
-mkdir -pv "${COOKBOOK_STAGE}/share/games/openttd/baseset/opensfx"
-cp -Rv "${COOKBOOK_SOURCE}"/* "${COOKBOOK_STAGE}/share/games/openttd/baseset/opensfx"
-"""
+mkdir -pv "${COOKBOOK_STAGE}/usr/share/games/openttd/baseset/opensfx"
+cp -Rv "${COOKBOOK_SOURCE}"/* "${COOKBOOK_STAGE}/usr/share/games/openttd/baseset/opensfx"
+"""

recipes/games/openttd/recipe.toml

@@ -29,7 +29,7 @@ rsync -av --delete "${COOKBOOK_SOURCE}/" ./
 ./configure \\
     --build="$(gcc -dumpmachine)" \\
     --host="${TARGET}" \\
-    --prefix="" \\
+    --prefix="/usr" \\
     --disable-static \\
     --without-liblzo2 \\
     --disable-network \\
@@ -40,7 +40,7 @@ make VERBOSE=1 -j"$(nproc)"
 dest="${COOKBOOK_STAGE}"
 bundledir="$dest/bundle"
 
-make VERBOSE=1 ROOT_DIR="./" BUNDLE_DIR="$bundledir" INSTALL_DIR="$dest/usr" install
+make VERBOSE=1 ROOT_DIR="./" BUNDLE_DIR="$bundledir" INSTALL_DIR="$dest" install
 rm -rf "$bundledir"
 
 if [ -d "${COOKBOOK_STAGE}/usr/bin" ]

recipes/games/quakespasm/manifest

@@ -1,4 +1,4 @@
 name=QuakeSpasm
 category=Games
 binary=/usr/games/quakespasm
-icon=/usr/share/ui/icons/apps/quakespasm.png
+icon=/usr/share/icons/apps/quakespasm.png

recipes/games/sm64ex/manifest

@@ -1,4 +1,4 @@
 name=Super Mario 64 EX
 category=Games
 binary=/bin/sm64
-icon=/usr/share/ui/icons/apps/sm64ex.png
+icon=/usr/share/icons/apps/sm64ex.png

recipes/libs/ffmpeg6/recipe.toml

@@ -17,10 +17,14 @@ dependencies = [
     "sdl2",
     "zlib",
 ]
+dev-dependencies = [
+    "libstdcxx"
+]
+compiler = "gcc-no-lto"
 script = """
 DYNAMIC_INIT
 
-export LDFLAGS="$LDFLAGS -lSDL2 -lorbital -lOSMesa -lstdc++"
+export LDFLAGS="$LDFLAGS -lSDL2 -lorbital -lOSMesa"
 ARCH="${TARGET%%-*}"
 COOKBOOK_CONFIGURE_FLAGS=(
     --enable-cross-compile
@@ -34,6 +38,7 @@ COOKBOOK_CONFIGURE_FLAGS=(
     --disable-network
     --enable-sdl2
     --enable-zlib
+    --enable-pic
     --enable-encoder=png
     --enable-decoder=png
 )

recipes/libs/gstreamer/recipe.toml

@@ -11,7 +11,7 @@ template = "custom"
 dependencies = [
     "bzip2",
     "curl",
-    #TODO: "ffmpeg6",
+    "ffmpeg6",
     "gdk-pixbuf",
     "libass",
     "libffi",
@@ -21,6 +21,7 @@ dependencies = [
     "libsoup",
     "libwebp",
     "mesa",
+    "libfdk-aac",
     #TODO: "openal",
     "pango",
 ]
@@ -34,7 +35,7 @@ CFLAGS="${CFLAGS} -DM_LN2=0.69314718055994530942"
 cookbook_meson \
     -Ddevtools=disabled \
     -Dexamples=disabled \
-    -Dlibav=disabled \
+    -Dlibav=enabled \
     -Dlibnice=disabled \
     -Dorc=disabled \
     -Dtests=disabled \

recipes/libs/libarchive/recipe.toml

@@ -6,4 +6,14 @@ tar = "https://libarchive.org/downloads/libarchive-3.8.7.tar.xz"
 blake3 = "6b7f744132368a53ecf98a4586af09c255f81cebf37687edd857528a1bfd3bd3"
 
 [build]
-template = "configure"
+template = "cmake"
+cmakeflags = [
+    "-DENABLE_TEST=OFF"
+]
+dependencies = [
+    "openssl3",
+    "libxml2",
+    "bzip2",
+    "zlib",
+    "zstd",
+]

recipes/libs/lua-compat-53/recipe.toml

@@ -9,6 +9,10 @@ dependencies = [
     "lua54"
 ]
 script = """
-mkdir -pv "${COOKBOOK_STAGE}/include"
-cp -r "$COOKBOOK_SOURCE/c-api/." "${COOKBOOK_STAGE}/include"
+${CC} -O2 -fPIC ${CPPFLAGS} -c "${COOKBOOK_SOURCE}/c-api/compat-5.3.c" -o compat-5.3.o
+${AR} rcs libcompat53.a compat-5.3.o
+
+mkdir -p "${COOKBOOK_STAGE}/usr/lib" "${COOKBOOK_STAGE}/usr/include"
+cp libcompat53.a "${COOKBOOK_STAGE}/usr/lib/"
+cp "${COOKBOOK_SOURCE}/c-api/compat-5.3.h" "${COOKBOOK_STAGE}/usr/include/"
 """

recipes/net/rsync/recipe.toml

@@ -2,8 +2,8 @@
 description = "Fast, versatile remote (and local) file-copying tool"
 
 [source]
-tar = "https://download.samba.org/pub/rsync/src/rsync-3.4.1.tar.gz"
-blake3 = "e1cfdd51a1a89a49e73f8fa730a4321392fe4a29533c0979c2c09c7ce3808b6f"
+tar = "https://download.samba.org/pub/rsync/src/rsync-3.5.1.tar.gz"
+blake3 = "bafd113fecb286d462dbb0455078421a72fc73f3360a6c9f05c369f1c8707e1b"
 
 [build]
 template = "configure"
@@ -13,3 +13,7 @@ dependencies = [
     "openssl3",
     "xxhash",
 ]
+# TODO: libidn failing on libunistring (requires gnulib fseterr)
+configureflags = [
+    "--disable-idn"
+]

recipes/terminal/bash-completion/recipe.toml

@@ -12,5 +12,5 @@ configureflags = [
 [package]
 description = "Collection of command-line completion recipes for Bash"
 dependencies = [
-    "sed",
+    "uutils-sed",
 ]

recipes/text/nano/recipe.toml

@@ -1,9 +1,6 @@
 [source]
 tar = "https://www.nano-editor.org/dist/v9/nano-9.2.tar.xz"
 blake3 = "6a4dd380f6ee2bb2d74851c182090774f61eddfc37d9ff4d060b69f2c0fe4646"
-patches = [
-    "redox.patch"
-]
 
 [build]
 template = "configure"

recipes/text/nano/redox.patch

@@ -1,12 +0,0 @@
-diff --color -ruwN source/lib/fseterr.c source-new/lib/fseterr.c
---- source/lib/fseterr.c	2026-07-31 13:13:07.000000000 +0700
-+++ source-new/lib/fseterr.c	2026-08-19 21:12:05.375336440 +0700
-@@ -53,7 +53,7 @@
- #elif defined EPLAN9                /* Plan9 */
-   if (fp->state != 0 /* CLOSED */)
-     fp->state = 5 /* ERR */;
--#elif 0                             /* unknown  */
-+#elif defined __redox__                         /* unknown  */
-   /* Portable fallback, based on an idea by Rich Felker.
-      Wow! 6 system calls for something that is just a bit operation!
-      Not activated on any system, because there is no way to repair FP when

recipes/tools/gnu-grep/grep.patch

@@ -1,23 +1,4 @@
 Only in source: grep.patch
-diff -ru source/lib/getdtablesize.c source-new/lib/getdtablesize.c
---- source/lib/getdtablesize.c	2017-07-23 20:50:44.287742363 -0700
-+++ source-new/lib/getdtablesize.c	2017-07-23 20:51:06.271284748 -0700
-@@ -109,15 +109,6 @@
- int
- getdtablesize (void)
- {
--  struct rlimit lim;
--
--  if (getrlimit (RLIMIT_NOFILE, &lim) == 0
--      && 0 <= lim.rlim_cur && lim.rlim_cur <= INT_MAX
--      && lim.rlim_cur != RLIM_INFINITY
--      && lim.rlim_cur != RLIM_SAVED_CUR
--      && lim.rlim_cur != RLIM_SAVED_MAX)
--    return lim.rlim_cur;
--
-   return INT_MAX;
- }
- 
 diff -ru source/lib/getprogname.c source-new/lib/getprogname.c
 --- source/lib/getprogname.c	2017-01-16 09:29:13.000000000 -0800
 +++ source-new/lib/getprogname.c	2017-07-23 20:49:21.133618122 -0700

recipes/web/netsurf/manifest

@@ -1,6 +1,6 @@
 name=Netsurf
 binary=/usr/bin/netsurf-fb
-icon=/usr/share/ui/icons/apps/internet-web-browser.png
+icon=/usr/share/icons/apps/internet-web-browser.png
 accept=*.html
 author=The Netsurf Developers
 description=Browser for Redox

recipes/web/netsurf/recipe.toml

@@ -30,9 +30,6 @@ DYNAMIC_INIT
 # Netsurf does not currently support out-of-tree builds :(
 rsync -av --delete "${COOKBOOK_SOURCE}/" ./
 
-# obscure crash from sccache if jobs number is too much
-COOKBOOK_MAKE_JOBS="$(( ${COOKBOOK_MAKE_JOBS} > 8 ? 8 : ${COOKBOOK_MAKE_JOBS} ))"
-
 export TARGET="framebuffer"
 export CFLAGS="-I${PWD}/inst-${TARGET}/include"
 export LDFLAGS="${LDFLAGS} -L${COOKBOOK_SYSROOT}/lib -L${PWD}/inst-${TARGET}/lib -Wl,--allow-multiple-definition -Wl,-rpath-link,${COOKBOOK_SYSROOT}/lib"

recipes/wip/analysis/binsider/recipe.toml

@@ -1,4 +1,4 @@
-#TODO async-io and rustix crates error
+#TODO lurk-cli crate error
 [source]
 git = "https://github.com/orhun/binsider"
 shallow_clone = true

recipes/wip/analysis/cutter/recipe.toml

@@ -1,13 +1,13 @@
-#TODO not compiled or tested
+#TODO can't find qt6 dep cmake config
 #TODO determine minimum dependencies from cmake log
 # build instructions: https://cutter.re/docs/building.html
 [source]
 tar = "https://github.com/rizinorg/cutter/releases/download/v2.4.1/Cutter-v2.4.1-src.tar.gz"
 [build]
 template = "cmake"
-#dependencies = [
+dependencies = [
 #    "libzip",
 #    "zlib",
-#    "qt6-base",
+    "qt6-base",
 #    "qt6-svg",
-#]
+]

recipes/wip/analysis/email-sleuth/recipe.toml

@@ -1,6 +1,7 @@
-#TODO openssl-sys crate error
+#TODO openssl-sys crate error, make it use openssl3 recipe
 [source]
 git = "https://github.com/tokenizer-decode/email-sleuth"
 shallow_clone = true
 [build]
 template = "cargo"
+dependencies = ["openssl3"]

recipes/wip/analysis/flowgger/recipe.toml

@@ -1,7 +1,9 @@
-#TODO not compiled or tested
+#TODO can't find protobuf
 # build instructions: https://github.com/awslabs/flowgger/wiki/Installation
 [source]
 git = "https://github.com/awslabs/flowgger"
 shallow_clone = true
 [build]
 template = "cargo"
+dev-dependencies = ["host:protobuf"]
+dependencies = ["openssl3"]

recipes/wip/analysis/mmdr/recipe.toml

@@ -1,4 +1,4 @@
-#TODO not compiled or tested
+#TODO compiled but untested
 [source]
 git = "https://github.com/1jehuang/mermaid-rs-renderer"
 shallow_clone = true

recipes/wip/analysis/netdata/recipe.toml

@@ -1,4 +1,4 @@
-#TODO not compiled or tested
+#TODO port: unsupported platform, UnixPaths
 # build instructions: https://learn.netdata.cloud/docs/developer-and-contributor-corner/build-the-netdata-agent-yourself/compile-from-source-code#building-netdata
 [source]
 tar = "https://github.com/netdata/netdata/releases/download/v2.8.5/netdata-v2.8.5.tar.gz"

recipes/wip/analysis/radare2/recipe.toml

@@ -1,4 +1,4 @@
-#TODO compile and test
+#TODO can't find exe_wrapper
 [source]
 tar = "https://github.com/radareorg/radare2/releases/download/6.1.4/radare2-6.1.4.tar.xz"
 [build]

recipes/wip/analysis/rizin/recipe.toml

@@ -1,4 +1,4 @@
-#TODO not compiled or tested
+#TODO can't find pcre2 dep
 # build instructions: https://github.com/rizinorg/rizin/blob/dev/BUILDING.md
 [source]
 tar = "https://github.com/rizinorg/rizin/releases/download/v0.8.1/rizin-src-v0.8.1.tar.xz"
@@ -8,3 +8,6 @@ mesonflags = [
     "-Denable_tests=false",
     "-Denable_rz_test=false",
 ]
+dependencies = [
+    "pcre2",
+]

recipes/wip/analysis/tmmpr/recipe.toml

@@ -1,4 +1,4 @@
-#TODO not compiled or tested
+#TODO compiled but untested
 [source]
 git = "https://github.com/tanciaku/tmmpr"
 shallow_clone = true

recipes/wip/archives/7zip/recipe.toml

@@ -1,5 +1,5 @@
-#TODO missing script for gnu make: https://github.com/mcmilk/7-Zip/tree/master/DOC#readme
+#TODO add script for gnu make: https://github.com/ip7z/7zip/blob/main/DOC/readme.txt#L110
 [source]
-tar = "https://7-zip.org/a/7z2301-src.tar.xz"
+tar = "https://7-zip.org/a/7z2605-src.tar.xz"
 [build]
 template = "cmake"

recipes/wip/archives/gnu-tar/recipe.toml

@@ -1,4 +1,4 @@
-#TODO not compiled or tested
+#TODO fix gzip dep
 [source]
 tar = "https://ftp.gnu.org/gnu/tar/tar-1.35.tar.bz2"
 [build]

recipes/wip/archives/gzip/recipe.toml

@@ -1,5 +1,7 @@
-#TODO not compiled or tested
 [source]
-tar = "https://ftp.gnu.org/gnu/gzip/gzip-1.14.tar.gz"
+tar = "https://ftp.gnu.org/gnu/gzip/gzip-1.15.tar.gz"
 [build]
 template = "configure"
+configureflags = [
+  "ac_cv_have_decl___fseterr=yes"
+]

recipes/wip/archives/hatchzip/recipe.toml

@@ -0,0 +1,11 @@
+#TODO build error: HatchZip has no platform module for this system yet; add one in src/platform/
+[source]
+git = "https://github.com/xevrion/hatchzip"
+shallow_clone = true
+[build]
+template = "cargo"
+cargopackages = [
+    "hatchzip",
+    "hatchzip-gui",
+]
+#dependencies = ["fontconfig"] # needed?

recipes/wip/archives/orz/recipe.toml

@@ -1,4 +1,4 @@
-#TODO don't run
+#TODO can't run
 [source]
 git = "https://github.com/richox/orz"
 shallow_clone = true

recipes/wip/archives/ouch/recipe.toml

@@ -1,4 +1,4 @@
-#TODO compilation error
+#TODO unrar-ng-sys crate error
 [source]
 git = "https://github.com/ouch-org/ouch"
 shallow_clone = true

recipes/wip/archives/unrar/recipe.toml

@@ -1,5 +1,11 @@
-#TODO missing script for gnu make, read the makefile in the tarball
+#TODO not compiled or tested
 [source]
 tar = "https://www.rarlab.com/rar/unrarsrc-7.2.6.tar.gz"
 [build]
 template = "custom"
+script = """
+rsync -av --delete "${COOKBOOK_SOURCE}/" ./
+DYNAMIC_INIT
+"${COOKBOOK_MAKE}" unrar lib -j "${COOKBOOK_MAKE_JOBS}"
+"${COOKBOOK_MAKE}" install-unrar install-lib DESTDIR="${COOKBOOK_STAGE}/usr"
+"""

recipes/wip/archives/unzip-rs/recipe.toml

@@ -1,5 +1,5 @@
 # the rust reimplementation is prefered over c implementation, which is abandoned with security bugs: https://github.com/quininer/unzrip#safety
-#TODO compile and test
+#TODO compiled but not tested (after cargo update)
 [source]
 git = "https://github.com/quininer/unzrip"
 shallow_clone = true

recipes/wip/bench/bencher/recipe.toml

@@ -1,8 +1,12 @@
-#TODO compile and test
+#TODO compiled but untested
+#TODO add command for installation
 # self-hosted documentation: https://bencher.dev/docs/explanation/bencher-self-hosted/
 [source]
 git = "https://github.com/bencherdev/bencher"
 shallow_clone = true
 [build]
-template = "cargo"
-cargopackages = ["bencher_cli"]
+template = "custom"
+script = """
+DYNAMIC_INIT
+cookbook_cargo_packages bencher_cli
+"""

recipes/wip/bench/fearless-simd/recipe.toml

@@ -1,10 +1,10 @@
-#TODO compile and test
+#TODO compiled but untested
 [source]
 git = "https://github.com/linebender/fearless_simd"
 shallow_clone = true
 [build]
 template = "cargo"
-cargopath = "fearless_simd/examples"
+cargopath = "fearless_simd"
 cargoexamples = [
     "sigmoid",
     "sigmoid_generic",

recipes/wip/bench/hpc/hpcg/recipe.toml

@@ -1,6 +1,10 @@
-#TODO not compiled or tested
+#TODO ninja error: unknown target 'install'
 [source]
 git = "https://github.com/hpcg-benchmark/hpcg"
 shallow_clone = true
 [build]
-template = "cmake"
+template = "custom"
+script = """
+DYNAMIC_INIT
+cookbook_cmake
+"""

recipes/wip/bench/hpc/minibude/recipe.toml

@@ -1,6 +1,7 @@
-#TODO missing script for gnu make: https://github.com/UoB-HPC/miniBUDE#building
+#TODO build and test
+#TODO does a model need to be chosen?: https://github.com/UoB-HPC/miniBUDE#building
 [source]
 git = "https://github.com/UoB-HPC/miniBUDE"
 shallow_clone = true
 [build]
-template = "custom"
+template = "cmake"

recipes/wip/bench/hyperfine/recipe.toml

@@ -1,4 +1,4 @@
-#TODO libc::RUSAGE_CHILDREN
+#TODO cannot find function `wait4` in crate `libc`
 [source]
 git = "https://github.com/sharkdp/hyperfine"
 shallow_clone = true

recipes/wip/bench/io/blogbench/recipe.toml

@@ -1,4 +1,4 @@
-#TODO not compiled or tested
+#TODO syntax error near unexpected token `newline'
 # build instructions: https://github.com/jedisct1/Blogbench/blob/master/README#L18
 [source]
 tar = "https://github.com/jedisct1/Blogbench/releases/download/1.2/blogbench-1.2.tar.bz2"

recipes/wip/bench/io/fio/recipe.toml

@@ -1,7 +1,10 @@
-#TODO configuration problem
+#TODO bad configure options
 [source]
 git = "https://github.com/axboe/fio"
 rev = "fio-3.41"
 shallow_clone = true
 [build]
 template = "configure"
+configureflags = [
+    "--disable-native",
+]

recipes/wip/bench/io/simple-disk-benchmark/recipe.toml

@@ -1,6 +1,6 @@
 #TODO source code error
 [source]
-git = "https://github.com/schwa/simple-disk-benchmark-rs"
+git = "https://github.com/isan-Ethen/simple-disk-benchmark-rs"
 shallow_clone = true
 [build]
 template = "cargo"

recipes/wip/bench/jasonisnthappy/recipe.toml

@@ -1,4 +1,4 @@
-#TODO not compiled or tested
+#TODO port fs2 crate
 [source]
 git = "https://github.com/sohzm/jasonisnthappy"
 shallow_clone = true

recipes/wip/bench/nanobench/recipe.toml

@@ -1,4 +1,7 @@
-#TODO build the userspace implementation: https://github.com/andreas-abel/nanoBench#user-space-version
+# userspace implementation: https://github.com/andreas-abel/nanoBench#user-space-version
+#TODO build and test
+#TODO add command for installation
+#TODO package msr-tools: https://01.org/sites/default/files/downloads/msr-tools/msr-tools-1.3.zip
 [source]
 git = "https://github.com/andreas-abel/nanoBench"
 rev = "36c077fd30db11e8c83cedfcb58daa505d1d0b12"
@@ -9,3 +12,8 @@ template = "custom"
 dependencies = [
     "python312",
 ]
+script = """
+rsync -av --delete "${COOKBOOK_SOURCE}/" ./
+DYNAMIC_INIT
+"${COOKBOOK_MAKE}" user -j "${COOKBOOK_MAKE_JOBS}"
+"""

recipes/wip/bench/rayon/recipe.toml

@@ -1,4 +1,4 @@
-#TODO compile and test
+#TODO glutin crate error
 [source]
 git = "https://github.com/rayon-rs/rayon"
 shallow_clone = true

recipes/wip/bench/rodinia/recipe.toml

@@ -1,5 +1,11 @@
-#TODO missing script for gnu make, build the openmp (cpu backend?) or opencl implementation
+#TODO build and test
 [source]
 tar = "http://www.cs.virginia.edu/~skadron/lava/rodinia/Packages/rodinia_3.1.tar.bz2"
 [build]
 template = "custom"
+dependencies = ["openmp"]
+script = """
+rsync -av --delete "${COOKBOOK_SOURCE}/" ./
+DYNAMIC_INIT
+"${COOKBOOK_MAKE}" OMP -j "${COOKBOOK_MAKE_JOBS}"
+"""

recipes/wip/bench/rpc-perf/recipe.toml

@@ -1,4 +1,5 @@
-#TODO not compiled or tested
+#TODO outdated metriken-core crate
+#TODO metriken-core crate error: distributed_slice is not implemented for this platform
 [source]
 git = "https://github.com/iopsystems/rpc-perf"
 shallow_clone = true

recipes/wip/bench/rsb/recipe.toml

@@ -1,6 +1,7 @@
-#TODO not compiled or tested
+#TODO openssl-sys crate error, make it use openssl3 recipe
 [source]
 git = "https://github.com/gamelife1314/rsb"
 shallow_clone = true
 [build]
 template = "cargo"
+dependencies = ["openssl3"]

recipes/wip/bench/stress-ng/recipe.toml

@@ -1,4 +1,4 @@
-#TODO missing script for gnu make: https://github.com/ColinIanKing/stress-ng#building-stress-ng
+#TODO '_SC_MAPPED_FILES' undeclared
 #TODO determine minimum dependencies
 [source]
 git = "https://github.com/ColinIanKing/stress-ng"
@@ -19,3 +19,9 @@ template = "custom"
 #    "zlib",
 #    "mesa",
 #]
+script = """
+rsync -av --delete "${COOKBOOK_SOURCE}/" ./
+DYNAMIC_INIT
+"${COOKBOOK_MAKE}" -j "${COOKBOOK_MAKE_JOBS}"
+"${COOKBOOK_MAKE}" install DESTDIR="${COOKBOOK_STAGE}/usr"
+"""

recipes/wip/bench/suite/pts/recipe.toml

@@ -1,4 +1,4 @@
-#TODO figure out the installation script - https://github.com/phoronix-test-suite/phoronix-test-suite
+#TODO test
 [source]
 git = "https://github.com/phoronix-test-suite/phoronix-test-suite"
 shallow_clone = true

recipes/wip/cosmic/cosmic-player/manifest

@@ -1,6 +1,6 @@
 name=COSMIC Media Player
 binary=/usr/bin/cosmic-player
-icon=/usr/share/ui/icons/apps/multimedia-photo-viewer.png
+icon=/usr/share/icons/apps/multimedia-photo-viewer.png
 author=Jeremy Soller
 description=COSMIC Media Player
 accept=*.avi

recipes/wip/data/poppler-data/recipe.toml

@@ -2,4 +2,4 @@
 [source]
 tar = "https://poppler.freedesktop.org/poppler-data-0.4.12.tar.gz"
 [build]
-template = "custom"
+template = "cmake"

recipes/wip/demos/anima/recipe.toml

@@ -1,4 +1,4 @@
-#TODO compile and test
+#TODO compiled but untested
 [source]
 git = "https://github.com/Yazelix/anima"
 shallow_clone = true

recipes/wip/demos/ascii-rain/recipe.toml

@@ -0,0 +1,14 @@
+#TODO compile and test
+[source]
+git = "https://github.com/nkleemann/ascii-rain"
+rev = "39396dea0a84b4580f0ee5f46de9de4468566ed0"
+shallow_clone = true
+[build]
+template = "custom"
+dependencies = ["ncursesw"]
+script = """
+rsync -av --delete "${COOKBOOK_SOURCE}/rain.c" ./
+mkdir -pv "${COOKBOOK_STAGE}/usr/bin"
+DYNAMIC_INIT
+"${COOKBOOK_CC}" rain.c -o "${COOKBOOK_STAGE}"/usr/bin/rain -lncurses
+"""

recipes/wip/demos/black-hole-glfw/recipe.toml

@@ -1,13 +1,18 @@
-#TODO compile and test
+#TODO compiled but untested
+#TODO ninja error: unknown target 'install'
 [source]
 git = "https://github.com/kavan010/black_hole"
 rev = "dc263bb5a1b72f5a24190d2e38b84b5c8fe9a317"
 shallow_clone = true
 [build]
-template = "cmake"
+template = "custom"
 dependencies = [
     "glew",
     "glfw3",
-    "glm",
-    "mesa-x11",
+    "libglm",
+    "mesa",
 ]
+script = """
+DYNAMIC_INIT
+cookbook_cmake
+"""

recipes/wip/demos/black-hole-sdl/recipe.toml

@@ -1,4 +1,4 @@
-#TODO compile and test
+#TODO fix sdl3 dep
 [source]
 git = "https://github.com/jsoulier/black_hole_simulation"
 rev = "6205903db7f22d86d2dbc328831bfc2f68108b7a"

recipes/wip/demos/fonterator/recipe.toml

@@ -1,4 +1,4 @@
-#TODO not compiled or tested
+#TODO compiled but untested
 [source]
 git = "https://github.com/ardaku/fonterator"
 shallow_clone = true

recipes/wip/demos/franken-solver/recipe.toml

@@ -1,4 +1,4 @@
-#TODO compile and test
+#TODO build error: can be cross-compiled?
 [source]
 git = "https://github.com/prp/franken-solver"
 shallow_clone = true

recipes/wip/demos/gl-flightsim/recipe.toml

@@ -1,4 +1,4 @@
-#TODO compile and test
+#TODO GLM_GTX_component_wise is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.
 [source]
 git = "https://github.com/gue-ni/OpenGL_Flightsim"
 rev = "7b865b085e18fc3b9e242651f3bd12073e3071dd"
@@ -9,9 +9,10 @@ dependencies = [
     "sdl2",
     "sdl2-image",
     "glew",
-    "glm",
+    "libglm",
 ]
 script = """
+COOKBOOK_SOURCE="${COOKBOOK_SOURCE}/OpenGL_Flightsim"
 DYNAMIC_INIT
-cookbook_cmake "${COOKBOOK_SOURCE}"/OpenGL_Flightsim
+cookbook_cmake
 """

recipes/wip/demos/myth/recipe.toml

@@ -1,4 +1,4 @@
-#TODO not compiled or tested
+#TODO rfd crate error
 [source]
 git = "https://github.com/panxinmiao/myth"
 shallow_clone = true

recipes/wip/demos/nibble/recipe.toml

@@ -1,4 +1,4 @@
-#TODO not compiled or tested
+#TODO compiled but untested
 [source]
 git = "https://github.com/Vaishnav-Sabari-Girish/nibble"
 shallow_clone = true

recipes/wip/demos/nms/recipe.toml

@@ -0,0 +1,14 @@
+#TODO compiled but untested
+[source]
+git = "https://github.com/bartobri/no-more-secrets"
+rev = "v1.0.1"
+shallow_clone = true
+[build]
+template = "custom"
+#dependencies = ["ncursesw"] # enable if needed
+script = """
+rsync -av --delete "${COOKBOOK_SOURCE}/" ./
+DYNAMIC_INIT
+"${COOKBOOK_MAKE}" nms -j "${COOKBOOK_MAKE_JOBS}"
+"${COOKBOOK_MAKE}" install DESTDIR="${COOKBOOK_STAGE}/usr"
+"""

recipes/wip/demos/nobubbles/recipe.toml

@@ -4,3 +4,7 @@ git = "https://github.com/romancitodev/nobubbles"
 shallow_clone = true
 [build]
 template = "cargo"
+cargoexamples = [
+    "counter",
+    "fx",
+]

recipes/wip/demos/orbit-sim/recipe.toml

@@ -1,4 +1,4 @@
-#TODO compile and test
+#TODO fix raylib dep
 [source]
 git = "https://github.com/IceWizard7/simulation-orbit"
 rev = "e772641909df7a0876093b9ffea0377e5bea82bf"

recipes/wip/demos/plush/recipe.toml

@@ -1,4 +1,4 @@
-#TODO compile and test
+#TODO error[E0658]: use of unstable library feature `float_algebraic`
 [source]
 git = "https://github.com/maximecb/plush"
 shallow_clone = true

recipes/wip/demos/raclettui/recipe.toml

@@ -4,8 +4,4 @@ git = "https://github.com/ishrut/raclettui"
 shallow_clone = true
 [build]
 template = "cargo"
-cargoexamples = [
-    "cpu_ratatui",
-    "test",
-    "wgpu_ratatui",
-]
+cargoexamples = ["hello"]

recipes/wip/demos/ratatui-3d/recipe.toml

@@ -1,4 +1,4 @@
-#TODO compile and test
+#TODO compiled but not tested
 [source]
 git = "https://github.com/limlabs/ratatui-3d"
 shallow_clone = true
@@ -7,6 +7,5 @@ template = "cargo"
 cargoflags = ["--no-default-features --features=gltf,gpu"]
 cargoexamples = [
     "cornell",
-    "cube",
     "dna",
 ]