From 312fd4d09f235625520d56411cd81ce6138b9a0d Mon Sep 17 00:00:00 2001 From: Le Philousophe Date: Sat, 31 Dec 2022 14:52:24 +0000 Subject: [PATCH] ALL: Various toolchains updates --- Makefile | 2 +- toolchains/amigaos4/packages/libflac/build.sh | 2 +- .../amigaos4/packages/toolchain/build.sh | 2 +- toolchains/android-common/functions-sdk.sh | 4 +- .../common/packages/fluidsynth/build.sh | 2 +- toolchains/common/packages/libsdl1.2/build.sh | 2 +- toolchains/common/packages/retrowave/build.sh | 2 +- .../retrowave/patches/retrowave-cmake.patch | 130 ------------------ .../common/packages/sdl-net1.2/build.sh | 2 +- toolchains/devkitarm/Dockerfile.m4 | 2 +- toolchains/devkitswitch/Dockerfile.m4 | 2 +- toolchains/m4/debian-toolchain-base.m4 | 2 +- .../retrowave/retrowave-9999-cmake.patch | 130 ------------------ .../mxe/packages/retrowave/retrowave.mk | 4 +- .../packages/toolchain/build.sh | 2 +- .../patches/0001-Fix-PCRE-URLs.patch | 39 ------ toolchains/psp/packages/toolchain/build.sh | 2 +- toolchains/riscos/packages/toolchain/build.sh | 2 +- toolchains/vita/packages/toolchain/build.sh | 4 +- workers/fetcher/Dockerfile.m4 | 2 +- workers/m4/debian-builder-base.m4 | 2 +- 21 files changed, 21 insertions(+), 320 deletions(-) delete mode 100644 toolchains/common/packages/retrowave/patches/retrowave-cmake.patch delete mode 100644 toolchains/mxe/packages/retrowave/retrowave-9999-cmake.patch delete mode 100644 toolchains/opendingux-beta/packages/toolchain/patches/0001-Fix-PCRE-URLs.patch diff --git a/Makefile b/Makefile index 3bff0bd..3426fe0 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -BUILDBOT_VERSION := 3.6.1 +BUILDBOT_VERSION := 3.7.0 BUILDBOT_BASEDIR := buildbot-workdir BOTTLE_VERSION := 0.12.23 diff --git a/toolchains/amigaos4/packages/libflac/build.sh b/toolchains/amigaos4/packages/libflac/build.sh index ecd3c96..7457356 100755 --- a/toolchains/amigaos4/packages/libflac/build.sh +++ b/toolchains/amigaos4/packages/libflac/build.sh @@ -6,7 +6,7 @@ HELPERS_DIR=$PACKAGE_DIR/../.. do_make_bdir -do_lha_fetch audio/libflac "libflac-*/SDK" +do_lha_fetch audio/libflac "flac-*/SDK" do_lha_install diff --git a/toolchains/amigaos4/packages/toolchain/build.sh b/toolchains/amigaos4/packages/toolchain/build.sh index a97a680..a577ae7 100755 --- a/toolchains/amigaos4/packages/toolchain/build.sh +++ b/toolchains/amigaos4/packages/toolchain/build.sh @@ -1,6 +1,6 @@ #! /bin/sh -TOOLCHAIN_VERSION=5ec2e2d879f2cc0cb4fe2b63a1a0594a54be7bea +TOOLCHAIN_VERSION=c614a172ef8038c277a03a24f7ce2cf60b7a4a23 # Versions of components to use provided by toolchain BINUTILS_VER=2.23.2 diff --git a/toolchains/android-common/functions-sdk.sh b/toolchains/android-common/functions-sdk.sh index ddde1bd..e434c6d 100644 --- a/toolchains/android-common/functions-sdk.sh +++ b/toolchains/android-common/functions-sdk.sh @@ -1,5 +1,5 @@ -CMDLINE_TOOLS_VERSION=8512546 -CMDLINE_TOOLS_CHECKSUM="sha256:2ccbda4302db862a28ada25aa7425d99dce9462046003c1714b059b5c47970d8" +CMDLINE_TOOLS_VERSION=9123335 +CMDLINE_TOOLS_CHECKSUM="sha256:0bebf59339eaa534f4217f8aa0972d14dc49e7207be225511073c661ae01da0a" CMDLINE_TOOLS_SUBDIR=cmdline-tools do_install_sdk_tools () { diff --git a/toolchains/common/packages/fluidsynth/build.sh b/toolchains/common/packages/fluidsynth/build.sh index 03df5f0..e5fddae 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.0 +FLUIDSYNTH_VERSION=2.3.1 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 index 51b0cca..8391369 100755 --- a/toolchains/common/packages/libsdl1.2/build.sh +++ b/toolchains/common/packages/libsdl1.2/build.sh @@ -1,6 +1,6 @@ #! /bin/sh -SDL_VERSION=b637671eff3d7c8e7a527ad72b1108824c1eee8b +SDL_VERSION=ca3acd25348edc9b6e984fc1712fd4d365931dc1 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) HELPERS_DIR=$PACKAGE_DIR/../.. diff --git a/toolchains/common/packages/retrowave/build.sh b/toolchains/common/packages/retrowave/build.sh index 021484c..c8a7978 100755 --- a/toolchains/common/packages/retrowave/build.sh +++ b/toolchains/common/packages/retrowave/build.sh @@ -1,6 +1,6 @@ #! /bin/sh -RETROWAVE_VERSION=0.0.9 +RETROWAVE_VERSION=0.1.0 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) HELPERS_DIR=$PACKAGE_DIR/../.. diff --git a/toolchains/common/packages/retrowave/patches/retrowave-cmake.patch b/toolchains/common/packages/retrowave/patches/retrowave-cmake.patch deleted file mode 100644 index 2792b61..0000000 --- a/toolchains/common/packages/retrowave/patches/retrowave-cmake.patch +++ /dev/null @@ -1,130 +0,0 @@ -From 893175c8605e91df435b6c5933b0d80241ffdd9e Mon Sep 17 00:00:00 2001 -From: Cameron Cawley -Date: Sun, 12 Dec 2021 21:45:51 +0000 -Subject: [PATCH 1/4] Lower the minimum CMake version to 3.13.4 - ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c296941..c03cac8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.14) -+cmake_minimum_required(VERSION 3.13.4) - project(RetroWave) - - set(CMAKE_CXX_STANDARD 17) --- -2.30.2 - - -From c16c04a14494f7fea1491be70a476a6d417608ba Mon Sep 17 00:00:00 2001 -From: Cameron Cawley -Date: Sun, 12 Dec 2021 21:57:06 +0000 -Subject: [PATCH 2/4] Fix setting RETROWAVE_BUILD_PLAYER from the command line - ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c03cac8..88b85aa 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -24,7 +24,7 @@ add_library( - - target_include_directories(RetroWave INTERFACE .) - --set(RETROWAVE_BUILD_PLAYER -1) -+set(RETROWAVE_BUILD_PLAYER -1 CACHE STRING "Set this to 0 to disable the player.") - - if(${RETROWAVE_BUILD_PLAYER} EQUAL -1) - message("-- Note: Building the player by default. This requires additional dependencies. Use -DRETROWAVE_BUILD_PLAYER=0 to disable.") --- -2.30.2 - - -From d4f657bbc95ac46a6a2930f26a027aac53980629 Mon Sep 17 00:00:00 2001 -From: Cameron Cawley -Date: Sun, 12 Dec 2021 22:39:19 +0000 -Subject: [PATCH 3/4] Install the static library and headers - ---- - CMakeLists.txt | 19 ++++++++++++++++--- - 1 file changed, 16 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 88b85aa..64803e6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -8,9 +8,12 @@ if(${CMAKE_C_COMPILER} MATCHES "(C|c)lang|Xcode") - add_compile_options(-Wno-unknown-warning-option) - endif() - --file(GLOB_RECURSE RETROWAVE_BOARD_SOURCES "RetroWaveLib/Board/*.*") --file(GLOB_RECURSE RETROWAVE_PLATFORM_SOURCES "RetroWaveLib/Platform/*.*") --file(GLOB_RECURSE RETROWAVE_PROTOCOL_SOURCES "RetroWaveLib/Protocol/*.*") -+file(GLOB_RECURSE RETROWAVE_BOARD_SOURCES "RetroWaveLib/Board/*.c") -+file(GLOB_RECURSE RETROWAVE_BOARD_HEADERS "RetroWaveLib/Board/*.h") -+file(GLOB_RECURSE RETROWAVE_PLATFORM_SOURCES "RetroWaveLib/Platform/*.c") -+file(GLOB_RECURSE RETROWAVE_PLATFORM_HEADERS "RetroWaveLib/Platform/*.h") -+file(GLOB_RECURSE RETROWAVE_PROTOCOL_SOURCES "RetroWaveLib/Protocol/*.c") -+file(GLOB_RECURSE RETROWAVE_PROTOCOL_HEADERS "RetroWaveLib/Protocol/*.h") - - add_library( - RetroWave -@@ -18,12 +21,22 @@ add_library( - RetroWaveLib/RetroWave.c RetroWaveLib/RetroWave.h - - ${RETROWAVE_BOARD_SOURCES} -+ ${RETROWAVE_BOARD_HEADERS} - ${RETROWAVE_PLATFORM_SOURCES} -+ ${RETROWAVE_PLATFORM_HEADERS} - ${RETROWAVE_PROTOCOL_SOURCES} -+ ${RETROWAVE_PROTOCOL_HEADERS} - ) - - target_include_directories(RetroWave INTERFACE .) - -+install(FILES RetroWaveLib/RetroWave.h DESTINATION include/RetroWaveLib) -+install(FILES ${RETROWAVE_BOARD_HEADERS} DESTINATION include/RetroWaveLib/Board) -+install(FILES ${RETROWAVE_PLATFORM_HEADERS} DESTINATION include/RetroWaveLib/Platform) -+install(FILES ${RETROWAVE_PROTOCOL_HEADERS} DESTINATION include/RetroWaveLib/Protocol) -+ -+install(TARGETS RetroWave DESTINATION lib) -+ - set(RETROWAVE_BUILD_PLAYER -1 CACHE STRING "Set this to 0 to disable the player.") - - if(${RETROWAVE_BUILD_PLAYER} EQUAL -1) --- -2.30.2 - - -From 6ba74d9bcd83818186ec28884198f8d44504a231 Mon Sep 17 00:00:00 2001 -From: Cameron Cawley -Date: Mon, 13 Dec 2021 00:08:26 +0000 -Subject: [PATCH 4/4] Use lowercase for the library file name - ---- - CMakeLists.txt | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 64803e6..a62d9a8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -30,6 +30,8 @@ add_library( - - target_include_directories(RetroWave INTERFACE .) - -+set_target_properties(RetroWave PROPERTIES OUTPUT_NAME "retrowave") -+ - install(FILES RetroWaveLib/RetroWave.h DESTINATION include/RetroWaveLib) - install(FILES ${RETROWAVE_BOARD_HEADERS} DESTINATION include/RetroWaveLib/Board) - install(FILES ${RETROWAVE_PLATFORM_HEADERS} DESTINATION include/RetroWaveLib/Platform) --- -2.30.2 - diff --git a/toolchains/common/packages/sdl-net1.2/build.sh b/toolchains/common/packages/sdl-net1.2/build.sh index 6a9d6cd..da6d30e 100755 --- 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=091c95c031769f48d3ffaacddfdea1af999f4446 +SDL_NET_VERSION=3079ee39e1224d744fdedc066280690c8ec40bb1 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) HELPERS_DIR=$PACKAGE_DIR/../.. diff --git a/toolchains/devkitarm/Dockerfile.m4 b/toolchains/devkitarm/Dockerfile.m4 index 9e8cce9..a4df744 100644 --- a/toolchains/devkitarm/Dockerfile.m4 +++ b/toolchains/devkitarm/Dockerfile.m4 @@ -1,4 +1,4 @@ -m4_define(`DEVKITARM_VERSION',20220821) +m4_define(`DEVKITARM_VERSION',20221115) # 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/devkitswitch/Dockerfile.m4 b/toolchains/devkitswitch/Dockerfile.m4 index ab88632..8a6175c 100644 --- a/toolchains/devkitswitch/Dockerfile.m4 +++ b/toolchains/devkitswitch/Dockerfile.m4 @@ -1,4 +1,4 @@ -m4_define(`DEVKITA64_VERSION',20220821) +m4_define(`DEVKITA64_VERSION',20221113) # 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/m4/debian-toolchain-base.m4 b/toolchains/m4/debian-toolchain-base.m4 index 8aac282..9f57ec9 100644 --- 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',20221024)') +m4_ifdef(`DEBIAN_VERSION',,`m4_define(`DEBIAN_VERSION',20221219)') 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/mxe/packages/retrowave/retrowave-9999-cmake.patch b/toolchains/mxe/packages/retrowave/retrowave-9999-cmake.patch deleted file mode 100644 index 2792b61..0000000 --- a/toolchains/mxe/packages/retrowave/retrowave-9999-cmake.patch +++ /dev/null @@ -1,130 +0,0 @@ -From 893175c8605e91df435b6c5933b0d80241ffdd9e Mon Sep 17 00:00:00 2001 -From: Cameron Cawley -Date: Sun, 12 Dec 2021 21:45:51 +0000 -Subject: [PATCH 1/4] Lower the minimum CMake version to 3.13.4 - ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c296941..c03cac8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.14) -+cmake_minimum_required(VERSION 3.13.4) - project(RetroWave) - - set(CMAKE_CXX_STANDARD 17) --- -2.30.2 - - -From c16c04a14494f7fea1491be70a476a6d417608ba Mon Sep 17 00:00:00 2001 -From: Cameron Cawley -Date: Sun, 12 Dec 2021 21:57:06 +0000 -Subject: [PATCH 2/4] Fix setting RETROWAVE_BUILD_PLAYER from the command line - ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c03cac8..88b85aa 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -24,7 +24,7 @@ add_library( - - target_include_directories(RetroWave INTERFACE .) - --set(RETROWAVE_BUILD_PLAYER -1) -+set(RETROWAVE_BUILD_PLAYER -1 CACHE STRING "Set this to 0 to disable the player.") - - if(${RETROWAVE_BUILD_PLAYER} EQUAL -1) - message("-- Note: Building the player by default. This requires additional dependencies. Use -DRETROWAVE_BUILD_PLAYER=0 to disable.") --- -2.30.2 - - -From d4f657bbc95ac46a6a2930f26a027aac53980629 Mon Sep 17 00:00:00 2001 -From: Cameron Cawley -Date: Sun, 12 Dec 2021 22:39:19 +0000 -Subject: [PATCH 3/4] Install the static library and headers - ---- - CMakeLists.txt | 19 ++++++++++++++++--- - 1 file changed, 16 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 88b85aa..64803e6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -8,9 +8,12 @@ if(${CMAKE_C_COMPILER} MATCHES "(C|c)lang|Xcode") - add_compile_options(-Wno-unknown-warning-option) - endif() - --file(GLOB_RECURSE RETROWAVE_BOARD_SOURCES "RetroWaveLib/Board/*.*") --file(GLOB_RECURSE RETROWAVE_PLATFORM_SOURCES "RetroWaveLib/Platform/*.*") --file(GLOB_RECURSE RETROWAVE_PROTOCOL_SOURCES "RetroWaveLib/Protocol/*.*") -+file(GLOB_RECURSE RETROWAVE_BOARD_SOURCES "RetroWaveLib/Board/*.c") -+file(GLOB_RECURSE RETROWAVE_BOARD_HEADERS "RetroWaveLib/Board/*.h") -+file(GLOB_RECURSE RETROWAVE_PLATFORM_SOURCES "RetroWaveLib/Platform/*.c") -+file(GLOB_RECURSE RETROWAVE_PLATFORM_HEADERS "RetroWaveLib/Platform/*.h") -+file(GLOB_RECURSE RETROWAVE_PROTOCOL_SOURCES "RetroWaveLib/Protocol/*.c") -+file(GLOB_RECURSE RETROWAVE_PROTOCOL_HEADERS "RetroWaveLib/Protocol/*.h") - - add_library( - RetroWave -@@ -18,12 +21,22 @@ add_library( - RetroWaveLib/RetroWave.c RetroWaveLib/RetroWave.h - - ${RETROWAVE_BOARD_SOURCES} -+ ${RETROWAVE_BOARD_HEADERS} - ${RETROWAVE_PLATFORM_SOURCES} -+ ${RETROWAVE_PLATFORM_HEADERS} - ${RETROWAVE_PROTOCOL_SOURCES} -+ ${RETROWAVE_PROTOCOL_HEADERS} - ) - - target_include_directories(RetroWave INTERFACE .) - -+install(FILES RetroWaveLib/RetroWave.h DESTINATION include/RetroWaveLib) -+install(FILES ${RETROWAVE_BOARD_HEADERS} DESTINATION include/RetroWaveLib/Board) -+install(FILES ${RETROWAVE_PLATFORM_HEADERS} DESTINATION include/RetroWaveLib/Platform) -+install(FILES ${RETROWAVE_PROTOCOL_HEADERS} DESTINATION include/RetroWaveLib/Protocol) -+ -+install(TARGETS RetroWave DESTINATION lib) -+ - set(RETROWAVE_BUILD_PLAYER -1 CACHE STRING "Set this to 0 to disable the player.") - - if(${RETROWAVE_BUILD_PLAYER} EQUAL -1) --- -2.30.2 - - -From 6ba74d9bcd83818186ec28884198f8d44504a231 Mon Sep 17 00:00:00 2001 -From: Cameron Cawley -Date: Mon, 13 Dec 2021 00:08:26 +0000 -Subject: [PATCH 4/4] Use lowercase for the library file name - ---- - CMakeLists.txt | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 64803e6..a62d9a8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -30,6 +30,8 @@ add_library( - - target_include_directories(RetroWave INTERFACE .) - -+set_target_properties(RetroWave PROPERTIES OUTPUT_NAME "retrowave") -+ - install(FILES RetroWaveLib/RetroWave.h DESTINATION include/RetroWaveLib) - install(FILES ${RETROWAVE_BOARD_HEADERS} DESTINATION include/RetroWaveLib/Board) - install(FILES ${RETROWAVE_PLATFORM_HEADERS} DESTINATION include/RetroWaveLib/Platform) --- -2.30.2 - diff --git a/toolchains/mxe/packages/retrowave/retrowave.mk b/toolchains/mxe/packages/retrowave/retrowave.mk index 14a139e..31039b7 100644 --- a/toolchains/mxe/packages/retrowave/retrowave.mk +++ b/toolchains/mxe/packages/retrowave/retrowave.mk @@ -2,10 +2,10 @@ PKG := retrowave $(PKG)_WEBSITE := https://github.com/SudoMaker/RetroWave $(PKG)_DESCR := RetroWave $(PKG)_IGNORE := -$(PKG)_VERSION := 0.0.9 +$(PKG)_VERSION := 0.1.0 $(PKG)_GH_CONF := SudoMaker/RetroWave/tags, v $(PKG)_GH_ARCHIVE_EXT := .tar.gz -$(PKG)_CHECKSUM := 720704b062e6292aa4d3c7b10413d32902b1021d1212311e29f48eca9f6ab101 +$(PKG)_CHECKSUM := da86c0ecfde558da6a01e5f6d1d0c6a07a164ef5cff912f7a8667089adf7ea84 $(PKG)_DEPS := cc define $(PKG)_BUILD diff --git a/toolchains/opendingux-beta/packages/toolchain/build.sh b/toolchains/opendingux-beta/packages/toolchain/build.sh index 17d8f8a..b742994 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=e7316840b746bcff9b70afbdcddc93eaeee53539 +TOOLCHAIN_VERSION=4d23381101e15cd53d9e1cb37e2a488d99d5b6e1 TARGETS="gcw0 rs90 lepus" PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) diff --git a/toolchains/opendingux-beta/packages/toolchain/patches/0001-Fix-PCRE-URLs.patch b/toolchains/opendingux-beta/packages/toolchain/patches/0001-Fix-PCRE-URLs.patch deleted file mode 100644 index f088aaa..0000000 --- a/toolchains/opendingux-beta/packages/toolchain/patches/0001-Fix-PCRE-URLs.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 2d96a35a47416108ea30ec05b9d0d094a0c94903 Mon Sep 17 00:00:00 2001 -From: Le Philousophe -Date: Fri, 12 Nov 2021 13:28:07 +0100 -Subject: [PATCH] Fix PCRE URLs - ---- - package/pcre/pcre.mk | 2 +- - package/pcre2/pcre2.mk | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/package/pcre/pcre.mk b/package/pcre/pcre.mk -index c8498b7acf..219ac59786 100644 ---- a/package/pcre/pcre.mk -+++ b/package/pcre/pcre.mk -@@ -5,7 +5,7 @@ - ################################################################################ - - PCRE_VERSION = 8.44 --PCRE_SITE = https://ftp.pcre.org/pub/pcre -+PCRE_SITE = http://downloads.sourceforge.net/project/pcre/pcre/$(PCRE_VERSION) - PCRE_SOURCE = pcre-$(PCRE_VERSION).tar.bz2 - PCRE_LICENSE = BSD-3-Clause - PCRE_LICENSE_FILES = LICENCE -diff --git a/package/pcre2/pcre2.mk b/package/pcre2/pcre2.mk -index d02772650f..d9254125d1 100644 ---- a/package/pcre2/pcre2.mk -+++ b/package/pcre2/pcre2.mk -@@ -5,7 +5,7 @@ - ################################################################################ - - PCRE2_VERSION = 10.36 --PCRE2_SITE = https://ftp.pcre.org/pub/pcre -+PCRE2_SITE = http://downloads.sourceforge.net/project/pcre/pcre2/$(PCRE_VERSION) - PCRE2_SOURCE = pcre2-$(PCRE2_VERSION).tar.bz2 - PCRE2_LICENSE = BSD-3-Clause - PCRE2_LICENSE_FILES = LICENCE --- -2.32.0 - diff --git a/toolchains/psp/packages/toolchain/build.sh b/toolchains/psp/packages/toolchain/build.sh index c1437f0..a74c567 100755 --- a/toolchains/psp/packages/toolchain/build.sh +++ b/toolchains/psp/packages/toolchain/build.sh @@ -1,6 +1,6 @@ #! /bin/sh -PSPDEV_VERSION=c9d2d0e2b923669c60ce01e68fe2323f1bbd0277 +PSPDEV_VERSION=bccfddf5c2be0ed63569d646a27dc7e8732cef4d export PSPTOOLCHAIN_VERSION=f63dad313d48b30cbc04fdc0efbbe451de018198 export PSPSDK_VERSION=61fc8f79991ede62227331dc0d3400a482bf8d42 export PSPLINKUSB_VERSION=07c464bc11d6304107bbda68fa3fbd94b1b81101 diff --git a/toolchains/riscos/packages/toolchain/build.sh b/toolchains/riscos/packages/toolchain/build.sh index 8cd0c7e..63547c6 100755 --- a/toolchains/riscos/packages/toolchain/build.sh +++ b/toolchains/riscos/packages/toolchain/build.sh @@ -1,6 +1,6 @@ #! /bin/sh -GCCSDK_VERSION=7724 +GCCSDK_VERSION=7732 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 59feca8..0340995 100755 --- a/toolchains/vita/packages/toolchain/build.sh +++ b/toolchains/vita/packages/toolchain/build.sh @@ -1,8 +1,8 @@ #! /bin/sh -VITA_VERSION=2.429 +VITA_VERSION=2.447 # This one must be updated as well -PKG_DATE=2022-11-10_13-25-31 +PKG_DATE=2022-12-27_17-30-24 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) HELPERS_DIR=$PACKAGE_DIR/../.. diff --git a/workers/fetcher/Dockerfile.m4 b/workers/fetcher/Dockerfile.m4 index 8fe8e7c..cb13be5 100644 --- a/workers/fetcher/Dockerfile.m4 +++ b/workers/fetcher/Dockerfile.m4 @@ -1,4 +1,4 @@ -m4_define(`ALPINE_VERSION',3.16.3)m4_dnl +m4_define(`ALPINE_VERSION',3.17)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 index 26e9410..479f853 100644 --- 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',20221024)') +m4_ifdef(`DEBIAN_VERSION',,`m4_define(`DEBIAN_VERSION',20221219)') m4_define(`BASE_DEBIAN',`')m4_dnl FROM debian:DEBIAN_RELEASE-DEBIAN_VERSION-slim USER root