ALL: Various toolchain updates

2026-05-21 05:40:49 +00:00 · 2023-04-23 10:13:51 +00:00
parent fcdad56488
commit 5807c22b7c
22 changed files with 84 additions and 32 deletions
@@ -1,4 +1,4 @@
-BUILDBOT_VERSION   := 3.7.0
+BUILDBOT_VERSION   := 3.8.0
 BUILDBOT_BASEDIR   := buildbot-workdir

 BOTTLE_VERSION     := 0.12.25
@@ -1,6 +1,6 @@
 #! /bin/sh

-LHA_VERSION=167f6eabcbae425922e0fee3388c10f4073a0117
+LHA_VERSION=26950220c9c7590fd603ecaa54a12a52371affed

 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
 HELPERS_DIR=$PACKAGE_DIR/../..
@@ -1,6 +1,6 @@
 #! /bin/sh

-TOOLCHAIN_VERSION=1501a4a26cf1bcffdd6dd4bcd603167a3e00f51b
+TOOLCHAIN_VERSION=0e9abdbab3bf2afa252d0542a83b1c16f40b379f

 # Versions of components to use provided by toolchain
 BINUTILS_VER=2.23.2
@@ -1,7 +1,7 @@
 #! /bin/sh

 OSXCROSS_VERSION=50e86ebca7d14372febd0af8cd098705049161b9
-export XAR_VERSION=c2111a9a9cabc50d2b9c604aff41a481ae3f1989
+export XAR_VERSION=fb897139262d7ac5c9e187a9f9c219255f465983

 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
 HELPERS_DIR=$PACKAGE_DIR/../..
@@ -1,6 +1,6 @@
 #! /bin/sh

-XAR_VERSION=c2111a9a9cabc50d2b9c604aff41a481ae3f1989
+XAR_VERSION=fb897139262d7ac5c9e187a9f9c219255f465983

 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
 HELPERS_DIR=$PACKAGE_DIR/../..
@@ -2,7 +2,7 @@

 OSXCROSS_VERSION=50e86ebca7d14372febd0af8cd098705049161b9
 export PBZX_VERSION=2a4d7c3300c826d918def713a24d25c237c8ed53
-export XAR_VERSION=c2111a9a9cabc50d2b9c604aff41a481ae3f1989
+export XAR_VERSION=fb897139262d7ac5c9e187a9f9c219255f465983

 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
 HELPERS_DIR=$PACKAGE_DIR/../..
@@ -1,6 +1,6 @@
 #! /bin/sh

-FLUIDLITE_VERSION=7c150b021f8b7e7d4f624bbad644fd2f96e5826b
+FLUIDLITE_VERSION=d59d2328818f913b7d1a6a59aed695c47a8ce388

 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
 HELPERS_DIR=$PACKAGE_DIR/../..
@@ -0,0 +1,51 @@
+From 849751658e68ae734dcf493153d012da63c2652a Mon Sep 17 00:00:00 2001
+From: Le Philousophe <lephilousophe@users.noreply.github.com>
+Date: Fri, 5 May 2023 22:58:29 +0200
+Subject: [PATCH] Fix static build
+
+---
+ CMakeLists.txt                          | 3 ++-
+ include/{fluidlite.h => fluidlite.h.in} | 6 ++++++
+ 2 files changed, 8 insertions(+), 1 deletion(-)
+ rename include/{fluidlite.h => fluidlite.h.in} (95%)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4aead6c..530651f 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -33,10 +33,11 @@ include(CheckIncludeFile)
+ check_include_file(fcntl.h HAVE_FCNTL_H)
+ 
+ list(APPEND HEADERS
+-    include/fluidlite.h
+    ${PROJECT_BINARY_DIR}/fluidlite.h
+ )
+ 
+ configure_file(src/version.cmake ${PROJECT_BINARY_DIR}/fluidlite/version.h @ONLY)
+configure_file(include/fluidlite.h.in ${PROJECT_BINARY_DIR}/fluidlite.h)
+ 
+ list(APPEND SCOPED_HEADERS
+     include/fluidlite/types.h
+diff --git a/include/fluidlite.h b/include/fluidlite.h.in
+similarity index 95%
+rename from include/fluidlite.h
+rename to include/fluidlite.h.in
+index a159ddd..5e6ea4b 100644
+--- a/include/fluidlite.h
+++ b/include/fluidlite.h.in
+@@ -27,6 +27,12 @@
+ extern "C" {
+ #endif
+ 
+#cmakedefine01 FLUIDLITE_BUILD_SHARED
+
+#if (FLUIDLITE_BUILD_SHARED == 0) && !defined(FLUIDLITE_STATIC)
+#define FLUIDLITE_STATIC
+#endif
+
+ #if defined(_WIN32)
+ #if defined(FLUIDLITE_STATIC)
+ #define FLUIDSYNTH_API
+-- 
+2.34.1
+
@@ -1,6 +1,6 @@
 #! /bin/sh

-FLUIDSYNTH_VERSION=2.3.1
+FLUIDSYNTH_VERSION=2.3.2

 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
 HELPERS_DIR=$PACKAGE_DIR/../..
@@ -47,10 +47,14 @@ do_http_fetch fluidsynth \
 	"https://github.com/FluidSynth/fluidsynth/archive/v${FLUIDSYNTH_VERSION}.tar.gz" 'tar xzf'

 # Fluidsynth doesn't link correctly against static glib, fix this
-sed -i -e 's/\${GLIB_\([^}]\+\)}/${GLIB_STATIC_\1}/g' CMakeLists.txt src/CMakeLists.txt
 sed -i -e '/add_executable ( fluidsynth/,/)/{
-/)/a target_link_options ( fluidsynth PRIVATE ${GLIB_STATIC_LDFLAGS_OTHER} )
+/)/a target_link_options ( fluidsynth PRIVATE ${PC_GLIB2_STATIC_LDFLAGS_OTHER} )
 }' src/CMakeLists.txt
