Merge branch 'main' into add-sse2-fillers

Author: itzpr3d4t0r

.github/workflows/build-debian-multiarch.yml

@@ -50,7 +50,7 @@ jobs:
     - uses: actions/checkout@v4.1.1
 
     - name: Build sources and run tests
-      uses: uraimo/run-on-arch-action@v2.5.1
+      uses: uraimo/run-on-arch-action@v2.6.0
       id: build
       with:
         arch: ${{ matrix.arch }}

.github/workflows/build-manylinux.yml

@@ -95,14 +95,14 @@ jobs:
 
     - name: Extract metadata (tags, labels) for Docker
       id: meta
-      uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934
+      uses: docker/metadata-action@e6428a5c4e294a61438ed7f43155db912025b6b3
       with:
         images: ghcr.io/${{ github.repository }}_${{ matrix.arch }}
         tags: type=raw,value=${{ hashFiles('buildconfig/manylinux-build/**') }}
 
     - name: Build and push Docker image
       if: steps.inspect.outcome == 'failure'
-      uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09
+      uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56
       with:
         context: ${{ github.workspace }}/buildconfig/manylinux-build/docker_base
         file: ${{ github.workspace }}/buildconfig/manylinux-build/docker_base/Dockerfile-${{ matrix.arch }}

README.rst

@@ -140,7 +140,7 @@ Dependency versions:
 +----------+------------------------+
 | CPython  | >= 3.8 (Or use PyPy3)  |
 +----------+------------------------+
-| SDL      | >= 2.0.9               |
+| SDL      | >= 2.0.10              |
 +----------+------------------------+
 | SDL_mixer| >= 2.0.4               |
 +----------+------------------------+

buildconfig/config_msys2.py

@@ -269,7 +269,8 @@ def hunt_dll(self, search_paths, root):
                         return True
         return False
 
-class DependencyDummy:
+
+class DependencyPlaceholder:
     def __init__(self, name):
         self.name = name
         self.inc_dir = None
@@ -281,6 +282,7 @@ def __init__(self, name):
     def configure(self):
         pass
 
+
 class DependencyWin:
     def __init__(self, name, cflags):
         self.name = name
@@ -329,8 +331,8 @@ def add_dll(self, dll_regex, lib=None, wildcards=None, libs=None, link_lib=None)
         self.dlls.append(dep)
         return dep
 
-    def add_dummy(self, name):
-        self.dependencies.append(DependencyDummy(name))
+    def add_placeholder(self, name):
+        self.dependencies.append(DependencyPlaceholder(name))
 
     def find(self, name):
         for dep in self:
@@ -410,7 +412,7 @@ def setup_prebuilt_sdl2(prebuilt_dir):
                         ['SDL', 'vorbisfile'])
     DEPS.add('PORTMIDI', 'portmidi', ['portmidi'], r'(lib){0,1}portmidi\.dll$', find_header=r'portmidi\.h')
     # #DEPS.add('PORTTIME', 'porttime', ['porttime'], r'porttime\.dll$')
