From fc2c4dc48be773c84926bb289a4832fa68c80ab2 Mon Sep 17 00:00:00 2001 From: Le Philousophe Date: Sat, 12 Aug 2023 21:09:13 +0000 Subject: [PATCH] ALL: Various toolchain upgrades --- check-versions/config.py | 8 +++++++- toolchains/amigaos4/packages/libpng/build.sh | 2 +- toolchains/amigaos4/packages/libsdl2/build.sh | 2 +- toolchains/android-common/functions-sdk.sh | 4 ++-- .../packages/osxcross-clang/build.sh | 2 +- .../apple-common/packages/osxcross/build.sh | 2 +- .../apple-sdks/packages/xcode-extractor/build.sh | 2 +- toolchains/common/packages/fluidsynth/build.sh | 2 +- toolchains/devkitarm/Dockerfile.m4 | 2 +- toolchains/devkitppc/Dockerfile.m4 | 2 +- toolchains/devkitswitch/Dockerfile.m4 | 2 +- .../opendingux-beta/packages/toolchain/build.sh | 2 +- .../patches/0000-fix-libmikmod-config.patch | 12 ++++++++++++ toolchains/psp/packages/psp-packages/build.sh | 2 +- toolchains/psp/packages/toolchain/build.sh | 16 ++++++++-------- .../00_set_versions.patch | 2 +- toolchains/riscos/packages/toolchain/build.sh | 2 +- toolchains/vita/packages/toolchain/build.sh | 4 ++-- 18 files changed, 44 insertions(+), 26 deletions(-) create mode 100644 toolchains/opendingux-beta/packages/toolchain/patches/0000-fix-libmikmod-config.patch diff --git a/check-versions/config.py b/check-versions/config.py index 21a6df9..28efd26 100644 --- a/check-versions/config.py +++ b/check-versions/config.py @@ -272,12 +272,16 @@ VERSIONS = { 'check': 'docker tag', 'registry': 'https://registry-1.docker.io', 'image name': 'devkitpro/devkitarm', + 'architecture': 'amd64', + 'reference': 'latest', }, ('./toolchains/devkitppc/Dockerfile.m4', 'DEVKITPPC'): { 'check': 'docker tag', 'registry': 'https://registry-1.docker.io', 'image name': 'devkitpro/devkitppc', + 'architecture': 'amd64', + 'reference': 'latest', }, ('./toolchains/devkitppc/packages/libgxflux/build.sh', 'GXFLUX'): { 'check': 'git commit', @@ -289,6 +293,8 @@ VERSIONS = { 'check': 'docker tag', 'registry': 'https://registry-1.docker.io', 'image name': 'devkitpro/devkita64', + 'architecture': 'amd64', + 'reference': 'latest', }, ('./toolchains/dreamcast/packages/libronin/build.sh', 'LIBRONIN'): { @@ -465,7 +471,7 @@ VERSIONS = { ('./toolchains/psp/packages/toolchain/build.sh', 'NEWLIB'): { 'check': 'git commit', 'repository': 'https://github.com/pspdev/newlib.git', - 'branch': 'allegrex-v4.1.0', + 'branch': 'allegrex-v4.3.0', }, ('./toolchains/psp/packages/toolchain/build.sh', 'PTHREAD_EMBEDDED'): { 'check': 'git commit', diff --git a/toolchains/amigaos4/packages/libpng/build.sh b/toolchains/amigaos4/packages/libpng/build.sh index d4b7618..9fa761c 100755 --- a/toolchains/amigaos4/packages/libpng/build.sh +++ b/toolchains/amigaos4/packages/libpng/build.sh @@ -6,7 +6,7 @@ HELPERS_DIR=$PACKAGE_DIR/../.. do_make_bdir -do_lha_fetch graphics/libpng +do_lha_fetch graphics/libpng "SDK" do_lha_install diff --git a/toolchains/amigaos4/packages/libsdl2/build.sh b/toolchains/amigaos4/packages/libsdl2/build.sh index 68ded50..cc93fc9 100755 --- a/toolchains/amigaos4/packages/libsdl2/build.sh +++ b/toolchains/amigaos4/packages/libsdl2/build.sh @@ -1,6 +1,6 @@ #! /bin/sh -SDL2_VERSION=2.26.5-release +SDL2_VERSION=2.28.0 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) HELPERS_DIR=$PACKAGE_DIR/../.. diff --git a/toolchains/android-common/functions-sdk.sh b/toolchains/android-common/functions-sdk.sh index b0a3537..174759a 100644 --- a/toolchains/android-common/functions-sdk.sh +++ b/toolchains/android-common/functions-sdk.sh @@ -1,5 +1,5 @@ -CMDLINE_TOOLS_VERSION=9477386 -CMDLINE_TOOLS_CHECKSUM="sha256:bd1aa17c7ef10066949c88dc6c9c8d536be27f992a1f3b5a584f9bd2ba5646a0" +CMDLINE_TOOLS_VERSION=10406996 +CMDLINE_TOOLS_CHECKSUM="sha256:8919e8752979db73d8321e9babe2caedcc393750817c1a5f56c128ec442fb540" CMDLINE_TOOLS_SUBDIR=cmdline-tools do_install_sdk_tools () { diff --git a/toolchains/apple-common/packages/osxcross-clang/build.sh b/toolchains/apple-common/packages/osxcross-clang/build.sh index 7a031d7..36c7ec5 100755 --- a/toolchains/apple-common/packages/osxcross-clang/build.sh +++ b/toolchains/apple-common/packages/osxcross-clang/build.sh @@ -1,6 +1,6 @@ #! /bin/sh -OSXCROSS_VERSION=50e86ebca7d14372febd0af8cd098705049161b9 +OSXCROSS_VERSION=564e2b9aa8e7a40da663d890c0e853a1259ff8b1 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) HELPERS_DIR=$PACKAGE_DIR/../.. diff --git a/toolchains/apple-common/packages/osxcross/build.sh b/toolchains/apple-common/packages/osxcross/build.sh index 1c2411e..8a2f69c 100755 --- a/toolchains/apple-common/packages/osxcross/build.sh +++ b/toolchains/apple-common/packages/osxcross/build.sh @@ -1,6 +1,6 @@ #! /bin/sh -OSXCROSS_VERSION=50e86ebca7d14372febd0af8cd098705049161b9 +OSXCROSS_VERSION=564e2b9aa8e7a40da663d890c0e853a1259ff8b1 export XAR_VERSION=fb897139262d7ac5c9e187a9f9c219255f465983 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) diff --git a/toolchains/apple-sdks/packages/xcode-extractor/build.sh b/toolchains/apple-sdks/packages/xcode-extractor/build.sh index 2356d48..97cbed0 100755 --- a/toolchains/apple-sdks/packages/xcode-extractor/build.sh +++ b/toolchains/apple-sdks/packages/xcode-extractor/build.sh @@ -1,6 +1,6 @@ #! /bin/sh -OSXCROSS_VERSION=50e86ebca7d14372febd0af8cd098705049161b9 +OSXCROSS_VERSION=564e2b9aa8e7a40da663d890c0e853a1259ff8b1 export PBZX_VERSION=2a4d7c3300c826d918def713a24d25c237c8ed53 export XAR_VERSION=fb897139262d7ac5c9e187a9f9c219255f465983 diff --git a/toolchains/common/packages/fluidsynth/build.sh b/toolchains/common/packages/fluidsynth/build.sh index 5a4d05e..1534064 100755 --- a/toolchains/common/packages/fluidsynth/build.sh +++ b/toolchains/common/packages/fluidsynth/build.sh @@ -1,6 +1,6 @@ #! /bin/sh -FLUIDSYNTH_VERSION=2.3.2 +FLUIDSYNTH_VERSION=2.3.3 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) HELPERS_DIR=$PACKAGE_DIR/../.. diff --git a/toolchains/devkitarm/Dockerfile.m4 b/toolchains/devkitarm/Dockerfile.m4 index 4804b53..a9765f5 100644 --- a/toolchains/devkitarm/Dockerfile.m4 +++ b/toolchains/devkitarm/Dockerfile.m4 @@ -1,4 +1,4 @@ -m4_define(`DEVKITARM_VERSION',20230501) +m4_define(`DEVKITARM_VERSION',20230622) # 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 diff --git a/toolchains/devkitppc/Dockerfile.m4 b/toolchains/devkitppc/Dockerfile.m4 index d8e4ab0..50eb5cf 100644 --- a/toolchains/devkitppc/Dockerfile.m4 +++ b/toolchains/devkitppc/Dockerfile.m4 @@ -1,4 +1,4 @@ -m4_define(`DEVKITPPC_VERSION',20230515) +m4_define(`DEVKITPPC_VERSION',20230625) # 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 diff --git a/toolchains/devkitswitch/Dockerfile.m4 b/toolchains/devkitswitch/Dockerfile.m4 index bd0a9c6..d7e1833 100644 --- a/toolchains/devkitswitch/Dockerfile.m4 +++ b/toolchains/devkitswitch/Dockerfile.m4 @@ -1,4 +1,4 @@ -m4_define(`DEVKITA64_VERSION',20230507) +m4_define(`DEVKITA64_VERSION',20230622) # 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 diff --git a/toolchains/opendingux-beta/packages/toolchain/build.sh b/toolchains/opendingux-beta/packages/toolchain/build.sh index f449b9b..44cae2f 100755 --- a/toolchains/opendingux-beta/packages/toolchain/build.sh +++ b/toolchains/opendingux-beta/packages/toolchain/build.sh @@ -1,6 +1,6 @@ #! /bin/sh -TOOLCHAIN_VERSION=41ffaf53e08af98c70da85bbbd7aa324ab3ba32d +TOOLCHAIN_VERSION=9e5f8f1c44414b7e6f0c5da3f64e6d133ed447dc TARGETS="gcw0 rs90 lepus" PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) diff --git a/toolchains/opendingux-beta/packages/toolchain/patches/0000-fix-libmikmod-config.patch b/toolchains/opendingux-beta/packages/toolchain/patches/0000-fix-libmikmod-config.patch new file mode 100644 index 0000000..423c2b5 --- /dev/null +++ b/toolchains/opendingux-beta/packages/toolchain/patches/0000-fix-libmikmod-config.patch @@ -0,0 +1,12 @@ +diff --git a/board/opendingux/package/libmikmod/libmikmod.mk b/board/opendingux/package/libmikmod/libmikmod.mk +index 6b9530e75a..fae2324131 100644 +--- a/board/opendingux/package/libmikmod/libmikmod.mk ++++ b/board/opendingux/package/libmikmod/libmikmod.mk +@@ -6,6 +6,7 @@ + LIBMIKMOD_VERSION := 3.3.11.1 + LIBMIKMOD_SITE := https://sourceforge.net/projects/mikmod/files/libmikmod/${LIBMIKMOD_VERSION} + LIBMIKMOD_INSTALL_STAGING = YES ++LIBMIKMOD_CONFIG_SCRIPTS = libmikmod-config + + LIBMIKMOD_CONF_OPTS = --localstatedir=/var --disable-esd + diff --git a/toolchains/psp/packages/psp-packages/build.sh b/toolchains/psp/packages/psp-packages/build.sh index e6dca95..966095a 100755 --- a/toolchains/psp/packages/psp-packages/build.sh +++ b/toolchains/psp/packages/psp-packages/build.sh @@ -1,6 +1,6 @@ #! /bin/sh -PSP_PACKAGES_VERSION=191098dcbd1628ae88dfb2182bb10d3b9cb83fcf +PSP_PACKAGES_VERSION=13167679e5829f529a6af61318230c3a87ffad96 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) HELPERS_DIR=$PACKAGE_DIR/../.. diff --git a/toolchains/psp/packages/toolchain/build.sh b/toolchains/psp/packages/toolchain/build.sh index fc61108..8ae20f9 100755 --- a/toolchains/psp/packages/toolchain/build.sh +++ b/toolchains/psp/packages/toolchain/build.sh @@ -1,17 +1,17 @@ #! /bin/sh -PSPDEV_VERSION=cfa3985528570adcf41c463d17e8d9d18376f19f -export PSPTOOLCHAIN_VERSION=880af7154095ac229be00326285756985d3c0e9e -export PSPSDK_VERSION=fbfb0692d308e25e14c027fc28bdd5e8963c2192 -export PSPLINKUSB_VERSION=07c464bc11d6304107bbda68fa3fbd94b1b81101 +PSPDEV_VERSION=b0ef1ab7c1d7f999265cb13af4958ca111cc40e8 +export PSPTOOLCHAIN_VERSION=1597b22623cab2bf83a9ebee5468e6a16fdfb575 +export PSPSDK_VERSION=e20ebe38220705abcbd6693ee2161170fb9665f1 +export PSPLINKUSB_VERSION=d8c81925bf7e7bbad3303ec099ffc987a58b309d export EBOOTSIGNER_VERSION=10cfbb51ea87adfe02d63dc3a262c8480fdf31e7 -export PSPTOOLCHAIN_ALLEGREX_VERSION=19a924c3cd0785a678c10a7af90a2b5cd65365a3 -export PSPTOOLCHAIN_EXTRA_VERSION=4f99575cbf57da37754bf465a6668b2b421031b2 +export PSPTOOLCHAIN_ALLEGREX_VERSION=63a7bd43867a1cd5733ad8c20cf802ce61135497 +export PSPTOOLCHAIN_EXTRA_VERSION=058c56116febfd0ffbbf78195d6fdfa66a6a4a3a export BINUTILS_VERSION=1bf9b3f9be9d82cc89374ca916cd4e8e6115dcf8 export GCC_VERSION=65cf73279bb91ff72e5327dd1621c206f027f761 -export NEWLIB_VERSION=034f72f6e21e211137d38ca4015a58c9ab82a369 +export NEWLIB_VERSION=ccdd58b38d854d6d03b1af4d8cd18a9dcb397aa7 export PTHREAD_EMBEDDED_VERSION=c7e2d5a7e810401174b0484979b6d29a2f1ab519 -export PSP_PACMAN_VERSION=21c98d6d1268196084c0532127d04fcc28e25c5c +export PSP_PACMAN_VERSION=aedc04981cd6125741916e0b4b1b4d42715af6fa PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) HELPERS_DIR=$PACKAGE_DIR/../.. diff --git a/toolchains/psp/packages/toolchain/psptoolchain-allegrex-patches/00_set_versions.patch b/toolchains/psp/packages/toolchain/psptoolchain-allegrex-patches/00_set_versions.patch index ae48ec9..ee97bfc 100644 --- a/toolchains/psp/packages/toolchain/psptoolchain-allegrex-patches/00_set_versions.patch +++ b/toolchains/psp/packages/toolchain/psptoolchain-allegrex-patches/00_set_versions.patch @@ -52,7 +52,7 @@ index e30a362..6e2b4f3 100755 ## Download the source code. REPO_URL="https://github.com/pspdev/newlib.git" REPO_FOLDER="newlib" --BRANCH_NAME="allegrex-v4.1.0" +-BRANCH_NAME="allegrex-v4.3.0" -if test ! -d "$REPO_FOLDER"; then - git clone --depth 1 -b $BRANCH_NAME $REPO_URL && cd $REPO_FOLDER || { exit 1; } -else diff --git a/toolchains/riscos/packages/toolchain/build.sh b/toolchains/riscos/packages/toolchain/build.sh index b2aaab4..5ad36fd 100755 --- a/toolchains/riscos/packages/toolchain/build.sh +++ b/toolchains/riscos/packages/toolchain/build.sh @@ -1,6 +1,6 @@ #! /bin/sh -GCCSDK_VERSION=7750 +GCCSDK_VERSION=7766 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) HELPERS_DIR=$PACKAGE_DIR/../.. diff --git a/toolchains/vita/packages/toolchain/build.sh b/toolchains/vita/packages/toolchain/build.sh index f27107a..b088500 100755 --- a/toolchains/vita/packages/toolchain/build.sh +++ b/toolchains/vita/packages/toolchain/build.sh @@ -1,8 +1,8 @@ #! /bin/sh -VITA_VERSION=2.481 +VITA_VERSION=2.509 # This one must be updated as well -PKG_DATE=2023-03-17_05-46-17 +PKG_DATE=2023-07-25_09-05-40 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) HELPERS_DIR=$PACKAGE_DIR/../..