recipes/rust-cairo/recipe.sh → recipes/demos/rust-cairo/recipe.sh

 GIT=https://gitlab.redox-os.org/redox-os/rust-cairo.git
-BUILD_DEPENDS=(cairo expat fontconfig freetype libpng pixman zlib)
+BUILD_DEPENDS=(cairo expat fontconfig freetype2 libpng pixman zlib)
 CARGOFLAGS="--example gui"
 
 function recipe_build {
     sysroot="$(realpath ../sysroot)"
-    cp -p "$ROOT/Xargo.toml" "Xargo.toml"
     cargo rustc --target "$TARGET" --release ${CARGOFLAGS} \
         -- \
         -L "${sysroot}/lib" \

recipes/sdl2_gears/gears.c → recipes/demos/sdl2-gears/gears.c

@@ -276,13 +276,13 @@ void CheckSDLError(int line)
 }
 
 SDL_Surface *image;
-const char *IMAGE_FILE_NAME = "/games/sdl2_gears/assets/image.png";
+const char *IMAGE_FILE_NAME = "/usr/games/sdl2_gears/assets/image.png";
 
 Mix_Music *music = NULL;
-const char *MUSIC_FILE_NAME = "/games/sdl2_gears/assets/music.wav";
+const char *MUSIC_FILE_NAME = "/usr/games/sdl2_gears/assets/music.wav";
 
 TTF_Font *font = NULL;
