.cargo/config

@@ -9,7 +9,3 @@ rustflags = []
 [target.x86_64-unknown-redox]
 linker = "x86_64-unknown-redox-gcc"
 rustflags = []
-
-# TODO: remove patch if https://github.com/rust-lang/libc/pull/3024 is released
-[patch.crates-io]
-libc = { git = "https://gitlab.redox-os.org/redox-os/liblibc.git", branch = "rust-2022-03-18" }

Xargo.toml

-[target.aarch64-unknown-redox.dependencies.std]
-features = ["panic_unwind"]
-
-[target.x86_64-unknown-redox.dependencies.std]
-features = ["panic_unwind"]
-#features = ["panic_unwind", "backtrace"]
-
-#[dependencies.test]
-#stage = 1
-

clean.sh

@@ -14,5 +14,3 @@ for recipe in $recipes
 do
     ./cook.sh "$recipe" distclean
 done
-
-rm -rf xargo

config.sh

@@ -13,7 +13,6 @@ HOST="$TARGET"
 ROOT="$(cd `dirname "$0"` && pwd)"
 REPO="$ROOT/repo/$TARGET"
 export PATH="${ROOT}/bin:$PATH"
-export XARGO_HOME="${ROOT}/xargo"
 
 export AR="${HOST}-gcc-ar"
 export AS="${HOST}-as"

cook.sh