+# Fluidsynth adds frameworks manually and it fails to build on iOS/AppleTV
+sed -i -e '/-Wl,-framework/s/^/#/' cmake_admin/FindGLib2.cmake
+# Fluidsynth is completly bugguy at finding dependencies
+sed -i -e 's/"\${PC_G\([A-Z]\+\)2_INCLUDEDIR}"/${PC_G\12_INCLUDE_DIRS}/' cmake_admin/FindGLib2.cmake
+sed -i -e 's/"\${PC_G\([A-Z]\+\)2_LIBDIR}"/${PC_G\12_LIBRARY_DIRS}/' cmake_admin/FindGLib2.cmake
 # Don't install fluidsynth binary
 # Still build it to ensure we have a working setup with all static libraries
 sed -i -e 's/install\(.*\) fluidsynth /install\1 /g' src/CMakeLists.txt
@@ -70,7 +74,7 @@ do_cmake \
 	-Denable-readline=off -Denable-lash=off \
 	-Denable-alsa=off -Denable-systemd=off \
 	-Denable-coreaudio=off -Denable-coremidi=off \
-	-Denable-framework=off -Denable-dart=off "$@"
+	-Denable-framework=off "$@"
 do_make
 do_make install

@@ -1,6 +1,6 @@
 #! /bin/sh

-SDL_NET_VERSION=282fb17725a246fdcb9847ea99d8a978f5966d39
+SDL_NET_VERSION=70b04a3087b4329d75affb766b4c84a977a546c0

 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
 HELPERS_DIR=$PACKAGE_DIR/../..
@@ -43,7 +43,7 @@ ENV \

 # libjpeg-turbo is already installed in original toolchain

-helpers_package(giflib)
+# giflib is already installed in original toolchain

 helpers_package(faad2)

@@ -68,6 +68,6 @@ helpers_package(libvpx, --disable-multithread)

 # freetype is already installed in original toolchain

-helpers_package(fribidi)
+# fribidi is already installed in original toolchain

 helpers_package(fluidlite, -DCMAKE_TOOLCHAIN_FILE=${DEVKITPRO}/cmake/3DS.cmake)
