From e26d314bcd480332060a1a89f29fd59bb1eb69ee Mon Sep 17 00:00:00 2001 From: Starbuck5 <46412508+Starbuck5@users.noreply.github.com> Date: Sat, 7 Jun 2025 01:50:18 -0700 Subject: [PATCH 1/2] Update to SDL 2.32.8 --- buildconfig/download_win_prebuilt.py | 8 ++++---- .../docker_base/sdl_libs/build-sdl2-libs.sh | 2 +- .../manylinux-build/docker_base/sdl_libs/sdl2.sha512 | 2 +- meson.build | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/buildconfig/download_win_prebuilt.py b/buildconfig/download_win_prebuilt.py index 489d6ddd93..94f197ea33 100644 --- a/buildconfig/download_win_prebuilt.py +++ b/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.32.6/SDL2-devel-2.32.6-VC.zip', - 'beab1beb38b0c5a4cc6ebd2d059431e1de631b35', + 'https://github.com/libsdl-org/SDL/releases/download/release-2.32.8/SDL2-devel-2.32.8-VC.zip', + 'ec8bbf2a2d2bf754fe04b6ffc647f78aa7f4c2a1', ], [ 'https://github.com/libsdl-org/SDL/releases/download/release-3.2.10/SDL3-devel-3.2.10-VC.zip', @@ -269,12 +269,12 @@ def copy(src, dst): copy( os.path.join( temp_dir, - 'SDL2-devel-2.32.6-VC/SDL2-2.32.6' + 'SDL2-devel-2.32.8-VC/SDL2-2.32.8' ), os.path.join( move_to_dir, prebuilt_dir, - 'SDL2-2.32.6' + 'SDL2-2.32.8' ) ) copy( diff --git a/buildconfig/manylinux-build/docker_base/sdl_libs/build-sdl2-libs.sh b/buildconfig/manylinux-build/docker_base/sdl_libs/build-sdl2-libs.sh index bf9b51ffe2..9c0f812670 100644 --- a/buildconfig/manylinux-build/docker_base/sdl_libs/build-sdl2-libs.sh +++ b/buildconfig/manylinux-build/docker_base/sdl_libs/build-sdl2-libs.sh @@ -3,7 +3,7 @@ set -e -x cd $(dirname `readlink -f "$0"`) -SDL2_VER="2.32.6" +SDL2_VER="2.32.8" SDL2="SDL2-$SDL2_VER" IMG2_VER="2.8.8" IMG2="SDL2_image-$IMG2_VER" diff --git a/buildconfig/manylinux-build/docker_base/sdl_libs/sdl2.sha512 b/buildconfig/manylinux-build/docker_base/sdl_libs/sdl2.sha512 index b884de0ad9..bd4567c695 100644 --- a/buildconfig/manylinux-build/docker_base/sdl_libs/sdl2.sha512 +++ b/buildconfig/manylinux-build/docker_base/sdl_libs/sdl2.sha512 @@ -1,4 +1,4 @@ -2dae8ae9f10e160a50f625daddad891d25e782130e5a5e3f02079d94ab8858aca92ab8871ab19fdf5be6aca83ffeb9c1ea03949841c2506066f12d2bf2332d47 SDL2-2.32.6.tar.gz +484c33638e7bd1002815bb1f6a47a292d1eaf0b963598dde65f4a3e077dfe75ee35b9ea4b3b767365b3ef4f613c4d69ce55b5e96675de562994344e83a978272 SDL2-2.32.8.tar.gz 5c521ae6a053e1eb6b42dce3ccccdbdb353eb7e9d1bd89392b1913bfc9fbb6b8a9d5506c80e5b7924b51637bb95cd270657ca87dafe60edd5534e333524bc901 SDL2_image-2.8.8.tar.gz 6148591404b2113bcdb54391821658548acfe380a9cba660113e55e6f2fb7da2a5a59a99fefe51a0d7f8b91160648f11f72750353da88d285a962e3a410aecd7 SDL2_mixer-2.8.1.tar.gz a0f94e26f0387385f13ec1eb08ddca677d4181969073a50af387a0dce9c7bdddf393c028c8084538e01f875e19790ef7ae9a00c5106bf7ca9d21f3fcf9eee885 SDL2_ttf-2.24.0.tar.gz diff --git a/meson.build b/meson.build index f58ab5b4ff..9f5efdeffb 100644 --- a/meson.build +++ b/meson.build @@ -109,7 +109,7 @@ if plat == 'win' and host_machine.cpu_family().startswith('x86') ) endif - sdl_ver = (sdl_api == 3) ? '3.2.10' : '2.32.6' + sdl_ver = (sdl_api == 3) ? '3.2.10' : '2.32.8' sdl_image_ver = (sdl_api == 3) ? '3.2.4' : '2.8.8' sdl_mixer_ver = '2.8.1' sdl_ttf_ver = (sdl_api == 3) ? '3.2.2' : '2.24.0' From fcfd235956edfca8b46179ddbdccd9385765716e Mon Sep 17 00:00:00 2001 From: Starbuck5 <46412508+Starbuck5@users.noreply.github.com> Date: Sun, 8 Jun 2025 01:44:19 -0700 Subject: [PATCH 2/2] Update libdrm version to fix build Previous one failed hash checks because they renamed a folder (apparently?). --- .../manylinux-build/docker_base/mesa/libdrm/build-libdrm.sh | 6 +++--- .../docker_base/mesa/libdrm/libdrm.sha512sum | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/buildconfig/manylinux-build/docker_base/mesa/libdrm/build-libdrm.sh b/buildconfig/manylinux-build/docker_base/mesa/libdrm/build-libdrm.sh index 4d2fe8a054..58972d90c7 100644 --- a/buildconfig/manylinux-build/docker_base/mesa/libdrm/build-libdrm.sh +++ b/buildconfig/manylinux-build/docker_base/mesa/libdrm/build-libdrm.sh @@ -6,10 +6,10 @@ cd $(dirname `readlink -f "$0"`) # The drm already available on manylinux docker images is too old for mesa, so # we need to compile the latest from source -DRM_VER="libdrm-2.4.123" -DRM="drm-$DRM_VER" +DRM_VER="libdrm-2.4.124" +DRM="libdrm-$DRM_VER" -curl -sL --retry 10 https://gitlab.freedesktop.org/mesa/drm/-/archive/$DRM_VER/$DRM.tar.gz > $DRM.tar.gz +curl -sL --retry 10 https://gitlab.freedesktop.org/mesa/libdrm/-/archive/$DRM_VER/$DRM.tar.gz > $DRM.tar.gz sha512sum -c libdrm.sha512sum tar xzf $DRM.tar.gz diff --git a/buildconfig/manylinux-build/docker_base/mesa/libdrm/libdrm.sha512sum b/buildconfig/manylinux-build/docker_base/mesa/libdrm/libdrm.sha512sum index 71a0ac9ba5..1666d67034 100644 --- a/buildconfig/manylinux-build/docker_base/mesa/libdrm/libdrm.sha512sum +++ b/buildconfig/manylinux-build/docker_base/mesa/libdrm/libdrm.sha512sum @@ -1 +1 @@ -b593eb26be0f4e3aac44dfe8ec4e37d9e1a2666f9c86f2dcd3c32bd3e6fe376bfce7bd1c47af4d39b85b3d6f43ebf12f02704f055106872fb35f1d85b45286f3 drm-libdrm-2.4.123.tar.gz +8052839ffb2c81bc8c65e0e8e810e197ca6532fafdaf1acc181b97763068e68ba921035bb0e5675eb9c8d2ff6f32731e10d4a16f307c915e3b680453dd0e9ebd libdrm-libdrm-2.4.124.tar.gz