recipes/tools/bzip2/recipe.toml

@@ -5,19 +5,35 @@ blake3 = "97af3f520629c65fe41292f77e6ca798fe594d7987bfb2aebe7c6fcdc7ab5ed2"
 [build]
 template = "custom"
 script = """
+DYNAMIC_INIT
+
+# This installs the static library regardless of config options
+# The static lib is preferred according to the README because it's faster
 rsync -av --delete "${COOKBOOK_SOURCE}/" ./
 "${COOKBOOK_MAKE}" -j"${COOKBOOK_MAKE_JOBS}" \
     AR="${TARGET}-ar" \
     CC="${TARGET}-gcc" \
-    LDFLAGS="-static" \
-    PREFIX=/ \
+    PREFIX="${COOKBOOK_STAGE}" \
     RANLIB="${TARGET}-ranlib" \
-    libbz2.a \
-    bzip2
-mkdir -pv "${COOKBOOK_STAGE}/bin"
-cp -v bzip2 "${COOKBOOK_STAGE}/bin"
-mkdir -pv "${COOKBOOK_STAGE}/include"
-cp -v bzlib.h "${COOKBOOK_STAGE}/include"
-mkdir -pv "${COOKBOOK_STAGE}/lib"
-cp -v libbz2.a "${COOKBOOK_STAGE}/lib"
+    install
+
+# However, distros distribute libbz2 as well so we'll support it too
+if ! [[ -n "${COOKBOOK_PREFER_STATIC}" ]]; then
+    # Linking the lib fails if we don't rebuild the objects from earlier
+    "${COOKBOOK_MAKE}" clean
+
+    # This DOES NOT build/clobber the binaries already built above
+    "${COOKBOOK_MAKE}" -f Makefile-libbz2_so \
+        -j"${COOKBOOK_MAKE_JOBS}" \
+        AR="${TARGET}-ar" \
+        CC="${TARGET}-gcc" \
+        PREFIX="${COOKBOOK_STAGE}" \
+        RANLIB="${TARGET}-ranlib"
+
+    cp -v libbz2.so.1.0.8 "${COOKBOOK_STAGE}/lib"
+    cp -v libbz2.so.1.0 "${COOKBOOK_STAGE}/lib"
+fi
 """
+
+[package]
+shared-deps = ["libgcc"]

recipes/tools/cosmic-store/recipe.toml

@@ -9,6 +9,7 @@ dependencies = [
     "openssl1",
 ]
 script = """
+DYNAMIC_INIT
 export GETTEXT_DIR="${COOKBOOK_SYSROOT}"
 export GETTEXT_STATIC=1
 cookbook_cargo --no-default-features --features desktop,pkgar
@@ -21,3 +22,9 @@ cp -v "${COOKBOOK_SOURCE}/res/${APPID}.metainfo.xml" "${COOKBOOK_STAGE}/usr/shar
 mkdir -pv "${COOKBOOK_STAGE}/usr/share/icons/"
 cp -rv "${COOKBOOK_SOURCE}/res/icons/hicolor/" "${COOKBOOK_STAGE}/usr/share/icons/"
 """
+
+[package]
+shared-deps = [
+    "libgcc",
+    "openssl1",
+]

recipes/tools/vim/recipe.sh

-VERSION=8.2
-# We use `https://ftp.nluug.nl` because `ftp.vim.org` doesn't support `https`
-# see https://www.vim.org/mirrors.php
-TAR=https://ftp.nluug.nl/pub/vim/unix/vim-$VERSION.tar.bz2
-
-BUILD_DEPENDS=(ncurses)
-DEPENDS="terminfo"
-
-function recipe_version {
-    echo "$VERSION"
-    skip=1
-}
-
-function recipe_build {
-    sysroot="$(realpath ../sysroot)"
-    export LDFLAGS="-L$sysroot/lib -static"
-    export CPPFLAGS="-I$sysroot/include"
-    export vim_cv_toupper_broken=no
-    export vim_cv_tgetent=zero
-    export vim_cv_terminfo=yes
-    export vim_cv_tty_group=world
-    export vim_cv_getcwd_broken=no
-    export vim_cv_stat_ignores_slash=yes
-    export vim_cv_memmove_handles_overlap=yes
-    ./configure --build=${BUILD} --host=${HOST} --prefix=/ --with-tlib=ncurses
-    "$REDOX_MAKE" -j"$($NPROC)"
-    skip=1
-}
-
-function recipe_clean {
-    "$REDOX_MAKE" clean
-    skip=1
-}
-
-function recipe_stage {
-    dest="$(realpath $1)"
-    "$REDOX_MAKE" DESTDIR="$dest" ${MAKEFLAGS} install
-    skip=1
-}

recipes/tools/vim/recipe.toml

