ALL: Upgrade toolchains to Debian Bookworm

GCW0 toolchain can't be built anymore as Mesa build requires Python 2 which is not available anymore. Helper packages got upgraded and configure arguments and several patches must be updated. New GCC defaults to a too modern C++ version to compile old GCC. Debian now provides a modern enough CLang hence switching to it.
scummvm · Aug 13, 2023 · 737891c · 737891c
1 parent 38f397f
commit 737891c
Show file tree

Hide file tree

Showing 109 changed files with 429 additions and 62,040 deletions.
diff --git a/check-versions/config.py b/check-versions/config.py
@@ -91,8 +91,8 @@
     'registry': 'https://registry-1.docker.io',
     'image name': 'library/debian',
     'architecture': 'amd64',
-    'reference': 'bullseye-slim',
-    'tag_format': 'bullseye-{0}-slim',
+    'reference': 'bookworm-slim',
+    'tag_format': 'bookworm-{0}-slim',
 }
 raspios_check = {
     'check': 'scrape',
@@ -303,36 +303,6 @@
     ('./toolchains/dreamcast/packages/toolchain-sh4/build.sh', 'GCC'): 'ignore',
     ('./toolchains/dreamcast/packages/toolchain-sh4/build.sh', 'NEWLIB'): 'ignore',
 
-    # GCW0 packages (except toolchain) are set by old firmware
-    ('./toolchains/gcw0/packages/alsa-lib/build.sh', 'ALSA_LIB'): 'ignore',
-    ('./toolchains/gcw0/packages/etna_viv/build.sh', 'ETNA_VIV'): 'ignore',
-    ('./toolchains/gcw0/packages/eudev/build.sh', 'EUDEV'): 'ignore',
-    ('./toolchains/gcw0/packages/expat/build.sh', 'EXPAT'): 'ignore',
-    ('./toolchains/gcw0/packages/flac/build.sh', 'FLAC'): 'ignore',
-    ('./toolchains/gcw0/packages/fluidsynth/build.sh', 'FLUIDSYNTH'): 'ignore',
-    ('./toolchains/gcw0/packages/freetype/build.sh', 'FREETYPE'): 'ignore',
-    ('./toolchains/gcw0/packages/gettext/build.sh', 'GETTEXT'): 'ignore',
-    ('./toolchains/gcw0/packages/libdrm/build.sh', 'LIBPTHREAD_STUBS'): 'ignore',
-    ('./toolchains/gcw0/packages/libdrm/build.sh', 'LIBDRM'): 'ignore',
-    ('./toolchains/gcw0/packages/libffi/build.sh', 'LIBFFI'): 'ignore',
-    ('./toolchains/gcw0/packages/libglib2/build.sh', 'GLIB2'): 'ignore',
-    ('./toolchains/gcw0/packages/libiconv/build.sh', 'LIBICONV'): 'ignore',
-    ('./toolchains/gcw0/packages/libjpeg/build.sh', 'JPEG'): 'ignore',
-    ('./toolchains/gcw0/packages/libmikmod/build.sh', 'LIBMIKMOD'): 'ignore',
-    ('./toolchains/gcw0/packages/libogg/build.sh', 'LIBOGG'): 'ignore',
-    ('./toolchains/gcw0/packages/libpng/build.sh', 'LIBPNG'): 'ignore',
-    ('./toolchains/gcw0/packages/libsdl/build.sh', 'SDL'): 'ignore',
-    ('./toolchains/gcw0/packages/libsdl2/build.sh', 'SDL'): 'ignore',
-    ('./toolchains/gcw0/packages/libsndfile/build.sh', 'LIBSNDFILE'): 'ignore',
-    ('./toolchains/gcw0/packages/libtheora/build.sh', 'LIBTHEORA'): 'ignore',
-    ('./toolchains/gcw0/packages/libvorbisidec/build.sh', 'LIBTREMOR'): 'ignore',
-    ('./toolchains/gcw0/packages/mesa3d-etna_viv/build.sh', 'MESA3D_ETNA_VIV'): 'ignore',
-    ('./toolchains/gcw0/packages/sdl-net1.2/build.sh', 'SDL_NET'): 'ignore',
-    ('./toolchains/gcw0/packages/sdl2-net/build.sh', 'SDL_NET'): 'ignore',
-    ('./toolchains/gcw0/packages/zlib/build.sh', 'ZLIB'): 'ignore',
-    # Latest crosstool-ng doesn't support uClibc anymore
-    ('./toolchains/gcw0/packages/toolchain/build.sh', 'CT_NG'): 'ignore',
-
     # This version is set by toolchain configuration
     ('./toolchains/miyoo/packages/toolchain/build.sh', 'BUILDROOT'): 'ignore',
 

diff --git a/toolchains/amigaos4/Dockerfile.m4 b/toolchains/amigaos4/Dockerfile.m4
@@ -16,7 +16,6 @@ RUN apt-get update && \
 		libgmp-dev \
 		libmpc-dev \
 		libmpfr-dev \
-		python \
 		texinfo && \
 	rm -rf /var/lib/apt/lists/*
 

diff --git a/toolchains/amigaos4/packages/toolchain/patches/fix-werror.patch b/toolchains/amigaos4/packages/toolchain/patches/fix-werror.patch
@@ -0,0 +1,26 @@
+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 \
diff --git a/toolchains/android-common/packages/libsdl2-net/patches/no-sdl.patch b/toolchains/android-common/packages/libsdl2-net/patches/no-sdl.patch
@@ -1,22 +1,23 @@
 diff --git a/SDL2_net.pc.in b/SDL2_net.pc.in
-index e3ad892..e7731be 100644
+index 28dd6c8..576d490 100644
 --- a/SDL2_net.pc.in
 +++ b/SDL2_net.pc.in
-@@ -6,6 +6,6 @@ includedir=@includedir@
+@@ -6,7 +6,7 @@ includedir=@includedir@
  Name: SDL2_net
  Description: net library for Simple DirectMedia Layer
  Version: @VERSION@
 -Requires: sdl2 >= @SDL_VERSION@
 +Requires:
- Libs: -L${libdir} -lSDL2_net
- Cflags: -I${includedir}/SDL2
+ @ENABLE_SHARED_TRUE@Libs: -L${libdir} -lSDL2_net
+ @ENABLE_SHARED_TRUE@@ENABLE_STATIC_TRUE@Libs.private: @INETLIB@
+ @ENABLE_SHARED_FALSE@Libs: -L${libdir} -lSDL2_net @INETLIB@
 diff --git a/SDL_net.h b/SDL_net.h
-index bd5ec7f..c7293e9 100644
+index 6a19af3..babafa3 100644
 --- a/SDL_net.h
 +++ b/SDL_net.h
-@@ -25,7 +25,10 @@
- #ifndef _SDL_NET_H
- #define _SDL_NET_H
+@@ -23,7 +23,10 @@
+ #ifndef SDL_NET_H_
+ #define SDL_NET_H_
 
 +#define WITHOUT_SDL
 +
@@ -25,7 +26,7 @@ index bd5ec7f..c7293e9 100644
  #include <stdint.h>
  typedef uint8_t Uint8;
  typedef uint16_t Uint16;
-@@ -37,6 +40,11 @@ typedef struct SDLNet_version {
+@@ -35,6 +38,11 @@ typedef struct SDLNet_version {
      Uint8 patch;
  } SDLNet_version;
 
@@ -37,7 +38,7 @@ index bd5ec7f..c7293e9 100644
  #else /* WITHOUT_SDL */
 
  #include "SDL.h"
-@@ -47,7 +55,156 @@ typedef SDL_version SDLNet_version;
+@@ -45,7 +53,156 @@ typedef SDL_version SDLNet_version;
 
  #endif /* WITHOUT_SDL */
 
@@ -195,7 +196,7 @@ index bd5ec7f..c7293e9 100644
 
  /* Set up for C function definitions, even when using C++ */
  #ifdef __cplusplus
-@@ -438,6 +595,25 @@ SDL_FORCE_INLINE Uint32 _SDLNet_Read32(const void *areap)
+@@ -1076,6 +1233,25 @@ SDL_FORCE_INLINE Uint32 _SDLNet_Read32(const void *areap)
  #ifdef __cplusplus
  }
  #endif
