From 40db0827a14d870e81760fe11168cae153befb9e Mon Sep 17 00:00:00 2001
From: mintsuki <mintsuki@protonmail.com>
Date: Sun, 23 Feb 2025 23:38:20 +0100
Subject: [PATCH] ports: Misc backports

---
 recipes/base              |  1 +
 recipes/freestnd-c-hdrs   |  2 +-
 recipes/freestnd-cxx-hdrs |  2 +-
 recipes/libwebp           |  2 +-
 recipes/mlibc             |  2 +-
 recipes/taisei            | 16 ++++++++--------
 recipes/xorriso           |  3 ---
 7 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/recipes/base b/recipes/base
index ea125fcaa..f7e13b55c 100644
--- a/recipes/base
+++ b/recipes/base
@@ -1,5 +1,6 @@
 #! /bin/sh
 
 name=base
+version=0.0
 revision=1
 deps="base-files kernel init bash binutils bzip2 coreutils diffutils findutils gawk gcc gmp grep gzip less make mpc mpfr nano ncurses pcre2 readline sed tar tzdata util-vinix xz zlib zstd"
diff --git a/recipes/freestnd-c-hdrs b/recipes/freestnd-c-hdrs
index 16c10fef3..a2d6266d4 100644
--- a/recipes/freestnd-c-hdrs
+++ b/recipes/freestnd-c-hdrs
@@ -7,7 +7,7 @@ git_url="https://github.com/osdev0/freestnd-c-hdrs.git"
 commit=${version}
 
 build() {
-    cp -rp "${source_dir}"/. ./
+    cp -rpf "${source_dir}"/. ./
 }
 
 package() {
diff --git a/recipes/freestnd-cxx-hdrs b/recipes/freestnd-cxx-hdrs
index 9c80e1ca9..ae69c1eee 100644
--- a/recipes/freestnd-cxx-hdrs
+++ b/recipes/freestnd-cxx-hdrs
@@ -7,7 +7,7 @@ git_url="https://github.com/osdev0/freestnd-cxx-hdrs.git"
 commit=${version}
 
 build() {
-    cp -rp "${source_dir}"/. ./
+    cp -rpf "${source_dir}"/. ./
 }
 
 package() {
diff --git a/recipes/libwebp b/recipes/libwebp
index 698551592..36b9c5177 100644
--- a/recipes/libwebp
+++ b/recipes/libwebp
@@ -7,7 +7,7 @@ tarball_url="https://storage.googleapis.com/downloads.webmproject.org/releases/w
 tarball_blake2b="022cef190284b69af781718a82b28ee9806d7e6b1e642ee0833e608f64f691ef918a83e99db02335fb9f60d24d6f0cfc58e7e05e99a3f13d2118719d40a71722"
 source_hostdeps="automake autoconf libtool pkg-config"
 hostdeps="gcc autoconf automake libtool pkg-config"
-deps="core-libs libjpeg-turbo libpng freeglut sdl2 libtiff"
+deps="core-libs libjpeg-turbo libpng freeglut sdl2-compat libtiff"
 
 prepare() {
     autotools_recursive_regen
diff --git a/recipes/mlibc b/recipes/mlibc
index cdef3bdb1..6706614bf 100644
--- a/recipes/mlibc
+++ b/recipes/mlibc
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 name=mlibc
-version=06db168549d6d42823c8b20d12086d2b1d4b8f98
+version=8f59583a20c1019e0b6349a8e7ffcce62784db57
 revision=1
 git_url="https://github.com/managarm/mlibc.git"
 commit=${version}
diff --git a/recipes/taisei b/recipes/taisei
index 96bc6a420..33ce073cc 100644
--- a/recipes/taisei
+++ b/recipes/taisei
@@ -1,20 +1,20 @@
 #! /bin/sh
 
 name=taisei
-version=1.3.2
+version=1.4.2
 revision=1
-tarball_url="https://github.com/taisei-project/taisei/releases/download/v${version}/taisei-v${version}.tar.xz"
-tarball_blake2b="608b5db6f17e2693539ce0742a1812633e91e901b3935b9e54f91514827642334f6cb6f0217aff713f1ff9dd01d971ae895ac8c98b0360f254b52d3e49bfae61"
-imagedeps="meson ninja-build"
+tarball_url="https://github.com/taisei-project/taisei/releases/download/v${version}/taisei-${version}.tar.xz"
+tarball_blake2b="382e6e02013573f4218a073ad9d19cd128f0b4366d3f3f586e8ab4de9a5948ffedd13a22cefc9a8af04cccd2cf0205c9d6c738b125fd332b363606acd5938e4a"
+imagedeps="meson ninja-build build-essential"
 hostdeps="gcc pkg-config"
-deps="core-libs freetype2 libpng sdl2 libwebp zlib cglm openssl libzip"
+deps="core-libs freetype2 libpng sdl2-compat libwebp zlib cglm openssl"
 
 configure() {
     meson_configure \
-        -Ddocs=false \
-        -Da_sdl2mixer=false \
+        -Ddocs=disabled \
         -Da_default=null \
-        -Db_lto=false
+        -Db_lto=false \
+        -Da_sdl=disabled
 }
 
 build() {
diff --git a/recipes/xorriso b/recipes/xorriso
index 404faafde..7c06799d7 100644
--- a/recipes/xorriso
+++ b/recipes/xorriso
@@ -15,9 +15,6 @@ prepare() {
 }
 
 configure() {
-    cp -rp "${source_dir}"/. ./
-
-        configure_script_path=./configure \
     autotools_configure
 }