[sdl2-mixer] Fix link error building with features fluidsynth and libvorbis (#20089)

5 files changed, 34 insertions, 19 deletions

diff --git a/ports/sdl2-mixer/CMakeLists.txt b/ports/sdl2-mixer/CMakeLists.txt
index b350d5bc3..b6d0dbb92 100644
--- a/ports/sdl2-mixer/CMakeLists.txt
+++ b/ports/sdl2-mixer/CMakeLists.txt
@@ -55,6 +55,7 @@ if(SDL_MIXER_ENABLE_OGGVORBIS)
     find_library(VORBISFILE_LIBRARY vorbisfile)
     list(APPEND SDL_MIXER_INCLUDES ${VORBIS_INCLUDE_DIR})
     list(APPEND SDL_MIXER_DEFINES MUSIC_OGG)
+    list(APPEND SDL_MIXER_LIBRARIES ${VORBISFILE_LIBRARY})
     if (SDL_DYNAMIC_LOAD)
         get_filename_component(VORBISFILE_LIBRARY_NAME "${VORBISFILE_LIBRARY}" NAME_WE)
         list(APPEND SDL_MIXER_LOAD_DEFINES -DOGG_DYNAMIC="${VORBISFILE_LIBRARY_NAME}${LIBRARY_SUFFIX}")
@@ -80,6 +81,7 @@ if(SDL_MIXER_ENABLE_FLUIDSYNTH)
     find_library(FLUIDSYNTH_LIBRARY fluidsynth)
     list(APPEND SDL_MIXER_INCLUDES ${FLUIDSYNTH_INCLUDE_DIR})
     list(APPEND SDL_MIXER_DEFINES MUSIC_MID_FLUIDSYNTH)
+    list(APPEND SDL_MIXER_LIBRARIES ${FLUIDSYNTH_LIBRARY})
     if (SDL_DYNAMIC_LOAD)
         get_filename_component(FLUIDSYNTH_LIBRARY_NAME "${FLUIDSYNTH_LIBRARY}" NAME_WE)
         list(APPEND SDL_MIXER_LOAD_DEFINES -DFLUIDSYNTH_DYNAMIC="${FLUIDSYNTH_LIBRARY_NAME}${LIBRARY_SUFFIX}")
diff --git a/ports/sdl2-mixer/portfile.cmake b/ports/sdl2-mixer/portfile.cmake
index 122df61e1..aa89f98e7 100644
--- a/ports/sdl2-mixer/portfile.cmake
+++ b/ports/sdl2-mixer/portfile.cmake
@@ -25,22 +25,22 @@ if ("dynamic-load" IN_LIST FEATURES)
     endif()
 endif()
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    dynamic-load SDL_DYNAMIC_LOAD
-    mpg123 SDL_MIXER_ENABLE_MP3
-    libflac SDL_MIXER_ENABLE_FLAC
-    libmodplug SDL_MIXER_ENABLE_MOD
-    libvorbis SDL_MIXER_ENABLE_OGGVORBIS
-    opusfile SDL_MIXER_ENABLE_OPUS
-    nativemidi SDL_MIXER_ENABLE_NATIVEMIDI
-    fluidsynth SDL_MIXER_ENABLE_FLUIDSYNTH
+    FEATURES
+        dynamic-load SDL_DYNAMIC_LOAD
+        mpg123 SDL_MIXER_ENABLE_MP3
+        libflac SDL_MIXER_ENABLE_FLAC
+        libmodplug SDL_MIXER_ENABLE_MOD
+        libvorbis SDL_MIXER_ENABLE_OGGVORBIS
+        opusfile SDL_MIXER_ENABLE_OPUS
+        nativemidi SDL_MIXER_ENABLE_NATIVEMIDI
+        fluidsynth SDL_MIXER_ENABLE_FLUIDSYNTH
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         ${FEATURE_OPTIONS}
         -DLIBRARY_SUFFIX=${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX} # It should always be dynamic suffix
@@ -48,10 +48,10 @@ vcpkg_configure_cmake(
         -DSDL_MIXER_SKIP_HEADERS=ON
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 vcpkg_copy_pdbs()
-vcpkg_fixup_cmake_targets()
+vcpkg_cmake_config_fixup()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
-file(INSTALL ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/COPYING.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
\ No newline at end of file
diff --git a/ports/sdl2-mixer/vcpkg.json b/ports/sdl2-mixer/vcpkg.json
index 4ea851c9e..02013acf1 100644
--- a/ports/sdl2-mixer/vcpkg.json
+++ b/ports/sdl2-mixer/vcpkg.json
@@ -1,11 +1,19 @@
 {
   "name": "sdl2-mixer",
   "version": "2.0.4",
-  "port-version": 12,
+  "port-version": 13,
   "description": "Multi-channel audio mixer library for SDL.",
   "homepage": "https://www.libsdl.org/projects/SDL_mixer",
   "dependencies": [
-    "sdl2"
+    "sdl2",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
   ],
   "default-features": [
     "nativemidi"
diff --git a/versions/baseline.json b/versions/baseline.json
index e519cf727..16508a0ac 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5870,7 +5870,7 @@
     },
     "sdl2-mixer": {
       "baseline": "2.0.4",
-      "port-version": 12
+      "port-version": 13
     },
     "sdl2-net": {
       "baseline": "2.0.1",
diff --git a/versions/s-/sdl2-mixer.json b/versions/s-/sdl2-mixer.json
index 2828ed5b1..61bf61154 100644
--- a/versions/s-/sdl2-mixer.json
+++ b/versions/s-/sdl2-mixer.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "6338ed4f079dda0759ac18a4dcc5f04448e56cc3",
+      "version": "2.0.4",
+      "port-version": 13
+    },
+    {
       "git-tree": "fe2777f2acc7962d9d08092e4778221468e212cd",
       "version": "2.0.4",
       "port-version": 12