mirror of
https://github.com/scummvm/dockerized-bb.git
synced 2026-05-21 05:40:49 +00:00
ALL: Various toolchain upgrades
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
|
||||
LHA_VERSION=8e301f21a821c607461536d2667f9b2a7876f13f
|
||||
LHA_VERSION=0a07ec7fcc8014d0a4a3fa844abf1ea4f8278a28
|
||||
|
||||
PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
|
||||
HELPERS_DIR=$PACKAGE_DIR/../..
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
|
||||
OBOE_VERSION=1.9.3
|
||||
OBOE_VERSION=1.10.0
|
||||
|
||||
PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
|
||||
HELPERS_DIR=$PACKAGE_DIR/../..
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
|
||||
CCTOOLS_PORT_VERSION=55943b0c68c0eaf8b8ad2f51f63738bbc7b0c86b
|
||||
CCTOOLS_PORT_VERSION=19383894833e22f5c41c82cacbcf2e9f5aac93da
|
||||
export LDID_VERSION=4bf8f4d60384a0693dbbe2084ce62a35bfeb87ab
|
||||
export LIBDISPATCH_VERSION=323b9b4e0ca05d6c56a0c2f2d7d8d47363e612b7
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
|
||||
SPARKLE_VERSION=2.7.1
|
||||
SPARKLE_VERSION=2.8.0
|
||||
|
||||
PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
|
||||
HELPERS_DIR=$PACKAGE_DIR/../..
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
|
||||
FLUIDSYNTH_VERSION=2.4.8
|
||||
FLUIDSYNTH_VERSION=2.5.0
|
||||
|
||||
PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
|
||||
HELPERS_DIR=$PACKAGE_DIR/../..
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
|
||||
SDL_VERSION=f2d1ac374fb0b3e6354270a129d2ab1051cd5b8e
|
||||
SDL_VERSION=debb2ab0d7b7fad2dff1eb14200e5e7317ab6e29
|
||||
|
||||
PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
|
||||
HELPERS_DIR=$PACKAGE_DIR/../..
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
m4_ifdef(`DEBIAN_RELEASE',,`m4_define(`DEBIAN_RELEASE',bookworm)')
|
||||
m4_ifdef(`DEBIAN_VERSION',,`m4_define(`DEBIAN_VERSION',20250811)')
|
||||
m4_ifdef(`DEBIAN_VERSION',,`m4_define(`DEBIAN_VERSION',20250929)')
|
||||
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',be3ac46b3f6e501bef517e527bf4d5c3d5ccfc99)m4_dnl
|
||||
m4_define(`MXE_VERSION',2ffe7bb05ce08a036cc1e39bdd6962e19e0f6321)m4_dnl
|
||||
|
||||
m4_include(`paths.m4')m4_dnl
|
||||
m4_include(`packages.m4')m4_dnl
|
||||
@@ -84,7 +84,7 @@ mxe_package(flac)
|
||||
|
||||
mxe_package(libmikmod)
|
||||
|
||||
local_mxe_package(libmpeg2)
|
||||
mxe_package(libmpeg2)
|
||||
|
||||
mxe_package(a52dec)
|
||||
|
||||
|
||||
@@ -1,145 +0,0 @@
|
||||
From a75110570a8427241c4128d3ac68a23d31ac0a71 Mon Sep 17 00:00:00 2001
|
||||
From: Viktor Szakats <commit@vsz.me>
|
||||
Date: Mon, 21 Jul 2025 01:57:26 +0200
|
||||
Subject: [PATCH] windows: fix `if_nametoindex()` detection with autotools,
|
||||
improve with cmake
|
||||
|
||||
- autotools: fix auto-detection on the Windows platform.
|
||||
It was mis-detected when targeting Windows XP/2003 64-bit.
|
||||
It was permanently undetected when building for Windows 32-bit.
|
||||
```
|
||||
lib/url.c: In function 'zonefrom_url':
|
||||
lib/url.c:1802:18: error: implicit declaration of function 'if_nametoindex' [-Wimplicit-function-declaration]
|
||||
1802 | scopeidx = if_nametoindex(zoneid);
|
||||
| ^~~~~~~~~~~~~~
|
||||
lib/url.c:1802:18: error: nested extern declaration of 'if_nametoindex' [-Werror=nested-externs]
|
||||
```
|
||||
Ref: https://github.com/curl/curl/actions/runs/16405598782/job/46351023138?pr=17982#step:10:29
|
||||
|
||||
Reported-by: LoRd_MuldeR
|
||||
Fixes #17979
|
||||
|
||||
Without this patch the workaround for the 8.15.0 release is:
|
||||
`export ac_cv_func_if_nametoindex=0` for Windows XP/2003 64-bit.
|
||||
|
||||
Background: Checking for the `if_nametoindex()` function via
|
||||
`AC_CHECK_FUNCS()` (autotools) or `check_function_exists()` (cmake) do
|
||||
not work on Windows, for two reasons:
|
||||
- the function may be disabled at compile-time in Windows headers
|
||||
when targeting old Windows versions (XP or WS2003 in curl context)
|
||||
via `_WIN32_WINNT`. But it's always present in the system implib
|
||||
`iphlpapi` where these checks are looking.
|
||||
- for 32-bit Windows the function signature in the implib requires
|
||||
a 4-byte argument, while these checks always use no arguments,
|
||||
making them always fail.
|
||||
|
||||
- cmake: call `if_nametoindex` dynamically with mingw-w64 v1.0.
|
||||
This mingw-w64 version lacks prototype and implib entry for it.
|
||||
|
||||
- cmake: add auto-detection for Windows and use as a fallback for
|
||||
non-pre-fill cases.
|
||||
|
||||
- cmake: disable pre-fill with `_CURL_PREFILL=OFF`. (for testing)
|
||||
|
||||
- cmake: disable pre-fill for untested compilers. (i.e. non-MSVC,
|
||||
non-mingw64)
|
||||
|
||||
- GHA/windows: make an autotools job build for Windows XP.
|
||||
|
||||
Follow-up to 0d71b18153c8edb996738f8a362373fc72d0013b #17413
|
||||
|
||||
Closes #17982
|
||||
---
|
||||
.github/workflows/windows.yml | 2 +-
|
||||
CMakeLists.txt | 23 ++++++++++++++---------
|
||||
appveyor.yml | 2 +-
|
||||
configure.ac | 22 ++++++++++++++++++++--
|
||||
4 files changed, 36 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 31f6f1b1e425..6e046c8b3e6d 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1609,14 +1609,17 @@ if(WIN32)
|
||||
endif()
|
||||
|
||||
# Pre-fill detection results based on target OS version
|
||||
- if(HAVE_WIN32_WINNT AND HAVE_WIN32_WINNT GREATER_EQUAL 0x0600 AND # Windows Vista or newer
|
||||
- (MINGW OR MSVC) AND
|
||||
- NOT WINCE AND NOT WINDOWS_STORE)
|
||||
- set(HAVE_IF_NAMETOINDEX 1)
|
||||
- else()
|
||||
- set(HAVE_IF_NAMETOINDEX 0)
|
||||
+ if(_CURL_PREFILL)
|
||||
+ if(NOT HAVE_WIN32_WINNT OR HAVE_WIN32_WINNT LESS 0x0600 OR # older than Windows Vista
|
||||
+ (MINGW AND MINGW64_VERSION VERSION_LESS 2.0) OR
|
||||
+ WINCE OR WINDOWS_STORE)
|
||||
+ set(HAVE_IF_NAMETOINDEX 0)
|
||||
+ unset(HAVE_IF_NAMETOINDEX CACHE)
|
||||
+ elseif(MSVC OR MINGW)
|
||||
+ set(HAVE_IF_NAMETOINDEX 1)
|
||||
+ unset(HAVE_IF_NAMETOINDEX CACHE)
|
||||
+ endif()
|
||||
endif()
|
||||
- unset(HAVE_IF_NAMETOINDEX CACHE)
|
||||
endif()
|
||||
|
||||
if(NOT WIN32)
|
||||
@@ -1772,12 +1775,14 @@ check_function_exists("eventfd" HAVE_EVENTFD)
|
||||
check_symbol_exists("ftruncate" "unistd.h" HAVE_FTRUNCATE)
|
||||
check_symbol_exists("getpeername" "${CURL_INCLUDES}" HAVE_GETPEERNAME) # winsock2.h unistd.h proto/bsdsocket.h
|
||||
check_symbol_exists("getsockname" "${CURL_INCLUDES}" HAVE_GETSOCKNAME) # winsock2.h unistd.h proto/bsdsocket.h
|
||||
-check_function_exists("if_nametoindex" HAVE_IF_NAMETOINDEX) # iphlpapi.h (Windows Vista+ non-UWP), net/if.h
|
||||
check_function_exists("getrlimit" HAVE_GETRLIMIT)
|
||||
check_function_exists("setlocale" HAVE_SETLOCALE)
|
||||
check_function_exists("setrlimit" HAVE_SETRLIMIT)
|
||||
|
||||
-if(NOT WIN32)
|
||||
+if(WIN32)
|
||||
+ check_symbol_exists("if_nametoindex" "winsock2.h;iphlpapi.h" HAVE_IF_NAMETOINDEX) # Windows Vista+ non-UWP
|
||||
+else()
|
||||
+ check_function_exists("if_nametoindex" HAVE_IF_NAMETOINDEX) # net/if.h
|
||||
check_function_exists("realpath" HAVE_REALPATH)
|
||||
check_function_exists("sched_yield" HAVE_SCHED_YIELD)
|
||||
check_symbol_exists("strcasecmp" "string.h" HAVE_STRCASECMP)
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 1d4746c8c410..6e335986036f 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -4224,7 +4224,6 @@ AC_CHECK_FUNCS([\
|
||||
getpwuid_r \
|
||||
getrlimit \
|
||||
gettimeofday \
|
||||
- if_nametoindex \
|
||||
mach_absolute_time \
|
||||
pipe \
|
||||
pipe2 \
|
||||
@@ -4238,8 +4237,27 @@ AC_CHECK_FUNCS([\
|
||||
utimes \
|
||||
])
|
||||
|
||||
-if test "$curl_cv_native_windows" != 'yes'; then
|
||||
+if test "$curl_cv_native_windows" = 'yes'; then
|
||||
+ AC_MSG_CHECKING([for if_nametoindex on Windows])
|
||||
+ AC_LINK_IFELSE([
|
||||
+ AC_LANG_PROGRAM([[
|
||||
+ #ifndef WIN32_LEAN_AND_MEAN
|
||||
+ #define WIN32_LEAN_AND_MEAN
|
||||
+ #endif
|
||||
+ #include <winsock2.h>
|
||||
+ #include <iphlpapi.h>
|
||||
+ ]],[[
|
||||
+ if_nametoindex("");
|
||||
+ ]])
|
||||
+ ],[
|
||||
+ AC_MSG_RESULT([yes])
|
||||
+ AC_DEFINE(HAVE_IF_NAMETOINDEX, 1, [if you have the 'if_nametoindex' function])
|
||||
+ ],[
|
||||
+ AC_MSG_RESULT([no])
|
||||
+ ])
|
||||
+else
|
||||
AC_CHECK_FUNCS([\
|
||||
+ if_nametoindex \
|
||||
realpath \
|
||||
sched_yield \
|
||||
])
|
||||
@@ -1,51 +0,0 @@
|
||||
Index: libmpeg2-0.5.1/configure
|
||||
===================================================================
|
||||
--- libmpeg2-0.5.1.orig/configure
|
||||
+++ libmpeg2-0.5.1/configure
|
||||
@@ -27071,7 +27071,7 @@ _ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
-
|
||||
+#include <stdint.h>
|
||||
int
|
||||
main ()
|
||||
{
|
||||
@@ -27081,10 +27081,10 @@ static struct s {
|
||||
} S = {0, 0};
|
||||
switch (1) {
|
||||
case 0:
|
||||
- case (long)(&((struct s *)0)->b) == $ac_cv_c_attr_align_try:
|
||||
+ case (uintptr_t)(&((struct s *)0)->b) == $ac_cv_c_attr_align_try:
|
||||
return 0;
|
||||
}
|
||||
- return (long)&S;
|
||||
+ return (uintptr_t)&S;
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
Index: libmpeg2-0.5.1/m4/keywords.m4
|
||||
===================================================================
|
||||
--- libmpeg2-0.5.1.orig/m4/keywords.m4
|
||||
+++ libmpeg2-0.5.1/m4/keywords.m4
|
||||
@@ -72,17 +72,17 @@ AC_DEFUN([AC_C_ATTRIBUTE_ALIGNED],
|
||||
[ac_cv_c_attribute_aligned],
|
||||
[ac_cv_c_attribute_aligned=0
|
||||
for ac_cv_c_attr_align_try in 2 4 8 16 32 64; do
|
||||
- AC_TRY_COMPILE([],
|
||||
+ AC_TRY_COMPILE([#include <stdint.h>],
|
||||
[static struct s {
|
||||
char a;
|
||||
char b __attribute__ ((aligned($ac_cv_c_attr_align_try)));
|
||||
} S = {0, 0};
|
||||
switch (1) {
|
||||
case 0:
|
||||
- case (long)(&((struct s *)0)->b) == $ac_cv_c_attr_align_try:
|
||||
+ case (uintptr_t)(&((struct s *)0)->b) == $ac_cv_c_attr_align_try:
|
||||
return 0;
|
||||
}
|
||||
- return (long)&S;],
|
||||
+ return (uintptr_t)&S;],
|
||||
[ac_cv_c_attribute_aligned=$ac_cv_c_attr_align_try])
|
||||
done])
|
||||
if test x"$ac_cv_c_attribute_aligned" != x"0"; then
|
||||
@@ -1 +0,0 @@
|
||||
# This file is a placeholder because MXE expects to find .mk files in the plugins folders
|
||||
@@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
|
||||
LIBRARIES_VERSION=0ff811c61b11089d5619aa4466e5afce6d81a820
|
||||
LIBRARIES_VERSION=560b1cbed5b0e5b079e28702cde16534aecfc4d9
|
||||
|
||||
PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
|
||||
HELPERS_DIR=$PACKAGE_DIR/../..
|
||||
|
||||
@@ -1,21 +0,0 @@
|
||||
diff --git a/scripts/026-libmpeg2.sh b/scripts/026-libmpeg2.sh
|
||||
index f9bcebe..b0b73e6 100755
|
||||
--- a/scripts/026-libmpeg2.sh
|
||||
+++ b/scripts/026-libmpeg2.sh
|
||||
@@ -3,14 +3,14 @@
|
||||
VER=0.5.1
|
||||
|
||||
## Download the source code.
|
||||
-if [ ! -f libmpeg2-${VER}.tar.gz ]; then wget --continue https://libmpeg2.sourceforge.io/files/libmpeg2-${VER}.tar.gz; fi
|
||||
+if [ ! -f libmpeg2-${VER}.tar.gz ]; then wget --continue http://deb.debian.org/debian/pool/main/m/mpeg2dec/mpeg2dec_${VER}.orig.tar.gz; fi
|
||||
|
||||
## 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
|
||||
if [ ! -f config.sub ]; then wget --continue http://git.savannah.gnu.org/cgit/config.git/plain/config.sub; fi
|
||||
|
||||
## Unpack the source code.
|
||||
-rm -Rf libmpeg2-${VER} && tar xfz libmpeg2-${VER}.tar.gz && cd libmpeg2-${VER}
|
||||
+rm -Rf libmpeg2-${VER} && tar xfz mpeg2dec_${VER}.orig.tar.gz && cd libmpeg2-${VER}
|
||||
|
||||
## Replace config.guess and config.sub
|
||||
cp ../config.guess ../config.sub .
|
||||
@@ -1,225 +0,0 @@
|
||||
diff --git a/scripts/002-libpng.sh b/scripts/002-libpng.sh
|
||||
index d7c1ba1..bcb7350 100755
|
||||
--- a/scripts/002-libpng.sh
|
||||
+++ b/scripts/002-libpng.sh
|
||||
@@ -7,8 +7,8 @@ VER=1.6.44
|
||||
if [ ! -f libpng-${VER}.tar.gz ]; then wget --continue http://download.sourceforge.net/libpng/libpng-${VER}.tar.gz; fi
|
||||
|
||||
## 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
|
||||
-if [ ! -f config.sub ]; then wget --continue http://git.savannah.gnu.org/cgit/config.git/plain/config.sub; fi
|
||||
+if [ ! -f config.guess ]; then wget --continue https://cgit.git.savannah.gnu.org/cgit/config.git/plain/config.guess; fi
|
||||
+if [ ! -f config.sub ]; then wget --continue https://cgit.git.savannah.gnu.org/cgit/config.git/plain/config.sub; fi
|
||||
|
||||
## Unpack the source code.
|
||||
rm -Rf libpng-${VER} && tar xfz libpng-${VER}.tar.gz && cd libpng-${VER}
|
||||
diff --git a/scripts/003-jpeg.sh b/scripts/003-jpeg.sh
|
||||
index 4965f5f..806d5a9 100755
|
||||
--- a/scripts/003-jpeg.sh
|
||||
+++ b/scripts/003-jpeg.sh
|
||||
@@ -7,8 +7,8 @@ VER=9f
|
||||
wget --continue http://www.ijg.org/files/jpegsrc.v${VER}.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
|
||||
-if [ ! -f config.sub ]; then wget --continue http://git.savannah.gnu.org/cgit/config.git/plain/config.sub; fi
|
||||
+if [ ! -f config.guess ]; then wget --continue https://cgit.git.savannah.gnu.org/cgit/config.git/plain/config.guess; fi
|
||||
+if [ ! -f config.sub ]; then wget --continue https://cgit.git.savannah.gnu.org/cgit/config.git/plain/config.sub; fi
|
||||
|
||||
## Unpack the source code.
|
||||
rm -Rf jpeg-${VER} && tar xfz jpegsrc.v${VER}.tar.gz && cd jpeg-${VER}
|
||||
diff --git a/scripts/004-freetype.sh b/scripts/004-freetype.sh
|
||||
index 7b3c2c7..4e527ff 100755
|
||||
--- a/scripts/004-freetype.sh
|
||||
+++ b/scripts/004-freetype.sh
|
||||
@@ -7,8 +7,8 @@ VER=2.13.3
|
||||
wget --continue https://download.savannah.gnu.org/releases/freetype/freetype-${VER}.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
|
||||
-if [ ! -f config.sub ]; then wget --continue http://git.savannah.gnu.org/cgit/config.git/plain/config.sub; fi
|
||||
+if [ ! -f config.guess ]; then wget --continue https://cgit.git.savannah.gnu.org/cgit/config.git/plain/config.guess; fi
|
||||
+if [ ! -f config.sub ]; then wget --continue https://cgit.git.savannah.gnu.org/cgit/config.git/plain/config.sub; fi
|
||||
|
||||
## Unpack the source code.
|
||||
rm -Rf freetype-${VER} && tar xfz freetype-${VER}.tar.gz && cd freetype-${VER}
|
||||
diff --git a/scripts/007-libogg.sh b/scripts/007-libogg.sh
|
||||
index e56f4cd..5305cc5 100755
|
||||
--- a/scripts/007-libogg.sh
|
||||
+++ b/scripts/007-libogg.sh
|
||||
@@ -7,8 +7,8 @@ VER=1.3.5
|
||||
wget --continue http://downloads.xiph.org/releases/ogg/libogg-${VER}.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
|
||||
-if [ ! -f config.sub ]; then wget --continue http://git.savannah.gnu.org/cgit/config.git/plain/config.sub; fi
|
||||
+if [ ! -f config.guess ]; then wget --continue https://cgit.git.savannah.gnu.org/cgit/config.git/plain/config.guess; fi
|
||||
+if [ ! -f config.sub ]; then wget --continue https://cgit.git.savannah.gnu.org/cgit/config.git/plain/config.sub; fi
|
||||
|
||||
## Unpack the source code.
|
||||
rm -Rf libogg-${VER} && tar xfz libogg-${VER}.tar.gz && cd libogg-${VER}
|
||||
diff --git a/scripts/008-libvorbis.sh b/scripts/008-libvorbis.sh
|
||||
index 0ceb3f9..4abb19a 100755
|
||||
--- a/scripts/008-libvorbis.sh
|
||||
+++ b/scripts/008-libvorbis.sh
|
||||
@@ -7,8 +7,8 @@ VER=1.3.7
|
||||
wget --continue http://downloads.xiph.org/releases/vorbis/libvorbis-${VER}.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
|
||||
-if [ ! -f config.sub ]; then wget --continue http://git.savannah.gnu.org/cgit/config.git/plain/config.sub; fi
|
||||
+if [ ! -f config.guess ]; then wget --continue https://cgit.git.savannah.gnu.org/cgit/config.git/plain/config.guess; fi
|
||||
+if [ ! -f config.sub ]; then wget --continue https://cgit.git.savannah.gnu.org/cgit/config.git/plain/config.sub; fi
|
||||
|
||||
## Unpack the source code.
|
||||
rm -Rf libvorbis-${VER} && tar xfz libvorbis-${VER}.tar.gz && cd libvorbis-${VER}
|
||||
diff --git a/scripts/016-libcurl.sh b/scripts/016-libcurl.sh
|
||||
index 41cd0ed..f34a7fc 100755
|
||||
--- a/scripts/016-libcurl.sh
|
||||
+++ b/scripts/016-libcurl.sh
|
||||
@@ -11,8 +11,8 @@ wget https://curl.haxx.se/ca/cacert.pem
|
||||
mv cacert.pem $PSL1GHT/
|
||||
|
||||
## 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
|
||||
-if [ ! -f config.sub ]; then wget --continue http://git.savannah.gnu.org/cgit/config.git/plain/config.sub; fi
|
||||
+if [ ! -f config.guess ]; then wget --continue https://cgit.git.savannah.gnu.org/cgit/config.git/plain/config.guess; fi
|
||||
+if [ ! -f config.sub ]; then wget --continue https://cgit.git.savannah.gnu.org/cgit/config.git/plain/config.sub; fi
|
||||
|
||||
## Unpack the source code.
|
||||
rm -Rf curl-${VER} && tar xfz curl-${VER}.tar.gz && cd curl-${VER}
|
||||
diff --git a/scripts/017-libmad.sh b/scripts/017-libmad.sh
|
||||
index f507fbb..22ba9e8 100755
|
||||
--- a/scripts/017-libmad.sh
|
||||
+++ b/scripts/017-libmad.sh
|
||||
@@ -7,8 +7,8 @@ VER=0.15.1b
|
||||
wget --continue https://sourceforge.net/projects/mad/files/libmad/${VER}/libmad-${VER}.tar.gz/download -O libmad-${VER}.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
|
||||
-if [ ! -f config.sub ]; then wget --continue http://git.savannah.gnu.org/cgit/config.git/plain/config.sub; fi
|
||||
+if [ ! -f config.guess ]; then wget --continue https://cgit.git.savannah.gnu.org/cgit/config.git/plain/config.guess; fi
|
||||
+if [ ! -f config.sub ]; then wget --continue https://cgit.git.savannah.gnu.org/cgit/config.git/plain/config.sub; fi
|
||||
|
||||
## Unpack the source code.
|
||||
rm -Rf libmad-${VER} && tar xfz libmad-${VER}.tar.gz && cd libmad-${VER}
|
||||
diff --git a/scripts/018-flac.sh b/scripts/018-flac.sh
|
||||
index 3744099..13fe7f7 100755
|
||||
--- a/scripts/018-flac.sh
|
||||
+++ b/scripts/018-flac.sh
|
||||
@@ -7,8 +7,8 @@ VER=1.2.1
|
||||
wget --continue http://downloads.sourceforge.net/project/flac/flac-src/flac-${VER}-src/flac-${VER}.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
|
||||
-if [ ! -f config.sub ]; then wget --continue http://git.savannah.gnu.org/cgit/config.git/plain/config.sub; fi
|
||||
+if [ ! -f config.guess ]; then wget --continue https://cgit.git.savannah.gnu.org/cgit/config.git/plain/config.guess; fi
|
||||
+if [ ! -f config.sub ]; then wget --continue https://cgit.git.savannah.gnu.org/cgit/config.git/plain/config.sub; fi
|
||||
|
||||
## Unpack the source code.
|
||||
rm -Rf flac-${VER} && tar xfz flac-${VER}.tar.gz && cd flac-${VER}
|
||||
diff --git a/scripts/019-faad2.sh b/scripts/019-faad2.sh
|
||||
index c23de3f..b85c946 100755
|
||||
--- a/scripts/019-faad2.sh
|
||||
+++ b/scripts/019-faad2.sh
|
||||
@@ -5,8 +5,8 @@
|
||||
wget --continue https://github.com/knik0/faad2/archive/refs/tags/2_10_0.tar.gz -O faad2-2.10.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
|
||||
-if [ ! -f config.sub ]; then wget --continue http://git.savannah.gnu.org/cgit/config.git/plain/config.sub; fi
|
||||
+if [ ! -f config.guess ]; then wget --continue https://cgit.git.savannah.gnu.org/cgit/config.git/plain/config.guess; fi
|
||||
+if [ ! -f config.sub ]; then wget --continue https://cgit.git.savannah.gnu.org/cgit/config.git/plain/config.sub; fi
|
||||
|
||||
## Unpack the source code.
|
||||
rm -Rf faad2-2.10 && tar xfz faad2-2.10.tar.gz && cd faad2-2_10_0
|
||||
diff --git a/scripts/020-libtheora.sh b/scripts/020-libtheora.sh
|
||||
index a400947..af7f9cd 100755
|
||||
--- a/scripts/020-libtheora.sh
|
||||
+++ b/scripts/020-libtheora.sh
|
||||
@@ -7,8 +7,8 @@ VER=1.1.1
|
||||
wget --continue http://downloads.xiph.org/releases/theora/libtheora-${VER}.tar.bz2
|
||||
|
||||
## 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
|
||||
-if [ ! -f config.sub ]; then wget --continue http://git.savannah.gnu.org/cgit/config.git/plain/config.sub; fi
|
||||
+if [ ! -f config.guess ]; then wget --continue https://cgit.git.savannah.gnu.org/cgit/config.git/plain/config.guess; fi
|
||||
+if [ ! -f config.sub ]; then wget --continue https://cgit.git.savannah.gnu.org/cgit/config.git/plain/config.sub; fi
|
||||
|
||||
## Unpack the source code.
|
||||
rm -Rf libtheora-${VER} && tar xfj libtheora-${VER}.tar.bz2 && cd libtheora-${VER}
|
||||
diff --git a/scripts/023-a52dec.sh b/scripts/023-a52dec.sh
|
||||
index 1be0ddb..2566c9a 100755
|
||||
--- a/scripts/023-a52dec.sh
|
||||
+++ b/scripts/023-a52dec.sh
|
||||
@@ -6,8 +6,8 @@ VER=0.7.4
|
||||
wget --continue http://deb.debian.org/debian/pool/main/a/a52dec/a52dec_${VER}.orig.tar.gz -O a52dec-${VER}.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
|
||||
-if [ ! -f config.sub ]; then wget --continue http://git.savannah.gnu.org/cgit/config.git/plain/config.sub; fi
|
||||
+if [ ! -f config.guess ]; then wget --continue https://cgit.git.savannah.gnu.org/cgit/config.git/plain/config.guess; fi
|
||||
+if [ ! -f config.sub ]; then wget --continue https://cgit.git.savannah.gnu.org/cgit/config.git/plain/config.sub; fi
|
||||
|
||||
## Unpack the source code.
|
||||
rm -Rf a52dec-${VER} && tar xfz a52dec-${VER}.tar.gz && cd a52dec-${VER}
|
||||
diff --git a/scripts/024-fribidi.sh b/scripts/024-fribidi.sh
|
||||
index 8e8dd71..dd6d75b 100755
|
||||
--- a/scripts/024-fribidi.sh
|
||||
+++ b/scripts/024-fribidi.sh
|
||||
@@ -6,8 +6,8 @@ VER=1.0.16
|
||||
wget --continue https://github.com/fribidi/fribidi/releases/download/v${VER}/fribidi-${VER}.tar.xz
|
||||
|
||||
## 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
|
||||
-if [ ! -f config.sub ]; then wget --continue http://git.savannah.gnu.org/cgit/config.git/plain/config.sub; fi
|
||||
+if [ ! -f config.guess ]; then wget --continue https://cgit.git.savannah.gnu.org/cgit/config.git/plain/config.guess; fi
|
||||
+if [ ! -f config.sub ]; then wget --continue https://cgit.git.savannah.gnu.org/cgit/config.git/plain/config.sub; fi
|
||||
|
||||
## Unpack the source code.
|
||||
rm -Rf fribidi-${VER} && tar xf fribidi-${VER}.tar.xz && cd fribidi-${VER}
|
||||
diff --git a/scripts/026-libmpeg2.sh b/scripts/026-libmpeg2.sh
|
||||
index f9bcebe..87614ed 100755
|
||||
--- a/scripts/026-libmpeg2.sh
|
||||
+++ b/scripts/026-libmpeg2.sh
|
||||
@@ -6,8 +6,8 @@ VER=0.5.1
|
||||
if [ ! -f libmpeg2-${VER}.tar.gz ]; then wget --continue https://libmpeg2.sourceforge.io/files/libmpeg2-${VER}.tar.gz; fi
|
||||
|
||||
## 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
|
||||
-if [ ! -f config.sub ]; then wget --continue http://git.savannah.gnu.org/cgit/config.git/plain/config.sub; fi
|
||||
+if [ ! -f config.guess ]; then wget --continue https://cgit.git.savannah.gnu.org/cgit/config.git/plain/config.guess; fi
|
||||
+if [ ! -f config.sub ]; then wget --continue https://cgit.git.savannah.gnu.org/cgit/config.git/plain/config.sub; fi
|
||||
|
||||
## Unpack the source code.
|
||||
rm -Rf libmpeg2-${VER} && tar xfz libmpeg2-${VER}.tar.gz && cd libmpeg2-${VER}
|
||||
diff --git a/scripts/028-vpx.sh b/scripts/028-vpx.sh
|
||||
index c90bf20..06ccadb 100755
|
||||
--- a/scripts/028-vpx.sh
|
||||
+++ b/scripts/028-vpx.sh
|
||||
@@ -6,8 +6,8 @@ VER=1.15.0
|
||||
wget --continue https://github.com/webmproject/libvpx/archive/v${VER}/libvpx-${VER}.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
|
||||
-if [ ! -f config.sub ]; then wget --continue http://git.savannah.gnu.org/cgit/config.git/plain/config.sub; fi
|
||||
+if [ ! -f config.guess ]; then wget --continue https://cgit.git.savannah.gnu.org/cgit/config.git/plain/config.guess; fi
|
||||
+if [ ! -f config.sub ]; then wget --continue https://cgit.git.savannah.gnu.org/cgit/config.git/plain/config.sub; fi
|
||||
|
||||
## Unpack the source code.
|
||||
rm -Rf libvpx-${VER} && tar xzf libvpx-${VER}.tar.gz && cd libvpx-${VER}
|
||||
diff --git a/scripts/029-libmpcdec.sh b/scripts/029-libmpcdec.sh
|
||||
index a9366d2..378cade 100755
|
||||
--- a/scripts/029-libmpcdec.sh
|
||||
+++ b/scripts/029-libmpcdec.sh
|
||||
@@ -6,8 +6,8 @@ VER=1.2.6
|
||||
wget --continue https://files.musepack.net/source/libmpcdec-${VER}.tar.bz2
|
||||
|
||||
## 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
|
||||
-if [ ! -f config.sub ]; then wget --continue http://git.savannah.gnu.org/cgit/config.git/plain/config.sub; fi
|
||||
+if [ ! -f config.guess ]; then wget --continue https://cgit.git.savannah.gnu.org/cgit/config.git/plain/config.guess; fi
|
||||
+if [ ! -f config.sub ]; then wget --continue https://cgit.git.savannah.gnu.org/cgit/config.git/plain/config.sub; fi
|
||||
|
||||
## Unpack the source code.
|
||||
rm -Rf libmpcdec-${VER} && tar xf libmpcdec-${VER}.tar.bz2 && cd libmpcdec-${VER}
|
||||
@@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
|
||||
TOOLCHAIN_VERSION=c6c17413a89ea1cd6a1ba2700d87e11fd87582ee
|
||||
TOOLCHAIN_VERSION=5a5da97005960701bb3052bfc307b074613306e1
|
||||
|
||||
PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
|
||||
HELPERS_DIR=$PACKAGE_DIR/../..
|
||||
|
||||
@@ -1,60 +0,0 @@
|
||||
diff --git a/scripts/001-binutils-PPU.sh b/scripts/001-binutils-PPU.sh
|
||||
index 3aecc19..0ec0c2b 100755
|
||||
--- a/scripts/001-binutils-PPU.sh
|
||||
+++ b/scripts/001-binutils-PPU.sh
|
||||
@@ -9,8 +9,8 @@ if [ ! -d ${BINUTILS} ]; then
|
||||
if [ ! -f ${BINUTILS}.tar.bz2 ]; then wget --continue https://ftp.gnu.org/gnu/binutils/${BINUTILS}.tar.bz2; fi
|
||||
|
||||
## Download an up-to-date config.guess and config.sub
|
||||
- if [ ! -f config.guess ]; then wget --continue https://git.savannah.gnu.org/cgit/config.git/plain/config.guess; fi
|
||||
- if [ ! -f config.sub ]; then wget --continue https://git.savannah.gnu.org/cgit/config.git/plain/config.sub; fi
|
||||
+ if [ ! -f config.guess ]; then wget --continue https://cgit.git.savannah.gnu.org/cgit/config.git/plain/config.guess; fi
|
||||
+ if [ ! -f config.sub ]; then wget --continue https://cgit.git.savannah.gnu.org/cgit/config.git/plain/config.sub; fi
|
||||
|
||||
## Unpack the source code.
|
||||
tar xfj ${BINUTILS}.tar.bz2
|
||||
diff --git a/scripts/003-gdb-PPU.sh b/scripts/003-gdb-PPU.sh
|
||||
index 25984b0..6f57ea9 100755
|
||||
--- a/scripts/003-gdb-PPU.sh
|
||||
+++ b/scripts/003-gdb-PPU.sh
|
||||
@@ -9,8 +9,8 @@ if [ ! -d ${GDB} ]; then
|
||||
if [ ! -f ${GDB}.tar.gz ]; then wget --continue https://ftp.gnu.org/gnu/gdb/${GDB}.tar.gz; fi
|
||||
|
||||
## Download an up-to-date config.guess and config.sub
|
||||
- if [ ! -f config.guess ]; then wget --continue https://git.savannah.gnu.org/cgit/config.git/plain/config.guess; fi
|
||||
- if [ ! -f config.sub ]; then wget --continue https://git.savannah.gnu.org/cgit/config.git/plain/config.sub; fi
|
||||
+ if [ ! -f config.guess ]; then wget --continue https://cgit.git.savannah.gnu.org/cgit/config.git/plain/config.guess; fi
|
||||
+ if [ ! -f config.sub ]; then wget --continue https://cgit.git.savannah.gnu.org/cgit/config.git/plain/config.sub; fi
|
||||
|
||||
## Unpack the source code.
|
||||
tar xzf ${GDB}.tar.gz
|
||||
diff --git a/scripts/005-binutils-SPU.sh b/scripts/005-binutils-SPU.sh
|
||||
index 4e572c5..9aa3d9a 100755
|
||||
--- a/scripts/005-binutils-SPU.sh
|
||||
+++ b/scripts/005-binutils-SPU.sh
|
||||
@@ -9,8 +9,8 @@ if [ ! -d ${BINUTILS} ]; then
|
||||
if [ ! -f ${BINUTILS}.tar.bz2 ]; then wget --continue https://ftp.gnu.org/gnu/binutils/${BINUTILS}.tar.bz2; fi
|
||||
|
||||
## Download an up-to-date config.guess and config.sub
|
||||
- if [ ! -f config.guess ]; then wget --continue https://git.savannah.gnu.org/cgit/config.git/plain/config.guess; fi
|
||||
- if [ ! -f config.sub ]; then wget --continue https://git.savannah.gnu.org/cgit/config.git/plain/config.sub; fi
|
||||
+ if [ ! -f config.guess ]; then wget --continue https://cgit.git.savannah.gnu.org/cgit/config.git/plain/config.guess; fi
|
||||
+ if [ ! -f config.sub ]; then wget --continue https://cgit.git.savannah.gnu.org/cgit/config.git/plain/config.sub; fi
|
||||
|
||||
## Unpack the source code.
|
||||
tar xfj ${BINUTILS}.tar.bz2
|
||||
diff --git a/scripts/007-gdb-SPU.sh b/scripts/007-gdb-SPU.sh
|
||||
index ea917a3..a927048 100755
|
||||
--- a/scripts/007-gdb-SPU.sh
|
||||
+++ b/scripts/007-gdb-SPU.sh
|
||||
@@ -9,8 +9,8 @@ if [ ! -d ${GDB} ]; then
|
||||
if [ ! -f ${GDB}.tar.gz ]; then wget --continue https://ftp.gnu.org/gnu/gdb/${GDB}.tar.gz; fi
|
||||
|
||||
## Download an up-to-date config.guess and config.sub
|
||||
- if [ ! -f config.guess ]; then wget --continue https://git.savannah.gnu.org/cgit/config.git/plain/config.guess; fi
|
||||
- if [ ! -f config.sub ]; then wget --continue https://git.savannah.gnu.org/cgit/config.git/plain/config.sub; fi
|
||||
+ if [ ! -f config.guess ]; then wget --continue https://cgit.git.savannah.gnu.org/cgit/config.git/plain/config.guess; fi
|
||||
+ if [ ! -f config.sub ]; then wget --continue https://cgit.git.savannah.gnu.org/cgit/config.git/plain/config.sub; fi
|
||||
|
||||
## Unpack the source code.
|
||||
tar xfz ${GDB}.tar.gz
|
||||
@@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
|
||||
PSP_PACKAGES_VERSION=dcef892e35dc6aadcacf0b54c3cd6f9d3fa469e6
|
||||
PSP_PACKAGES_VERSION=bb2b240f7f931f90a170756f13eb5a7f0da5d26e
|
||||
|
||||
PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
|
||||
HELPERS_DIR=$PACKAGE_DIR/../..
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
#! /bin/sh
|
||||
|
||||
PSPDEV_VERSION=36de9dbde264c5bc21ee7ff32b0c43e8a032cca0
|
||||
export PSPTOOLCHAIN_VERSION=4d1e6670ea2bb5a9d60033df889ef8f1bad22c5f
|
||||
export PSPSDK_VERSION=6ba471c7c3d824032e824c8571c95da731bd80ae
|
||||
export PSPLINKUSB_VERSION=285ea43e31f9133f9a1314cb392336085577175d
|
||||
PSPDEV_VERSION=d4706acd27481e325fd7b81a0cca368161ba4335
|
||||
export PSPTOOLCHAIN_VERSION=49a2715584c8e1f14fb01ae3ce12e3fab351efde
|
||||
export PSPSDK_VERSION=d46b2b237d2884737c92a1269d2230528ab53cc1
|
||||
export PSPLINKUSB_VERSION=1720e4bddf4af4d4fd50175299bd7ac3c315fd84
|
||||
export EBOOTSIGNER_VERSION=17d6386f034ac922f540ca78200961761b23ecae
|
||||
export PSPTOOLCHAIN_ALLEGREX_VERSION=ab90c1274acc7269f213852f85abaf81b4b6a56d
|
||||
export PSPTOOLCHAIN_ALLEGREX_VERSION=bc23870d873615620800670ea7254ab48d7c0910
|
||||
export PSPTOOLCHAIN_EXTRA_VERSION=12339428164a243978d0d4dc40e1507cd6962bb8
|
||||
export BINUTILS_VERSION=a8b53fe2b5825fa86337623c743d21a19aeb0daf
|
||||
export GCC_VERSION=33e5b187fa86c429c8827f6e12f120eab7d51c9e
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
m4_define(`ALPINE_VERSION',3.22.1)m4_dnl
|
||||
m4_define(`ALPINE_VERSION',3.22.2)m4_dnl
|
||||
FROM alpine:ALPINE_VERSION
|
||||
m4_define(`BASE_ALPINE',`')m4_dnl
|
||||
USER root
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
m4_ifdef(`DEBIAN_RELEASE',,`m4_define(`DEBIAN_RELEASE',bookworm)')
|
||||
m4_ifdef(`DEBIAN_VERSION',,`m4_define(`DEBIAN_VERSION',20250811)')
|
||||
m4_ifdef(`DEBIAN_VERSION',,`m4_define(`DEBIAN_VERSION',20250929)')
|
||||
m4_define(`BASE_DEBIAN',`')m4_dnl
|
||||
FROM debian:DEBIAN_RELEASE-DEBIAN_VERSION-slim
|
||||
USER root
|
||||
|
||||
Reference in New Issue
Block a user