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

ALL: Various versions updates

Browse Source
This commit is contained in:
Le Philousophe
2021-04-04 09:54:31 +00:00
parent e9fd2c4d10
commit 033dcf2e56
18 changed files with 32 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchains/apple-sdks/packages/xcode-extractor/build.sh
+1 -1
View File
@@ -1,6 +1,6 @@
#! /bin/sh
OSXCROSS_VERSION=035cc170338b7b252e3f13b0e3ccbf4411bffc41
OSXCROSS_VERSION=9a2c6e344fdc06e1e46726e19956fbdb7f3ccd61
export PBZX_VERSION=2a4d7c3300c826d918def713a24d25c237c8ed53
export XAR_VERSION=2b9a4ab7003f1db8c54da4fea55fcbb424fdecb0
toolchains/apple-sdks/packages/xcode-extractor/patches/0001-Set-versions.patch
+4 -18
View File
@@ -1,27 +1,13 @@
From 52e49e85d7f278fe6c5536d3c5e18decd7d8b954 Mon Sep 17 00:00:00 2001
From 01f3581c237cfd1f7242589429b2e437a3d69d2f 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/4] Set versions
---
build.sh | 2 +-
tools/gen_sdk_package_pbzx.sh | 2 +-
tools/tools.sh | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.sh b/build.sh
index ac628f8..7b8c911 100755
--- a/build.sh
+++ b/build.sh
@@ -100,7 +100,7 @@ build_xar
if [ $ARM_SUPPORTED -eq 1 ]; then
get_sources \
- https://github.com/tpoechtrager/ldid.git master
+ https://github.com/tpoechtrager/ldid.git $LDID_VERSION
if [ $f_res -eq 1 ]; then
pushd $CURRENT_BUILD_PROJECT_NAME &>/dev/null
diff --git a/tools/gen_sdk_package_pbzx.sh b/tools/gen_sdk_package_pbzx.sh
index d741550..f2ae9de 100755
--- a/tools/gen_sdk_package_pbzx.sh
@@ -36,10 +22,10 @@ index d741550..f2ae9de 100755
if [ $f_res -eq 1 ]; then
pushd $CURRENT_BUILD_PROJECT_NAME &>/dev/null
diff --git a/tools/tools.sh b/tools/tools.sh
index c94fae3..ca22cc2 100644
index 5e4c1aa..ea6f7a2 100644
--- a/tools/tools.sh
+++ b/tools/tools.sh
@@ -472,7 +472,7 @@ function build_xar()
@@ -481,7 +481,7 @@ function build_xar()
{
pushd $BUILD_DIR &>/dev/null
toolchains/apple-sdks/packages/xcode-extractor/patches/0002-Accept-piped-data-and-avoid-intermediate-files.patch
+3 -3
View File
@@ -1,4 +1,4 @@
From 3872debcaa91739da7a3cc04a5a6d45996f9ff4d Mon Sep 17 00:00:00 2001
From ba13e91c9a8e9db3b9d283be371d76af9e609f9f 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/4] Accept piped data and avoid intermediate files
@@ -222,10 +222,10 @@ index f2ae9de..60480a2 100755
popd &>/dev/null # TMP_DIR
popd &>/dev/null # BUILD_DIR
diff --git a/tools/tools.sh b/tools/tools.sh
index ca22cc2..cde7ecb 100644
index ea6f7a2..b3bfe83 100644
--- a/tools/tools.sh
+++ b/tools/tools.sh
@@ -473,6 +473,111 @@ function build_xar()
@@ -482,6 +482,111 @@ function build_xar()
pushd $BUILD_DIR &>/dev/null
get_sources https://github.com/tpoechtrager/xar.git $XAR_VERSION
toolchains/apple-sdks/packages/xcode-extractor/patches/0003-Generate-all-SDKs-and-not-only-MacOSX.patch
+1 -1
View File
@@ -1,4 +1,4 @@
From 1d18f003c5b0262c14e03ff3db91a427b5580460 Mon Sep 17 00:00:00 2001
From cc8bb1a8f1a25545152e25e7d471859ba191ec4e 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/4] Generate all SDKs and not only MacOSX
toolchains/apple-sdks/packages/xcode-extractor/patches/0004-Lighten-extraction-more.patch
+1 -1
View File
@@ -1,4 +1,4 @@
From c95716e86a9353fb6d4dee5b624c3188e6f0ce29 Mon Sep 17 00:00:00 2001
From b18efcb32a975f6514591ba9f38fda2b01a95413 Mon Sep 17 00:00:00 2001
From: Le Philousophe <lephilousophe@users.noreply.github.com>
Date: Sun, 24 Jan 2021 20:28:04 +0100
Subject: [PATCH 4/4] Lighten extraction more
toolchains/common/packages/fluidsynth/build.sh
+1 -1
View File
@@ -1,6 +1,6 @@
#! /bin/sh
FLUIDSYNTH_VERSION=2.1.8
FLUIDSYNTH_VERSION=2.2.0
PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
HELPERS_DIR=$PACKAGE_DIR/../..
toolchains/iphone/packages/toolchain/build.sh
+1 -1
View File
@@ -1,6 +1,6 @@
#! /bin/sh
CCTOOLS_PORT_VERSION=30518813875aed656aa7f18b6d485feee25f8f87
CCTOOLS_PORT_VERSION=faa1f24cb7e31be132f98f503cc447c90ce2fd87
export LDID_VERSION=4bf8f4d60384a0693dbbe2084ce62a35bfeb87ab
PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
toolchains/m4/debian-toolchain-base.m4
+1 -1
View File
@@ -1,4 +1,4 @@
m4_define(`DEBIAN_VERSION',20210311)
m4_define(`DEBIAN_VERSION',20210329)
FROM toolchains/common AS helpers
FROM debian:stable-DEBIAN_VERSION-slim m4_ifdef(`STAGE_IMAGE_NAME',AS STAGE_IMAGE_NAME,)
toolchains/macosx-common/packages/osxcross-clang/build.sh
+1 -1
View File
@@ -1,6 +1,6 @@
#! /bin/sh
OSXCROSS_VERSION=035cc170338b7b252e3f13b0e3ccbf4411bffc41
OSXCROSS_VERSION=9a2c6e344fdc06e1e46726e19956fbdb7f3ccd61
PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
HELPERS_DIR=$PACKAGE_DIR/../..
toolchains/macosx-common/packages/osxcross/build.sh
+1 -1
View File
@@ -1,6 +1,6 @@
#! /bin/sh
OSXCROSS_VERSION=035cc170338b7b252e3f13b0e3ccbf4411bffc41
OSXCROSS_VERSION=9a2c6e344fdc06e1e46726e19956fbdb7f3ccd61
export XAR_VERSION=2b9a4ab7003f1db8c54da4fea55fcbb424fdecb0
export LDID_VERSION=4bf8f4d60384a0693dbbe2084ce62a35bfeb87ab
toolchains/macosx-common/packages/osxcross/patches/0001-Set-versions.patch
+4 -18
View File
@@ -1,27 +1,13 @@
From dcf10cc0462910215f7357b79da9995c389b19ef Mon Sep 17 00:00:00 2001
From 433f8668ce3dbc333738afba2c54b14e85f45fd8 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/2] Set versions
---
build.sh | 2 +-
tools/gen_sdk_package_pbzx.sh | 2 +-
tools/tools.sh | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.sh b/build.sh
index ac628f8..7b8c911 100755
--- a/build.sh
+++ b/build.sh
@@ -100,7 +100,7 @@ build_xar
if [ $ARM_SUPPORTED -eq 1 ]; then
get_sources \
- https://github.com/tpoechtrager/ldid.git master
+ https://github.com/tpoechtrager/ldid.git $LDID_VERSION
if [ $f_res -eq 1 ]; then
pushd $CURRENT_BUILD_PROJECT_NAME &>/dev/null
diff --git a/tools/gen_sdk_package_pbzx.sh b/tools/gen_sdk_package_pbzx.sh
index d741550..f2ae9de 100755
--- a/tools/gen_sdk_package_pbzx.sh
@@ -36,10 +22,10 @@ index d741550..f2ae9de 100755
if [ $f_res -eq 1 ]; then
pushd $CURRENT_BUILD_PROJECT_NAME &>/dev/null
diff --git a/tools/tools.sh b/tools/tools.sh
index c94fae3..ca22cc2 100644
index 5e4c1aa..ea6f7a2 100644
--- a/tools/tools.sh
+++ b/tools/tools.sh
@@ -472,7 +472,7 @@ function build_xar()
@@ -481,7 +481,7 @@ function build_xar()
{
pushd $BUILD_DIR &>/dev/null
toolchains/macosx-common/packages/osxcross/patches/0002-Add-arm64-support-to-osxcross-macports.patch
+5 -27
View File
@@ -1,39 +1,17 @@
From 46e770b0283979ec1e7c741fe6e49a4e4112335f Mon Sep 17 00:00:00 2001
From 53d5dd1cd894e87bbd9f0162d96f05803773cafc Mon Sep 17 00:00:00 2001
From: Le Philousophe <lephilousophe@users.noreply.github.com>
Date: Sat, 6 Feb 2021 23:22:32 +0100
Subject: [PATCH 2/2] Add arm64 support to osxcross-macports
---
tools/osxcross-macports | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
tools/osxcross-macports | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tools/osxcross-macports b/tools/osxcross-macports
index a3f45c9..40c8389 100755
index e3f88b0..208121b 100755
--- a/tools/osxcross-macports
+++ b/tools/osxcross-macports
@@ -80,6 +80,9 @@ case $MACOSX_DEPLOYMENT_TARGET in
10.13* ) OSXVERSION="darwin_17" ;;
10.14* ) OSXVERSION="darwin_18" ;;
10.15* ) OSXVERSION="darwin_19" ;;
+ 10.16* ) OSXVERSION="darwin_20" ;;
+ 11.0* ) OSXVERSION="darwin_20.1" ;;
+ 11.1* ) OSXVERSION="darwin_20.2" ;;
* ) unsupportedDepTarget ;;
esac
@@ -296,9 +299,9 @@ getPkgUrl()
verboseMsg " $p"
done
- local pkg=$(echo "$pkgs" | grep $OSXVERSION | grep $ARCH | uniq | tail -n1)
+ local pkg=$(echo "$pkgs" | grep -F "$OSXVERSION." | grep $ARCH | uniq | tail -n1)
if [ -z "$pkg" ]; then
- pkg=$(echo "$pkgs" | grep $OSXVERSION | grep "noarch" | uniq | tail -n1)
+ pkg=$(echo "$pkgs" | grep -F "$OSXVERSION." | grep "noarch" | uniq | tail -n1)
fi
verboseMsg " selected: $pkg"
@@ -584,6 +587,8 @@ main()
@@ -586,6 +586,8 @@ main()
ARCH="i386"
elif [ $opt == "-universal" -o $opt == "--universal" ]; then
ARCH="i386-x86_64"
toolchains/ps3/packages/toolchain/build.sh
+1 -1
View File
@@ -1,6 +1,6 @@
#! /bin/sh
TOOLCHAIN_VERSION=21b036c15b98121a24722c82cb2ff9f5298a0b4c
TOOLCHAIN_VERSION=0824344cb72bcc22bb76168edfd94548dbca927e
export PSL1GHT_VERSION=f720b858bd56ed83ffc9093a6e5d63b0854bef7b
export PS3LIBRARIES_VERSION=60e761843be6aee00d0126b0a9ce8d7d8798c5d5
export SDL_PSL1GHT_VERSION=641a8ca2efa3f775d489daa37878ada1d92c24ab
toolchains/psp/packages/toolchain/build.sh
+2 -2
View File
@@ -1,12 +1,12 @@
#! /bin/sh
TOOLCHAIN_VERSION=ace65dbe5611e5c0d5553a60dcd49a4ad8eda3ec
export PSPSDK_VERSION=bdf459303c8e5bdd27298262fbfe128dc2ce47a3
export PSPSDK_VERSION=d019dbc7ecc198102229d0cdfe02976b6bef4e4d
export NEWLIB_VERSION=6dc26bb7f8bdc7dff72a811104e1d654d77f75d9
export PSPLINKUSB_VERSION=9a9512ed115c3415ac953b64613d53283a75ada9
export EBOOTSIGNER_VERSION=10cfbb51ea87adfe02d63dc3a262c8480fdf31e7
export PSP_PKGCONF_VERSION=c50b45fd551c08eefebd9cb02edc55887fd68b28
export PSPLIBRARIES_VERSION=8b0fb6f1fc8bc2804d52f76753dd604ca5a75f53
export PSPLIBRARIES_VERSION=90251f458c636abce5d01bc07768df0aa0969d67
PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
HELPERS_DIR=$PACKAGE_DIR/../..
toolchains/riscos/packages/toolchain/build.sh
+1 -1
View File
@@ -1,6 +1,6 @@
#! /bin/sh
GCCSDK_VERSION=7466
GCCSDK_VERSION=7555
PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
HELPERS_DIR=$PACKAGE_DIR/../..
toolchains/vita/packages/toolchain/build.sh
+2 -2
View File
@@ -1,8 +1,8 @@
#! /bin/sh
VITA_VERSION=1438
VITA_VERSION=1447
# This one must be updated as well
PKG_DATE=2021-03-17_18-55-42
PKG_DATE=2021-03-29_17-07-52
PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
HELPERS_DIR=$PACKAGE_DIR/../..
workers/fetcher/Dockerfile.m4
+1 -1
View File
@@ -1,4 +1,4 @@
m4_define(`ALPINE_VERSION',3.13.2)m4_dnl
m4_define(`ALPINE_VERSION',3.13.4)m4_dnl
FROM alpine:ALPINE_VERSION
m4_define(`BASE_ALPINE',`')m4_dnl
USER root
workers/m4/debian-builder-base.m4
+1 -1
View File
@@ -1,4 +1,4 @@
m4_define(`DEBIAN_VERSION',20210311)
m4_define(`DEBIAN_VERSION',20210329)
m4_define(`BASE_DEBIAN',`')m4_dnl
FROM debian:stable-DEBIAN_VERSION-slim
USER root