+[source]
+tar = "https://github.com/vim/vim/archive/refs/tags/v8.2.5172.tar.gz"
+blake3 = "28a58578a6655e2e45078331569d6e6c96ed05189acda34c2a784581bf614cd2"
+patch = ["vim.patch"]
+
+[build]
+dependencies = ["ncurses"]
+template = "custom"
+script = """
+export vim_cv_toupper_broken=no
+export vim_cv_tgetent=zero
+export vim_cv_terminfo=yes
+export vim_cv_tty_group=world
+export vim_cv_getcwd_broken=no
+export vim_cv_stat_ignores_slash=yes
+export vim_cv_memmove_handles_overlap=yes
+export SRCDIR="${COOKBOOK_SOURCE}/src"
+
+COOKBOOK_CONFIGURE_FLAGS+=(
+    --with-tlib=ncurses
+)
+
+pushd "${SRCDIR}"
+cookbook_configure
+popd
+"""

recipes/web/netsurf/recipe.sh

-VERSION=3.10
-TAR=https://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-all-$VERSION.tar.gz
-BUILD_DEPENDS=(curl expat libjpeg libpng nghttp2 openssl1 sdl1 zlib freetype2 liborbital libiconv)
-DEPENDS="ca-certificates orbital"
-
-function recipe_version {
-    echo "$VERSION"
-    skip=1
-}
-
-function recipe_build {
-    export TARGET="framebuffer"
-    export CFLAGS="-I${COOKBOOK_SYSROOT}/include -I${PWD}/inst-${TARGET}/include"
-    export LDFLAGS="-L${COOKBOOK_SYSROOT}/lib -L${PWD}/inst-${TARGET}/lib -Wl,--allow-multiple-definition"
-    # nghttp2 is not linked for some reason
-    export LDFLAGS="${LDFLAGS} -lcurl -lnghttp2"
-    "$REDOX_MAKE" PREFIX=/usr V=1 -j"$($NPROC)"
-    skip=1
-}
-
-function recipe_clean {
-    "$REDOX_MAKE" clean
-    skip=1
-}
-
-function recipe_stage {
-    dest="$(realpath "$1")"
-    "$REDOX_MAKE" DESTDIR="$dest" PREFIX=/usr install
-    mkdir -pv "$dest/ui/apps"
-    cp -v "${COOKBOOK_RECIPE}/manifest" "$dest/ui/apps/00_netsurf"
-    skip=1
-}

recipes/web/netsurf/recipe.toml

+[source]
+tar = "https://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-all-3.10.tar.gz"
+blake3 = "d0f3b4dabf536a39059b156d2ec4633c6f7b71208466e09a3c1ca2a319a44b61"
+patches = [
+    "./01_redox.patch"
+]
+
+[build]
+template = "custom"
+dependencies = [
+    "curl",
+    "expat",
+    "libjpeg",
+    "libpng",
+    "nghttp2",
+    "openssl1",
+    "sdl1",
+    "zlib",
+    "freetype2",
+    "liborbital",
+    "libiconv"
+]
+script = """
+DYNAMIC_INIT
+
+# Netsurf does not currently support out-of-tree builds :(
+rsync -av --delete "${COOKBOOK_SOURCE}/" ./
+
+export TARGET="framebuffer"
+export CFLAGS="-I${COOKBOOK_SYSROOT}/include -I${PWD}/inst-${TARGET}/include"
+export LDFLAGS="-L${COOKBOOK_SYSROOT}/lib -L${PWD}/inst-${TARGET}/lib -Wl,--allow-multiple-definition -Wl,-rpath-link,${COOKBOOK_SYSROOT}/lib"
+# nghttp2 is not linked for some reason
+export LDFLAGS="${LDFLAGS} -lcurl -lnghttp2"
+
+"$COOKBOOK_MAKE" PREFIX=/usr V=1 -j"$($NPROC)"
+"$COOKBOOK_MAKE" DESTDIR="$COOKBOOK_STAGE" PREFIX=/usr install -j"$($NPROC)"
+mkdir -pv "$COOKBOOK_STAGE/ui/apps"
+cp -v "${COOKBOOK_RECIPE}/manifest" "$COOKBOOK_STAGE/ui/apps/00_netsurf"
+"""
+
+[package]
+shared-deps = [
+    # XXX: currently only the following are dynamically linked
+    "curl",
+    "libgcc",
+    "libiconv",
+    "liborbital",
+    "libpng",
+    "nghttp2",
+    "openssl1",
+    "relibc",
+    "zlib",
+]
+dependencies = [
+    "ca-certificates",
+    "orbital",
+]

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

+#TODO missing script for gnu make
+[source]
+tar = "https://poppler.freedesktop.org/poppler-data-0.4.12.tar.gz"
+[build]
+template = "custom"

recipes/core/logd/recipe.toml → recipes/wip/dev/cargo-tools/cargo-autodd/recipe.toml

+#TODO not compiled or tested
 [source]
-git = "https://gitlab.redox-os.org/redox-os/logd.git"
-
+git = "https://github.com/nwiizo/cargo-autodd"
 [build]
 template = "cargo"

recipes/core/init/recipe.toml → recipes/wip/dev/other/customasm/recipe.toml

+#TODO not compiled or tested
 [source]
