From 43a0e5469b8c4e85b7a3914feb92982441ff031d Mon Sep 17 00:00:00 2001 From: past-due <30942300+past-due@users.noreply.github.com> Date: Sat, 6 Jul 2024 15:08:17 -0400 Subject: [PATCH 1/2] Update vcpkg sdl2 overlay-port to 2.30.5 + emscripten patch --- .ci/vcpkg/overlay-ports/sdl2/portfile.cmake | 10 +++++----- .ci/vcpkg/overlay-ports/sdl2/vcpkg.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.ci/vcpkg/overlay-ports/sdl2/portfile.cmake b/.ci/vcpkg/overlay-ports/sdl2/portfile.cmake index 3a66dff7726..cbd29b876fa 100644 --- a/.ci/vcpkg/overlay-ports/sdl2/portfile.cmake +++ b/.ci/vcpkg/overlay-ports/sdl2/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libsdl-org/SDL REF "release-${VERSION}" - SHA512 fa762df4eb5e57bee272b27dbbeca342e2db60cd2fee74e89e1a2d1f71a07681eeb5dfa68888f6cceb73b551e2b4b8ebcc55c87ed1236dffd59d21207979caf7 + SHA512 1df251333904c8530736a04cd699bcb2b786ad4bcb50e4d67e30cf7e857a46d60aeb48ebea8670f8aecc5632b3cfe635499721ed0cd72f6c8330d5e8ad32aacc HEAD_REF main PATCHES deps.patch @@ -97,7 +97,7 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_UWP AND NOT VCPKG_TARGET_IS_M file(GLOB SHARE_FILES "${CURRENT_PACKAGES_DIR}/share/sdl2/*.cmake") foreach(SHARE_FILE ${SHARE_FILES}) - vcpkg_replace_string("${SHARE_FILE}" "lib/SDL2main" "lib/manual-link/SDL2main") + vcpkg_replace_string("${SHARE_FILE}" "lib/SDL2main" "lib/manual-link/SDL2main" IGNORE_UNCHANGED) endforeach() endif() @@ -111,9 +111,9 @@ string(REGEX REPLACE ${DYLIB_COMPATIBILITY_VERSION_REGEX} "\\1" DYLIB_COMPATIBIL string(REGEX REPLACE ${DYLIB_CURRENT_VERSION_REGEX} "\\1" DYLIB_CURRENT_VERSION "${DYLIB_CURRENT_VERSION}") if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/sdl2.pc" "-lSDL2main" "-lSDL2maind") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/sdl2.pc" "-lSDL2 " "-lSDL2d ") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/sdl2.pc" "-lSDL2-static " "-lSDL2-staticd ") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/sdl2.pc" "-lSDL2main" "-lSDL2maind" IGNORE_UNCHANGED) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/sdl2.pc" "-lSDL2 " "-lSDL2d " IGNORE_UNCHANGED) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/sdl2.pc" "-lSDL2-static " "-lSDL2-staticd " IGNORE_UNCHANGED) endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" AND VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) diff --git a/.ci/vcpkg/overlay-ports/sdl2/vcpkg.json b/.ci/vcpkg/overlay-ports/sdl2/vcpkg.json index ede6f112a45..830ec5925c8 100644 --- a/.ci/vcpkg/overlay-ports/sdl2/vcpkg.json +++ b/.ci/vcpkg/overlay-ports/sdl2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sdl2", - "version": "2.30.4", + "version": "2.30.5", "description": "Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D.", "homepage": "https://www.libsdl.org/download-2.0.php", "license": "Zlib", From 2730676e19e0ffcdeb62a155b69318470947567a Mon Sep 17 00:00:00 2001 From: past-due <30942300+past-due@users.noreply.github.com> Date: Sat, 6 Jul 2024 15:10:15 -0400 Subject: [PATCH 2/2] [Snap] Update SDL to 2.30.5 --- snapcraft.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 219a677c023..5638357e74a 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -59,8 +59,8 @@ apps: parts: sdl: - source: https://github.com/libsdl-org/SDL/releases/download/release-2.30.4/SDL2-2.30.4.tar.gz - source-checksum: sha512/dace0bfcfb9c7452786bee7082c8293199430ed0735e1efd983d73b604ab6bab8b9d2bc84530fa66c2cfa4e5c3ae6b506b2b6cb9a068c25f0f5b3352240d859b + source: https://github.com/libsdl-org/SDL/releases/download/release-2.30.5/SDL2-2.30.5.tar.gz + source-checksum: sha512/a5892d96e4bd97702aacaddebef16c0d731582539ef3eb4cf95494b81fcda2305e93ac0735074d6269833efd106b4ae194b964ef5696476d071e071ba22aadc4 plugin: cmake cmake-parameters: - -DCMAKE_INSTALL_PREFIX=/usr