diff --git a/recipes/backends/cairo/recipe.sh b/recipes/backends/cairo/recipe.sh
index 3c8e53639bc1bac63058ccc56dc8faaae5ab8d74..9116f701f59d004a2e97a8b783e69dff2225ed73 100755
--- a/recipes/backends/cairo/recipe.sh
+++ b/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"
diff --git a/recipes/backends/pango/recipe.sh b/recipes/backends/pango/recipe.sh
index c03bbd07194dd11de0e2eaed1845d9f2e08b3da1..a76a68afb514609a581a78fd7003679de3486c25 100755
--- a/recipes/backends/pango/recipe.sh
+++ b/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"
diff --git a/recipes/backends/sdl_gfx/01_redox.patch b/recipes/backends/sdl-gfx/01_redox.patch
similarity index 100%
rename from recipes/backends/sdl_gfx/01_redox.patch
rename to recipes/backends/sdl-gfx/01_redox.patch
diff --git a/recipes/backends/sdl_gfx/recipe.sh b/recipes/backends/sdl-gfx/recipe.sh
similarity index 93%
rename from recipes/backends/sdl_gfx/recipe.sh
rename to recipes/backends/sdl-gfx/recipe.sh
index d3fdbba6efb12dcb96081b925f11eb984ec02c23..8b4460ac7d2752de2cdb42393984961d45548f77 100644
--- a/recipes/backends/sdl_gfx/recipe.sh
+++ b/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"
diff --git a/recipes/backends/sdl_image/01_redox.patch b/recipes/backends/sdl1-image/01_redox.patch
similarity index 100%
rename from recipes/backends/sdl_image/01_redox.patch
rename to recipes/backends/sdl1-image/01_redox.patch
diff --git a/recipes/backends/sdl_image/recipe.sh b/recipes/backends/sdl1-image/recipe.sh
similarity index 91%
rename from recipes/backends/sdl_image/recipe.sh
rename to recipes/backends/sdl1-image/recipe.sh
index cda7f4fa39541d4baa011d28ccffb22cd4a3902f..76791fa7ec6391edd047b3a92d3351cb03953b1c 100644
--- a/recipes/backends/sdl_image/recipe.sh
+++ b/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"
diff --git a/recipes/backends/sdl_mixer/recipe.sh b/recipes/backends/sdl1-mixer/recipe.sh
similarity index 94%
rename from recipes/backends/sdl_mixer/recipe.sh
rename to recipes/backends/sdl1-mixer/recipe.sh
index be384383959cc72846eeefc33c0b12723fc8a188..3213f3e81aaf508688df4b2af30d20f616d0afcf 100644
--- a/recipes/backends/sdl_mixer/recipe.sh
+++ b/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"
diff --git a/recipes/backends/sdl_mixer/redox.patch b/recipes/backends/sdl1-mixer/redox.patch
similarity index 100%
rename from recipes/backends/sdl_mixer/redox.patch
rename to recipes/backends/sdl1-mixer/redox.patch
diff --git a/recipes/backends/sdl_ttf/01_redox.patch b/recipes/backends/sdl1-ttf/01_redox.patch
similarity index 100%
rename from recipes/backends/sdl_ttf/01_redox.patch
rename to recipes/backends/sdl1-ttf/01_redox.patch
diff --git a/recipes/backends/sdl_ttf/recipe.sh b/recipes/backends/sdl1-ttf/recipe.sh
similarity index 92%
rename from recipes/backends/sdl_ttf/recipe.sh
rename to recipes/backends/sdl1-ttf/recipe.sh
index 8b40579de146f5b0820819eb70e03b4926c45d15..9e77728b12356f53b24d92020246a1eb3b659dd4 100644
--- a/recipes/backends/sdl_ttf/recipe.sh
+++ b/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"
diff --git a/recipes/backends/sdl/recipe.toml b/recipes/backends/sdl1/recipe.toml
similarity index 100%
rename from recipes/backends/sdl/recipe.toml
rename to recipes/backends/sdl1/recipe.toml
diff --git a/recipes/backends/sdl2_image/recipe.toml b/recipes/backends/sdl2-image/recipe.toml
similarity index 100%
rename from recipes/backends/sdl2_image/recipe.toml
rename to recipes/backends/sdl2-image/recipe.toml
diff --git a/recipes/backends/sdl2_mixer/recipe.toml b/recipes/backends/sdl2-mixer/recipe.toml
similarity index 100%
rename from recipes/backends/sdl2_mixer/recipe.toml
rename to recipes/backends/sdl2-mixer/recipe.toml
diff --git a/recipes/backends/sdl2_mixer/redox.patch b/recipes/backends/sdl2-mixer/redox.patch
similarity index 100%
rename from recipes/backends/sdl2_mixer/redox.patch
rename to recipes/backends/sdl2-mixer/redox.patch
diff --git a/recipes/backends/sdl2_ttf/recipe.sh b/recipes/backends/sdl2-ttf/recipe.sh
similarity index 92%
rename from recipes/backends/sdl2_ttf/recipe.sh
rename to recipes/backends/sdl2-ttf/recipe.sh
index b6916b8c9cc81b72801abb417e98f335ec2dd062..bc365d15a016742625610e8daa35ea60ac5a959a 100644
--- a/recipes/backends/sdl2_ttf/recipe.sh
+++ b/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"
diff --git a/recipes/backends/webrender/recipe.sh b/recipes/backends/webrender/recipe.sh
index 774f8d33478a16357de7fbe2813343c02701a184..f68153d3525a2dbe926b7fb3fb9e86ec15bcfe04 100644
--- a/recipes/backends/webrender/recipe.sh
+++ b/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)"
diff --git a/recipes/demos/cairodemo/recipe.sh b/recipes/demos/cairodemo/recipe.sh
index 3a42c66cc23667d2318418292970f95b85ee80c2..c92c479b0d16178dca84dde9fc76e7c2f76b2319 100755
--- a/recipes/demos/cairodemo/recipe.sh
+++ b/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"
diff --git a/recipes/demos/gears/recipe.sh b/recipes/demos/gears/recipe.sh
index bbf3b4c2760d736f83a24290eac018dea406a7cc..47067cf10fed8cabd407833f7c2373f08213a85b 100644
--- a/recipes/demos/gears/recipe.sh
+++ b/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"
diff --git a/recipes/demos/osdemo/recipe.sh b/recipes/demos/osdemo/recipe.sh
index 99942a1075aaf7ee5dbb4b2bbe9c5f83850b53dc..5476214e25be73f2cdd92193619fcf17b1361308 100644
--- a/recipes/demos/osdemo/recipe.sh
+++ b/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"
diff --git a/recipes/demos/rust-cairo-demo/recipe.sh b/recipes/demos/rust-cairo-demo/recipe.sh
index 2b493d1ff2d5a3cfc4d170f86f887471ef45f767..7c1c4c28d8be7907a6fd33706d817e01b69d77ae 100644
--- a/recipes/demos/rust-cairo-demo/recipe.sh
+++ b/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)"
diff --git a/recipes/demos/sdl2_gears/assets/font.ttf b/recipes/demos/sdl2-gears/assets/font.ttf
similarity index 100%
rename from recipes/demos/sdl2_gears/assets/font.ttf
rename to recipes/demos/sdl2-gears/assets/font.ttf
diff --git a/recipes/demos/sdl2_gears/assets/image.png b/recipes/demos/sdl2-gears/assets/image.png
similarity index 100%
rename from recipes/demos/sdl2_gears/assets/image.png
rename to recipes/demos/sdl2-gears/assets/image.png
diff --git a/recipes/demos/sdl2_gears/assets/music.wav b/recipes/demos/sdl2-gears/assets/music.wav
similarity index 100%
rename from recipes/demos/sdl2_gears/assets/music.wav
rename to recipes/demos/sdl2-gears/assets/music.wav
diff --git a/recipes/demos/sdl2_gears/gears.c b/recipes/demos/sdl2-gears/gears.c
similarity index 100%
rename from recipes/demos/sdl2_gears/gears.c
rename to recipes/demos/sdl2-gears/gears.c
diff --git a/recipes/demos/sdl2_gears/recipe.sh b/recipes/demos/sdl2-gears/recipe.sh
similarity index 89%
rename from recipes/demos/sdl2_gears/recipe.sh
rename to recipes/demos/sdl2-gears/recipe.sh
index 8ae41967bb276a652ed74f5faa8eb770b11191f4..6da36dd23731f2a95802e63ae5289708fdf2f764 100644
--- a/recipes/demos/sdl2_gears/recipe.sh
+++ b/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"
diff --git a/recipes/development/autoconf/recipe.toml b/recipes/dev/autoconf/recipe.toml
similarity index 100%
rename from recipes/development/autoconf/recipe.toml
rename to recipes/dev/autoconf/recipe.toml
diff --git a/recipes/development/automake/recipe.toml b/recipes/dev/automake/recipe.toml
similarity index 100%
rename from recipes/development/automake/recipe.toml
rename to recipes/dev/automake/recipe.toml
diff --git a/recipes/development/cargo/recipe.toml b/recipes/dev/cargo/recipe.toml
similarity index 97%
rename from recipes/development/cargo/recipe.toml
rename to recipes/dev/cargo/recipe.toml
index a443f377d70b609aa3248f84c2bdc6048a2db1a7..71834b9198b4512ccdce177a179a022b1ccfac2a 100644
--- a/recipes/development/cargo/recipe.toml
+++ b/recipes/dev/cargo/recipe.toml
@@ -9,7 +9,7 @@ dependencies = [
"curl",
"libssh2",
"nghttp2",
- "openssl",
+ "openssl1",
"zlib",
]
script = """
diff --git a/recipes/development/cmake/recipe.toml b/recipes/dev/cmake/recipe.toml
similarity index 96%
rename from recipes/development/cmake/recipe.toml
rename to recipes/dev/cmake/recipe.toml
index 7c3d24b115fb162035ca9517bc17f78735936e47..77c573b70334fdf82e97188fc15ac3aa3d2d1157 100644
--- a/recipes/development/cmake/recipe.toml
+++ b/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"
diff --git a/recipes/development/crates-io-index/recipe.toml b/recipes/dev/crates-io-index/recipe.toml
similarity index 100%
rename from recipes/development/crates-io-index/recipe.toml
rename to recipes/dev/crates-io-index/recipe.toml
diff --git a/recipes/development/fal/recipe.sh b/recipes/dev/fal/recipe.sh
similarity index 100%
rename from recipes/development/fal/recipe.sh
rename to recipes/dev/fal/recipe.sh
diff --git a/recipes/development/fontconfig/recipe.toml b/recipes/dev/fontconfig/recipe.toml
old mode 100755
new mode 100644
similarity index 97%
rename from recipes/development/fontconfig/recipe.toml
rename to recipes/dev/fontconfig/recipe.toml
index b230274b728a75dec299403fc044a9b73980e7cd..49eed3b32a38636a384ed4e55129f04c0d731e15
--- a/recipes/development/fontconfig/recipe.toml
+++ b/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",
]
diff --git a/recipes/development/fontconfig/redox.patch b/recipes/dev/fontconfig/redox.patch
similarity index 100%
rename from recipes/development/fontconfig/redox.patch
rename to recipes/dev/fontconfig/redox.patch
diff --git a/recipes/development/gawk/recipe.sh b/recipes/dev/gawk/recipe.sh
similarity index 100%
rename from recipes/development/gawk/recipe.sh
rename to recipes/dev/gawk/recipe.sh
diff --git a/recipes/development/gcc/recipe.sh b/recipes/dev/gcc13/recipe.sh
similarity index 100%
rename from recipes/development/gcc/recipe.sh
rename to recipes/dev/gcc13/recipe.sh
diff --git a/recipes/development/gdbserver/recipe.toml b/recipes/dev/gdbserver/recipe.toml
similarity index 100%
rename from recipes/development/gdbserver/recipe.toml
rename to recipes/dev/gdbserver/recipe.toml
diff --git a/recipes/development/gdk-pixbuf/recipe.sh b/recipes/dev/gdk-pixbuf/recipe.sh
old mode 100755
new mode 100644
similarity index 100%
rename from recipes/development/gdk-pixbuf/recipe.sh
rename to recipes/dev/gdk-pixbuf/recipe.sh
diff --git a/recipes/development/gnu-make/make.patch b/recipes/dev/gnu-make/make.patch
similarity index 100%
rename from recipes/development/gnu-make/make.patch
rename to recipes/dev/gnu-make/make.patch
diff --git a/recipes/development/gnu-make/recipe.sh b/recipes/dev/gnu-make/recipe.sh
similarity index 100%
rename from recipes/development/gnu-make/recipe.sh
rename to recipes/dev/gnu-make/recipe.sh
diff --git a/recipes/development/lci/recipe.sh b/recipes/dev/lci/recipe.sh
similarity index 100%
rename from recipes/development/lci/recipe.sh
rename to recipes/dev/lci/recipe.sh
diff --git a/recipes/development/llvm/native.cmake b/recipes/dev/llvm/native.cmake
similarity index 100%
rename from recipes/development/llvm/native.cmake
rename to recipes/dev/llvm/native.cmake
diff --git a/recipes/development/llvm/recipe.toml b/recipes/dev/llvm/recipe.toml
similarity index 100%
rename from recipes/development/llvm/recipe.toml
rename to recipes/dev/llvm/recipe.toml
diff --git a/recipes/development/lua/recipe.toml b/recipes/dev/lua54/recipe.toml
similarity index 100%
rename from recipes/development/lua/recipe.toml
rename to recipes/dev/lua54/recipe.toml
diff --git a/recipes/development/nasm/recipe.toml b/recipes/dev/nasm/recipe.toml
similarity index 100%
rename from recipes/development/nasm/recipe.toml
rename to recipes/dev/nasm/recipe.toml
diff --git a/recipes/development/patch/01-no-rlimit.patch b/recipes/dev/patch/01-no-rlimit.patch
similarity index 100%
rename from recipes/development/patch/01-no-rlimit.patch
rename to recipes/dev/patch/01-no-rlimit.patch
diff --git a/recipes/development/patch/02-no-chown.patch b/recipes/dev/patch/02-no-chown.patch
similarity index 100%
rename from recipes/development/patch/02-no-chown.patch
rename to recipes/dev/patch/02-no-chown.patch
diff --git a/recipes/development/patch/recipe.sh b/recipes/dev/patch/recipe.sh
similarity index 100%
rename from recipes/development/patch/recipe.sh
rename to recipes/dev/patch/recipe.sh
diff --git a/recipes/development/pciids/recipe.toml b/recipes/dev/pciids/recipe.toml
similarity index 100%
rename from recipes/development/pciids/recipe.toml
rename to recipes/dev/pciids/recipe.toml
diff --git a/recipes/development/perl/perl.patch b/recipes/dev/perl5/perl.patch
similarity index 100%
rename from recipes/development/perl/perl.patch
rename to recipes/dev/perl5/perl.patch
diff --git a/recipes/development/perl/recipe.sh b/recipes/dev/perl5/recipe.sh
similarity index 100%
rename from recipes/development/perl/recipe.sh
rename to recipes/dev/perl5/recipe.sh
diff --git a/recipes/development/pkg-config/recipe.toml b/recipes/dev/pkg-config/recipe.toml
old mode 100755
new mode 100644
similarity index 100%
rename from recipes/development/pkg-config/recipe.toml
rename to recipes/dev/pkg-config/recipe.toml
diff --git a/recipes/development/pkgar/recipe.toml b/recipes/dev/pkgar/recipe.toml
similarity index 100%
rename from recipes/development/pkgar/recipe.toml
rename to recipes/dev/pkgar/recipe.toml
diff --git a/recipes/development/python/config.site b/recipes/dev/python37/config.site
similarity index 100%
rename from recipes/development/python/config.site
rename to recipes/dev/python37/config.site
diff --git a/recipes/development/python/recipe.sh b/recipes/dev/python37/recipe.sh
similarity index 97%
rename from recipes/development/python/recipe.sh
rename to recipes/dev/python37/recipe.sh
index 3f3b73072201df5ac3b115ea1f0ce22104fb9ed3..1c92b6d6e8109d75a2af5b115f856a00a2aa09fc 100644
--- a/recipes/development/python/recipe.sh
+++ b/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
diff --git a/recipes/development/python/redox.patch b/recipes/dev/python37/redox.patch
similarity index 100%
rename from recipes/development/python/redox.patch
rename to recipes/dev/python37/redox.patch
diff --git a/recipes/development/redoxerd/recipe.toml b/recipes/dev/redoxerd/recipe.toml
similarity index 100%
rename from recipes/development/redoxerd/recipe.toml
rename to recipes/dev/redoxerd/recipe.toml
diff --git a/recipes/development/rust/.gitignore b/recipes/dev/rust/.gitignore
similarity index 100%
rename from recipes/development/rust/.gitignore
rename to recipes/dev/rust/.gitignore
diff --git a/recipes/development/rust/config.toml b/recipes/dev/rust/config.toml
similarity index 100%
rename from recipes/development/rust/config.toml
rename to recipes/dev/rust/config.toml
diff --git a/recipes/development/rust/recipe.sh b/recipes/dev/rust/recipe.sh
similarity index 96%
rename from recipes/development/rust/recipe.sh
rename to recipes/dev/rust/recipe.sh
index d327fb0a80312ae5103e598481a83a28188569a4..166d23a395d08392411146c2ebae7560959924b9 100644
--- a/recipes/development/rust/recipe.sh
+++ b/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 {
diff --git a/recipes/development/rustpython/recipe.toml b/recipes/dev/rustpython/recipe.toml
similarity index 92%
rename from recipes/development/rustpython/recipe.toml
rename to recipes/dev/rustpython/recipe.toml
index dcd992a89f122bb81eaa542ba22103094fd58c7f..5c064657942e4b29ee5b243caa8559aeb0cf6053 100644
--- a/recipes/development/rustpython/recipe.toml
+++ b/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)
diff --git a/recipes/development/strace/recipe.toml b/recipes/dev/strace/recipe.toml
similarity index 100%
rename from recipes/development/strace/recipe.toml
rename to recipes/dev/strace/recipe.toml
diff --git a/recipes/documentation/book/recipe.toml b/recipes/doc/book/recipe.toml
similarity index 100%
rename from recipes/documentation/book/recipe.toml
rename to recipes/doc/book/recipe.toml
diff --git a/recipes/emulators/dosbox/recipe.sh b/recipes/emulators/dosbox/recipe.sh
index 8aa594ea1e976a1b679a0742ec214d448f1e8bf3..91376e0e364d82375af621a37b94fbcc8076bffe 100644
--- a/recipes/emulators/dosbox/recipe.sh
+++ b/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"
diff --git a/recipes/emulators/flycast/recipe.toml b/recipes/emulators/flycast/recipe.toml
index cd5a8c0836ee2829a22a7e106333fe07463a490f..41cb8953653cee3761415507c2f8a711e0d3e485 100644
--- a/recipes/emulators/flycast/recipe.toml
+++ b/recipes/emulators/flycast/recipe.toml
@@ -10,7 +10,7 @@ dependencies = [
"llvm",
"mesa",
"nghttp2",
- "openssl",
+ "openssl1",
"sdl2",
"zlib",
]
diff --git a/recipes/emulators/mgba/recipe.sh b/recipes/emulators/mgba/recipe.sh
index f7baad9053dd55fc0330d969a732f90f4df58cb9..1e38f3f56c6b40d4c1bee275051bb94e0b8a1d6e 100644
--- a/recipes/emulators/mgba/recipe.sh
+++ b/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"
diff --git a/recipes/emulators/qemu/recipe.sh b/recipes/emulators/qemu/recipe.sh
index f14bb48ddcb22082ab5fc1d1eaebbaaac59cd4e7..b0c3d46d2d23a3c8ea43ab3a70f0b3a0ebe617b7 100644
--- a/recipes/emulators/qemu/recipe.sh
+++ b/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"
diff --git a/recipes/emulators/retroarch/recipe.toml b/recipes/emulators/retroarch/recipe.toml
index 25a38366366c30ef8bf331264dca7e6f7c47902f..51f4019e40cc9f9b7ba30ded67895032ebc80a3d 100644
--- a/recipes/emulators/retroarch/recipe.toml
+++ b/recipes/emulators/retroarch/recipe.toml
@@ -8,7 +8,7 @@ dependencies = [
"libretro-super",
"llvm",
"mesa",
- "openssl",
+ "openssl1",
"sdl2",
"zlib",
]
diff --git a/recipes/emulators/scummvm/recipe.sh b/recipes/emulators/scummvm/recipe.sh
index 22ee8d5c978b3dbe16457ea9df2dcdf7c296e00d..f772252bc87ed03f98a2cb4bfd7acba82fea29ea 100644
--- a/recipes/emulators/scummvm/recipe.sh
+++ b/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"
diff --git a/recipes/emulators/vice/recipe.sh b/recipes/emulators/vice/recipe.sh
index 42da781950433c4ca3a11c93b03c01432d160001..1f5a713e10992d2fdc6aa14a2d32a95c34d9c6dc 100644
--- a/recipes/emulators/vice/recipe.sh
+++ b/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"
diff --git a/recipes/examples/rust-cairo/recipe.sh b/recipes/examples/rust-cairo/recipe.sh
index a9a5725fa7324eae78caf657942689003e7e3a37..033b28df061a761d5c953c6b177715dc0e8bcba8 100644
--- a/recipes/examples/rust-cairo/recipe.sh
+++ b/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 {
diff --git a/recipes/games/devilutionx/recipe.toml b/recipes/games/devilutionx/recipe.toml
index d47fdd6e23f0bbfab84e4866f948355fbd8b5c14..4d505f9fe4b3e766a5a0efc56f65f85c49ce009b 100644
--- a/recipes/games/devilutionx/recipe.toml
+++ b/recipes/games/devilutionx/recipe.toml
@@ -7,7 +7,7 @@ template = "custom"
dependencies = [
"libiconv",
"liborbital",
- "sdl",
+ "sdl1",
]
script = """
export CFLAGS="${CFLAGS} -I${COOKBOOK_SYSROOT}/include"
diff --git a/recipes/games/eduke32/recipe.sh b/recipes/games/eduke32/recipe.sh
index 5ab7df329a5e57917488eff9f709bc33a40430c8..855d3e18a89558e06b27d2c55f863f36f3d7ed6b 100644
--- a/recipes/games/eduke32/recipe.sh
+++ b/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"
diff --git a/recipes/games/freeciv/recipe.sh b/recipes/games/freeciv/recipe.sh
index be7e2a3743a7057c0ce10db032f12939230abc91..b27858943257fbf08939605c097a795e9fcf8ad2 100644
--- a/recipes/games/freeciv/recipe.sh
+++ b/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"
diff --git a/recipes/games/gigalomania/recipe.sh b/recipes/games/gigalomania/recipe.sh
index 5bb399143ecaf7b5c5dfc5a0f5077509a0291523..e43d67164547a27c41c92ba6cdc9419e33f1ba1f 100644
--- a/recipes/games/gigalomania/recipe.sh
+++ b/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"
diff --git a/recipes/games/neverball/recipe.sh b/recipes/games/neverball/recipe.sh
index 4ba9d47db7731a4d88999567ffda06a0d8209288..4c12afda1cf3aa13cff387983c15d4c279b0ee67 100644
--- a/recipes/games/neverball/recipe.sh
+++ b/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"
diff --git a/recipes/games/openjazz/recipe.sh b/recipes/games/openjazz/recipe.sh
index 56b0c8331beff02aa1708260aef6540009880b64..d16191cfc07247622ee6a4afc43b4a00066be9df 100644
--- a/recipes/games/openjazz/recipe.sh
+++ b/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"
diff --git a/recipes/games/openttd/recipe.sh b/recipes/games/openttd/recipe.sh
index 51e396f4330d795e19bf76f30a4570942b9d49c9..bd15e67e3657dbac129d3dc88aeda90e71833f6e 100644
--- a/recipes/games/openttd/recipe.sh
+++ b/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"
diff --git a/recipes/games/prboom/recipe.sh b/recipes/games/prboom/recipe.sh
index 17d520497e0a37a32a97cd35edc2a87e9ba85854..c2ce128a6e819108b0206799143296253cdd44b2 100644
--- a/recipes/games/prboom/recipe.sh
+++ b/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"
diff --git a/recipes/games/sopwith/recipe.sh b/recipes/games/sopwith/recipe.sh
index 170748c1a37055652d5de81c0bd889204c532efa..a3ed07f91b31cea18cb12836a51bad03cdf931b2 100644
--- a/recipes/games/sopwith/recipe.sh
+++ b/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"
diff --git a/recipes/games/spacecadetpinball/recipe.toml b/recipes/games/spacecadetpinball/recipe.toml
index 1f098976bb59c671ac825dd992ca85e0e34bef53..49683b4803e6cceab21e97dbccc831c05b513791 100644
--- a/recipes/games/spacecadetpinball/recipe.toml
+++ b/recipes/games/spacecadetpinball/recipe.toml
@@ -12,7 +12,7 @@ dependencies = [
"llvm",
"mesa",
"sdl2",
- "sdl2_mixer",
+ "sdl2-mixer",
"zlib",
]
script = """
diff --git a/recipes/games/syobonaction/recipe.sh b/recipes/games/syobonaction/recipe.sh
index 5c50b4b1129627cdba9682dc124fa3867e1b3ac7..dc2b7a3bd9a98909a68242e75ea0c92741402c68 100644
--- a/recipes/games/syobonaction/recipe.sh
+++ b/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"
diff --git a/recipes/games/vvvvvv/recipe.sh b/recipes/games/vvvvvv/recipe.sh
index cd1e3f646a724e5306ec7c490b2c6939bdf739d9..28649e57625cfe2ebcf6813255df8849a58776a6 100644
--- a/recipes/games/vvvvvv/recipe.sh
+++ b/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"
diff --git a/recipes/games/wesnoth/recipe.sh b/recipes/games/wesnoth/recipe.sh
index 03b32fa3b716f7f2ddc986d387160e606c8e7846..b93029fd63041d1273ef9de5fd47d53fc6db518a 100644
--- a/recipes/games/wesnoth/recipe.sh
+++ b/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
)
diff --git a/recipes/libraries/duktape/recipe.sh b/recipes/libs/duktape/recipe.sh
similarity index 100%
rename from recipes/libraries/duktape/recipe.sh
rename to recipes/libs/duktape/recipe.sh
diff --git a/recipes/libraries/duktape/redox.patch b/recipes/libs/duktape/redox.patch
similarity index 100%
rename from recipes/libraries/duktape/redox.patch
rename to recipes/libs/duktape/redox.patch
diff --git a/recipes/libraries/expat/recipe.toml b/recipes/libs/expat/recipe.toml
similarity index 100%
rename from recipes/libraries/expat/recipe.toml
rename to recipes/libs/expat/recipe.toml
diff --git a/recipes/libraries/ffmpeg/binutils-2.41.patch b/recipes/libs/ffmpeg6/binutils-2.41.patch
similarity index 100%
rename from recipes/libraries/ffmpeg/binutils-2.41.patch
rename to recipes/libs/ffmpeg6/binutils-2.41.patch
diff --git a/recipes/libraries/ffmpeg/ffmpeg.patch b/recipes/libs/ffmpeg6/ffmpeg.patch
similarity index 100%
rename from recipes/libraries/ffmpeg/ffmpeg.patch
rename to recipes/libs/ffmpeg6/ffmpeg.patch
diff --git a/recipes/libraries/ffmpeg/recipe.toml b/recipes/libs/ffmpeg6/recipe.toml
similarity index 100%
rename from recipes/libraries/ffmpeg/recipe.toml
rename to recipes/libs/ffmpeg6/recipe.toml
diff --git a/recipes/libraries/freeglut/recipe.sh b/recipes/libs/freeglut/recipe.sh
similarity index 96%
rename from recipes/libraries/freeglut/recipe.sh
rename to recipes/libs/freeglut/recipe.sh
index d291f77e80b227f72561c9d916bd6f4868c3b610..b9e4b08b2681ce9d6d6d1d0a4465e6cc6b9c407b 100644
--- a/recipes/libraries/freeglut/recipe.sh
+++ b/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"
diff --git a/recipes/libraries/freeglut/redox_cross_toolchain.cmake b/recipes/libs/freeglut/redox_cross_toolchain.cmake
similarity index 100%
rename from recipes/libraries/freeglut/redox_cross_toolchain.cmake
rename to recipes/libs/freeglut/redox_cross_toolchain.cmake
diff --git a/recipes/libraries/freetype/recipe.toml b/recipes/libs/freetype2/recipe.toml
similarity index 100%
rename from recipes/libraries/freetype/recipe.toml
rename to recipes/libs/freetype2/recipe.toml
diff --git a/recipes/libraries/fribidi/recipe.sh b/recipes/libs/fribidi/recipe.sh
old mode 100755
new mode 100644
similarity index 100%
rename from recipes/libraries/fribidi/recipe.sh
rename to recipes/libs/fribidi/recipe.sh
diff --git a/recipes/libraries/glib/recipe.toml b/recipes/libs/glib/recipe.toml
similarity index 100%
rename from recipes/libraries/glib/recipe.toml
rename to recipes/libs/glib/recipe.toml
diff --git a/recipes/libraries/glib/redox.patch b/recipes/libs/glib/redox.patch
similarity index 100%
rename from recipes/libraries/glib/redox.patch
rename to recipes/libs/glib/redox.patch
diff --git a/recipes/libraries/gstreamer/recipe.sh b/recipes/libs/gstreamer/recipe.sh
similarity index 100%
rename from recipes/libraries/gstreamer/recipe.sh
rename to recipes/libs/gstreamer/recipe.sh
diff --git a/recipes/libraries/gstreamer/redox.patch b/recipes/libs/gstreamer/redox.patch
similarity index 100%
rename from recipes/libraries/gstreamer/redox.patch
rename to recipes/libs/gstreamer/redox.patch
diff --git a/recipes/libraries/harfbuzz/recipe.toml b/recipes/libs/harfbuzz/recipe.toml
similarity index 97%
rename from recipes/libraries/harfbuzz/recipe.toml
rename to recipes/libs/harfbuzz/recipe.toml
index 22f21ea8e31e2a1ebe7e3c5c5a33b88710c59973..a38b16312d6004a61d1d272b88c6b4ece6e1be38 100644
--- a/recipes/libraries/harfbuzz/recipe.toml
+++ b/recipes/libs/harfbuzz/recipe.toml
@@ -6,7 +6,7 @@ blake3 = "6572676ffef55bd37bacdd33052bedfb07333b659371495a2a26b9825ce685c0"
[build]
template = "custom"
dependencies = [
- "freetype",
+ "freetype2",
"gettext",
"glib",
"libiconv",
diff --git a/recipes/libraries/jansson/jansson.patch b/recipes/libs/jansson/jansson.patch
similarity index 100%
rename from recipes/libraries/jansson/jansson.patch
rename to recipes/libs/jansson/jansson.patch
diff --git a/recipes/libraries/jansson/recipe.sh b/recipes/libs/jansson/recipe.sh
similarity index 100%
rename from recipes/libraries/jansson/recipe.sh
rename to recipes/libs/jansson/recipe.sh
diff --git a/recipes/libraries/libcosmic/recipe.toml b/recipes/libs/libcosmic/recipe.toml
similarity index 100%
rename from recipes/libraries/libcosmic/recipe.toml
rename to recipes/libs/libcosmic/recipe.toml
diff --git a/recipes/libraries/libffi/recipe.toml b/recipes/libs/libffi/recipe.toml
similarity index 100%
rename from recipes/libraries/libffi/recipe.toml
rename to recipes/libs/libffi/recipe.toml
diff --git a/recipes/libraries/libffi/redox.patch b/recipes/libs/libffi/redox.patch
similarity index 100%
rename from recipes/libraries/libffi/redox.patch
rename to recipes/libs/libffi/redox.patch
diff --git a/recipes/libraries/libflac/recipe.toml b/recipes/libs/libflac/recipe.toml
similarity index 100%
rename from recipes/libraries/libflac/recipe.toml
rename to recipes/libs/libflac/recipe.toml
diff --git a/recipes/libraries/libgmp/recipe.toml b/recipes/libs/libgmp/recipe.toml
similarity index 100%
rename from recipes/libraries/libgmp/recipe.toml
rename to recipes/libs/libgmp/recipe.toml
diff --git a/recipes/libraries/libiconv/01_redox.patch b/recipes/libs/libiconv/01_redox.patch
similarity index 100%
rename from recipes/libraries/libiconv/01_redox.patch
rename to recipes/libs/libiconv/01_redox.patch
diff --git a/recipes/libraries/libiconv/recipe.toml b/recipes/libs/libiconv/recipe.toml
similarity index 100%
rename from recipes/libraries/libiconv/recipe.toml
rename to recipes/libs/libiconv/recipe.toml
diff --git a/recipes/libraries/libjpeg/recipe.toml b/recipes/libs/libjpeg/recipe.toml
similarity index 100%
rename from recipes/libraries/libjpeg/recipe.toml
rename to recipes/libs/libjpeg/recipe.toml
diff --git a/recipes/libraries/libmpfr/recipe.toml b/recipes/libs/libmpfr/recipe.toml
similarity index 100%
rename from recipes/libraries/libmpfr/recipe.toml
rename to recipes/libs/libmpfr/recipe.toml
diff --git a/recipes/libraries/libogg/recipe.toml b/recipes/libs/libogg/recipe.toml
similarity index 100%
rename from recipes/libraries/libogg/recipe.toml
rename to recipes/libs/libogg/recipe.toml
diff --git a/recipes/libraries/libogg/redox.patch b/recipes/libs/libogg/redox.patch
similarity index 100%
rename from recipes/libraries/libogg/redox.patch
rename to recipes/libs/libogg/redox.patch
diff --git a/recipes/libraries/liborbital/recipe.toml b/recipes/libs/liborbital/recipe.toml
similarity index 100%
rename from recipes/libraries/liborbital/recipe.toml
rename to recipes/libs/liborbital/recipe.toml
diff --git a/recipes/libraries/libpng/recipe.toml b/recipes/libs/libpng/recipe.toml
similarity index 100%
rename from recipes/libraries/libpng/recipe.toml
rename to recipes/libs/libpng/recipe.toml
diff --git a/recipes/libraries/libsodium/random.patch b/recipes/libs/libsodium/random.patch
similarity index 100%
rename from recipes/libraries/libsodium/random.patch
rename to recipes/libs/libsodium/random.patch
diff --git a/recipes/libraries/libsodium/recipe.toml b/recipes/libs/libsodium/recipe.toml
similarity index 100%
rename from recipes/libraries/libsodium/recipe.toml
rename to recipes/libs/libsodium/recipe.toml
diff --git a/recipes/libraries/libssh2/recipe.toml b/recipes/libs/libssh2/recipe.toml
similarity index 95%
rename from recipes/libraries/libssh2/recipe.toml
rename to recipes/libs/libssh2/recipe.toml
index 6665e66864ceed128936fea60c56b5b74a0c9b87..8b6200990204331c6d0074254901778e52b6072b 100644
--- a/recipes/libraries/libssh2/recipe.toml
+++ b/recipes/libs/libssh2/recipe.toml
@@ -8,5 +8,5 @@ patches = []
[build]
template = "configure"
dependencies = [
- "openssl"
+ "openssl1"
]
diff --git a/recipes/libraries/libvorbis/recipe.toml b/recipes/libs/libvorbis/recipe.toml
similarity index 100%
rename from recipes/libraries/libvorbis/recipe.toml
rename to recipes/libs/libvorbis/recipe.toml
diff --git a/recipes/libraries/libxml2/recipe.toml b/recipes/libs/libxml2/recipe.toml
similarity index 100%
rename from recipes/libraries/libxml2/recipe.toml
rename to recipes/libs/libxml2/recipe.toml
diff --git a/recipes/libraries/mesa_glu/recipe.sh b/recipes/libs/mesa-glu/recipe.sh
similarity index 100%
rename from recipes/libraries/mesa_glu/recipe.sh
rename to recipes/libs/mesa-glu/recipe.sh
diff --git a/recipes/libraries/mesa/recipe.toml b/recipes/libs/mesa/recipe.toml
similarity index 100%
rename from recipes/libraries/mesa/recipe.toml
rename to recipes/libs/mesa/recipe.toml
diff --git a/recipes/tui/ncurses/recipe.toml b/recipes/libs/ncurses/recipe.toml
similarity index 100%
rename from recipes/tui/ncurses/recipe.toml
rename to recipes/libs/ncurses/recipe.toml
diff --git a/recipes/tui/ncursesw/01-config-sub.patch b/recipes/libs/ncursesw/01-config-sub.patch
similarity index 100%
rename from recipes/tui/ncursesw/01-config-sub.patch
rename to recipes/libs/ncursesw/01-config-sub.patch
diff --git a/recipes/tui/ncursesw/recipe.sh b/recipes/libs/ncursesw/recipe.sh
similarity index 100%
rename from recipes/tui/ncursesw/recipe.sh
rename to recipes/libs/ncursesw/recipe.sh
diff --git a/recipes/libraries/openssl/recipe.toml b/recipes/libs/openssl1/recipe.toml
similarity index 100%
rename from recipes/libraries/openssl/recipe.toml
rename to recipes/libs/openssl1/recipe.toml
diff --git a/recipes/libraries/pcre/recipe.toml b/recipes/libs/pcre/recipe.toml
similarity index 100%
rename from recipes/libraries/pcre/recipe.toml
rename to recipes/libs/pcre/recipe.toml
diff --git a/recipes/libraries/pcre/redox.patch b/recipes/libs/pcre/redox.patch
similarity index 100%
rename from recipes/libraries/pcre/redox.patch
rename to recipes/libs/pcre/redox.patch
diff --git a/recipes/libraries/pixman/recipe.sh b/recipes/libs/pixman/recipe.sh
old mode 100755
new mode 100644
similarity index 100%
rename from recipes/libraries/pixman/recipe.sh
rename to recipes/libs/pixman/recipe.sh
diff --git a/recipes/libraries/pixman/redox.patch b/recipes/libs/pixman/redox.patch
similarity index 100%
rename from recipes/libraries/pixman/redox.patch
rename to recipes/libs/pixman/redox.patch
diff --git a/recipes/libraries/readline/recipe.toml b/recipes/libs/readline/recipe.toml
similarity index 100%
rename from recipes/libraries/readline/recipe.toml
rename to recipes/libs/readline/recipe.toml
diff --git a/recipes/libraries/readline/redox.patch b/recipes/libs/readline/redox.patch
similarity index 100%
rename from recipes/libraries/readline/redox.patch
rename to recipes/libs/readline/redox.patch
diff --git a/recipes/libraries/redox-fatfs/recipe.toml b/recipes/libs/redox-fatfs/recipe.toml
similarity index 100%
rename from recipes/libraries/redox-fatfs/recipe.toml
rename to recipes/libs/redox-fatfs/recipe.toml
diff --git a/recipes/libraries/zlib/recipe.toml b/recipes/libs/zlib/recipe.toml
similarity index 100%
rename from recipes/libraries/zlib/recipe.toml
rename to recipes/libs/zlib/recipe.toml
diff --git a/recipes/network/netsurf/01_redox.patch b/recipes/net/netsurf/01_redox.patch
similarity index 100%
rename from recipes/network/netsurf/01_redox.patch
rename to recipes/net/netsurf/01_redox.patch
diff --git a/recipes/network/netsurf/manifest b/recipes/net/netsurf/manifest
similarity index 100%
rename from recipes/network/netsurf/manifest
rename to recipes/net/netsurf/manifest
diff --git a/recipes/network/netsurf/recipe.sh b/recipes/net/netsurf/recipe.sh
similarity index 89%
rename from recipes/network/netsurf/recipe.sh
rename to recipes/net/netsurf/recipe.sh
index 77ddf17f11947c35c2ad4c0d56ff3b56ce0482e4..2eda2d70bc05c02459385656de261dc2204e688b 100644
--- a/recipes/network/netsurf/recipe.sh
+++ b/recipes/net/netsurf/recipe.sh
@@ -1,6 +1,6 @@
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 openssl sdl zlib freetype liborbital libiconv)
+BUILD_DEPENDS=(curl expat libjpeg libpng nghttp2 openssl1 sdl1 zlib freetype2 liborbital libiconv)
DEPENDS="ca-certificates orbital"
function recipe_version {
diff --git a/recipes/network/nghttp2/recipe.toml b/recipes/net/nghttp2/recipe.toml
similarity index 100%
rename from recipes/network/nghttp2/recipe.toml
rename to recipes/net/nghttp2/recipe.toml
diff --git a/recipes/shells/nushell/recipe.toml b/recipes/shells/nushell/recipe.toml
index 27c9c8d610f8151587c5fa5206ac50df1c4e7c54..e2559c66807e14cccdf6b24faa51ddc34f95e02f 100644
--- a/recipes/shells/nushell/recipe.toml
+++ b/recipes/shells/nushell/recipe.toml
@@ -9,7 +9,7 @@ branch = "redox"
[build]
dependencies = [
- "openssl"
+ "openssl1"
]
template = "custom"
script = """
diff --git a/recipes/toolkits/servo/recipe.sh b/recipes/toolkits/servo/recipe.sh
index a436c4c30fc9f26bc212a817175590225ed6a4a2..b24a58048a4042de27c77ed554e5a4cdd76a0add 100644
--- a/recipes/toolkits/servo/recipe.sh
+++ b/recipes/toolkits/servo/recipe.sh
@@ -1,7 +1,7 @@
GIT=https://gitlab.redox-os.org/redox-os/servo.git
GIT_UPSTREAM=https://github.com/servo/servo.git
BRANCH=redox
-BUILD_DEPENDS=(freetype gettext glib gstreamer harfbuzz libffi libiconv libpng openssl pcre zlib)
+BUILD_DEPENDS=(freetype2 gettext glib gstreamer harfbuzz libffi libiconv libpng openssl1 pcre zlib)
PREPARE_COPY=0
function recipe_version {
diff --git a/recipes/tools/curl/recipe.toml b/recipes/tools/curl/recipe.toml
index 244f9c653a70852b3a53083d3e7b23dfd3fae32b..bd28bb6eb7ba88a73f47b3df20d15042982f44b7 100644
--- a/recipes/tools/curl/recipe.toml
+++ b/recipes/tools/curl/recipe.toml
@@ -6,7 +6,7 @@ branch = "redox"
template = "custom"
dependencies = [
"nghttp2",
- "openssl",
+ "openssl1",
"zlib"
]
script = """
diff --git a/recipes/tools/git/recipe.sh b/recipes/tools/git/recipe.sh
index eeb4ef660d76a881847726538e34e55b192b6d94..0d6f14c2cbd142a9fcfcdffff9c6d6ccb44c4e35 100644
--- a/recipes/tools/git/recipe.sh
+++ b/recipes/tools/git/recipe.sh
@@ -1,6 +1,6 @@
VERSION=2.13.1
TAR=https://www.kernel.org/pub/software/scm/git/git-$VERSION.tar.xz
-BUILD_DEPENDS=(zlib curl openssl expat nghttp2)
+BUILD_DEPENDS=(zlib curl openssl1 expat nghttp2)
DEPENDS="ca-certificates"
MAKEFLAGS=(
diff --git a/recipes/tools/gitoxide/recipe.toml b/recipes/tools/gitoxide/recipe.toml
index 4a531c082e91332266b2b80623715a2ae52a01a3..4bd2cf93fe72dba66546fce1c9a6428bba6218d6 100644
--- a/recipes/tools/gitoxide/recipe.toml
+++ b/recipes/tools/gitoxide/recipe.toml
@@ -3,7 +3,7 @@ git = "https://github.com/Byron/gitoxide.git"
[build]
dependencies = [
- "openssl",
+ "openssl1",
]
template = "custom"
script = """
diff --git a/recipes/tools/miniserve/recipe.sh b/recipes/tools/miniserve/recipe.sh
index 9ae5bb15d876bcb0d23eeb2145dfea63f1a34fb0..fdd79422a58a76756fd14d86fab32db2022a0240 100644
--- a/recipes/tools/miniserve/recipe.sh
+++ b/recipes/tools/miniserve/recipe.sh
@@ -1,2 +1,2 @@
GIT=https://gitlab.redox-os.org/redox-os/miniserve
-BUILD_DEPENDS=(openssl zlib)
+BUILD_DEPENDS=(openssl1 zlib)
diff --git a/recipes/tools/schismtracker/recipe.sh b/recipes/tools/schismtracker/recipe.sh
index 42e6e38780c7aba9772fc06967ff4b0e8aa92ed6..b79414672976450d1d4248074d091225329b8f8b 100644
--- a/recipes/tools/schismtracker/recipe.sh
+++ b/recipes/tools/schismtracker/recipe.sh
@@ -1,7 +1,7 @@
VERSION=20181223
TAR=https://github.com/schismtracker/schismtracker/archive/$VERSION.tar.gz
TAR_SHA256=fc32930c611fdb78face87dbe8a3c62e70088fd8d4ad803140e0b9a0b2e72ad7
-BUILD_DEPENDS=(sdl liborbital libiconv)
+BUILD_DEPENDS=(sdl12 liborbital libiconv)
function recipe_version {
echo "$VERSION"
diff --git a/recipes/tools/ssh/recipe.sh b/recipes/tools/ssh/recipe.sh
index ef1cf953b6de8f8b02498cb06ad05a1589062586..6b8e08fb18764454896b50665545738813c84744 100644
--- a/recipes/tools/ssh/recipe.sh
+++ b/recipes/tools/ssh/recipe.sh
@@ -1,6 +1,6 @@
VERSION=7.9p1
TAR=https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-$VERSION.tar.gz
-BUILD_DEPENDS=(openssl zlib)
+BUILD_DEPENDS=(openssl1 zlib)
function recipe_version {
echo "$VERSION"
diff --git a/recipes/video/sdl-player/recipe.sh b/recipes/video/sdl-player/recipe.sh
index c948178a5e85b4819f5783dc8cfa68d202e843eb..2d419ad692f6a4df4bfcb2cb1330f5fe7723c2fe 100644
--- a/recipes/video/sdl-player/recipe.sh
+++ b/recipes/video/sdl-player/recipe.sh
@@ -1,5 +1,5 @@
GIT=https://gitlab.redox-os.org/redox-os/sdl-player.git
-BUILD_DEPENDS=(ffmpeg liborbital sdl zlib)
+BUILD_DEPENDS=(ffmpeg6 liborbital sdl1 zlib)
function recipe_version {
echo "1.0.0"