-    DEPS.add_dummy('PORTTIME')
+    DEPS.add_placeholder('PORTTIME')
 
     # force use of the correct freetype DLL
     ftDep = DEPS.add('FREETYPE', 'freetype', ['SDL2_ttf-[2-9].*', 'freetype-[1-9].*'], r'(lib)?freetype[-0-9]*\.dll$',

buildconfig/config_win.py

@@ -252,7 +252,8 @@ def hunt_dll(self, search_paths, root):
                         return True
         return False
 
-class DependencyDummy:
+
+class DependencyPlaceholder:
     def __init__(self, name):
         self.name = name
         self.inc_dir = None
@@ -264,6 +265,7 @@ def __init__(self, name):
     def configure(self):
         pass
 
+
 class DependencyWin:
     def __init__(self, name, cflags):
         self.name = name
@@ -312,8 +314,8 @@ def add_dll(self, dll_regex, lib=None, wildcards=None, libs=None, link_lib=None)
         self.dlls.append(dep)
         return dep
 
-    def add_dummy(self, name):
-        self.dependencies.append(DependencyDummy(name))
+    def add_placeholder(self, name):
+        self.dependencies.append(DependencyPlaceholder(name))
 
     def find(self, name):
         for dep in self:
@@ -371,7 +373,7 @@ def setup():
     DEPS.add('SDL', 'SDL2', ['SDL2-[1-9].*'], r'(lib){0,1}SDL2\.dll$', required=1)
     DEPS.add('PORTMIDI', 'portmidi', ['portmidi'], r'portmidi\.dll$', find_header=r'portmidi\.h')
     #DEPS.add('PORTTIME', 'porttime', ['porttime'], r'porttime\.dll$')
-    DEPS.add_dummy('PORTTIME')
+    DEPS.add_placeholder('PORTTIME')
     DEPS.add('MIXER', 'SDL2_mixer', ['SDL2_mixer-[1-9].*'], r'(lib){0,1}SDL2_mixer\.dll$',
              ['SDL'])
     DEPS.add('PNG', 'png', ['SDL2_image-[2-9].*', 'libpng-[1-9].*'], r'(png|libpng)[-0-9]*\.dll$', ['z'],
@@ -413,7 +415,7 @@ def setup_prebuilt_sdl2(prebuilt_dir):
                         ['SDL'])
     DEPS.add('PORTMIDI', 'portmidi', ['portmidi'], r'portmidi\.dll$', find_header=r'portmidi\.h')
     #DEPS.add('PORTTIME', 'porttime', ['porttime'], r'porttime\.dll$')
-    DEPS.add_dummy('PORTTIME')
+    DEPS.add_placeholder('PORTTIME')
     DEPS.configure()
 
     DEPS.add('FREETYPE', 'freetype', ['freetype'], r'freetype[-0-9]*\.dll$',

buildconfig/download_win_prebuilt.py

@@ -78,8 +78,8 @@ def get_urls(x86=True, x64=True):
     url_sha1 = []
     url_sha1.extend([
         [
-        'https://github.com/libsdl-org/SDL/releases/download/release-2.26.5/SDL2-devel-2.26.5-VC.zip',
-        'f040c352af677161200ec07463efe8d1325135e4',
+        'https://github.com/libsdl-org/SDL/releases/download/release-2.28.5/SDL2-devel-2.28.5-VC.zip',
+        '7469e9ea44d30a48b0510328cd94b25596e0aa0f',
         ],
         [
         'https://www.libsdl.org/projects/SDL_image/release/SDL2_image-devel-2.0.5-VC.zip',
@@ -234,12 +234,12 @@ def copy(src, dst):
         copy(
             os.path.join(
                 temp_dir,
-                'SDL2-devel-2.26.5-VC/SDL2-2.26.5'
+                'SDL2-devel-2.28.5-VC/SDL2-2.28.5'
             ),
             os.path.join(
                 move_to_dir,
                 prebuilt_dir,
-                'SDL2-2.26.5'
+                'SDL2-2.28.5'
             )
         )
 

buildconfig/macdependencies/build_mac_deps.sh

@@ -34,6 +34,11 @@ export PG_BASE_CMAKE_FLAGS="-DCMAKE_INSTALL_PREFIX=$PG_DEP_PREFIX \
 
 export PG_BASE_CONFIGURE_FLAGS="--prefix=$PG_DEP_PREFIX"
 
+export PG_BASE_MESON_FLAGS="--prefix=$PG_DEP_PREFIX \
+    -Dlibdir=lib \
+    -Dbuildtype=release \
+    -Ddefault_library=shared"
+
 if [[ "$MAC_ARCH" == "arm64" ]]; then
     # for scripts using ./configure to make arm64 binaries
     export CC="clang -target arm64-apple-macos11.0"
@@ -45,6 +50,9 @@ if [[ "$MAC_ARCH" == "arm64" ]]; then
     # configure cmake to cross-compile
     export PG_BASE_CMAKE_FLAGS="$PG_BASE_CMAKE_FLAGS -DCMAKE_OSX_ARCHITECTURES=arm64"
 
+    # configure meson to cross-compile
+    export PG_BASE_MESON_FLAGS="$PG_BASE_MESON_FLAGS --cross-file $(pwd)/macos_arm64.ini"
+
     # we don't need mac 10.9 support while compiling for apple M1 macs
     export MACOSX_DEPLOYMENT_TARGET=11.0
 else
@@ -54,13 +62,19 @@ else
     # SDL 2.26.5 new minimum macos is 10.11, so we build our x86 mac deps
     # for 10.11 as well.
     export MACOSX_DEPLOYMENT_TARGET=10.11
+
+    # needs native-file that has correct macosx deployment target
+    export PG_BASE_MESON_FLAGS="$PG_BASE_MESON_FLAGS --native-file $(pwd)/macos_x86_64.ini"
 fi
 
 cd ../manylinux-build/docker_base
 
 # Now start installing dependencies
 # ---------------------------------
 
+# install some buildtools
+bash buildtools/install.sh
+
 # sdl_image deps
 bash zlib-ng/build-zlib-ng.sh
 bash libpng/build-png.sh # depends on zlib
@@ -81,8 +95,8 @@ bash mpg123/build-mpg123.sh
 bash opus/build-opus.sh # needs libogg (which is a container format)
 
 # fluidsynth (for sdl_mixer)
-bash gettext/build-gettext.sh
-bash glib/build-glib.sh # depends on gettext
+# bash gettext/build-gettext.sh
+bash glib/build-glib.sh
 bash sndfile/build-sndfile.sh
 bash fluidsynth/build-fluidsynth.sh
 

buildconfig/macdependencies/clean_usr_local.sh

@@ -29,7 +29,7 @@ rm -rf /usr/local/Cellar/libtiff
 rm -rf /usr/local/Cellar/libsndfile
 rm -rf /usr/local/Cellar/glib
 rm -rf /usr/local/Cellar/brotli
-rm -rf /usr/local/Cellar/pcre
+rm -rf /usr/local/Cellar/pcre*
 rm -rf /usr/local/Cellar/opusfile
 rm -rf /usr/local/Cellar/opus
 rm -rf /usr/local/Cellar/freetype

buildconfig/macdependencies/macos_arm64.ini

@@ -0,0 +1,28 @@
+[constants]
+macos_ver = ['-mmacosx-version-min=11.0']
+macos_arch = ['-arch', 'arm64']
+
+[host_machine]
+system = 'darwin'
+cpu_family = 'aarch64'
+cpu = 'arm64'
+endian = 'little'
+
+[binaries]
+c = ['clang']
+cpp = ['clang++']
+objc = ['clang']
+objcpp = ['clang++']
+ar = ['ar']
+strip = ['strip']
+pkgconfig = ['pkg-config']
+
+[built-in options]
+c_args = macos_arch + macos_ver
+cpp_args = macos_arch + macos_ver + ['-stdlib=libc++']
+objc_args = macos_arch + macos_ver
+objcpp_args = macos_arch + macos_ver + ['-stdlib=libc++']
+c_link_args = macos_arch + macos_ver
+cpp_link_args = macos_arch + macos_ver
+objc_link_args = macos_arch + macos_ver
+objcpp_link_args = macos_arch + macos_ver

buildconfig/macdependencies/macos_x86_64.ini

@@ -0,0 +1,21 @@
+[constants]
+macos_ver = ['-mmacosx-version-min=10.11']
+
+[binaries]
+c = ['clang']
+cpp = ['clang++']
+objc = ['clang']
+objcpp = ['clang++']
+ar = ['ar']
+strip = ['strip']
+pkgconfig = ['pkg-config']
+
+[built-in options]
+c_args = macos_ver
+cpp_args = macos_ver + ['-stdlib=libc++']
+objc_args = macos_ver
+objcpp_args = macos_ver + ['-stdlib=libc++']
+c_link_args = macos_ver
+cpp_link_args = macos_ver
+objc_link_args = macos_ver
+objcpp_link_args = macos_ver