From e9239c56bd88e39839fb751414b8e59bec861c93 Mon Sep 17 00:00:00 2001 From: WangWeiLin-MV <156736127+WangWeiLin-MV@users.noreply.github.com> Date: Fri, 27 Dec 2024 09:10:14 +0000 Subject: [PATCH] [sdl2] Fix could not find found library alsa --- ports/sdl2/alsa-dep-fix.patch | 3 +-- ports/sdl2/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/s-/sdl2.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/sdl2/alsa-dep-fix.patch b/ports/sdl2/alsa-dep-fix.patch index 5ee6eefe22f1f5..5b2c77b937d803 100644 --- a/ports/sdl2/alsa-dep-fix.patch +++ b/ports/sdl2/alsa-dep-fix.patch @@ -2,13 +2,12 @@ diff --git a/SDL2Config.cmake.in b/SDL2Config.cmake.in index cc8bcf26d..ead829767 100644 --- a/SDL2Config.cmake.in +++ b/SDL2Config.cmake.in -@@ -35,7 +35,8 @@ include("${CMAKE_CURRENT_LIST_DIR}/sdlfind.cmake") +@@ -35,7 +35,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/sdlfind.cmake") set(SDL_ALSA @SDL_ALSA@) set(SDL_ALSA_SHARED @SDL_ALSA_SHARED@) -if(SDL_ALSA AND NOT SDL_ALSA_SHARED AND TARGET SDL2::SDL2-static) +if(SDL_ALSA) -+ set(CMAKE_REQUIRE_FIND_PACKAGE_ALSA 1) sdlFindALSA() endif() unset(SDL_ALSA) diff --git a/ports/sdl2/vcpkg.json b/ports/sdl2/vcpkg.json index b4e8acd40fec54..5480e802f6f304 100644 --- a/ports/sdl2/vcpkg.json +++ b/ports/sdl2/vcpkg.json @@ -1,6 +1,7 @@ { "name": "sdl2", "version": "2.30.10", + "port-version": 1, "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", diff --git a/versions/baseline.json b/versions/baseline.json index fd13fea6c4b5a1..882d557c82e413 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8234,7 +8234,7 @@ }, "sdl2": { "baseline": "2.30.10", - "port-version": 0 + "port-version": 1 }, "sdl2-gfx": { "baseline": "1.0.4", diff --git a/versions/s-/sdl2.json b/versions/s-/sdl2.json index 14a21d61bdea5c..73cb4e7baf33c3 100644 --- a/versions/s-/sdl2.json +++ b/versions/s-/sdl2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "52c67d447613dba08aff29bd9ee48376cf168f04", + "version": "2.30.10", + "port-version": 1 + }, { "git-tree": "c34f21447296be501bab81979e8d0698264b48c3", "version": "2.30.10",