@@ -221,12 +222,12 @@ index bd5ec7f..c7293e9 100644
 +#pragma pack(pop)
 +#endif /* Compiler needs structure packing set */
 
- #endif /* _SDL_NET_H */
+ #endif /* SDL_NET_H_ */
 diff --git a/SDLnet.c b/SDLnet.c
-index 53d125a..7e54e63 100644
+index 7d0223e..2ba59c9 100644
 --- a/SDLnet.c
 +++ b/SDLnet.c
-@@ -66,7 +66,12 @@ void SDLCALL SDLNet_SetError(const char *fmt, ...)
+@@ -95,7 +95,12 @@ void SDLCALL SDLNet_SetError(const char *fmt, ...)
  {
      va_list argp;
      va_start(argp, fmt);
@@ -239,16 +240,16 @@ index 53d125a..7e54e63 100644
      va_end(argp);
  #ifndef WITHOUT_SDL
      SDL_SetError("%s", errorbuf);
-diff --git a/configure.in b/configure.in
-index 4228c6f..dca90a6 100644
---- a/configure.in
-+++ b/configure.in
-@@ -107,16 +107,6 @@ case "$host" in
- esac
- AC_SUBST(INETLIB)
+diff --git a/configure.ac b/configure.ac
+index b28a92d..f90ff2f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -189,16 +189,6 @@ AC_ARG_ENABLE([examples],
+     enable_examples=yes)
+ AM_CONDITIONAL(ENABLE_EXAMPLES, [test x$enable_examples = xyes])
 
 -dnl Check for SDL
--SDL_VERSION=2.0.0
+-SDL_VERSION=2.0.4
 -AC_SUBST(SDL_VERSION)
 -AM_PATH_SDL2($SDL_VERSION,
 -            :,
@@ -257,6 +258,6 @@ index 4228c6f..dca90a6 100644
 -CFLAGS="$CFLAGS $SDL_CFLAGS"
 -LIBS="$LIBS $SDL_LIBS"
 -
- dnl Check for GUI library for the chat client
- have_GUI=no
- AC_ARG_ENABLE(gui,
+ dnl Calculate the location of the prefix, relative to the cmake folder
+ pkg_cmakedir='$libdir/cmake/SDL2_net'
+ AX_COMPUTE_RELATIVE_PATHS([pkg_cmakedir:prefix:cmake_prefix_relpath])
diff --git a/toolchains/android-common/packages/openssl/patches/00_modernize_build_system.patch b/toolchains/android-common/packages/openssl/patches/00_modernize_build_system.patch
diff --git a/toolchains/android-common/packages/openssl/patches/fix-android-build.patch b/toolchains/android-common/packages/openssl/patches/fix-android-build.patch
@@ -0,0 +1,19 @@
+commit 9ba0363c93eb3c2c7178f5a6b7a28466239c3eed
+Author: Le Philousophe <lephilousophe@users.noreply.github.com>
+Date:   Sun Aug 6 22:51:42 2023 +0200
+
+    Fix Android build
+
+diff --git a/Configurations/15-android.conf b/Configurations/15-android.conf
+index 41ad9223e0..237b5f8735 100644
+--- a/Configurations/15-android.conf
++++ b/Configurations/15-android.conf
+@@ -224,7 +224,7 @@ my %targets = (
+         inherit_from     => [ "android" ],
+         bn_ops           => add("RC4_CHAR"),
+         asm_arch         => 'armv4',
+-        perlasm_scheme   => "void",
++        perlasm_scheme   => "linux",
+     },
+     "android-arm64" => {
+         inherit_from     => [ "android" ],
diff --git a/toolchains/apple-common/packages/curl/patches/00_fix_compile_flags.patch b/toolchains/apple-common/packages/curl/patches/00_fix_compile_flags.patch
@@ -6,7 +6,7 @@ Index: curl-7.74.0/curl-config.in
 
      --static-libs)
          if test "X@ENABLE_STATIC@" != "Xno" ; then
--          echo -Wl,-Bstatic -lcurl -Wl,-Bdynamic @LDFLAGS@ @LIBCURL_LIBS@
+-          echo -Wl,-Bstatic -lcurl -Wl,-Bdynamic @LIBCURL_LIBS@
 +          echo -lcurl @LDFLAGS@ @LIBCURL_LIBS@
          else
            echo "curl was built with static libraries disabled" >&2