@@ -235,7 +235,6 @@ function op {
 
             if [ "$skip" -eq "0" ]
             then
-                cp -p "$ROOT/Xargo.toml" "Xargo.toml"
                 "${CARGO[@]}" "$CARGOBUILD" --target "$TARGET" $release_flag $package_flag $CARGOFLAGS
             fi
             popd > /dev/null

recipes/block_encrypt/recipe.sh

-GIT=https://github.com/tomasritter/block_encrypt.git
-CARGO=(env RUSTFLAGS="$PREFIX_RUSTFLAGS -C target-feature=+aes" xargo)
-

recipes/calculator/recipe.sh

-GIT=https://gitlab.redox-os.org/redox-os/orbcalculator.git
-BRANCH=master

recipes/calculator/recipe.toml

+[source]
+git = "https://gitlab.redox-os.org/redox-os/orbcalculator.git"
+
+[build]
+template = "cargo"

recipes/cargo/recipe.toml

 [source]
 git = "https://gitlab.redox-os.org/redox-os/cargo.git"
 upstream = "https://github.com/rust-lang/cargo.git"
-branch = "redox-2022-03-18"
+branch = "redox-2023-01-21"
 
 [build]
 template = "custom"

recipes/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 = [
+    "openssl",
+]
+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/eduke32/redox.patch

 diff -rupwN source/Common.mak source-new/Common.mak
 --- source/Common.mak	2018-07-14 15:36:44.000000000 -0600
-+++ source-new/Common.mak	2019-03-15 21:28:32.366856380 -0600
++++ source-new/Common.mak	2023-01-20 10:38:24.948044222 -0700
 @@ -93,7 +93,7 @@ endif
  
  ##### Makefile meta-settings
@@ -21,22 +21,24 @@ diff -rupwN source/Common.mak source-new/Common.mak
  CC := $(CROSS)gcc$(CROSS_SUFFIX)
  CXX := $(CROSS)g++$(CROSS_SUFFIX)
  
-@@ -383,6 +387,14 @@ else ifeq ($(PLATFORM),$(filter $(PLATFO
+@@ -383,6 +387,16 @@ else ifeq ($(PLATFORM),$(filter $(PLATFO
      override NOASM := 1
  else ifeq ($(PLATFORM),$(filter $(PLATFORM),BEOS SKYOS))
      override NOASM := 1
 +else ifeq ($(PLATFORM),REDOX)
-+    override USE_OPENGL := 0
-+    override NETCODE := 0
-+    override HAVE_GTK2 := 0
 +    override HAVE_FLAC := 0
++    override HAVE_GTK2 := 0
 +    override HAVE_XMP := 0
 +    override MIXERTYPE := SDL
++    override NETCODE := 0
++    override NOASM := 1
++    override USE_OPENGL := 0
++    OPTOPT := -mtune=generic
 +    SDL_TARGET := 1
  endif
  
  ifneq (i386,$(strip $(IMPLICIT_ARCH)))
-@@ -868,7 +880,7 @@ ifeq ($(RENDERTYPE),SDL)
+@@ -868,7 +882,7 @@ ifeq ($(RENDERTYPE),SDL)
          SDLCONFIG := sdl2-config
          SDLNAME := SDL2
      else ifeq ($(SDL_TARGET),1)
@@ -45,7 +47,7 @@ diff -rupwN source/Common.mak source-new/Common.mak
          SDLNAME := SDL
          ifeq (0,$(RELEASE))
              COMPILERFLAGS += -DNOSDLPARACHUTE
-@@ -957,9 +969,11 @@ else ifeq ($(PLATFORM),WII)
+@@ -957,9 +971,11 @@ else ifeq ($(PLATFORM),WII)
      LIBS += -laesnd_tueidj -lfat -lwiiuse -lbte -lwiikeyboard -logc
  else ifeq ($(SUBPLATFORM),LINUX)
      LIBS += -lrt
@@ -58,9 +60,10 @@ diff -rupwN source/Common.mak source-new/Common.mak
      ifneq ($(PLATFORM),BSD)
          LIBS += -ldl
      endif
+Binary files source/.Common.mak.swp and source-new/.Common.mak.swp differ
 diff -rupwN source/source/build/include/compat.h source-new/source/build/include/compat.h
 --- source/source/build/include/compat.h	2018-10-06 23:21:24.000000000 -0600
-+++ source-new/source/build/include/compat.h	2019-03-15 21:21:09.285856877 -0600
++++ source-new/source/build/include/compat.h	2023-01-20 10:31:10.843745693 -0700
 @@ -7,6 +7,9 @@
  
  #pragma once
@@ -92,7 +95,7 @@ diff -rupwN source/source/build/include/compat.h source-new/source/build/include
  #if defined(__cplusplus) && defined(_MSC_VER)
 diff -rupwN source/source/build/src/baselayer.cpp source-new/source/build/src/baselayer.cpp
 --- source/source/build/src/baselayer.cpp	2018-10-06 23:21:43.000000000 -0600
-+++ source-new/source/build/src/baselayer.cpp	2019-03-15 21:21:09.285856877 -0600
++++ source-new/source/build/src/baselayer.cpp	2023-01-20 10:31:49.591772332 -0700
 @@ -498,7 +498,7 @@ int32_t baselayer_init(void)
  
  void maybe_redirect_outputs(void)
@@ -104,7 +107,7 @@ diff -rupwN source/source/build/src/baselayer.cpp source-new/source/build/src/ba
      // pipe standard outputs to files
 diff -rupwN source/source/build/src/sdlayer.cpp source-new/source/build/src/sdlayer.cpp
 --- source/source/build/src/sdlayer.cpp	2018-10-06 23:23:44.000000000 -0600
-+++ source-new/source/build/src/sdlayer.cpp	2019-03-15 21:21:09.289856979 -0600
++++ source-new/source/build/src/sdlayer.cpp	2023-01-20 10:30:49.223730830 -0700
 @@ -305,7 +305,7 @@ void wm_setapptitle(const char *name)
  //
  
@@ -116,7 +119,7 @@ diff -rupwN source/source/build/src/sdlayer.cpp source-new/source/build/src/sdla
  #endif
 diff -rupwN source/source/duke3d/src/common.cpp source-new/source/duke3d/src/common.cpp
 --- source/source/duke3d/src/common.cpp	2018-10-06 23:20:23.000000000 -0600
-+++ source-new/source/duke3d/src/common.cpp	2019-03-15 21:21:09.289856979 -0600
++++ source-new/source/duke3d/src/common.cpp	2023-01-20 10:30:49.223730830 -0700
 @@ -1173,6 +1173,7 @@ int32_t S_OpenAudio(const char *fn, char
      Bfree(testfn);
      return origfp;
@@ -132,7 +135,7 @@ diff -rupwN source/source/duke3d/src/common.cpp source-new/source/duke3d/src/com
 -#endif
 diff -rupwN source/source/duke3d/src/game.cpp source-new/source/duke3d/src/game.cpp
 --- source/source/duke3d/src/game.cpp	2018-10-06 23:23:48.000000000 -0600
-+++ source-new/source/duke3d/src/game.cpp	2019-03-15 21:21:09.293857082 -0600
++++ source-new/source/duke3d/src/game.cpp	2023-01-20 10:30:49.223730830 -0700
 @@ -6697,7 +6697,7 @@ MAIN_LOOP_RESTART:
              static char buf[128];
  #ifndef GEKKO
@@ -144,7 +147,7 @@ diff -rupwN source/source/duke3d/src/game.cpp source-new/source/duke3d/src/game.
              {
 diff -rupwN source/source/enet/include/enet/unix.h source-new/source/enet/include/enet/unix.h
 --- source/source/enet/include/enet/unix.h	2014-06-16 17:16:08.000000000 -0600
-+++ source-new/source/enet/include/enet/unix.h	2019-03-15 21:21:09.293857082 -0600
++++ source-new/source/enet/include/enet/unix.h	2023-01-20 10:30:49.223730830 -0700
 @@ -6,6 +6,7 @@
  #define __ENET_UNIX_H__
  

recipes/fd/recipe.sh

-GIT=https://github.com/sharkdp/fd.git
\ No newline at end of file

recipes/fd/recipe.toml

+[source]
+git = "https://github.com/sharkdp/fd.git"
+
+[build]
+template = "cargo"

recipes/ffmpeg/recipe.sh

-VERSION=4.0
-GIT=https://github.com/FFmpeg/FFmpeg
-BRANCH=release/$VERSION
-BUILD_DEPENDS=(zlib)
-
-function recipe_version {
-    echo "$VERSION"
-    skip=1
-}
-
-function recipe_build {
-    sysroot="$PWD/../sysroot"
-    export CPPFLAGS="-I$sysroot/include"
-    export LDFLAGS="-L$sysroot/lib -static"
-    ./configure \
-        --enable-cross-compile \
-        --target-os=redox \
-        --arch=${ARCH} \
-        --cross_prefix=${HOST}- \
-        --prefix=/ \
-        --disable-network \
-        --enable-zlib \
-        --enable-encoder=png \
-        --enable-decoder=png
-    "$REDOX_MAKE" -j"$($NPROC)"
-    skip=1
-}
-
-function recipe_clean {
-    "$REDOX_MAKE" clean
-    skip=1
-}
-
-function recipe_stage {
-    dest="$(realpath $1)"
-    "$REDOX_MAKE" DESTDIR="$dest" install
-    skip=1
-}

recipes/ffmpeg/recipe.toml

+[source]
+tar = "https://ffmpeg.org/releases/ffmpeg-5.1.2.tar.xz"
+patches = [
+    "ffmpeg.patch"
+]
+
+[build]
+template = "custom"
+dependencies = [
+    "liborbital",
+    "llvm",
+    "mesa",
+    "sdl2",
+    "zlib",
+]
+script = """
+ARCH="${TARGET%%-*}"
+COOKBOOK_CONFIGURE_FLAGS=(
+    --enable-cross-compile
+    --target-os=redox
+    --arch="${ARCH}"
+    --cross_prefix="${TARGET}-"
+    --prefix=/
+    --disable-network
+    --enable-sdl2
+    --enable-zlib
+    --enable-encoder=png
+    --enable-decoder=png
+)
+cookbook_configure
+"""

recipes/installer-gui/recipe.toml

+[source]
+git = "https://gitlab.redox-os.org/redox-os/installer-gui.git"
+
+[build]
+template = "cargo"

recipes/llvm/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-2022-03-18"
+branch = "redox-2023-01-21"
 
 [build]
 template = "custom"
-dependencies = []
+dependencies = [
+    "zlib"
+]
 script = """
 COOKBOOK_CONFIGURE="cmake"
 COOKBOOK_CONFIGURE_FLAGS=(
@@ -28,6 +30,7 @@ COOKBOOK_CONFIGURE_FLAGS=(
     -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
@@ -47,6 +50,8 @@ COOKBOOK_CONFIGURE_FLAGS=(
     -DLLVM_UTILS_INSTALL_DIR=bin
     -DPYTHON_EXECUTABLE="/usr/bin/python2"
     -DUNIX=1
+    -DZLIB_LIBRARY=-lz
+    -DZLIB_INCLUDE_DIR="${COOKBOOK_SYSROOT}/include"
     -Wno-dev
     "${COOKBOOK_SOURCE}/llvm"
 )

recipes/mesa/recipe.toml

@@ -57,7 +57,8 @@ meson "${COOKBOOK_SOURCE}" . \
     -Dshared-glapi=disabled
 ninja -v
 DESTDIR="${COOKBOOK_STAGE}" ninja install
+
 # Hack to add LLVM libs
 #TODO: only add necessary LLVM libs, not all of them
-sed -i "s/ -lOSMesa / -lOSMesa $("${TARGET}-llvm-config" --libs) /" "${COOKBOOK_STAGE}/lib/pkgconfig/osmesa.pc"
+sed -i "s/ -lOSMesa / -lOSMesa $("${TARGET}-llvm-config" --libs) -lstdc++ /" "${COOKBOOK_STAGE}/lib/pkgconfig/osmesa.pc"
 """

recipes/netsurf/01_redox.patch

-diff -ruwN source/buildsystem/makefiles/Makefile.top source-new/buildsystem/makefiles/Makefile.top
---- source/buildsystem/makefiles/Makefile.top	2020-05-24 15:35:19.000000000 -0600
-+++ source-new/buildsystem/makefiles/Makefile.top	2022-11-12 08:54:26.232793713 -0700
-@@ -407,12 +407,16 @@
- 	$(Q)$(AR) $(ARFLAGS) $@ $(OBJECTS)
- else
- 	$(VQ)$(ECHO) $(ECHOFLAGS) "    LINK: $@"
-+  ifeq ($(COMPONENT_FOR_BUILD),yes)
-+	$(Q)$(BUILD_CC) -o $@ $(OBJECTS) $(LDFLAGS) $(SHAREDLDFLAGS)
-+  else
-   ifeq ($(CXX_IN_BUILD),yes)
- 	$(Q)$(CXX) -o $@ $(OBJECTS) $(LDFLAGS) $(SHAREDLDFLAGS)
-   else
- 	$(Q)$(CC) -o $@ $(OBJECTS) $(LDFLAGS) $(SHAREDLDFLAGS)
-   endif
- endif
-+endif
- 
- ###############################################################################
- # Autogenerated, implied rules
 diff -ruwN source/libnsfb/Makefile source-new/libnsfb/Makefile
 --- source/libnsfb/Makefile	2020-05-24 15:35:21.000000000 -0600
-+++ source-new/libnsfb/Makefile	2022-11-12 08:53:23.376764307 -0700
++++ source-new/libnsfb/Makefile	2023-03-03 19:29:10.674915797 -0700
 @@ -43,10 +43,10 @@
  NSFB_XCB_PKG_NAMES := xcb xcb-icccm xcb-image xcb-keysyms xcb-atom
  
@@ -37,7 +17,7 @@ diff -ruwN source/libnsfb/Makefile source-new/libnsfb/Makefile
  ifeq ($(NSFB_SDL_AVAILABLE),yes)
 diff -ruwN source/libnsfb/src/plot.h source-new/libnsfb/src/plot.h
 --- source/libnsfb/src/plot.h	2020-05-24 15:35:21.000000000 -0600
-+++ source-new/libnsfb/src/plot.h	2022-11-12 08:53:23.376764307 -0700
++++ source-new/libnsfb/src/plot.h	2023-03-03 19:29:10.674915797 -0700
 @@ -46,7 +46,7 @@
          #error "Endian determination failed"
      #endif
@@ -47,9 +27,21 @@ diff -ruwN source/libnsfb/src/plot.h source-new/libnsfb/src/plot.h
      #if defined(__BYTE_ORDER__)
          #if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
              #define NSFB_BE_BYTE_ORDER
+diff -ruwN source/Makefile source-new/Makefile
+--- source/Makefile	2020-05-24 15:34:42.000000000 -0600
++++ source-new/Makefile	2023-03-03 19:34:34.411016536 -0700
+@@ -110,7 +110,7 @@
+ 
+ # prefixed install macro for each host sub target
+ define do_build_prefix_install
+-	$(MAKE) install --directory=$1 HOST=$(BUILD) PREFIX=$(TMP_PREFIX) Q=$(Q) DESTDIR=
++	$(MAKE) install --directory=$1 HOST=$(BUILD) PREFIX=$(TMP_PREFIX) Q=$(Q) DESTDIR= CC=cc LDFLAGS=
+ 
+ endef
+ 
 diff -ruwN source/netsurf/Makefile.config source-new/netsurf/Makefile.config
 --- source/netsurf/Makefile.config	1969-12-31 17:00:00.000000000 -0700
-+++ source-new/netsurf/Makefile.config	2022-11-12 08:53:23.376764307 -0700
++++ source-new/netsurf/Makefile.config	2023-03-03 19:29:10.674915797 -0700
 @@ -0,0 +1,28 @@
 +override NETSURF_HOMEPAGE := "https://www.redox-os.org/"
 +override NETSURF_FB_FRONTEND := sdl
@@ -81,7 +73,7 @@ diff -ruwN source/netsurf/Makefile.config source-new/netsurf/Makefile.config
 +override NETSURF_FB_FONT_FANTASY := Sans/Fira/Regular.ttf
 diff -ruwN source/netsurf/utils/config.h source-new/netsurf/utils/config.h
 --- source/netsurf/utils/config.h	2020-05-24 15:35:23.000000000 -0600
-+++ source-new/netsurf/utils/config.h	2022-11-12 09:00:03.996951825 -0700
++++ source-new/netsurf/utils/config.h	2023-03-03 19:29:10.674915797 -0700
 @@ -63,7 +63,8 @@
       defined(__BEOS__) ||     \
       defined(__amigaos4__) || \
@@ -92,14 +84,3 @@ diff -ruwN source/netsurf/utils/config.h source-new/netsurf/utils/config.h
  #undef HAVE_STRPTIME
  #undef HAVE_STRFTIME
  #else
-diff -ruwN source/nsgenbind/Makefile source-new/nsgenbind/Makefile
---- source/nsgenbind/Makefile	2020-05-24 15:35:23.000000000 -0600
-+++ source-new/nsgenbind/Makefile	2022-11-12 08:53:43.392773663 -0700
-@@ -10,6 +10,7 @@
- COMPONENT_TYPE := binary
- # Component version
- COMPONENT_VERSION := 0.8
-+COMPONENT_FOR_BUILD := yes
- 
- # Tooling
- PREFIX ?= /opt/netsurf