From 48b883fb2bc9f0800a292e2c8f93f0ebe5c08d9a Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Mon, 16 Oct 2023 19:48:03 +0200 Subject: [PATCH] [sdl2] Add feature alsa (#34311) --- ports/sdl2/portfile.cmake | 12 ++++++++---- ports/sdl2/vcpkg.json | 10 ++++++++++ versions/baseline.json | 2 +- versions/s-/sdl2.json | 5 +++++ 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/ports/sdl2/portfile.cmake b/ports/sdl2/portfile.cmake index 85de3d93e6..e9c6837b05 100644 --- a/ports/sdl2/portfile.cmake +++ b/ports/sdl2/portfile.cmake @@ -15,11 +15,15 @@ string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" FORCE_STATIC_VCRT) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - vulkan SDL_VULKAN - x11 SDL_X11 - wayland SDL_WAYLAND - samplerate SDL_LIBSAMPLERATE + alsa SDL_ALSA + alsa CMAKE_REQUIRE_FIND_PACKAGE_ALSA ibus SDL_IBUS + samplerate SDL_LIBSAMPLERATE + vulkan SDL_VULKAN + wayland SDL_WAYLAND + x11 SDL_X11 + INVERTED_FEATURES + alsa CMAKE_DISABLE_FIND_PACKAGE_ALSA ) if ("x11" IN_LIST FEATURES) diff --git a/ports/sdl2/vcpkg.json b/ports/sdl2/vcpkg.json index 870805a023..4f67f6ea0b 100644 --- a/ports/sdl2/vcpkg.json +++ b/ports/sdl2/vcpkg.json @@ -1,6 +1,7 @@ { "name": "sdl2", "version": "2.28.4", + "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", @@ -22,6 +23,15 @@ "base" ], "features": { + "alsa": { + "description": "Support for alsa audio", + "dependencies": [ + { + "name": "alsa", + "platform": "linux" + } + ] + }, "base": { "description": "Base functionality for SDL", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 4d0d4ded85..9ef366b78e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7578,7 +7578,7 @@ }, "sdl2": { "baseline": "2.28.4", - "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 5de84c2f71..88e296f3c0 100644 --- a/versions/s-/sdl2.json +++ b/versions/s-/sdl2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3d625914314454b36d303ce86753840f6193f2bd", + "version": "2.28.4", + "port-version": 1 + }, { "git-tree": "289db88c23499b30e20bf972b2e1e68c093e5dea", "version": "2.28.4",