From b28ee3ccd6416d0560cc5c0600dde8459b9aa708 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Thu, 8 Feb 2024 22:46:35 -0800 Subject: [PATCH] [sdl2-mixer] Fix feature libmodplug build failure (#36664) * [sdl2-mixer] Fix feature libmodplug build failure * update version --------- Co-authored-by: Lily Wang --- ports/sdl2-mixer/portfile.cmake | 3 +++ ports/sdl2-mixer/vcpkg.json | 4 +++- versions/baseline.json | 2 +- versions/s-/sdl2-mixer.json | 5 +++++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ports/sdl2-mixer/portfile.cmake b/ports/sdl2-mixer/portfile.cmake index deafae8978..f0ca49a2db 100644 --- a/ports/sdl2-mixer/portfile.cmake +++ b/ports/sdl2-mixer/portfile.cmake @@ -28,6 +28,8 @@ if("fluidsynth" IN_LIST FEATURES) list(APPEND EXTRA_OPTIONS "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}") endif() +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS @@ -43,6 +45,7 @@ vcpkg_cmake_configure( -DSDL2MIXER_MIDI_NATIVE=OFF -DSDL2MIXER_MIDI_TIMIDITY=OFF -DSDL2MIXER_MP3_DRMP3=OFF + -DSDL2MIXER_MOD_XMP_SHARED=${BUILD_SHARED} ) vcpkg_cmake_install() diff --git a/ports/sdl2-mixer/vcpkg.json b/ports/sdl2-mixer/vcpkg.json index 6106c20db3..76bb310bf6 100644 --- a/ports/sdl2-mixer/vcpkg.json +++ b/ports/sdl2-mixer/vcpkg.json @@ -1,6 +1,7 @@ { "name": "sdl2-mixer", "version": "2.8.0", + "port-version": 1, "description": "Multi-channel audio mixer library for SDL.", "homepage": "https://github.com/libsdl-org/SDL_mixer", "license": "Zlib", @@ -36,7 +37,8 @@ "libmodplug": { "description": "Use libmodplug to play MOD audio format.", "dependencies": [ - "libmodplug" + "libmodplug", + "libxmp" ] }, "mpg123": { diff --git a/versions/baseline.json b/versions/baseline.json index b05df15af1..c480e377b7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7834,7 +7834,7 @@ }, "sdl2-mixer": { "baseline": "2.8.0", - "port-version": 0 + "port-version": 1 }, "sdl2-mixer-ext": { "baseline": "2.6.0", diff --git a/versions/s-/sdl2-mixer.json b/versions/s-/sdl2-mixer.json index 87dc92745b..ee49538cc3 100644 --- a/versions/s-/sdl2-mixer.json +++ b/versions/s-/sdl2-mixer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b28cae64adf73bec946de9f037724763eb2ef1b2", + "version": "2.8.0", + "port-version": 1 + }, { "git-tree": "21406093a22cbd3a55befe2ff61f81011d055036", "version": "2.8.0",