-git = "https://gitlab.redox-os.org/redox-os/init.git"
-
+git = "https://github.com/hlorenzi/customasm"
 [build]
 template = "cargo"

recipes/wip/emulators/game-console/xbox360/xenia/recipe.toml → recipes/wip/emulators/game-console/xbox360/xenia-canary/recipe.toml

-#TODO missing script for building, see https://github.com/xenia-project/xenia/blob/master/docs/building.md#linux
+#TODO missing script for building, see https://github.com/xenia-canary/xenia-canary/blob/canary_experimental/docs/building.md#linux
 #TODO make all dependencies work
 [source]
-git = "https://github.com/xenia-project/xenia"
+git = "https://github.com/xenia-canary/xenia-canary"
 [build]
 template = "custom"
 dependencies = [

recipes/wip/emulators/windows/wine-stable/recipe.toml

 #TODO make all dependencies work
 #TODO does it use gtk3 for winecfg?
 [source]
-tar = "https://dl.winehq.org/wine/source/9.0/wine-9.0.tar.xz"
+tar = "https://dl.winehq.org/wine/source/10.0/wine-10.0.tar.xz"
 [build]
 template = "configure"
 dependencies = [

recipes/wip/games/other/love/recipe.toml

@@ -24,6 +24,7 @@ dependencies = [
     "zlib",
 ]
 script = """
+DYNAMIC_INIT
 export CFLAGS="${CFLAGS} -I${COOKBOOK_SYSROOT}/include -I${COOKBOOK_SYSROOT}/include/SDL2"
 export CXXFLAGS="${CXXFLAGS} -I${COOKBOOK_SYSROOT}/include -I${COOKBOOK_SYSROOT}/include/SDL2"
 
@@ -77,3 +78,12 @@ COOKBOOK_CONFIGURE_FLAGS=(
 mkdir -pv "${COOKBOOK_STAGE}/usr/bin"
 cp -v love "${COOKBOOK_STAGE}/usr/bin/love"
 """
+
+[package]
+shared-deps = [
+    "libgcc",
+    "liborbital",
+    "libpng",
+    "luajit",
+    "zlib",
+]

recipes/wip/graphics/shaders/vibe/recipe.toml

+#TODO not compiled or tested
+[source]
+git = "https://github.com/TornaxO7/vibe"
+[build]
+template = "cargo"
+dependencies = [
+    "libxkbcommon",
+    "libwayland",
+    "libalsa",
+]

recipes/wip/libs/audio/libalsa/recipe.toml

+#TODO maybe wrong template
+# build instructions - https://git.alsa-project.org/?p=alsa-lib.git;a=blob;f=INSTALL;h=a2427e072bcaf951addc3e1db1fccccf44f3b59b;hb=HEAD
+[source]
+tar = "http://www.alsa-project.org/files/pub/lib/alsa-lib-1.2.13.tar.bz2"
+[build]
+template = "configure"

recipes/wip/libs/audio/openal/recipe.toml

@@ -2,7 +2,7 @@
 [source]
 tar = "https://openal-soft.org/openal-releases/openal-soft-1.24.1.tar.bz2"
 blake3 = "8aeaa8307d3e14331ad20761c537ffebe70975cb7c3343e8d5c0c0ed7bc16eab"
-patch = [
+patches = [
     "redox.patch"
 ]
 

recipes/wip/libs/other/libsndfile/recipe.toml

@@ -4,7 +4,7 @@ tar = "https://github.com/libsndfile/libsndfile/releases/download/1.2.0/libsndfi
 [build]
 template = "configure"
 dependencies = [
-    "libflac",
+    #TODO "libflac",
     "libogg",
     "libvorbis",
 ]

recipes/wip/sim/coulomb/recipe.toml

+#TODO missing script for gradlew
+#TODO determine the dependencies
+[source]
+git = "https://github.com/hamza-algohary/Coulomb"
+rev = "6617d4817dd153ae5e5645d427cdb746c146ccee"
+[build]
+template = "custom"

recipes/wip/sound/fretboard/recipe.toml

+#TODO not compiled or tested
+[source]
+git = "https://github.com/bragefuglseth/fretboard"
+[build]
+template = "cargo"
+dependencies = [
+    "gtk4",
+    "libadwaita",
+]

recipes/wip/text/keypunch/recipe.toml

+#TODO not compiled or tested
+[source]
+git = "https://github.com/bragefuglseth/keypunch"
+[build]
+template = "cargo"
+dependencies = [
+    "gtk4",
+    "libadwaita",
+]

recipes/wip/text/rnote/recipe.toml

+#TODO not compiled or tested
+# build instructions - https://github.com/flxzt/rnote/blob/main/BUILDING.md#build-with-meson
+[source]
+git = "https://github.com/flxzt/rnote"
+[build]
+template = "custom"
+dependencies = [
+    "glib",
+    "libadwaita",
+    "glib",
+    "libalsa",
+    "libpoppler",
+]
+script = """
+cookbook_cargo_packages rnote
+"""