ScummVM/dockerized-bb
1
0
Fork 0
mirror of https://github.com/scummvm/dockerized-bb.git synced 2026-05-21 05:40:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

ALL: Various toolchains updates

Browse Source
This commit is contained in:
Le Philousophe
2021-11-15 19:15:02 +00:00
parent 395555e070
commit 814d58c35f
11 changed files with 19 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildbot-config/platforms.py
+2 -2
View File
@@ -435,7 +435,7 @@ def macosx_arm64():
# configure script doesn't compile discord check with proper flags
platform.env["DISCORD_LIBS"] = "-framework AppKit"
platform.configureargs.append("--host=aarch64-apple-darwin20.4")
platform.configureargs.append("--host=aarch64-apple-darwin21.1")
platform.buildconfigureargs = {
builds.ScummVMBuild: [ "--enable-static",
"--with-staticlib-prefix=${DESTDIR}/${PREFIX}",
@@ -476,7 +476,7 @@ def macosx_x86_64():
# configure script doesn't compile discord check with proper flags
platform.env["DISCORD_LIBS"] = "-framework AppKit"
platform.configureargs.append("--host=x86_64-apple-darwin20.4")
platform.configureargs.append("--host=x86_64-apple-darwin21.1")
platform.buildconfigureargs = {
builds.ScummVMBuild: [ "--enable-static",
"--with-staticlib-prefix=${DESTDIR}/${PREFIX}",
toolchains/apple-sdks/Dockerfile.m4
+1 -1
View File
@@ -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.0)
m4_define(`XCODE_VERSION', 13.1)
COPY Xcode_`'XCODE_VERSION.xip* ${PACKAGES_LOCATION}
local_package(xcode-extractor, , PACKAGE=Xcode_`'XCODE_VERSION.xip SDK_PLATFORMS="MacOSX iPhoneOS")
toolchains/macosx-arm64/Dockerfile.m4
+3 -3
View File
@@ -1,8 +1,8 @@
m4_dnl These settings must be kept in sync between toolchain and worker
m4_define(`DEBIAN_CLANG',-11)m4_dnl
m4_define(`MACOSX_SDK_VERSION',11.3)m4_dnl
m4_define(`PPA_CLANG',-13)m4_dnl
m4_define(`MACOSX_SDK_VERSION',12.0)m4_dnl
m4_define(`MACOSX_TARGET_ARCH',aarch64)m4_dnl
m4_define(`MACOSX_TARGET_VERSION',20.4)m4_dnl
m4_define(`MACOSX_TARGET_VERSION',21.1)m4_dnl
m4_define(`MACOSX_DEPLOYMENT_TARGET',10.16)m4_dnl
m4_define(`MACOSX_ARCHITECTURES',`arm64')m4_dnl
m4_define(`MACOSX_PORTS_ARCH_ARG',`--arm64')m4_dnl
toolchains/macosx-common/packages/sparkle/build.sh
+1 -1
View File
@@ -1,6 +1,6 @@
#! /bin/sh
SPARKLE_VERSION=1.27.0
SPARKLE_VERSION=1.27.1
PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
HELPERS_DIR=$PACKAGE_DIR/../..
toolchains/macosx-i386/Dockerfile.m4
+1 -1
View File
@@ -1,6 +1,6 @@
# This worker is used for old i386 only Mac
m4_dnl These settings must be kept in sync between toolchain and worker
m4_define(`DEBIAN_CLANG',-11)m4_dnl
m4_define(`PPA_CLANG',-13)m4_dnl
m4_define(`MACOSX_SDK_VERSION',10.13)m4_dnl
m4_define(`MACOSX_TARGET_ARCH',i386)m4_dnl
m4_define(`MACOSX_TARGET_VERSION',17)m4_dnl
toolchains/macosx-x86_64/Dockerfile.m4
+3 -3
View File
@@ -1,8 +1,8 @@
m4_dnl These settings must be kept in sync between toolchain and worker
m4_define(`DEBIAN_CLANG',-11)m4_dnl
m4_define(`MACOSX_SDK_VERSION',11.3)m4_dnl
m4_define(`PPA_CLANG',-13)m4_dnl
m4_define(`MACOSX_SDK_VERSION',12.0)m4_dnl
m4_define(`MACOSX_TARGET_ARCH',x86_64)m4_dnl
m4_define(`MACOSX_TARGET_VERSION',20.4)m4_dnl
m4_define(`MACOSX_TARGET_VERSION',21.1)m4_dnl
m4_define(`MACOSX_DEPLOYMENT_TARGET',10.9)m4_dnl
m4_define(`MACOSX_ARCHITECTURES',`x86_64')m4_dnl
m4_define(`MACOSX_PORTS_ARCH_ARG',`')m4_dnl
toolchains/ps3/packages/toolchain/build.sh
+1 -1
View File
@@ -2,7 +2,7 @@
TOOLCHAIN_VERSION=3f062dfe33fcc0c27192617842d11388a20956db
export PSL1GHT_VERSION=25bb6ecd3f74226a49329e7795143fd0e0862216
export PS3LIBRARIES_VERSION=60e761843be6aee00d0126b0a9ce8d7d8798c5d5
export PS3LIBRARIES_VERSION=be834909ca4db26beab8e7af551765172df9540c
export SDL_PSL1GHT_VERSION=641a8ca2efa3f775d489daa37878ada1d92c24ab
export SDL_PSL1GHT_LIBS_VERSION=5732608d69e0e7f6fc9ac2b6af906c38ab1d9475
export NORSX_VERSION=95d79a6ae8a800ad36040b836e896ff57fdd7052
toolchains/ps3/packages/toolchain/patches/0003-Fix-Freetype-URL.patch
-58
View File
@@ -1,58 +0,0 @@
From 6c67d173b917489f9e02117edc89df7e16c89426 Mon Sep 17 00:00:00 2001
From: Le Philousophe <lephilousophe@users.noreply.github.com>
Date: Wed, 25 Aug 2021 16:45:07 +0200
Subject: [PATCH 3/3] Fix Freetype URL
---
patches/ps3libraries-fix-freetype-url.patch | 25 +++++++++++++++++++++
scripts/009-ps3libraries.sh | 3 +++
2 files changed, 28 insertions(+)
create mode 100644 patches/ps3libraries-fix-freetype-url.patch
diff --git a/patches/ps3libraries-fix-freetype-url.patch b/patches/ps3libraries-fix-freetype-url.patch
new file mode 100644
index 0000000..239b8a0
--- /dev/null
+++ b/patches/ps3libraries-fix-freetype-url.patch
@@ -0,0 +1,25 @@
+From 322292d52466ebd462b3d7d040bb9326415dee17 Mon Sep 17 00:00:00 2001
+From: Le Philousophe <lephilousophe@users.noreply.github.com>
+Date: Wed, 25 Aug 2021 16:41:16 +0200
+Subject: [PATCH] Fix Freetype URL
+
+---
+ scripts/004-freetype-2.4.3.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scripts/004-freetype-2.4.3.sh b/scripts/004-freetype-2.4.3.sh
+index addafc4..fdd15a5 100755
+--- a/scripts/004-freetype-2.4.3.sh
++++ b/scripts/004-freetype-2.4.3.sh
+@@ -2,7 +2,7 @@
+ # freetype-2.4.3.sh by Naomi Peori (naomi@peori.ca)
+
+ ## Download the source code.
+-wget --continue http://download.savannah.gnu.org/releases/freetype/freetype-2.4.3.tar.gz
++wget --continue http://download.savannah.gnu.org/releases/freetype/freetype-old/freetype-2.4.3.tar.gz
+
+ ## Download an up-to-date config.guess and config.sub
+ if [ ! -f config.guess ]; then wget --continue http://git.savannah.gnu.org/cgit/config.git/plain/config.guess; fi
+--
+2.30.2
+
diff --git a/scripts/009-ps3libraries.sh b/scripts/009-ps3libraries.sh
index c732dc1..8db62bf 100755
--- a/scripts/009-ps3libraries.sh
+++ b/scripts/009-ps3libraries.sh
@@ -10,5 +10,8 @@ rm -Rf ps3libraries && mkdir ps3libraries && tar --strip-components=1 --director
## Set versions of libraries
cat ../../patches/ps3libraries-set-versions.patch | patch -p1
+## Fix Freetype
+cat ../../patches/ps3libraries-fix-freetype-url.patch | patch -p1
+
## Compile and install.
./libraries.sh
--
2.30.2
workers/macosx-arm64/Dockerfile.m4
+3 -3
View File
@@ -1,9 +1,9 @@
m4_define(`TOOLCHAIN',macosx-arm64)m4_dnl
m4_dnl These settings must be kept in sync between toolchain and worker
m4_define(`PPA_CLANG',-11)m4_dnl
m4_define(`MACOSX_SDK_VERSION',11.3)m4_dnl
m4_define(`PPA_CLANG',-13)m4_dnl
m4_define(`MACOSX_SDK_VERSION',12.0)m4_dnl
m4_define(`MACOSX_TARGET_ARCH',aarch64)m4_dnl
m4_define(`MACOSX_TARGET_VERSION',20.4)m4_dnl
m4_define(`MACOSX_TARGET_VERSION',21.1)m4_dnl
m4_define(`MACOSX_DEPLOYMENT_TARGET',10.16)m4_dnl
m4_define(`MACOSX_ARCHITECTURES',`arm64')m4_dnl
m4_define(`MACOSX_PORTS_ARCH_ARG',`--arm64')m4_dnl
workers/macosx-i386/Dockerfile.m4
+1 -1
View File
@@ -1,7 +1,7 @@
# This worker is used for old i386 only Mac
m4_define(`TOOLCHAIN',macosx-i386)m4_dnl
m4_dnl These settings must be kept in sync between toolchain and worker
m4_define(`PPA_CLANG',-11)m4_dnl
m4_define(`PPA_CLANG',-13)m4_dnl
m4_define(`MACOSX_SDK_VERSION',10.13)m4_dnl
m4_define(`MACOSX_TARGET_ARCH',i386)m4_dnl
m4_define(`MACOSX_TARGET_VERSION',17)m4_dnl
workers/macosx-x86_64/Dockerfile.m4
+3 -3
View File
@@ -1,9 +1,9 @@
m4_define(`TOOLCHAIN',macosx-x86_64)m4_dnl
m4_dnl These settings must be kept in sync between toolchain and worker
m4_define(`PPA_CLANG',-11)m4_dnl
m4_define(`MACOSX_SDK_VERSION',11.3)m4_dnl
m4_define(`PPA_CLANG',-13)m4_dnl
m4_define(`MACOSX_SDK_VERSION',12.0)m4_dnl
m4_define(`MACOSX_TARGET_ARCH',x86_64)m4_dnl
m4_define(`MACOSX_TARGET_VERSION',20.4)m4_dnl
m4_define(`MACOSX_TARGET_VERSION',21.1)m4_dnl
m4_define(`MACOSX_DEPLOYMENT_TARGET',10.9)m4_dnl
m4_define(`MACOSX_ARCHITECTURES',`x86_64')m4_dnl
m4_define(`MACOSX_PORTS_ARCH_ARG',`')m4_dnl