ALL: Various updates

scummvm · Sep 11, 2022 · a28d02c · a28d02c
1 parent 6db1321
commit a28d02c
Show file tree

Hide file tree

Showing 31 changed files with 45 additions and 95 deletions.
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
-BUILDBOT_VERSION   := 3.5.0
+BUILDBOT_VERSION   := 3.6.0
 BUILDBOT_BASEDIR   := buildbot-workdir
 
-BOTTLE_VERSION     := 0.12.21
+BOTTLE_VERSION     := 0.12.23
 TREQ_VERSION       := 22.2.0
 
 # Without toolchains/ part, all is a placeholder for all detected toolchains

diff --git a/check-versions/config.py b/check-versions/config.py
@@ -296,7 +296,8 @@
     ('./toolchains/gcw0/packages/sdl-net1.2/build.sh', 'SDL_NET'): 'ignore',
     ('./toolchains/gcw0/packages/sdl2-net/build.sh', 'SDL_NET'): 'ignore',
     ('./toolchains/gcw0/packages/zlib/build.sh', 'ZLIB'): 'ignore',
-    ('./toolchains/gcw0/packages/toolchain/build.sh', 'CT_NG'): crosstool_ng_check,
+    # Latest crosstool-ng doesn't support uClibc anymore
+    ('./toolchains/gcw0/packages/toolchain/build.sh', 'CT_NG'): 'ignore',
 
     ('./toolchains/iphone/packages/toolchain/build.sh', 'CCTOOLS_PORT'): cctools_port_check,
     ('./toolchains/iphone/packages/toolchain/build.sh', 'LDID'): {
@@ -372,7 +373,8 @@
     ('./toolchains/opendingux/packages/libvorbisidec/build.sh', 'LIBTREMOR'): 'ignore',
     ('./toolchains/opendingux/packages/sdl-net1.2/build.sh', 'SDL_NET'): 'ignore',
     ('./toolchains/opendingux/packages/zlib/build.sh', 'ZLIB'): 'ignore',
-    ('./toolchains/opendingux/packages/toolchain/build.sh', 'CT_NG'): crosstool_ng_check,
+    # Latest crosstool-ng doesn't support uClibc anymore
+    ('./toolchains/opendingux/packages/toolchain/build.sh', 'CT_NG'): 'ignore',
 
     ('./toolchains/opendingux-beta/packages/toolchain/build.sh', 'TOOLCHAIN'): {
         'check': 'git commit',

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.3
+REXX_VERSION=3.9.5
 
 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=26752f9a7637ebcbecd495128009220c24b8979a
+TOOLCHAIN_VERSION=58d6f763596974b8ba6d20953e6ef7a30a27d45f
 
 # Versions of components to use provided by toolchain
 BINUTILS_VER=2.23.2

diff --git a/toolchains/apple-sdks/Dockerfile.m4 b/toolchains/apple-sdks/Dockerfile.m4
@@ -26,7 +26,7 @@ COPY Xcode_`'I386_XCODE_VERSION.xip* ${PACKAGES_LOCATION}
 local_package(xcode-extractor, , PACKAGE=Xcode_`'I386_XCODE_VERSION.xip SDK_PLATFORMS="MacOSX")
 
 # Extract latest MacOS X and iPhoneOS SDK
-m4_define(`XCODE_VERSION', 13.4)
+m4_define(`XCODE_VERSION', 13.4.1)
 COPY Xcode_`'XCODE_VERSION.xip* ${PACKAGES_LOCATION}
 local_package(xcode-extractor, , PACKAGE=Xcode_`'XCODE_VERSION.xip SDK_PLATFORMS="MacOSX iPhoneOS")
 

diff --git a/toolchains/apple-sdks/packages/xcode-extractor/build.sh b/toolchains/apple-sdks/packages/xcode-extractor/build.sh
@@ -1,8 +1,8 @@
 #! /bin/sh
 
-OSXCROSS_VERSION=610542781e0eabc6968b0c0719bbc8d25c992025
+OSXCROSS_VERSION=17bb5e2d0a46533c1dd525cf4e9a80d88bd9f00e
 export PBZX_VERSION=2a4d7c3300c826d918def713a24d25c237c8ed53
-export XAR_VERSION=2b9a4ab7003f1db8c54da4fea55fcbb424fdecb0
+export XAR_VERSION=c2111a9a9cabc50d2b9c604aff41a481ae3f1989
 
 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
 HELPERS_DIR=$PACKAGE_DIR/../..

diff --git a/toolchains/apple-sdks/packages/xcode-extractor/patches/0001-Set-versions.patch b/toolchains/apple-sdks/packages/xcode-extractor/patches/0001-Set-versions.patch
@@ -1,4 +1,4 @@
-From e6cf7e6dcd5033da9d3ab5c3f27319007df1315f Mon Sep 17 00:00:00 2001
+From 98ea6c715afd7bfbc53cbec0c4779d94a61900da Mon Sep 17 00:00:00 2001
 From: Le Philousophe <lephilousophe@users.noreply.github.com>
 Date: Sun, 24 Jan 2021 19:15:52 +0100
 Subject: [PATCH 1/3] Set versions
@@ -35,5 +35,5 @@ index a09ec64..cf0d370 100644
    if [ $f_res -eq 1 ]; then
      pushd $CURRENT_BUILD_PROJECT_NAME/xar &>/dev/null
 -- 
-2.32.0
+2.34.1
 
diff --git a/...ackages/xcode-extractor/patches/0002-Accept-piped-data-and-avoid-intermediate-files.patch b/...ackages/xcode-extractor/patches/0002-Accept-piped-data-and-avoid-intermediate-files.patch
@@ -1,4 +1,4 @@
-From b214530e43110f88b17a6a821a87b581340f4aae Mon Sep 17 00:00:00 2001
+From e4dce5868f586ad9ce7b1ccc71f5d4f9bb862cda Mon Sep 17 00:00:00 2001
 From: Le Philousophe <lephilousophe@users.noreply.github.com>
 Date: Sun, 24 Jan 2021 19:18:24 +0100
 Subject: [PATCH 2/3] Accept piped data and avoid intermediate files
@@ -338,5 +338,5 @@ index cf0d370..9d61a6a 100644
    if [ $f_res -eq 1 ]; then
      pushd $CURRENT_BUILD_PROJECT_NAME/xar &>/dev/null
 -- 
-2.32.0
+2.34.1
 
diff --git a/...le-sdks/packages/xcode-extractor/patches/0003-Generate-all-SDKs-and-not-only-MacOSX.patch b/...le-sdks/packages/xcode-extractor/patches/0003-Generate-all-SDKs-and-not-only-MacOSX.patch
@@ -1,4 +1,4 @@
-From 3ffa0f3ed46aa63c1082bbd35cb158b458a8af3e Mon Sep 17 00:00:00 2001
+From 58f5c3823b0698d342784bb2318eb08350f4e418 Mon Sep 17 00:00:00 2001
 From: Le Philousophe <lephilousophe@users.noreply.github.com>
 Date: Sun, 24 Jan 2021 19:19:14 +0100
 Subject: [PATCH 3/3] Generate all SDKs and not only MacOSX
@@ -8,7 +8,7 @@ Subject: [PATCH 3/3] Generate all SDKs and not only MacOSX
  1 file changed, 7 insertions(+), 6 deletions(-)
 
 diff --git a/tools/gen_sdk_package.sh b/tools/gen_sdk_package.sh
-index 238a63f..a5ed371 100755
+index b41d08c..a5ed371 100755
 --- a/tools/gen_sdk_package.sh
 +++ b/tools/gen_sdk_package.sh
 @@ -124,8 +124,8 @@ set -e
@@ -26,7 +26,7 @@ index 238a63f..a5ed371 100755
    fi
  fi
 
--SDKS=$(ls | grep -E "^MacOSX12.*|^MacOSX11.*|^MacOSX10.*" | grep -v "Patch")
+-SDKS=$(ls | grep -E "^MacOSX13.*|^MacOSX12.*|^MacOSX11.*|^MacOSX10.*" | grep -v "Patch")
 +SDKS=$(for platform in $SDK_PLATFORMS; do ls -1d ${platform}.platform/Developer/SDKs/*.*.sdk | grep -v 'Patch'; done)
 
  if [ -z "$SDKS" ]; then
@@ -57,5 +57,5 @@ index 238a63f..a5ed371 100755
 -ls -lh | grep MacOSX
 +ls -lh *.*.sdk.*
 -- 
-2.32.0
+2.34.1
 
diff --git a/toolchains/common/packages/fluidlite/build.sh b/toolchains/common/packages/fluidlite/build.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-FLUIDLITE_VERSION=acc2183fdcb9af2aca233bcfdafd5f657dce33f8
+FLUIDLITE_VERSION=eaacb5f8d089a31084777de490d10c1c9b9c0c51
 
 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
 HELPERS_DIR=$PACKAGE_DIR/../..

diff --git a/toolchains/common/packages/fluidsynth/build.sh b/toolchains/common/packages/fluidsynth/build.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-FLUIDSYNTH_VERSION=2.2.7
+FLUIDSYNTH_VERSION=2.2.9
 
 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
 HELPERS_DIR=$PACKAGE_DIR/../..

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=e1c3a1aa5b6e56e78bc1405f64a9bd7d952614b1
+SDL_VERSION=dff35e7a6694acbd14c6222363b3e69f1bd1b96c
 
 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=fca71cd9b980cb7d797ff7f31bd8820c5c905116
+SDL_NET_VERSION=9aa8a57ab1d1a42acf2a421cb4c8220c09ec72bd
 
 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',20220216)
+m4_define(`DEVKITARM_VERSION',20220821)
 # 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
@@ -1,4 +1,4 @@
-m4_define(`DEVKITPPC_VERSION',20220216)
+m4_define(`DEVKITPPC_VERSION',20220821)
 # 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
@@ -1,4 +1,4 @@
-m4_define(`DEVKITA64_VERSION',20220216)
+m4_define(`DEVKITA64_VERSION',20220821)
 # 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/iphone/packages/xar/build.sh b/toolchains/iphone/packages/xar/build.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-XAR_VERSION=2b9a4ab7003f1db8c54da4fea55fcbb424fdecb0
+XAR_VERSION=c2111a9a9cabc50d2b9c604aff41a481ae3f1989
 
 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
 HELPERS_DIR=$PACKAGE_DIR/../..

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',bullseye)')
-m4_ifdef(`DEBIAN_VERSION',,`m4_define(`DEBIAN_VERSION',20220527)')
+m4_ifdef(`DEBIAN_VERSION',,`m4_define(`DEBIAN_VERSION',20220822)')
 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/macosx-common/packages/osxcross-clang/build.sh b/toolchains/macosx-common/packages/osxcross-clang/build.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-OSXCROSS_VERSION=610542781e0eabc6968b0c0719bbc8d25c992025
+OSXCROSS_VERSION=17bb5e2d0a46533c1dd525cf4e9a80d88bd9f00e
 
 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
 HELPERS_DIR=$PACKAGE_DIR/../..

diff --git a/toolchains/macosx-common/packages/osxcross/build.sh b/toolchains/macosx-common/packages/osxcross/build.sh
@@ -1,7 +1,7 @@
 #! /bin/sh
 
-OSXCROSS_VERSION=610542781e0eabc6968b0c0719bbc8d25c992025
-export XAR_VERSION=2b9a4ab7003f1db8c54da4fea55fcbb424fdecb0
+OSXCROSS_VERSION=17bb5e2d0a46533c1dd525cf4e9a80d88bd9f00e
+export XAR_VERSION=c2111a9a9cabc50d2b9c604aff41a481ae3f1989
 
 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
 HELPERS_DIR=$PACKAGE_DIR/../..

diff --git a/toolchains/macosx-common/packages/osxcross/patches/0001-Set-versions.patch b/toolchains/macosx-common/packages/osxcross/patches/0001-Set-versions.patch
@@ -1,7 +1,7 @@
-From 4fefe6200d14e4b7a6fb67fe887e85535a9ef548 Mon Sep 17 00:00:00 2001
+From e8419ab04f23b69757256328036b9b1e0596b139 Mon Sep 17 00:00:00 2001
 From: Le Philousophe <lephilousophe@users.noreply.github.com>
 Date: Sun, 24 Jan 2021 19:15:52 +0100
-Subject: [PATCH 1/3] Set versions
+Subject: [PATCH] Set versions
 
 ---
  tools/gen_sdk_package_pbzx.sh | 2 +-
@@ -35,5 +35,5 @@ index a09ec64..cf0d370 100644
    if [ $f_res -eq 1 ]; then
      pushd $CURRENT_BUILD_PROJECT_NAME/xar &>/dev/null
 -- 
-2.32.0
+2.34.1
 
diff --git a/toolchains/macosx-common/packages/osxcross/patches/0002-Add-12.3-SDK-support.patch b/toolchains/macosx-common/packages/osxcross/patches/0002-Add-12.3-SDK-support.patch
diff --git a/toolchains/macosx-common/packages/osxcross/patches/0003-Add-support-for-LLVM-14.x.patch b/toolchains/macosx-common/packages/osxcross/patches/0003-Add-support-for-LLVM-14.x.patch
diff --git a/toolchains/opendingux-beta/packages/toolchain/build.sh b/toolchains/opendingux-beta/packages/toolchain/build.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-TOOLCHAIN_VERSION=46fd31f88002db5806c77fa38a2f6412e18b4115
+TOOLCHAIN_VERSION=e11cbbc4e3aa626745a64458c72cc9efc93e6b41
 TARGETS="gcw0 rs90 lepus"
 
 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)

diff --git a/toolchains/ps3/packages/libraries/build.sh b/toolchains/ps3/packages/libraries/build.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-LIBRARIES_VERSION=8524b11a300ccaeac2d9da528d710bbf48c4549b
+LIBRARIES_VERSION=0aabb875322b1a5b8aacbe55b66d89988f6702f4
 
 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=9a5a65102aa6b006bc71eb02489c3c8f62a2485c
+PSP_PACKAGES_VERSION=f6e720a7b8e8a09147ceb00f41acc383c0102626
 
 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,13 +1,13 @@
 #! /bin/sh
 
-PSPDEV_VERSION=a9490878c30adeaa0d30081e921ee28d02a925b3
+PSPDEV_VERSION=38c23f527c6c628b33241d5d97584a932a5d7822
 export PSPTOOLCHAIN_VERSION=f63dad313d48b30cbc04fdc0efbbe451de018198
 export PSPSDK_VERSION=e9da170bcf8cad9ab9a02b3e42ea8446b8b9cfd4
 export PSPLINKUSB_VERSION=f60bf725702333615bb2ab221f9165f74cb902c3
 export EBOOTSIGNER_VERSION=10cfbb51ea87adfe02d63dc3a262c8480fdf31e7
-export PSPTOOLCHAIN_ALLEGREX_VERSION=08f2043411320ae89acb29dc85efadf5545f212f
+export PSPTOOLCHAIN_ALLEGREX_VERSION=308a144389bfe36cb43b87721937e393e7dcf7ee
 export PSPTOOLCHAIN_EXTRA_VERSION=880705e1993a43c8e0533e53e67bab6f3b57e202
-export BINUTILS_VERSION=e9c864fd3776b1fef2e374568e47f442ec58c773
+export BINUTILS_VERSION=1bf9b3f9be9d82cc89374ca916cd4e8e6115dcf8
 export GCC_VERSION=65cf73279bb91ff72e5327dd1621c206f027f761
 export NEWLIB_VERSION=034f72f6e21e211137d38ca4015a58c9ab82a369
 export PTHREAD_EMBEDDED_VERSION=c7e2d5a7e810401174b0484979b6d29a2f1ab519

diff --git a/toolchains/riscos/packages/toolchain/build.sh b/toolchains/riscos/packages/toolchain/build.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-GCCSDK_VERSION=7687
+GCCSDK_VERSION=7704
 
 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
@@ -1,8 +1,8 @@
 #! /bin/sh
 
-VITA_VERSION=2.343
+VITA_VERSION=2.414
 # This one must be updated as well
-PKG_DATE=2022-05-27_09-56-28
+PKG_DATE=2022-09-09_14-50-22
 
 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.16.0)m4_dnl
+m4_define(`ALPINE_VERSION',3.16.2)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',bullseye)')
-m4_ifdef(`DEBIAN_VERSION',,`m4_define(`DEBIAN_VERSION',20220527)')
+m4_ifdef(`DEBIAN_VERSION',,`m4_define(`DEBIAN_VERSION',20220822)')
 m4_define(`BASE_DEBIAN',`')m4_dnl
 FROM debian:DEBIAN_RELEASE-DEBIAN_VERSION-slim
 USER root