recipes/dev/cargo/recipe.toml

@@ -13,6 +13,7 @@ dependencies = [
     "zlib",
 ]
 script = """
+DYNAMIC_INIT
 export LIBSSH2_SYS_USE_PKG_CONFIG=1
 export LIBZ_SYS_STATIC=1
 export DEP_NGHTTP2_ROOT="${COOKBOOK_SYSROOT}"
@@ -29,3 +30,14 @@ export DEP_Z_ROOT="${COOKBOOK_SYSROOT}"
 mkdir -pv "${COOKBOOK_STAGE}/bin"
 cp -v "target/${TARGET}/release/cargo" "${COOKBOOK_STAGE}/bin/cargo"
 """
+
+[package]
+shared-deps = [
+    "curl",
+    "libgcc",
+    "libssh2",
+    "nghttp2",
+    "openssl1",
+    "zlib",
+]
+

recipes/dev/git/recipe.sh

-VERSION=2.13.1
-TAR=https://www.kernel.org/pub/software/scm/git/git-$VERSION.tar.xz
-BUILD_DEPENDS=(zlib curl openssl1 expat nghttp2)
-DEPENDS="ca-certificates nghttp2"
-
-MAKEFLAGS=(
-    NEEDS_SSL_WITH_CURL=1
-    NEEDS_CRYPTO_WITH_SSL=1
-    NO_IPV6=1
-    NO_PREAD=1
-    NO_MMAP=1
-    NO_SETITIMER=1
-    NO_UNIX_SOCKETS=1
-    NEEDS_LIBICONV=
-    NEEDS_LIBRT=
-    BLK_SHA1=1
-    V=1
-)
-
-function recipe_version {
-    echo "$VERSION"
-    skip=1
-}
-
-function recipe_build {
-    sysroot="$(realpath ../sysroot)"
-    export LDFLAGS="-L$sysroot/lib"
-    export CPPFLAGS="-I$sysroot/include"
-    export CURL_CONFIG="$sysroot/bin/curl-config"
-    ./configure \
-        --build="${BUILD}" \
-        --host="${HOST}" \
-        --prefix=/ \
-        ac_cv_fread_reads_directories=yes \
-        ac_cv_snprintf_returns_bogus=yes \
-        ac_cv_lib_curl_curl_global_init=yes
-    "$REDOX_MAKE" "${MAKEFLAGS[@]}" -j"$($NPROC)"
-    skip=1
-}
-
-function recipe_clean {
-    "$REDOX_MAKE" clean
-    skip=1
-}
-
-function recipe_stage {
-    dest="$(realpath $1)"
-    "$REDOX_MAKE" DESTDIR="$dest" "${MAKEFLAGS[@]}" install
-    ${STRIP} $1/bin/* || true
-    ${STRIP} $1/libexec/git-core/* || true
-    rm -rf $1/share/man
-    skip=1
-}

recipes/dev/git/recipe.toml

+[source]
+tar = "https://www.kernel.org/pub/software/scm/git/git-2.13.1.tar.xz"
+blake3 = "bc78271bffd60c5b8b938d8c08fd74dc2de8d21fbaf8f8e0e3155436d9263f17"
+patches = ["git.patch"]
+
+[build]
+dependencies=[
+    "curl",
+    "expat",
+    "nghttp2",
+    "openssl1",
+    "zlib"
+]
+template = "custom"
+script = """
+rsync -av --delete "${COOKBOOK_SOURCE}/" ./
+
+MAKEFLAGS=(
+    NEEDS_SSL_WITH_CURL=1
+    NEEDS_CRYPTO_WITH_SSL=1
+    NO_IPV6=1
+    NO_PREAD=1
+    NO_MMAP=1
+    NO_SETITIMER=1
+    NO_UNIX_SOCKETS=1
+    NEEDS_LIBICONV=
+    NEEDS_LIBRT=
+    BLK_SHA1=1
+    V=1
+)
+export LDFLAGS="-L${COOKBOOK_SYSROOT}/usr/lib"
+export CPPFLAGS="-I${COOKBOOK_SYSROOT}/usr/include"
+export CURL_CONFIG="${COOKBOOK_SYSROOT}/usr/bin/curl-config"
+./configure \
+    --host="${GNU_TARGET}" \
+    --prefix=/usr \
+    ac_cv_fread_reads_directories=yes \
+    ac_cv_snprintf_returns_bogus=yes \
+    ac_cv_lib_curl_curl_global_init=yes
+"${COOKBOOK_MAKE}" "${MAKEFLAGS[@]}" -j"${COOKBOOK_MAKE_JOBS}"
+"${COOKBOOK_MAKE}" DESTDIR="${COOKBOOK_STAGE}" "${MAKEFLAGS[@]}" install
+rm -rf "${COOKBOOK_STAGE}/usr/share/man"
+"""
+
+[package]
+dependencies = [
+    "ca-certificates",
+    "nghttp2"
+]

recipes/dev/llvm18-shared/native.cmake

+set(CMAKE_C_COMPILER cc)
+set(CMAKE_CXX_COMPILER c++)

recipes/dev/llvm18-shared/recipe.toml

+[source]
+git = "https://gitlab.redox-os.org/redox-os/llvm-project.git"
+upstream = "https://github.com/rust-lang/llvm-project.git"
+branch = "redox-2024-05-11"
+
+[build]
+template = "custom"
+dependencies = [
+    "zlib"
+]
+script = """
+DYNAMIC_INIT
+
+cat > CMakeToolchain-x86_64.cmake <<EOF
+set(CMAKE_SYSTEM_NAME UnixPaths)
+set(CMAKE_FIND_ROOT_PATH ${COOKBOOK_SYSROOT})
+set(CMAKE_C_COMPILER ${TARGET}-gcc)
+set(CMAKE_CXX_COMPILER ${TARGET}-g++)
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,")
+set(CMAKE_PLATFORM_USES_PATH_WHEN_NO_SONAME 1)
+EOF
+
+export LDFLAGS="-Wl,-rpath-link,${COOKBOOK_SYSROOT}/lib $LDFLAGS"
+
+COOKBOOK_MAKE="ninja"
+COOKBOOK_CONFIGURE_FLAGS=(
+    -GNinja
+    -DCMAKE_TOOLCHAIN_FILE=./CMakeToolchain-x86_64.cmake
+    -DCMAKE_AR="$(which "${TARGET}-ar")"
+    -DCMAKE_BUILD_TYPE=Release
+    -DCMAKE_CROSSCOMPILING=True
+    -DCMAKE_CXX_FLAGS="--std=gnu++11"
+    -DCMAKE_RANLIB="$(which "${TARGET}-ranlib")"
+    -DCMAKE_INSTALL_PREFIX="/"
+    -DCMAKE_INSTALL_INCLUDEDIR="include"
+    -DCMAKE_INSTALL_OLDINCLUDEDIR="/include"
+    -DLLVM_LINK_LLVM_DYLIB=On
+    -DCROSS_TOOLCHAIN_FLAGS_NATIVE="-DCMAKE_TOOLCHAIN_FILE=$(realpath "${COOKBOOK_RECIPE}/native.cmake")"
+    -DLLVM_BUILD_BENCHMARKS=Off
+    -DLLVM_BUILD_EXAMPLES=Off
+    -DLLVM_BUILD_TESTS=Off
+    -DLLVM_BUILD_UTILS=Off
+    -DLLVM_DEFAULT_TARGET_TRIPLE="${TARGET}"
+    -DLLVM_ENABLE_LTO=Off
+    -DLLVM_ENABLE_RTTI=On
+    -DLLVM_ENABLE_THREADS=On
+    -DLLVM_ENABLE_ZSTD=Off
+    -DLLVM_INCLUDE_BENCHMARKS=Off
+    -DLLVM_INCLUDE_EXAMPLES=Off
+    -DLLVM_INCLUDE_TESTS=Off
+    -DLLVM_INCLUDE_UTILS=Off
+    -DLLVM_OPTIMIZED_TABLEGEN=On
+    -DLLVM_TARGET_ARCH="$(echo "${TARGET}" | cut -d - -f1)"
+    -DLLVM_TARGETS_TO_BUILD=X86 # TODO: get from TARGET
+    -DLLVM_TOOL_LLVM_COV_BUILD=Off
+    -DLLVM_TOOL_LLVM_LTO_BUILD=Off
+    -DLLVM_TOOL_LLVM_LTO2_BUILD=Off
+    -DLLVM_TOOL_LLVM_PROFDATA_BUILD=Off
+    -DLLVM_TOOL_LLVM_RTDYLD_BUILD=Off
+    -DLLVM_TOOL_LLVM_XRAY_BUILD=Off
+    -DLLVM_TOOL_LLI_BUILD=Off
+    -DLLVM_TOOL_LTO_BUILD=Off
+    -DLLVM_TOOLS_INSTALL_DIR=bin
+    -DLLVM_UTILS_INSTALL_DIR=bin
+    -DUNIX=1
+    -DLLVM_ENABLE_PROJECTS="llvm"
+    -Wno-dev
+    "${COOKBOOK_SOURCE}/llvm"
+)
+set -x
+cmake "${COOKBOOK_CONFIGURE_FLAGS[@]}"
+ninja -j"${COOKBOOK_MAKE_JOBS}"
+DESTDIR="${COOKBOOK_STAGE}" ninja install -j"${COOKBOOK_MAKE_JOBS}"
+mv -vT "${COOKBOOK_STAGE}"/usr/include "${COOKBOOK_STAGE}/include"
+mv -vT "${COOKBOOK_STAGE}"/usr/share "${COOKBOOK_STAGE}/share"
+rmdir -v "${COOKBOOK_STAGE}"/usr
+set +x
+"""
+
+[package]
+dependencies = [
+  "zlib"
+]
+

recipes/dev/llvm18/native.cmake

 set(CMAKE_C_COMPILER cc)
 set(CMAKE_CXX_COMPILER c++)
+set(CMAKE_EXE_LINKER_FLAGS)

recipes/dev/llvm18/recipe.toml

@@ -17,7 +17,7 @@ COOKBOOK_CONFIGURE_FLAGS=(
     -DCMAKE_CXX_FLAGS="--std=gnu++11"
     -DCMAKE_EXE_LINKER_FLAGS="-static"
     -DCMAKE_RANLIB="$(which "${TARGET}-ranlib")"
-    -DCMAKE_INSTALL_PREFIX="/"
+    -DCMAKE_INSTALL_PREFIX="/usr"
     -DCMAKE_INSTALL_INCLUDEDIR="include"
     -DCMAKE_INSTALL_OLDINCLUDEDIR="/include"
     -DCMAKE_SYSTEM_NAME=Generic
@@ -35,7 +35,6 @@ COOKBOOK_CONFIGURE_FLAGS=(
     -DLLVM_INCLUDE_EXAMPLES=Off
     -DLLVM_INCLUDE_TESTS=Off
     -DLLVM_INCLUDE_UTILS=Off
-    -DLLVM_OPTIMIZED_TABLEGEN=On
     -DLLVM_TARGET_ARCH="$(echo "${TARGET}" | cut -d - -f1)"
     -DLLVM_TARGETS_TO_BUILD=X86 # TODO: get from TARGET
     -DLLVM_TOOL_LLVM_COV_BUILD=Off
@@ -53,12 +52,14 @@ COOKBOOK_CONFIGURE_FLAGS=(
     -DZLIB_LIBRARY=-lz
     -DZLIB_INCLUDE_DIR="${COOKBOOK_SYSROOT}/include"
     -Wno-dev
-    "${COOKBOOK_SOURCE}/llvm"
 )
+LLVM_TABLEGEN="$(which llvm-tblgen-18 || true)"
+if [ -n "${LLVM_TABLEGEN}" ]
+then
+    COOKBOOK_CONFIGURE_FLAGS+=(-DLLVM_TABLEGEN="${LLVM_TABLEGEN}")
+fi
+COOKBOOK_CONFIGURE_FLAGS+=("${COOKBOOK_SOURCE}/llvm")
 set -x
 cookbook_configure
-mv -vT "${COOKBOOK_STAGE}"/usr/include "${COOKBOOK_STAGE}/include"
-mv -vT "${COOKBOOK_STAGE}"/usr/share "${COOKBOOK_STAGE}/share"
-rmdir -v "${COOKBOOK_STAGE}"/usr
 set +x
 """

recipes/wip/dev/lang/luajit/recipe.toml → recipes/dev/luajit/recipe.toml

-#TODO remove -DLUAJIT_SECURITY_MCODE=0
 [source]
-# LuaJIT is only available as a rolling release
 git = "https://luajit.org/git/luajit.git"
-rev = "2090842410e0ba6f81fad310a77bf5432488249a"
-
+rev = "a4f56a459a588ae768801074b46ba0adcfb49eb1"
+patches = ["redox.patch"]
 [build]
 template = "custom"
 script = """
-rsync -av --delete "${COOKBOOK_SOURCE}/" ./
+DYNAMIC_INIT
 
-# Cookbook doesn't apply patches to git repositiories (so we do it manually)
-# The patch is applied so that LUAJIT_OS is set to LUAJIT_OS_POSIX without
-# redefinition warnings
-git apply "${COOKBOOK_RECIPE}/redox.patch"
+rsync -av --delete "${COOKBOOK_SOURCE}/" ./
 
 ${COOKBOOK_MAKE} -j ${COOKBOOK_MAKE_JOBS} install \
   PREFIX="${COOKBOOK_STAGE}" \
-  BUILDMODE='static' \
   TARGET_SYS='Redox' \
-  XCFLAGS='-DLUAJIT_SECURITY_MCODE=0' \
   CROSS="${TARGET}-"
-
-cd "${COOKBOOK_STAGE}"/bin && ln -s luajit-2.1.* luajit
 """

recipes/dev/rust/config.toml

 [llvm]
 download-ci-llvm = false
-static-libstdcpp = true
+static-libstdcpp = false 
 
 [build]
 host = ["x86_64-unknown-redox"]
@@ -26,4 +26,4 @@ ar = "x86_64-unknown-redox-ar"
 linker = "x86_64-unknown-redox-gcc"
 # Nasty path, please fix
 llvm-config = "../../../../bin/x86_64-unknown-redox-llvm-config"
-crt-static = true
+crt-static = false

recipes/dev/rust/recipe.sh

 GIT=https://gitlab.redox-os.org/redox-os/rust.git
 BRANCH=redox-2024-05-11
-BUILD_DEPENDS=(llvm18)
+BUILD_DEPENDS=(llvm18-shared zlib libgcc)
 DEPENDS="gcc13 cargo"
 PREPARE_COPY=0
 
@@ -11,6 +11,7 @@ function recipe_version {
 
 function recipe_build {
     unset AR AS CC CXX LD NM OBJCOPY OBJDUMP RANLIB READELF STRIP
+    export MAGIC_EXTRA_RUSTFLAGS="-C link-args=-lz"
     python3 "${COOKBOOK_SOURCE}/x.py" install --config "${COOKBOOK_RECIPE}/config.toml" --jobs $(nproc) --incremental
     skip=1
 }

recipes/emulators/flycast/recipe.toml

@@ -15,8 +15,9 @@ dependencies = [
     "zlib",
 ]
 script = """
-export CFLAGS="${CFLAGS} -I${COOKBOOK_SYSROOT}/include -I${COOKBOOK_SYSROOT}/include/SDL2"
-export CXXFLAGS="${CXXFLAGS} -D_GLIBCXX_USE_C99_MATH_TR1=1 -I${COOKBOOK_SYSROOT}/include -I${COOKBOOK_SYSROOT}/include/SDL2"
+DYNAMIC_INIT
+export CFLAGS="${CFLAGS} -I${COOKBOOK_SYSROOT}/usr/include -I${COOKBOOK_SYSROOT}/usr/include/SDL2"
+export CXXFLAGS="${CXXFLAGS} -D_GLIBCXX_USE_C99_MATH_TR1=1 -I${COOKBOOK_SYSROOT}/usr/include -I${COOKBOOK_SYSROOT}/usr/include/SDL2"
 #TODO: don't use this
 export SDL_LIBS="-lSDL2 -lorbital $("${TARGET}-pkg-config" --libs osmesa) -lstdc++"
 #TODO: don't add curl
@@ -26,7 +27,7 @@ COOKBOOK_CONFIGURE_FLAGS=(
     -DCMAKE_VERBOSE_MAKEFILE=On
     -DCMAKE_CROSSCOMPILING=True
     -DCMAKE_BUILD_TYPE=RelWithDebInfo
-    -DCMAKE_INSTALL_PREFIX="/"
+    -DCMAKE_INSTALL_PREFIX="/usr"
     -DCMAKE_SYSTEM_NAME=Generic
     -DCMAKE_SYSTEM_PROCESSOR="$(echo "${TARGET}" | cut -d - -f1)"
     -DREDOX=1
@@ -54,6 +55,13 @@ COOKBOOK_CONFIGURE_FLAGS=(
     "${COOKBOOK_SOURCE}"
 )
 cookbook_configure
-mv "${COOKBOOK_STAGE}/usr/"* "${COOKBOOK_STAGE}"
-rmdir "${COOKBOOK_STAGE}/usr"
 """
+
+[package]
+shared-deps = [
+    "curl",
+    "libgcc",
+    "nghttp2",
+    "openssl1",
+    "zlib",
+]
\ No newline at end of file

recipes/emulators/mednafen/recipe.toml

@@ -17,9 +17,17 @@ dependencies = [
     "zlib",
 ]
 script = """
+DYNAMIC_INIT
 export SDL_LIBS="-lSDL2 -lorbital $("${TARGET}-pkg-config" --libs osmesa) -lstdc++"
 COOKBOOK_CONFIGURE_FLAGS+=(
     --without-libflac
 )
 cookbook_configure
 """
+
+[package]
+shared-deps = [
+    "liborbital",
+    "libiconv",
+    "libgcc",
+]

recipes/games/devilutionx/recipe.toml

 [source]
-tar = "https://github.com/diasurgical/devilutionX/archive/refs/tags/1.5.1.tar.gz"
-blake3 = "8425152bf50a692573d17ba85a8445734a564a372eba2190223bf0aa04f31d86"
+tar = "https://github.com/diasurgical/devilutionX/archive/refs/tags/1.5.4.tar.gz"
+blake3 = "d4a61ff3a7c69d86a29158918aad48ab9c4866c6a22a3e8da5feadbb7d23b3ca"
 
 [build]
 template = "custom"
-dependencies = [
-    "libiconv",
-    "liborbital",
-    "sdl1",
-]
+dependencies = ["libiconv", "liborbital", "sdl1"]
 script = """
-export CFLAGS="${CFLAGS} -I${COOKBOOK_SYSROOT}/include"
-export CXXFLAGS="${CXXFLAGS} -I${COOKBOOK_SYSROOT}/include"
+DYNAMIC_INIT
+
+# export CFLAGS="${CFLAGS} -I${COOKBOOK_SYSROOT}/include"
+# export CXXFLAGS="${CXXFLAGS} -I${COOKBOOK_SYSROOT}/include"
+# export LDFLAGS="${LDFLAGS} -L${COOKBOOK_SYSROOT}/lib"
+
 COOKBOOK_CONFIGURE="cmake"
-COOKBOOK_CONFIGURE_FLAGS=(
+
+if [[ -n "${COOKBOOK_PREFER_STATIC}" ]]; then
+    COOKBOOK_CONFIGURE_FLAGS=(
+        -DDEVILUTIONX_STATIC_BZIP2=ON
+        -DDEVILUTIONX_STATIC_ZLIB=ON
+        -DDEVILUTIONX_SYSTEM_BZIP2=OFF
+        -DDEVILUTIONX_SYSTEM_ZLIB=OFF
+    )
+else
+    COOKBOOK_CONFIGURE_FLAGS=(
+        -DDEVILUTIONX_SYSTEM_BZIP2=ON
+        -DDEVILUTIONX_SYSTEM_ZLIB=ON
+        -DCMAKE_PREFIX_PATH="${COOKBOOK_SYSROOT}"
+    )
+fi
+
+COOKBOOK_CONFIGURE_FLAGS+=(
     -DCMAKE_BUILD_TYPE=Release
     -DCMAKE_CROSSCOMPILING=ON
     -DCMAKE_CXX_COMPILER="${TARGET}-g++"
@@ -21,10 +37,6 @@ COOKBOOK_CONFIGURE_FLAGS=(
     -DCMAKE_INSTALL_PREFIX="/"
     -DCMAKE_VERBOSE_MAKEFILE=ON
     -DBUILD_TESTING=OFF
-    -DDEVILUTIONX_STATIC_BZIP2=ON
-    -DDEVILUTIONX_STATIC_ZLIB=ON
-    -DDEVILUTIONX_SYSTEM_BZIP2=OFF
-    -DDEVILUTIONX_SYSTEM_ZLIB=OFF
     -DNONET=ON
     -DUSE_SDL1=ON
     -DSDL_LIBRARY="-lSDL -lorbital"
@@ -34,3 +46,6 @@ cookbook_configure
 mkdir -v "${COOKBOOK_STAGE}/bin"
 cp -v devilutionx "${COOKBOOK_STAGE}/bin"
 """
+
+[package]
+shared-deps = ["bzip2", "libgcc", "libiconv", "liborbital", "sdl1", "zlib"]

recipes/games/opentyrian/recipe.toml

@@ -43,8 +43,5 @@ curl -OL https://camanis.net/tyrian/tyrian21.zip
 sha256sum -c tyrian21.zip.sha
 unzip -jd "${ASSETSDIR}" tyrian21.zip
 
-# The build system doesn't automatically apply patches to cloned repositories
-git apply "${COOKBOOK_RECIPE}/redox.patch"
-
 cookbook_configure
 """

recipes/games/prboom/recipe.sh

-#TODO: remove --without-mixer when it no longer crashes on x86_64
-VERSION=2.5.0
-TAR=https://downloads.sourceforge.net/project/prboom/prboom%20stable/$VERSION/prboom-$VERSION.tar.gz
-BUILD_DEPENDS=(sdl1 liborbital sdl1-mixer libogg libvorbis)
-
-function recipe_version {
-    echo "$VERSION"
-    skip=1
-}
-
-function recipe_build {
-    export CFLAGS="-static"
-    export MIXER_LIBS="-lSDL_mixer -lvorbisfile -lvorbis -logg"
-    sysroot="$(realpath ../sysroot)"
-    autoreconf -if
-    wget -O autotools/config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false"
-    ./configure \
-        --prefix=/ \
-        --build=${BUILD} \
-        --host=${HOST} \
-        --disable-cpu-opt \
-        --disable-i386-asm \
-        --disable-gl \
-        --disable-sdltest \
-        --without-mixer \
-        --without-net \
-        --with-sdl-prefix="$sysroot" \
-        ac_cv_lib_SDL_mixer_Mix_OpenAudio=yes
-    "$REDOX_MAKE" -j"$($NPROC)"
-    skip=1
-}
-
-function recipe_clean {
-    "$REDOX_MAKE" clean
-    skip=1
-}
-
-function recipe_stage {
-    dest="$(realpath $1)"
-    "$REDOX_MAKE" DESTDIR="$dest/usr" install
-    skip=1
-}

recipes/games/prboom/recipe.toml

+#TODO: remove --without-mixer when it no longer crashes on x86_64
+[source]
+tar = "https://downloads.sourceforge.net/project/prboom/prboom%20stable/2.5.0/prboom-2.5.0.tar.gz"
+blake3 = "24c1b9b5aa15fd73e59162055f2c6d8faa82759b76ddfca9828cd2a5c8dc6b2a"
+script = """
+DYNAMIC_INIT
+autotools_recursive_regenerate
+wget -O autotools/config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false"
+"""
+
+[build]
+template = "custom"
+dependencies = [
+  "sdl1",
+  "liborbital", 
+  "sdl1-mixer",
+  "libogg",
+  "libvorbis"
+]
+script = """
+export CFLAGS="-static"
+export MIXER_LIBS="-lSDL_mixer -lvorbisfile -lvorbis -logg"
+COOKBOOK_CONFIGURE_FLAGS+=(
+  --disable-cpu-opt
+  --disable-i386-asm
+  --disable-gl
+  --disable-sdltest
+  --without-mixer
+  --without-net
+  --with-sdl-prefix="${COOKBOOK_SYSROOT}"
+  ac_cv_lib_SDL_mixer_Mix_OpenAudio=yes
+)
+cookbook_configure
+"""
+

recipes/games/quakespasm/recipe.toml

@@ -6,7 +6,6 @@
 [source]
 git = "https://github.com/sezero/quakespasm"
 rev = "cc32abe09ed417ce3be10af300d2dc2f686349ba"
-patches = ["redox.patch"]
 
 [build]
 template = "custom"

recipes/libs/libpng/recipe.toml

 [source]
-tar = "https://github.com/glennrp/libpng/archive/v1.6.39.tar.gz"
-blake3 = "02513cc5d15ac79c4c402f2ae623425f4f80bdbbf15ebc95430fb8ccfc987996"
+tar = "https://github.com/pnggroup/libpng/archive/refs/tags/v1.6.46.tar.gz"
+blake3 = "36f4bbb48c70975116b00ab0cff577931b96f703b2774ac3b33131d001419435"
 script = """
+DYNAMIC_INIT
 chmod +w config.sub
 wget -O config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false"
+autotools_recursive_regenerate
 """
 
-
 [build]
-template = "configure"
-dependencies = [
-    "zlib"
-]
+template = "custom"
+dependencies = ["zlib"]
+script = """
+DYNAMIC_INIT
+
+if [[ -n "${COOKBOOK_PREFER_STATIC}" ]]; then
+    COOKBOOK_CONFIGURE_FLAGS+=(
+        --enable-static
+        --disable-shared
+    )
+else
+    COOKBOOK_CONFIGURE_FLAGS+=(
+        --enable-shared
+        --enable-static
+    )
+fi
+
+cookbook_configure
+"""
+
+[package]
+shared_deps = ["libgcc", "zlib"]

recipes/libs/libsodium/random.patch

---- a/src/libsodium/randombytes/sysrandom/randombytes_sysrandom.c	2018-06-03 07:26:17.413729023 +0200
-+++ b/src/libsodium/randombytes/sysrandom/randombytes_sysrandom.c	2018-06-03 07:41:40.119390067 +0200
-@@ -162,10 +162,7 @@
- /* LCOV_EXCL_START */
-     struct stat        st;
-     static const char *devices[] = {
--# ifndef USE_BLOCKING_RANDOM
--        "/dev/urandom",
--# endif
--        "/dev/random", NULL
-+        "rand:", NULL
-     };
-     const char       **device = devices;
-     int                fd;