Add partial ABI separation on recipe dependencies and improve names

recipes/backends/cairo/recipe.sh

@@ -1,6 +1,6 @@
 VERSION="1.16.0"
 TAR=https://www.cairographics.org/releases/cairo-$VERSION.tar.xz
-BUILD_DEPENDS=(expat freetype fontconfig libpng pixman zlib)
+BUILD_DEPENDS=(expat freetype2 fontconfig libpng pixman zlib)
 
 function recipe_version {
 	echo "$VERSION"

recipes/backends/pango/recipe.sh

@@ -1,6 +1,6 @@
 VERSION="1.42.4"
 TAR="ftp.gnome.org/pub/GNOME/sources/pango/${VERSION%.*}/pango-${VERSION}.tar.xz"
-BUILD_DEPENDS=(cairo expat fontconfig freetype fribidi gettext glib harfbuzz libffi libiconv libpng pcre pixman zlib)
+BUILD_DEPENDS=(cairo expat fontconfig freetype2 fribidi gettext glib harfbuzz libffi libiconv libpng pcre pixman zlib)
 
 function recipe_version {
 	echo "$VERSION"

recipes/backends/sdl-gfx/recipe.sh

@@ -1,6 +1,6 @@
 VERSION=2.0.25
 TAR=https://sourceforge.net/projects/sdlgfx/files/SDL_gfx-$VERSION.tar.gz
-BUILD_DEPENDS=(sdl liborbital libiconv)
+BUILD_DEPENDS=(sdl1 liborbital libiconv)
 
 function recipe_version {
     echo "$VERSION"

recipes/backends/sdl1-image/recipe.sh

@@ -1,6 +1,6 @@
 VERSION=1.2.12
 TAR=https://www.libsdl.org/projects/SDL_image/release/SDL_image-$VERSION.tar.gz
-BUILD_DEPENDS=(sdl liborbital libiconv libjpeg libpng zlib)
+BUILD_DEPENDS=(sdl1 liborbital libiconv libjpeg libpng zlib)
 
 function recipe_version {
     echo "$VERSION"

recipes/backends/sdl1-mixer/recipe.sh

@@ -1,6 +1,6 @@
 VERSION=1.2.12
 TAR=https://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-$VERSION.tar.gz
-BUILD_DEPENDS=(sdl liborbital libogg libvorbis)
+BUILD_DEPENDS=(sdl1 liborbital libogg libvorbis)
 
 function recipe_version {
     echo "$VERSION"

recipes/backends/sdl1-ttf/recipe.sh

@@ -1,6 +1,6 @@
 VERSION=2.0.11
 TAR=https://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-$VERSION.tar.gz
-BUILD_DEPENDS=(sdl liborbital freetype libpng zlib)
+BUILD_DEPENDS=(sdl1 liborbital freetype2 libpng zlib)
 
 function recipe_version {
     echo "$VERSION"

recipes/backends/sdl2-ttf/recipe.sh

@@ -1,6 +1,6 @@
 VERSION=2.0.15
 TAR=https://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-$VERSION.tar.gz
-BUILD_DEPENDS=(sdl2 liborbital llvm mesa freetype libpng zlib)
+BUILD_DEPENDS=(sdl2 liborbital llvm mesa freetype2 libpng zlib)
 
 function recipe_version {
     echo "$VERSION"

recipes/backends/webrender/recipe.sh

@@ -1,7 +1,7 @@
 GIT=https://gitlab.redox-os.org/redox-os/webrender.git
 GIT_UPSTREAM=https://github.com/servo/webrender.git
 BRANCH=redox
-BUILD_DEPENDS=(freetype libpng llvm mesa zlib)
+BUILD_DEPENDS=(freetype2 libpng llvm mesa zlib)
 
 function recipe_build {
     sysroot="$(realpath ../sysroot)"

recipes/demos/cairodemo/recipe.sh

@@ -1,4 +1,4 @@
-BUILD_DEPENDS=(cairo expat fontconfig freetype liborbital libpng pixman zlib)
+BUILD_DEPENDS=(cairo expat fontconfig freetype2 liborbital libpng pixman zlib)
 
 function recipe_version {
     printf "1.0.0"

recipes/demos/gears/recipe.sh

@@ -1,4 +1,4 @@
-BUILD_DEPENDS=(liborbital llvm mesa mesa_glu zlib)
+BUILD_DEPENDS=(liborbital llvm mesa mesa-glu zlib)
 
 function recipe_version {
     printf "1.0.0"

recipes/demos/osdemo/recipe.sh

@@ -1,4 +1,4 @@
-BUILD_DEPENDS=(liborbital llvm mesa mesa_glu zlib)
+BUILD_DEPENDS=(liborbital llvm mesa mesa-glu zlib)
 
 function recipe_version {
     printf "1.0.0"

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

@@ -1,5 +1,5 @@
 GIT=https://gitlab.redox-os.org/redox-os/rust-cairo-demo.git
-BUILD_DEPENDS=(cairo expat fontconfig freetype libpng pixman zlib)
+BUILD_DEPENDS=(cairo expat fontconfig freetype2 libpng pixman zlib)
 
 function recipe_build {
     sysroot="$(realpath ../sysroot)"

recipes/demos/sdl2-gears/recipe.sh

@@ -1,4 +1,4 @@
-BUILD_DEPENDS=(sdl2_image sdl2_mixer sdl2_ttf sdl2 liborbital llvm mesa freetype libjpeg libpng libogg libvorbis zlib)
+BUILD_DEPENDS=(sdl2-image sdl2-mixer sdl2-ttf sdl2 liborbital llvm mesa freetype2 libjpeg libpng libogg libvorbis zlib)
 
 function recipe_version {
     printf "1.0.0"

recipes/dev/cargo/recipe.toml

@@ -9,7 +9,7 @@ dependencies = [
     "curl",
     "libssh2",
     "nghttp2",
-    "openssl",
+    "openssl1",
     "zlib",
 ]
 script = """

recipes/dev/cmake/recipe.toml

@@ -4,7 +4,7 @@ tar = "https://github.com/Kitware/CMake/releases/download/v3.25.2/cmake-3.25.2.t
 [build]
 template = "custom"
 dependencies = [
-    "openssl",
+    "openssl1",
 ]
 script = """
 COOKBOOK_CONFIGURE="cmake"

recipes/dev/fontconfig/recipe.toml

@@ -14,7 +14,7 @@ wget -O config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master
 template = "custom"
 dependencies = [
 	"expat",
-	"freetype",
+	"freetype2",
 	"libpng",
 	"zlib",
 ]

recipes/dev/python37/recipe.sh

@@ -1,6 +1,6 @@
 VERSION=3.7.4
 TAR=https://www.python.org/ftp/python/$VERSION/Python-$VERSION.tar.xz
-BUILD_DEPENDS=(openssl)
+BUILD_DEPENDS=(openssl1)
 
 export CONFIG_SITE=config.site
 

recipes/dev/rust/recipe.sh

@@ -1,7 +1,7 @@
 GIT=https://gitlab.redox-os.org/redox-os/rust.git
 BRANCH=redox-2023-09-07
 BUILD_DEPENDS=(llvm)
-DEPENDS="gcc cargo"
+DEPENDS="gcc13 cargo"
 PREPARE_COPY=0
 
 function recipe_version {

recipes/dev/rustpython/recipe.toml

@@ -3,7 +3,10 @@ git = "https://github.com/RustPython/RustPython"
 branch = "redox-release"
 
 [build]
-dependencies = ["openssl", "zlib"]
+dependencies = [
+  "openssl1",
+  "zlib",
+]
 template = "custom"
 script = """
 (cd "${COOKBOOK_SOURCE}" && bash scripts/redox/uncomment-cargo.sh && cargo update)

recipes/emulators/dosbox/recipe.sh

@@ -1,6 +1,6 @@
 VERSION=0.74-3
 TAR=https://sourceforge.net/projects/dosbox/files/dosbox/$VERSION/dosbox-$VERSION.tar.gz/download
-BUILD_DEPENDS=(sdl liborbital)
+BUILD_DEPENDS=(sdl1 liborbital)
 
 function recipe_version {
     echo "$VERSION"

recipes/emulators/flycast/recipe.toml

@@ -10,7 +10,7 @@ dependencies = [
     "llvm",
     "mesa",
     "nghttp2",
-    "openssl",
+    "openssl1",
     "sdl2",
     "zlib",
 ]

recipes/emulators/mgba/recipe.sh

@@ -1,7 +1,7 @@
 VERSION=0.7
 GIT=https://github.com/mgba-emu/mgba.git
 BRANCH=$VERSION
-BUILD_DEPENDS=(sdl liborbital libiconv pixman)
+BUILD_DEPENDS=(sdl1 liborbital libiconv pixman)
 
 function recipe_version {
     echo "$VERSION"

recipes/emulators/qemu/recipe.sh

@@ -1,6 +1,6 @@
 VERSION=3.1.0
 TAR=https://download.qemu.org/qemu-$VERSION.tar.xz
-BUILD_DEPENDS=(curl glib libiconv libpng pcre pixman sdl zlib)
+BUILD_DEPENDS=(curl glib libiconv libpng pcre pixman sdl1 zlib)
 
 function recipe_version {
     echo "$VERSION"

recipes/emulators/retroarch/recipe.toml

@@ -8,7 +8,7 @@ dependencies = [
     "libretro-super",
     "llvm",
     "mesa",
-    "openssl",
+    "openssl1",
     "sdl2",
     "zlib",
 ]

recipes/emulators/scummvm/recipe.sh

@@ -1,7 +1,7 @@
 VERSION=2.0.0
 TAR=https://downloads.scummvm.org/frs/scummvm/$VERSION/scummvm-$VERSION.tar.xz
 TAR_SHA256=9784418d555ba75822d229514a05cf226b8ce1a751eec425432e6b7e128fca60
-BUILD_DEPENDS=(sdl liborbital freetype zlib libpng)
+BUILD_DEPENDS=(sdl1 liborbital freetype2 zlib libpng)
 
 function recipe_version {
     echo "$VERSION"

recipes/emulators/vice/recipe.sh

@@ -1,7 +1,7 @@
 VERSION=3.3
 TAR=https://sourceforge.net/projects/vice-emu/files/releases/vice-$VERSION.tar.gz/download
 TAR_SHA256=1a55b38cc988165b077808c07c52a779d181270b28c14b5c9abf4e569137431d
-BUILD_DEPENDS=(sdl liborbital)
+BUILD_DEPENDS=(sdl1 liborbital)
 
 function recipe_version {
     echo "$VERSION"

recipes/examples/rust-cairo/recipe.sh

@@ -1,5 +1,5 @@
 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 {

recipes/games/devilutionx/recipe.toml

@@ -7,7 +7,7 @@ template = "custom"
 dependencies = [
     "libiconv",
     "liborbital",
-    "sdl",
+    "sdl1",
 ]
 script = """
 export CFLAGS="${CFLAGS} -I${COOKBOOK_SYSROOT}/include"

recipes/games/eduke32/recipe.sh

@@ -1,6 +1,6 @@
 VERSION=20181010-7067
 TAR=https://dukeworld.com/eduke32/synthesis/$VERSION/eduke32_src_$VERSION.tar.xz
-BUILD_DEPENDS=(sdl sdl_mixer liborbital libiconv libogg libvorbis)
+BUILD_DEPENDS=(sdl1 sdl1-mixer liborbital libiconv libogg libvorbis)
 
 function recipe_version {
     echo "$VERSION"

recipes/games/freeciv/recipe.sh

@@ -1,6 +1,6 @@
 VERSION=2.6.6
 TAR=https://files.freeciv.org/stable/freeciv-$VERSION.tar.bz2
-BUILD_DEPENDS=(curl freetype libiconv liborbital libpng openssl nghttp2 sdl sdl_gfx sdl_image sdl_mixer sdl_ttf zlib)
+BUILD_DEPENDS=(curl freetype2 libiconv liborbital libpng openssl1 nghttp2 sdl1 sdl-gfx sdl1-image sdl1-mixer sdl1-ttf zlib)
 
 function recipe_version {
     echo "$VERSION"

recipes/games/gigalomania/recipe.sh

@@ -1,7 +1,7 @@
 VERSION=1.0.1
 GIT=https://gitlab.redox-os.org/redox-os/gigalomania.git
 BRANCH=master
-BUILD_DEPENDS=(sdl_mixer sdl_image sdl liborbital libogg libpng libjpeg libvorbis zlib)
+BUILD_DEPENDS=(sdl1-mixer sdl1-image sdl1 liborbital libogg libpng libjpeg libvorbis zlib)
 
 function recipe_version {
     echo "$VERSION"

recipes/games/neverball/recipe.sh

@@ -1,6 +1,6 @@
 VERSION=1.6.0
 TAR="https://neverball.org/neverball-${VERSION}.tar.gz"
-BUILD_DEPENDS=(freetype libjpeg libogg liborbital libpng libvorbis llvm mesa sdl2 sdl2_ttf zlib)
+BUILD_DEPENDS=(freetype2 libjpeg libogg liborbital libpng libvorbis llvm mesa sdl2 sdl2-ttf zlib)
 
 function recipe_version {
     echo "$VERSION"

recipes/games/openjazz/recipe.sh

@@ -2,7 +2,7 @@
 VERSION=20190106
 TAR="https://github.com/AlisterT/openjazz/releases/download/${VERSION}/openjazz-${VERSION}.tar.xz"
 TAR_SHA256="91341adcc4908db12aad6b82d2fb0125429a26585f65d7eb32d403656313eaab"
-BUILD_DEPENDS=(sdl liborbital zlib)
+BUILD_DEPENDS=(sdl1 liborbital zlib)
 
 function recipe_version {
     echo "$VERSION"

recipes/games/openttd/recipe.sh

@@ -1,7 +1,7 @@
 VERSION=1.8
 GIT=https://github.com/OpenTTD/OpenTTD.git
 BRANCH=release/$VERSION
-BUILD_DEPENDS=(freetype liborbital libpng sdl xz zlib)
+BUILD_DEPENDS=(freetype2 liborbital libpng sdl1 xz zlib)
 
 function recipe_version {
     echo "$VERSION"

recipes/games/prboom/recipe.sh

@@ -1,6 +1,6 @@
 VERSION=2.5.0
 TAR=https://downloads.sourceforge.net/project/prboom/prboom%20stable/$VERSION/prboom-$VERSION.tar.gz
-BUILD_DEPENDS=(sdl liborbital sdl_mixer libogg libvorbis)
+BUILD_DEPENDS=(sdl1 liborbital sdl1-mixer libogg libvorbis)
 
 function recipe_version {
     echo "$VERSION"

recipes/games/sopwith/recipe.sh

@@ -1,6 +1,6 @@
 VERSION=1.8.4
 TAR=https://sourceforge.net/projects/sdl-sopwith/files/sdl_sopwith/$VERSION/sopwith-$VERSION.tar.gz/download
-BUILD_DEPENDS=(sdl liborbital libiconv)
+BUILD_DEPENDS=(sdl1 liborbital libiconv)
 
 function recipe_version {
     echo "$VERSION"

recipes/games/spacecadetpinball/recipe.toml

@@ -12,7 +12,7 @@ dependencies = [
     "llvm",
     "mesa",
     "sdl2",
-    "sdl2_mixer",
+    "sdl2-mixer",
     "zlib",
 ]
 script = """

recipes/games/syobonaction/recipe.sh

@@ -1,6 +1,6 @@
 VERSION=1.0-rc3
 GIT=https://github.com/angelXwind/OpenSyobonAction
-BUILD_DEPENDS=(sdl liborbital sdl_mixer sdl_image sdl_gfx sdl_ttf freetype libjpeg libpng zlib libogg libvorbis)
+BUILD_DEPENDS=(sdl1 liborbital sdl1-mixer sdl1-image sdl-gfx sdl1-ttf freetype2 libjpeg libpng zlib libogg libvorbis)
 
 function recipe_version {
     echo "$VERSION"

recipes/games/vvvvvv/recipe.sh

@@ -2,7 +2,7 @@ VERSION=2.0
 GIT=https://github.com/xTibor/VVVVVV
 BRANCH=redox
 GIT_UPSTREAM=https://github.com/TerryCavanagh/VVVVVV
-BUILD_DEPENDS=(sdl2_image sdl2_mixer sdl2 liborbital llvm mesa mesa_glu zlib libogg libvorbis)
+BUILD_DEPENDS=(sdl2-image sdl2-mixer sdl2 liborbital llvm mesa mesa-glu zlib libogg libvorbis)
 
 function recipe_version {
     printf "1.0.0"

recipes/games/wesnoth/recipe.sh

@@ -3,17 +3,17 @@ GIT=https://github.com/wesnoth/wesnoth.git
 BRANCH=$VERSION
 BUILD_DEPENDS=(
     cairo
-    freetype
+    freetype2
     glib
     libjpeg
     liborbital
     libpng
     libvorbis
     llvm
-    mesa mesa_glu
+    mesa mesa-glu
     pcre
     pixman
-    sdl2 sdl2_image sdl2_mixer sdl2_ttf
+    sdl2 sdl2-image sdl2-mixer sdl2-ttf
     zlib
 )
 

recipes/libs/freeglut/recipe.sh

@@ -1,6 +1,6 @@
 TAR=https://cytranet.dl.sourceforge.net/project/freeglut/freeglut/3.0.0/freeglut-3.0.0.tar.gz
 
-BUILD_DEPENDS=(mesa mesa_glu)
+BUILD_DEPENDS=(mesa mesa-glu)
 
 function recipe_version {
     echo "3.0.0"

recipes/libs/harfbuzz/recipe.toml

@@ -6,7 +6,7 @@ blake3 = "6572676ffef55bd37bacdd33052bedfb07333b659371495a2a26b9825ce685c0"
 [build]
 template = "custom"
 dependencies = [
-    "freetype",
+    "freetype2",
     "gettext",
     "glib",
     "libiconv",