ALL: Various toolchains upgrades

scummvm · Jun 25, 2024 · 3df6b4a · 3df6b4a
1 parent dd8e178
commit 3df6b4a
Show file tree

Hide file tree

Showing 20 changed files with 43 additions and 32 deletions.
diff --git a/Makefile b/Makefile
@@ -1,9 +1,9 @@
-BUILDBOT_VERSION   := 3.11.1
+BUILDBOT_VERSION   := 3.11.5
 BUILDBOT_BASEDIR   := buildbot-workdir
 
 BOTTLE_VERSION     := 0.12.25
 TREQ_VERSION       := 23.11.0
-DOCKER_PY_VERSION  := 7.0.0
+DOCKER_PY_VERSION  := 7.1.0
 
 # Without toolchains/ part, all is a placeholder for all detected toolchains
 TOOLCHAINS_ENABLED := all

diff --git a/check-versions/config.py b/check-versions/config.py
@@ -107,6 +107,7 @@
         'check': 'git tag',
         'repository': 'https://github.com/buildbot/buildbot.git',
         'prefix': 'v',
+        'pattern': r'v3\.',
         'exclude pattern': r'.*(b|rc)\d+'
     },
     ('./Makefile', 'BOTTLE'): {
@@ -467,12 +468,12 @@
     ('./toolchains/psp/packages/toolchain/build.sh', 'BINUTILS'): {
         'check': 'git commit',
         'repository': 'https://github.com/pspdev/binutils-gdb.git',
-        'branch': 'allegrex-v2.37.0',
+        'branch': 'allegrex-v2.40.0',
     },
     ('./toolchains/psp/packages/toolchain/build.sh', 'GCC'): {
         'check': 'git commit',
         'repository': 'https://github.com/pspdev/gcc.git',
-        'branch': 'allegrex-v13.2.0',
+        'branch': 'allegrex-v14.1.0',
     },
     ('./toolchains/psp/packages/toolchain/build.sh', 'NEWLIB'): {
         'check': 'git commit',

diff --git a/toolchains/amigaos4/packages/liba52/build.sh b/toolchains/amigaos4/packages/liba52/build.sh
@@ -6,7 +6,7 @@ HELPERS_DIR=$PACKAGE_DIR/../..
 
 do_make_bdir
 
-do_lha_fetch audio/liba52 "sdk"
+do_lha_fetch audio/liba52 "liba52/sdk"
 
 do_lha_install
 

diff --git a/toolchains/amigaos4/packages/regina-rexx/build.sh b/toolchains/amigaos4/packages/regina-rexx/build.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-REXX_VERSION=3.9.5
+REXX_VERSION=3.9.6
 
 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
 HELPERS_DIR=$PACKAGE_DIR/../..

diff --git a/toolchains/amigaos4/packages/toolchain/build.sh b/toolchains/amigaos4/packages/toolchain/build.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-TOOLCHAIN_VERSION=1c02337633738751bf127f6854c279ddda833e8e
+TOOLCHAIN_VERSION=09624111ca3a1ac3ee0e84c8405bbd284b27ef56
 
 # Versions of components to use provided by toolchain
 BINUTILS_VER=2.23.2

diff --git a/toolchains/common/packages/libsdl1.2/build.sh b/toolchains/common/packages/libsdl1.2/build.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-SDL_VERSION=f5f2d3825637169fc8f3ebc6ef0d076916e27e82
+SDL_VERSION=d0a9e90b21f1312b87533d96324cc24247ba6d99
 
 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
 HELPERS_DIR=$PACKAGE_DIR/../..

diff --git a/toolchains/common/packages/sdl-net1.2/build.sh b/toolchains/common/packages/sdl-net1.2/build.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-SDL_NET_VERSION=83ba32df29225b0f29be1a6d66e678b1b1cb01ac
+SDL_NET_VERSION=0043be2e559f8d562d04bf62d6e3f4162ed8edad
 
 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
 HELPERS_DIR=$PACKAGE_DIR/../..

diff --git a/toolchains/devkitarm/Dockerfile.m4 b/toolchains/devkitarm/Dockerfile.m4
@@ -1,4 +1,4 @@
-m4_define(`DEVKITARM_VERSION',20240202)
+m4_define(`DEVKITARM_VERSION',20240511)
 # This version of devkitARM depends on a Debian Bullseye
 # 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
@@ -1,4 +1,4 @@
-m4_define(`DEVKITPPC_VERSION',20240324)
+m4_define(`DEVKITPPC_VERSION',20240612)
 # This version of devkitPPC depends on a Debian Bullseye
 # 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
@@ -1,4 +1,4 @@
-m4_define(`DEVKITA64_VERSION',20240324)
+m4_define(`DEVKITA64_VERSION',20240604)
 # This version of devkitA64 depends on a Debian Bullseye
 # 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/m4/debian-toolchain-base.m4 b/toolchains/m4/debian-toolchain-base.m4
@@ -1,5 +1,5 @@
 m4_ifdef(`DEBIAN_RELEASE',,`m4_define(`DEBIAN_RELEASE',bookworm)')
-m4_ifdef(`DEBIAN_VERSION',,`m4_define(`DEBIAN_VERSION',20240408)')
+m4_ifdef(`DEBIAN_VERSION',,`m4_define(`DEBIAN_VERSION',20240612)')
 FROM toolchains/common AS helpers
 
 FROM debian:DEBIAN_RELEASE-DEBIAN_VERSION-slim m4_ifdef(`STAGE_IMAGE_NAME',AS STAGE_IMAGE_NAME,)

diff --git a/toolchains/ps3/packages/libraries/build.sh b/toolchains/ps3/packages/libraries/build.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-LIBRARIES_VERSION=6da19fa0de838a1e99519f471b48be654a7215ed
+LIBRARIES_VERSION=500ece9943da693ac22ffef72a08b1528694964a
 
 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
 HELPERS_DIR=$PACKAGE_DIR/../..

diff --git a/toolchains/ps3/packages/toolchain/build.sh b/toolchains/ps3/packages/toolchain/build.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-TOOLCHAIN_VERSION=ccb42018ebb6b7949f0667f309e98b3bc701804a
+TOOLCHAIN_VERSION=d9ce64effe01f34e723c8f0620d2155745d31db2
 
 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
 HELPERS_DIR=$PACKAGE_DIR/../..

diff --git 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=7fcfcf6bb675bd37d4baa7256c2b72fcb4bedb84
+PSP_PACKAGES_VERSION=eaae40cd1b3624fef930040d569a39bf3bf7f2c9
 
 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
@@ -1,17 +1,17 @@
 #! /bin/sh
 
-PSPDEV_VERSION=458a96d814f35799045021a0f4c222003f371a25
-export PSPTOOLCHAIN_VERSION=ce32f9c7d782dd50817bc089712441ea9f5e28b2
-export PSPSDK_VERSION=ae722cb5c1159aed6d0cf9edeaff6139fce171fb
-export PSPLINKUSB_VERSION=b9156ada7647d3d011fa26c598c86f16597c17c7
+PSPDEV_VERSION=05faca625578b06af22c7bfb93cdc8ed8081f36a
+export PSPTOOLCHAIN_VERSION=a420edb56fd5e63f21a043748b14ea2c7925bb48
+export PSPSDK_VERSION=5549b547607862407b6848d208bb553b9e1b36fa
+export PSPLINKUSB_VERSION=7fc1352bc546701f49c9f33c501376ffad684188
 export EBOOTSIGNER_VERSION=17d6386f034ac922f540ca78200961761b23ecae
-export PSPTOOLCHAIN_ALLEGREX_VERSION=74e301cf9ddae2ad9d1709ea90c98b4dc1be5c3d
-export PSPTOOLCHAIN_EXTRA_VERSION=2e450099ed73395ee2bd2fed33b80b08202555a9
-export BINUTILS_VERSION=1bf9b3f9be9d82cc89374ca916cd4e8e6115dcf8
-export GCC_VERSION=cbd5840ad74d19923abd0a058764e0ac0dc3c575
-export NEWLIB_VERSION=b8e1eb33d62ca778edf78f7254fba8ddd3d8911f
+export PSPTOOLCHAIN_ALLEGREX_VERSION=cdfaf141b899030c1188f6ee67302e2a7a5cd39f
+export PSPTOOLCHAIN_EXTRA_VERSION=a9532d80f733088c781f711eceef6471a585193d
+export BINUTILS_VERSION=982f4d2cb190f0bce06a98e7556b1b20a256d826
+export GCC_VERSION=9dc41f8ec692e2028838f67676ba956be62c0896
+export NEWLIB_VERSION=e2e50477342e32dd9a78143264dc4d15adb9fddb
 export PTHREAD_EMBEDDED_VERSION=4f43d30a23e8ac6d0334aef64272b4052b5bb7c2
-export PSP_PACMAN_VERSION=aedc04981cd6125741916e0b4b1b4d42715af6fa
+export PSP_PACMAN_VERSION=53603eccf7748de0fff614848a4020b52b1c5e31
 
 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
 HELPERS_DIR=$PACKAGE_DIR/../..

diff --git a/toolchains/psp/packages/toolchain/patches/01_fix_build_file.patch b/toolchains/psp/packages/toolchain/patches/01_fix_build_file.patch
@@ -0,0 +1,10 @@
+diff --git a/build-all.sh b/build-all.sh
+index fadf131..7b6b8ac 100755
+--- a/build-all.sh
++++ b/build-all.sh
+@@ -52,4 +52,4 @@ BUILD_FILE="${PSPDEV}/build.txt"
+ if [[ -f "${BUILD_FILE}" ]]; then
+   sed -i'' '/^pspdev /d' "${BUILD_FILE}"
+ fi
+-git log -1 --format="pspdev %H %cs %s" >> "${BUILD_FILE}"
++echo "pspdev $PSPDEV_VERSION" >> "${BUILD_FILE}"
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
@@ -7,10 +7,10 @@ index e71842a..29d5c80 100644
 
 +# Don't use the override file as conflicts in this file will allow us to track branch changes
  PSPTOOLCHAIN_ALLEGREX_BINUTILS_REPO_URL="https://github.com/pspdev/binutils-gdb.git"
--PSPTOOLCHAIN_ALLEGREX_BINUTILS_DEFAULT_REPO_REF="allegrex-v2.37.0"
+-PSPTOOLCHAIN_ALLEGREX_BINUTILS_DEFAULT_REPO_REF="allegrex-v2.40.0"
 +PSPTOOLCHAIN_ALLEGREX_BINUTILS_DEFAULT_REPO_REF="$BINUTILS_VERSION"
  PSPTOOLCHAIN_ALLEGREX_GCC_REPO_URL="https://github.com/pspdev/gcc.git"
--PSPTOOLCHAIN_ALLEGREX_GCC_DEFAULT_REPO_REF="allegrex-v13.2.0"
+-PSPTOOLCHAIN_ALLEGREX_GCC_DEFAULT_REPO_REF="allegrex-v14.1.0"
 +PSPTOOLCHAIN_ALLEGREX_GCC_DEFAULT_REPO_REF="$GCC_VERSION"
  PSPTOOLCHAIN_ALLEGREX_NEWLIB_REPO_URL="https://github.com/pspdev/newlib.git"
 -PSPTOOLCHAIN_ALLEGREX_NEWLIB_DEFAULT_REPO_REF="allegrex-v4.4.0"

diff --git a/toolchains/vita/packages/toolchain/build.sh b/toolchains/vita/packages/toolchain/build.sh
@@ -1,8 +1,8 @@
 #! /bin/sh
 
-VITA_VERSION=2.525
+VITA_VERSION=2.526
 # This one must be updated as well
-PKG_DATE=2024-02-05_05-05-05
+PKG_DATE=2024-05-23_20-53-38
 
 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
 HELPERS_DIR=$PACKAGE_DIR/../..

diff --git a/workers/fetcher/Dockerfile.m4 b/workers/fetcher/Dockerfile.m4
@@ -1,4 +1,4 @@
-m4_define(`ALPINE_VERSION',3.19.1)m4_dnl
+m4_define(`ALPINE_VERSION',3.20.1)m4_dnl
 FROM alpine:ALPINE_VERSION
 m4_define(`BASE_ALPINE',`')m4_dnl
 USER root

diff --git a/workers/m4/debian-builder-base.m4 b/workers/m4/debian-builder-base.m4
@@ -1,5 +1,5 @@
 m4_ifdef(`DEBIAN_RELEASE',,`m4_define(`DEBIAN_RELEASE',bookworm)')
-m4_ifdef(`DEBIAN_VERSION',,`m4_define(`DEBIAN_VERSION',20240408)')
+m4_ifdef(`DEBIAN_VERSION',,`m4_define(`DEBIAN_VERSION',20240612)')
 m4_define(`BASE_DEBIAN',`')m4_dnl
 FROM debian:DEBIAN_RELEASE-DEBIAN_VERSION-slim
 USER root