@@ -1,4 +1,4 @@
-m4_define(`DEVKITARM_VERSION',20221115)
+m4_define(`DEVKITARM_VERSION',20230404)
 # This version of devkitARM depends on a Debian Buster
 # For now it works with our version, we will have to ensure it stays like that
 FROM devkitpro/devkitarm:DEVKITARM_VERSION AS original-toolchain
@@ -1,4 +1,4 @@
-m4_define(`DEVKITPPC_VERSION',20230110)
+m4_define(`DEVKITPPC_VERSION',20230419)
 # This version of devkitPPC depends on a Debian Buster
 # For now it works with our version, we will have to ensure it stays like that
 FROM devkitpro/devkitppc:DEVKITPPC_VERSION AS original-toolchain
@@ -57,7 +57,7 @@ ENV \

 # libjpeg-turbo is already installed in original-toolchain

-helpers_package(giflib)
+# giflib is already installed in original-toolchain

 helpers_package(faad2)

@@ -65,14 +65,11 @@ helpers_package(faad2)

 # libogg is already installed in original-toolchain

-helpers_package(libtheora)
+# libtheora is already installed in original-toolchain

 # libvorbis is already installed in original-toolchain

-# Disable AltiVec as it's not supported by targets and SSE2 because configure script enables it
-# Copy specific patch to disable FORTIFY as toolchain doesn't seem to support it
-COPY packages/flac lib-helpers/packages/flac
-helpers_package(flac, --disable-altivec)
+# flac is already installed in original-toolchain

 helpers_package(mpeg2dec, , CFLAGS="$CFLAGS -mno-altivec")

@@ -85,6 +82,6 @@ helpers_package(libvpx, --disable-multithread)

 # freetype is already installed in original-toolchain

-helpers_package(fribidi)
+# fribidi is already installed in original-toolchain

 # No fluidsynth
@@ -1,4 +1,4 @@
-m4_define(`DEVKITA64_VERSION',20221113)
+m4_define(`DEVKITA64_VERSION',20230419)
 # This version of devkitA64 depends on a Debian Buster
 # For now it works with our version, we will have to ensure it stays like that
 FROM devkitpro/devkita64:DEVKITA64_VERSION AS original-toolchain
@@ -148,7 +148,7 @@ ports_package(libsdl2_net)

 # Lighten glib build by removing Objective C and Cocoa and fix intl detection
 COPY --from=apple-common /lib-helpers/packages/fluidsynth lib-helpers/packages/fluidsynth
-helpers_package(fluidsynth, -DCMAKE_SYSTEM_NAME=Darwin -DLIB_SUFFIX=)
+helpers_package(fluidsynth, -DCMAKE_SYSTEM_NAME=Darwin -DLIB_SUFFIX= -DCMAKE_FRAMEWORK_PATH=${TARGET_DIR}/SDK/MacOSX`'MACOSX_SDK_VERSION`'.sdk/usr/lib)

 helpers_package(retrowave, -DCMAKE_SYSTEM_NAME=Darwin)

@@ -1,5 +1,5 @@
 m4_ifdef(`DEBIAN_RELEASE',,`m4_define(`DEBIAN_RELEASE',bullseye)')
-m4_ifdef(`DEBIAN_VERSION',,`m4_define(`DEBIAN_VERSION',20230227)')
+m4_ifdef(`DEBIAN_VERSION',,`m4_define(`DEBIAN_VERSION',20230411)')
 FROM toolchains/common AS helpers

 FROM debian:DEBIAN_RELEASE-DEBIAN_VERSION-slim m4_ifdef(`STAGE_IMAGE_NAME',AS STAGE_IMAGE_NAME,)
@@ -1,6 +1,6 @@
 #! /bin/sh

-TOOLCHAIN_VERSION=035527ac16b66dd3980627f94a64a78dc3fd0e1b
+TOOLCHAIN_VERSION=499006079dc3ea3acf6fcd27dd33fcd9169e0ccf
 TARGETS="gcw0 rs90 lepus"

 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
@@ -1,6 +1,6 @@
 #! /bin/sh

-PSP_PACKAGES_VERSION=004f406e3ebb1f8409238e80a84fb4c7afb72f6f
+PSP_PACKAGES_VERSION=191098dcbd1628ae88dfb2182bb10d3b9cb83fcf

 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
 HELPERS_DIR=$PACKAGE_DIR/../..
@@ -2,7 +2,7 @@

 PSPDEV_VERSION=cfa3985528570adcf41c463d17e8d9d18376f19f
 export PSPTOOLCHAIN_VERSION=1d5094187fa69a46a0ea52cbb3289b7a43db4b33
-export PSPSDK_VERSION=62a9bc60ed77a0f99d9cdfbb743149a05e82e9a7
+export PSPSDK_VERSION=4493616d8e7255c951176b17f78f167745238fbd
 export PSPLINKUSB_VERSION=07c464bc11d6304107bbda68fa3fbd94b1b81101
 export EBOOTSIGNER_VERSION=10cfbb51ea87adfe02d63dc3a262c8480fdf31e7
 export PSPTOOLCHAIN_ALLEGREX_VERSION=19a924c3cd0785a678c10a7af90a2b5cd65365a3
@@ -1,6 +1,6 @@
 #! /bin/sh

-GCCSDK_VERSION=7735
+GCCSDK_VERSION=7742

 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
 HELPERS_DIR=$PACKAGE_DIR/../..
@@ -62,7 +62,7 @@ vdpm_package(curl)

 vdpm_package(freetype)

-helpers_package(fribidi)
+vdpm_package(libfribidi)

 vdpm_package(FluidLite)

@@ -1,5 +1,5 @@
 m4_ifdef(`DEBIAN_RELEASE',,`m4_define(`DEBIAN_RELEASE',bullseye)')
-m4_ifdef(`DEBIAN_VERSION',,`m4_define(`DEBIAN_VERSION',20230227)')
+m4_ifdef(`DEBIAN_VERSION',,`m4_define(`DEBIAN_VERSION',20230411)')
 m4_define(`BASE_DEBIAN',`')m4_dnl
 FROM debian:DEBIAN_RELEASE-DEBIAN_VERSION-slim
 USER root