mirror of
https://github.com/scummvm/dockerized-bb.git
synced 2026-05-21 05:40:49 +00:00
ALL: Various toolchain updates
This commit is contained in:
Le Philousophe
@@ -146,7 +146,7 @@ VERSIONS = {
|
||||
},
|
||||
('./toolchains/amigaos4/packages/toolchain/build.sh', 'TOOLCHAIN'): {
|
||||
'check': 'git commit',
|
||||
'repository': 'https://github.com/sba1/adtools.git',
|
||||
'repository': 'https://github.com/AmigaLabs/adtools.git',
|
||||
'branch': 'master',
|
||||
},
|
||||
|
||||
@@ -302,7 +302,7 @@ VERSIONS = {
|
||||
},
|
||||
('./toolchains/common/packages/sonivox/build.sh', 'SONIVOX'): {
|
||||
'check': 'git tag',
|
||||
'repository': 'https://github.com/pedrolcl/sonivox.git',
|
||||
'repository': 'https://github.com/EmbeddedSynth/sonivox.git',
|
||||
'prefix': 'v',
|
||||
'exclude pattern': r'.*\.(beta|rc)\d+$'
|
||||
},
|
||||
@@ -524,7 +524,7 @@ VERSIONS = {
|
||||
('./toolchains/psp/packages/toolchain/build.sh', 'GCC'): {
|
||||
'check': 'git commit',
|
||||
'repository': 'https://github.com/pspdev/gcc.git',
|
||||
'branch': 'allegrex-v15.1.1',
|
||||
'branch': 'allegrex-v15.2.0',
|
||||
},
|
||||
('./toolchains/psp/packages/toolchain/build.sh', 'NEWLIB'): {
|
||||
'check': 'git commit',
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
|
||||
LHA_VERSION=0a07ec7fcc8014d0a4a3fa844abf1ea4f8278a28
|
||||
LHA_VERSION=86094cb56aba34de45668f39f74fcfb61e9d7fb6
|
||||
|
||||
PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
|
||||
HELPERS_DIR=$PACKAGE_DIR/../..
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
|
||||
TOOLCHAIN_VERSION=09624111ca3a1ac3ee0e84c8405bbd284b27ef56
|
||||
TOOLCHAIN_VERSION=5f93e923a1c5957fe51f774bf89007e21c268051
|
||||
|
||||
# Versions of components to use provided by toolchain
|
||||
BINUTILS_VER=2.23.2
|
||||
@@ -12,7 +12,7 @@ HELPERS_DIR=$PACKAGE_DIR/../..
|
||||
|
||||
do_make_bdir
|
||||
|
||||
do_git_fetch adtools "https://github.com/sba1/adtools.git" "${TOOLCHAIN_VERSION}"
|
||||
do_git_fetch adtools "https://github.com/AmigaLabs/adtools.git" "${TOOLCHAIN_VERSION}"
|
||||
|
||||
# gild uses git am which needs author information
|
||||
# Don't pollute home directory
|
||||
|
||||
+5
-5
@@ -1,17 +1,17 @@
|
||||
From 76605b69039bfc627cf8c02dac19f1fc7a23f20f Mon Sep 17 00:00:00 2001
|
||||
From 88a7bf502f8024632b9b23e7f5285a82ed388427 Mon Sep 17 00:00:00 2001
|
||||
From: Le Philousophe <lephilousophe@users.noreply.github.com>
|
||||
Date: Sun, 30 Oct 2022 17:26:18 +0100
|
||||
Subject: [PATCH] Fix additional libs for SDK 54.16
|
||||
Subject: [PATCH 1/2] Fix additional libs for SDK 54.16
|
||||
|
||||
---
|
||||
native-build/makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/native-build/makefile b/native-build/makefile
|
||||
index e7e448e..e28a1c7 100644
|
||||
index 9d41410..e35900b 100644
|
||||
--- a/native-build/makefile
|
||||
+++ b/native-build/makefile
|
||||
@@ -206,7 +206,7 @@ additionals-libs:
|
||||
@@ -308,7 +308,7 @@ additionals-libs:
|
||||
mkdir -p $(CROSS_PREFIX)/ppc-amigaos/SDK/local/common/include
|
||||
mkdir -p /tmp/abcd
|
||||
cd downloads && lha xw=/tmp/abcd SDK_$(SDK_VERSION).lha
|
||||
@@ -21,5 +21,5 @@ index e7e448e..e28a1c7 100644
|
||||
rm -Rf /tmp/abcd
|
||||
|
||||
--
|
||||
2.34.1
|
||||
2.52.0
|
||||
|
||||
+15
@@ -1,3 +1,15 @@
|
||||
From d21af6f7f385dd448e9517e51c782a7df1f3087d Mon Sep 17 00:00:00 2001
|
||||
From: Le Philousophe <lephilousophe@users.noreply.github.com>
|
||||
Date: Sun, 25 Jan 2026 16:26:27 +0100
|
||||
Subject: [PATCH 2/2] Fix build with modern tools
|
||||
|
||||
---
|
||||
gcc/11/patches/9998-replace-itemx.patch | 25 +++++++++++++
|
||||
...libiberty-Darwin-Fix-a-build-warning.patch | 37 +++++++++++++++++++
|
||||
2 files changed, 62 insertions(+)
|
||||
create mode 100644 gcc/11/patches/9998-replace-itemx.patch
|
||||
create mode 100644 gcc/11/patches/9999-libiberty-Darwin-Fix-a-build-warning.patch
|
||||
|
||||
diff --git a/gcc/11/patches/9998-replace-itemx.patch b/gcc/11/patches/9998-replace-itemx.patch
|
||||
new file mode 100644
|
||||
index 0000000..cebf77c
|
||||
@@ -72,3 +84,6 @@ index 0000000..3c694a8
|
||||
+--
|
||||
+2.45.0
|
||||
+
|
||||
--
|
||||
2.52.0
|
||||
|
||||
@@ -1,26 +0,0 @@
|
||||
commit c9d88e3ec1e36c71e75c9fc08ba9614ffe9604ff
|
||||
Author: Le Philousophe <lephilousophe@users.noreply.github.com>
|
||||
Date: Sun Aug 6 20:11:00 2023 +0200
|
||||
|
||||
Disable Werror which fails with latest GCC
|
||||
|
||||
diff --git a/binutils-build/Makefile b/binutils-build/Makefile
|
||||
index 0675680..a4d3f9b 100644
|
||||
--- a/binutils-build/Makefile
|
||||
+++ b/binutils-build/Makefile
|
||||
@@ -18,6 +18,7 @@ all: cross
|
||||
cross:
|
||||
mkdir -p $(CROSS_BUILD_DIR)
|
||||
cd $(CROSS_BUILD_DIR); CFLAGS="-Wno-switch -Wno-unused" $(REAL_SRC_DIR)/configure \
|
||||
+ --disable-werror \
|
||||
--enable-plugins \
|
||||
--target=ppc-amigaos \
|
||||
--prefix=$(PREFIX)
|
||||
@@ -26,6 +27,7 @@ cross:
|
||||
native:
|
||||
mkdir -p $(NATIVE_BUILD_DIR)
|
||||
cd $(NATIVE_BUILD_DIR); LDFLAGS="-lunix" CFLAGS="-Wno-switch -Wno-unused" $(REAL_SRC_DIR)/configure \
|
||||
+ --disable-werror \
|
||||
--target=ppc-amigaos \
|
||||
--host=ppc-amigaos \
|
||||
--disable-nls \
|
||||
@@ -1,5 +1,5 @@
|
||||
CMDLINE_TOOLS_VERSION=13114758
|
||||
CMDLINE_TOOLS_CHECKSUM="sha256:7ec965280a073311c339e571cd5de778b9975026cfcbe79f2b1cdcb1e15317ee"
|
||||
CMDLINE_TOOLS_VERSION=14742923
|
||||
CMDLINE_TOOLS_CHECKSUM="sha256:04453066b540409d975c676d781da1477479dde3761310f1a7eb92a1dfb15af7"
|
||||
CMDLINE_TOOLS_SUBDIR=cmdline-tools
|
||||
|
||||
do_install_sdk_tools () {
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
|
||||
BINUTILS_VERSION=2.42
|
||||
GCC_VERSION=13.4.0
|
||||
MINTLIB_VERSION=fba33c97fb2979edc0f9133ca54b133e1a66d707
|
||||
MINTLIB_VERSION=76075e39aba5d9bd2aa7a79b3656697d7fef7d7c
|
||||
FDLIBM_VERSION=46a0b20e7094cb2946be02f905a6bdea9933cf29
|
||||
MINTBIN_VERSION=d595f7cfb6c51c4ed3a2c39d3d1c278d14a145a5
|
||||
MINTBIN_VERSION=a9d47c119ba5dbae0948a92bc3aa14c9e541afb8
|
||||
|
||||
# This package is inspired by dc-chain scripts for KallistiOS. Credits go to them.
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
|
||||
USOUND_VERSION=51307c04cb5e472cf11ad498cd036dcbab307609
|
||||
USOUND_VERSION=a8a81dfea8441ce8bf8e5c704df1190d8d20071e
|
||||
|
||||
PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
|
||||
HELPERS_DIR=$PACKAGE_DIR/../..
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
|
||||
FLUIDSYNTH_VERSION=2.5.1
|
||||
FLUIDSYNTH_VERSION=2.5.2
|
||||
|
||||
PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
|
||||
HELPERS_DIR=$PACKAGE_DIR/../..
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
|
||||
THEORA_VERSION=23161c4a63fd9f9d09b9e972f95def2d56c777af
|
||||
THEORA_VERSION=edfba372beb02ff70a1e2797d8cf561c242d0e0b
|
||||
|
||||
PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
|
||||
HELPERS_DIR=$PACKAGE_DIR/../..
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
|
||||
SONIVOX_VERSION=3.6.16
|
||||
SONIVOX_VERSION=4.0.0
|
||||
|
||||
PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
|
||||
HELPERS_DIR=$PACKAGE_DIR/../..
|
||||
@@ -9,11 +9,11 @@ HELPERS_DIR=$PACKAGE_DIR/../..
|
||||
do_make_bdir
|
||||
|
||||
do_http_fetch sonivox \
|
||||
"https://github.com/pedrolcl/sonivox/archive/refs/tags/v${SONIVOX_VERSION}.tar.gz" 'tar xzf'
|
||||
"https://github.com/EmbeddedSynth/sonivox/archive/refs/tags/v${SONIVOX_VERSION}.tar.gz" 'tar xzf'
|
||||
|
||||
# -DCMAKE_SYSTEM_NAME=Windows for Windows
|
||||
|
||||
do_cmake -DBUILD_SONIVOX_SHARED=OFF -DBUILD_TESTING=OFF -DBUILD_EXAMPLE=OFF "$@"
|
||||
do_cmake -DBUILD_TESTING=OFF -DBUILD_APPLICATION=OFF "$@"
|
||||
do_make
|
||||
do_make install
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
|
||||
PROJECT_CTR_VERSION=makerom-v0.18.4
|
||||
PROJECT_CTR_VERSION=makerom-v0.19.0
|
||||
|
||||
PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
|
||||
HELPERS_DIR=$PACKAGE_DIR/../..
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
m4_define(`DEVKITARM_VERSION',20251117)
|
||||
m4_define(`DEVKITARM_VERSION',20251231)
|
||||
# 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
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
m4_define(`DEVKITPPC_VERSION',20251117)
|
||||
m4_define(`DEVKITPPC_VERSION',20260117)
|
||||
# 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
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
m4_define(`DEVKITA64_VERSION',20251117)
|
||||
m4_define(`DEVKITA64_VERSION',20251231)
|
||||
# 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
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
m4_ifdef(`DEBIAN_RELEASE',,`m4_define(`DEBIAN_RELEASE',trixie)')
|
||||
m4_ifdef(`DEBIAN_VERSION',,`m4_define(`DEBIAN_VERSION',20251208)')
|
||||
m4_ifdef(`DEBIAN_VERSION',,`m4_define(`DEBIAN_VERSION',20260112)')
|
||||
FROM toolchains/common AS helpers
|
||||
|
||||
FROM debian:DEBIAN_RELEASE-DEBIAN_VERSION-slim m4_ifdef(`STAGE_IMAGE_NAME',AS STAGE_IMAGE_NAME,)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
m4_define(`MXE_VERSION',85d7f89dd521e92bfa0bf319716addb27a13de2c)m4_dnl
|
||||
m4_define(`MXE_VERSION',9e83f9c12e0f9e3de2d3f90bc2656cd7cce1cf0b)m4_dnl
|
||||
|
||||
m4_include(`paths.m4')m4_dnl
|
||||
m4_include(`packages.m4')m4_dnl
|
||||
|
||||
@@ -2,8 +2,8 @@ PKG := fluidsynth-embedded
|
||||
$(PKG)_WEBSITE := $(fluidsynth_WEBSITE)
|
||||
$(PKG)_DESCR := FluidSynth (with embedded OSAL)
|
||||
$(PKG)_IGNORE := $(fluidsynth_IGNORE)
|
||||
$(PKG)_VERSION := 2.5.1
|
||||
$(PKG)_CHECKSUM := 10b2e32ba78c72ac1384965c66df06443a4bd0ab968dcafaf8fa17086001bf03
|
||||
$(PKG)_VERSION := 2.5.2
|
||||
$(PKG)_CHECKSUM := 1dcb13308b3aa383db658c60a7b63d73d0ff4601ccee589582ba7a816475410e
|
||||
$(PKG)_GH_CONF := $(fluidsynth_GH_CONF)
|
||||
$(PKG)_FILE := fluidsynth-$$(filter-out $$(PKG)-,$$($$(PKG)_TAG_PREFIX))$($(PKG)_VERSION)$$($$(PKG)_TAG_SUFFIX)$$($$(PKG)_ARCHIVE_EXT)
|
||||
$(PKG)_DEPS := cc mman-win32 gcem
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
|
||||
PSP_PACKAGES_VERSION=116a19c42e4f4f4bb75ae77f273bda5fac508cb6
|
||||
PSP_PACKAGES_VERSION=ba46629f799e70369f7d52f970ac8abcaca7eebf
|
||||
|
||||
PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
|
||||
HELPERS_DIR=$PACKAGE_DIR/../..
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
PSPDEV_VERSION=cc874700eaef9e00c8ec63e0d116926e1048b656
|
||||
export PSPTOOLCHAIN_VERSION=73c98cece87b35d71a3dab678a7ecc71a19f1f06
|
||||
export PSPSDK_VERSION=04823907a6e9bef9858b9daf22ffcb67fac35f28
|
||||
export PSPLINKUSB_VERSION=5794b808d36a10b09f2578d6fa5880bb91c2c9b4
|
||||
export PSPSDK_VERSION=136e08695b1e7a849ef8a803d7f6d8e439c1c657
|
||||
export PSPLINKUSB_VERSION=8cc9876a868d202c0ef4197395c5278aeeff2829
|
||||
export EBOOTSIGNER_VERSION=17d6386f034ac922f540ca78200961761b23ecae
|
||||
export PSPTOOLCHAIN_ALLEGREX_VERSION=a2a732924f91601ff7b99b477655d44482ce2a53
|
||||
export PSPTOOLCHAIN_ALLEGREX_VERSION=57a511e50c97a70d3da4e2a9a9b15e2dcedafd2d
|
||||
export PSPTOOLCHAIN_EXTRA_VERSION=ce8127a5d7de5a8774bf1f7f152501dae0a800ae
|
||||
export BINUTILS_VERSION=a8b53fe2b5825fa86337623c743d21a19aeb0daf
|
||||
export GCC_VERSION=33e5b187fa86c429c8827f6e12f120eab7d51c9e
|
||||
export GCC_VERSION=989408bfa4b9125395df79219228df3d809df66c
|
||||
export NEWLIB_VERSION=9e0a073634ad73e8e088f2e071c55a9fe5d39709
|
||||
export PTHREAD_EMBEDDED_VERSION=4f43d30a23e8ac6d0334aef64272b4052b5bb7c2
|
||||
export PSP_PACMAN_VERSION=86787c81fc8ebd88f766dd79e880f20f2477d59e
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@ index e71842a..29d5c80 100644
|
||||
-PSPTOOLCHAIN_ALLEGREX_BINUTILS_DEFAULT_REPO_REF="allegrex-v2.44"
|
||||
+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-v15.1.1"
|
||||
-PSPTOOLCHAIN_ALLEGREX_GCC_DEFAULT_REPO_REF="allegrex-v15.2.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.5.0"
|
||||
|
||||
@@ -62,6 +62,8 @@ vdpm_package(libvpx)
|
||||
|
||||
vdpm_package(openssl)
|
||||
|
||||
# curl needs zstd
|
||||
vdpm_package(zstd)
|
||||
vdpm_package(curl)
|
||||
|
||||
# Freetype needs bzip2
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
m4_ifdef(`DEBIAN_RELEASE',,`m4_define(`DEBIAN_RELEASE',trixie)')
|
||||
m4_ifdef(`DEBIAN_VERSION',,`m4_define(`DEBIAN_VERSION',20251208)')
|
||||
m4_ifdef(`DEBIAN_VERSION',,`m4_define(`DEBIAN_VERSION',20260112)')
|
||||
m4_define(`BASE_DEBIAN',`')m4_dnl
|
||||
FROM debian:DEBIAN_RELEASE-DEBIAN_VERSION-slim
|
||||
USER root
|
||||
|
||||
Reference in New Issue
Block a user