-const char *TTF_FILE_NAME = "/games/sdl2_gears/assets/font.ttf";
+const char *TTF_FILE_NAME = "/usr/games/sdl2_gears/assets/font.ttf";
 
 void cleanup()
 {

recipes/sdl2_gears/recipe.sh → recipes/demos/sdl2-gears/recipe.sh

-BUILD_DEPENDS=(sdl2_image sdl2_mixer sdl2_ttf sdl2 liborbital mesa mesa_glu freetype libjpeg libpng libogg libvorbis zlib)
+BUILD_DEPENDS=(sdl2-image sdl2-mixer sdl2-ttf sdl2 liborbital llvm18 mesa freetype2 libjpeg libpng libogg libvorbis zlib)
 
 function recipe_version {
     printf "1.0.0"
     skip=1
 }
 
-function recipe_update {
-    echo "skipping update"
-    skip=1
-}
-
 function recipe_prepare {
     rm -rf source
     mkdir source
@@ -21,16 +16,11 @@ function recipe_prepare {
 function recipe_build {
     sysroot="$(realpath ../sysroot)"
     set -x
-    "${CXX}" -O2 -I "$sysroot/include" -L "$sysroot/lib" gears.c -o sdl2_gears -static -lSDL2_image -lSDL2_mixer -lSDL2_ttf -lSDL2 -lorbital $("${PKG_CONFIG}" --libs glu) -lfreetype -lpng -ljpeg -lvorbisfile -lvorbis -logg -lz
+    "${CXX}" -O2 -I "$sysroot/include" -L "$sysroot/lib" gears.c -o sdl2_gears -static -lSDL2_image -lSDL2_mixer -lSDL2_ttf -lSDL2 -lorbital $("${PKG_CONFIG}" --libs osmesa) -lfreetype -lpng -ljpeg -lvorbisfile -lvorbis -logg -lz
     set +x
     skip=1
 }
 
-function recipe_test {
-    echo "skipping test"
-    skip=1
-}
-
 function recipe_clean {
     echo "skipping clean"
     skip=1
@@ -38,11 +28,11 @@ function recipe_clean {
 
 function recipe_stage {
     dest="$(realpath $1)"
-    mkdir -pv "$dest/games/sdl2_gears"
-    mkdir -pv "$dest/games/sdl2_gears/assets"
-    cp -v "sdl2_gears" "$dest/games/sdl2_gears/sdl2_gears"
-    cp -v "assets/image.png" "$dest/games/sdl2_gears/assets/image.png"
-    cp -v "assets/music.wav" "$dest/games/sdl2_gears/assets/music.wav"
-    cp -v "assets/font.ttf" "$dest/games/sdl2_gears/assets/font.ttf"
+    mkdir -pv "$dest/usr/games/sdl2_gears"
+    mkdir -pv "$dest/usr/games/sdl2_gears/assets"
+    cp -v "sdl2_gears" "$dest/usr/games/sdl2_gears/sdl2_gears"
+    cp -v "assets/image.png" "$dest/usr/games/sdl2_gears/assets/image.png"
+    cp -v "assets/music.wav" "$dest/usr/games/sdl2_gears/assets/music.wav"
+    cp -v "assets/font.ttf" "$dest/usr/games/sdl2_gears/assets/font.ttf"
     skip=1
 }

recipes/demos/winit/recipe.toml

+[source]
+git = "https://github.com/pop-os/winit.git"
+branch = "winit-0.29"
+
+[build]
+template = "custom"
+script = """
+cookbook_cargo_examples cursor_grab drag_window window window_debug
+"""

recipes/dev/autoconf/recipe.toml

+[source]
+tar = "https://ftp.gnu.org/gnu/autoconf/autoconf-2.71.tar.xz"
+blake3 = "da1cc8af8551c343de9f42af0ae53fd7dff3623487157623892b6cd7e3bb5692"
+
+[build]
+template = "configure"

recipes/dev/automake/recipe.toml

+[source]
+tar = "https://ftp.gnu.org/gnu/automake/automake-1.16.5.tar.xz"
+blake3 = "f42cfc333aaaa11f2bcb05b5b0273b8706c820c22f9ba4367f7eb920551695cd"
+
+[build]
+template = "configure"

recipes/dev/cargo/recipe.toml

+[source]
+git = "https://gitlab.redox-os.org/redox-os/cargo.git"
+upstream = "https://github.com/rust-lang/cargo.git"
+branch = "redox-2023-01-21"
+
+[build]
+template = "custom"
+dependencies = [
+    "curl",
+    "libssh2",
+    "nghttp2",
+    "openssl1",
+    "zlib",
+]
+script = """
+DYNAMIC_INIT
+export LIBSSH2_SYS_USE_PKG_CONFIG=1
+export LIBZ_SYS_STATIC=1
+export DEP_NGHTTP2_ROOT="${COOKBOOK_SYSROOT}"
+export DEP_OPENSSL_ROOT="${COOKBOOK_SYSROOT}"
+export DEP_Z_ROOT="${COOKBOOK_SYSROOT}"
+# Force linking system nghttp2
+"${COOKBOOK_CARGO}" rustc \
+    --manifest-path "${COOKBOOK_SOURCE}/Cargo.toml" \
+    --release \
+    --bin cargo \
+    -- \
+    -L "${COOKBOOK_SYSROOT}/lib" \
+    -C link-arg="-lnghttp2"
+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/cmake/recipe.toml

+[source]
+tar = "https://github.com/Kitware/CMake/releases/download/v3.25.2/cmake-3.25.2.tar.gz"
+
+[build]
+template = "custom"
+dependencies = [
+    "openssl1",
+]
+script = """
+COOKBOOK_CONFIGURE="cmake"
+COOKBOOK_CONFIGURE_FLAGS=(
+    -DCMAKE_VERBOSE_MAKEFILE=On
+    -DCMAKE_CROSSCOMPILING=True
+    -DCMAKE_BUILD_TYPE=Release
+    -DCMAKE_INSTALL_PREFIX="/"
+    "${COOKBOOK_SOURCE}"
+)
+set -x
+cookbook_configure
+mv -vT "${COOKBOOK_STAGE}"/usr/bin "${COOKBOOK_STAGE}/bin"
+rmdir -v "${COOKBOOK_STAGE}"/usr
+set +x
+"""

recipes/dev/crates-io-index/recipe.toml

+[source]
+git = "https://github.com/rust-lang/crates.io-index.git"
+
+[build]
+template = "custom"
+script = """
+dir="${COOKBOOK_STAGE}/home/user/.cargo/registry/index/github.com-1ecc6299db9ec823"
+mkdir -pv "${dir}"
+cp -rv "${COOKBOOK_SOURCE}/.git" "${dir}"
+"""

recipes/dev/fontconfig/recipe.toml

+[source]
+tar = "https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.14.2.tar.xz"
+blake3 = "dc342745b8e19ecda458464a9df7cf1266d0af759b230d07f43964b34ca86581"
+patches = [
+	"redox.patch"
+]
+script = """
+wget -O config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false"
+"""
+
+[build]
+template = "custom"
+dependencies = [
+	"expat",
+	"freetype2",
+	"libpng",
+	"zlib",
+]
+script = """
+COOKBOOK_CONFIGURE_FLAGS+=(
+    --disable-docs \
+    ac_cv_func_XML_SetDoctypeDeclHandler=yes
+)
+cookbook_configure
+"""

recipes/dev/gcc13/recipe.toml

+[source]
+tar = "https://gitlab.redox-os.org/redox-os/gcc/-/archive/redox-13.2.0/gcc-redox-13.2.0.tar.gz"
+
+[build]
+template = "custom"
+dependencies = [
+    "libgmp",
+    "libmpfr",
+    "mpc",
+    "zlib"
+]
+script = """
+DYNAMIC_INIT
+
+mkdir -p "${COOKBOOK_SYSROOT}/usr"
+ln -sf "${COOKBOOK_SYSROOT}/include" "${COOKBOOK_SYSROOT}/usr/include"
+ln -sf "${COOKBOOK_SYSROOT}/lib" "${COOKBOOK_SYSROOT}/usr/lib"
+
+pushd $COOKBOOK_SOURCE
+COOKBOOK_AUTORECONF=autoreconf2.69 autotools_recursive_regenerate -I"$(realpath ./config)"
+cp -fpv $COOKBOOK_HOST_SYSROOT/share/libtool/build-aux/{config.sub,config.guess,install-sh} libiberty/
+popd # pushd $COOKBOOK_SOURCE
+
+COOKBOOK_CONFIGURE_FLAGS=(
+    --host="${GNU_TARGET}"
+    --target="${GNU_TARGET}"
+    --prefix=/
+    --enable-shared
+    --disable-static
+    --with-sysroot=/
+    --with-build-sysroot="${COOKBOOK_SYSROOT}"
+    --enable-languages=c,c++,lto
+    --enable-initfini-array
+    --disable-multilib
+    --with-system-zlib
+    --enable-host-shared
+    --with-bugurl="https://gitlab.redox-os.org/redox-os/gcc/-/issues"
+)
+
+if [[ -n "$COOKBOOK_PREFER_STATIC" ]]; then
+  COOKBOOK_CONFIGURE_FLAGS+=(
+    --enable-static
+    --disable-shared
+  )
+else
+  COOKBOOK_CONFIGURE_FLAGS+=(
+    --enable-shared
+    --disable-static
+  )
+fi
+
+"${COOKBOOK_CONFIGURE}" "${COOKBOOK_CONFIGURE_FLAGS[@]}"
+"${COOKBOOK_MAKE}" -j "${COOKBOOK_MAKE_JOBS}" all-gcc
+"${COOKBOOK_MAKE}" install-gcc DESTDIR="${COOKBOOK_STAGE}"
+ln -s "gcc" "${COOKBOOK_STAGE}/bin/cc"
+"""
+
+[package]
+dependencies = [
+    "libgcc",
+    "libgmp",
+    "libmpfr",
+    "mpc",
+    "zlib"
+]

recipes/mesa/recipe.sh → recipes/dev/gdk-pixbuf/recipe.sh

-GIT=https://gitlab.redox-os.org/redox-os/mesa.git
-GIT_UPSTREAM=https://gitlab.freedesktop.org/mesa/mesa
-BRANCH=redox
-BUILD_DEPENDS=(expat zlib)
+VERSION="2.38.1"
+TAR="https://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/${VERSION%.*}/gdk-pixbuf-${VERSION}.tar.xz"
+BUILD_DEPENDS=(gettext glib libffi libiconv libjpeg libpng pcre shared-mime-info zlib)
 
 function recipe_version {
-    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-    skip=1
-}
-
-function recipe_update {
-    echo "skipping update"
+    echo "$VERSION"
     skip=1
 }
 
 function recipe_build {
     sysroot="$(realpath ../sysroot)"
-    export CFLAGS="-I$sysroot/include -DHAVE_PTHREAD=1"
-    export CPPFLAGS="-I$sysroot/include -DHAVE_PTHREAD=1"
-    export LDFLAGS="-L$sysroot/lib --static"
-    #export LLVM_CONFIG="x86_64-unknown-redox-llvm-config"
+    export LDFLAGS="-static"
 
     # TODO: Fix this annoying shite
     echo "[binaries]" > cross_file.txt
@@ -27,16 +18,15 @@ function recipe_build {
     echo "ar = '${AR}'" >> cross_file.txt
     echo "strip = '${STRIP}'" >> cross_file.txt
     echo "pkgconfig = '${PKG_CONFIG}'" >> cross_file.txt
-    #echo "llvm-config = '${TARGET}-llvm-config'" >> cross_file.txt
 
     echo "[host_machine]" >> cross_file.txt
     echo "system = 'redox'" >> cross_file.txt
-    echo "cpu_family = 'x86_64'" >> cross_file.txt
-    echo "cpu = 'x86_64'" >> cross_file.txt
+    echo "cpu_family = '$(echo "${TARGET}" | cut -d - -f1)'" >> cross_file.txt
+    echo "cpu = '$(echo "${TARGET}" | cut -d - -f1)'" >> cross_file.txt
     echo "endian = 'little'" >> cross_file.txt
 
     echo "[paths]" >> cross_file.txt
-    echo "prefix = '/'" >> cross_file.txt
+    echo "prefix = '${sysroot}'" >> cross_file.txt
     echo "libdir = 'lib'" >> cross_file.txt
     echo "bindir = 'bin'" >> cross_file.txt
 
@@ -49,7 +39,6 @@ function recipe_build {
     unset OBJCOPY
     unset OBJDUMP
     unset PKG_CONFIG
-    unset PKG_CONFIG_PATH
     unset RANLIB
     unset READELF
     unset STRIP
@@ -59,23 +48,15 @@ function recipe_build {
         --buildtype release \
         --strip \
         -Ddefault_library=static \
-        -Dglx=disabled \
-        -Dllvm=disabled \
-        -Dosmesa=gallium \
-        -Dplatforms= \
-        -Dshader-cache=disabled \
-        -Dshared-llvm=disabled \
-        -Dshared-glapi=disabled
-
+        -Dprefix=/ \
+        -Dlibdir=lib \
+        -Dbuiltin_loaders=all \
+        -Dgir=false \
+        -Dx11=false
     ninja -C _build -v
     skip=1
 }
 
-function recipe_test {
-    echo "skipping test"
-    skip=1
-}
-
 function recipe_clean {
     "$REDOX_MAKE" clean
     skip=1
@@ -83,7 +64,7 @@ function recipe_clean {
 
 function recipe_stage {
     dest="$(realpath $1)"
-    DESTDIR="$dest" ninja -C _build install
+    DESTDIR="$dest" ninja -C _build -v install
     rm -f "$dest/lib/"*.la
     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/gitoxide/recipe.toml

+[source]
+git = "https://github.com/Byron/gitoxide.git"
+
+[build]
+dependencies = [
+    "openssl1",
+]
+template = "custom"
+script = """
+export OPENSSL_DIR="${COOKBOOK_SYSROOT}"
+export OPENSSL_STATIC="true"
+cookbook_cargo
+"""
+