[sdl2-mixer] Fix features link error (#16737)

* [sdl2-mixer] Fix features link error

* Update versions

5 files changed, 61 insertions, 34 deletions

diff --git a/ports/sdl2-mixer/CMakeLists.txt b/ports/sdl2-mixer/CMakeLists.txt
index f7e8a8590..6b422142c 100644
--- a/ports/sdl2-mixer/CMakeLists.txt
+++ b/ports/sdl2-mixer/CMakeLists.txt
@@ -16,6 +16,7 @@ if(SDL_MIXER_ENABLE_MP3)
     find_library(MPG123_LIBRARY NAMES libmpg123 mpg123)
     list(APPEND SDL_MIXER_INCLUDES ${MPG123_INCLUDE_DIR})
     list(APPEND SDL_MIXER_DEFINES MUSIC_MP3_MPG123)
+    list(APPEND SDL_MIXER_LIBRARIES ${MPG123_LIBRARY})
     if (SDL_DYNAMIC_LOAD)
         get_filename_component(MPG123_LIBRARY_NAME "${MPG123_LIBRARY}" NAME_WE)
         list(APPEND SDL_MIXER_LOAD_DEFINES -DMPG123_DYNAMIC="${MPG123_LIBRARY_NAME}${LIBRARY_SUFFIX}")
@@ -28,6 +29,7 @@ if(SDL_MIXER_ENABLE_FLAC)
     find_library(FLAC_LIBRARY FLAC)
     list(APPEND SDL_MIXER_INCLUDES ${FLAC_INCLUDE_DIR})
     list(APPEND SDL_MIXER_DEFINES MUSIC_FLAC)
+    list(APPEND SDL_MIXER_LIBRARIES ${FLAC_LIBRARY})
     if (SDL_DYNAMIC_LOAD)
         get_filename_component(FLAC_LIBRARY_NAME "${FLAC_LIBRARY}" NAME_WE)
         list(APPEND SDL_MIXER_LOAD_DEFINES -DFLAC_DYNAMIC="${FLAC_LIBRARY_NAME}${LIBRARY_SUFFIX}")
@@ -40,6 +42,7 @@ if(SDL_MIXER_ENABLE_MOD)
     find_library(MODPLUG_LIBRARY modplug)
     list(APPEND SDL_MIXER_INCLUDES ${MODPLUG_INCLUDE_DIR})
     list(APPEND SDL_MIXER_DEFINES MUSIC_MOD_MODPLUG)
+    list(APPEND SDL_MIXER_LIBRARIES ${MODPLUG_LIBRARY})
     if (SDL_DYNAMIC_LOAD)
         get_filename_component(MODPLUG_LIBRARY_NAME "${MODPLUG_LIBRARY}" NAME_WE)
         list(APPEND SDL_MIXER_LOAD_DEFINES -DMODPLUG_DYNAMIC="${MODPLUG_LIBRARY_NAME}${LIBRARY_SUFFIX}")
@@ -64,6 +67,7 @@ if(SDL_MIXER_ENABLE_OPUS)
     find_library(OPUSFILE_LIBRARY opusfile)
     list(APPEND SDL_MIXER_INCLUDES ${OPUS_INCLUDE_DIR})
     list(APPEND SDL_MIXER_DEFINES MUSIC_OPUS)
+    list(APPEND SDL_MIXER_LIBRARIES ${OPUSFILE_LIBRARY})
     if (SDL_DYNAMIC_LOAD)
         get_filename_component(OPUSFILE_LIBRARY_NAME "${OPUSFILE_LIBRARY}" NAME_WE)
         list(APPEND SDL_MIXER_LOAD_DEFINES -DOPUS_DYNAMIC="${OPUSFILE_LIBRARY_NAME}${LIBRARY_SUFFIX}")
diff --git a/ports/sdl2-mixer/CONTROL b/ports/sdl2-mixer/CONTROL
deleted file mode 100644
index ef18e139d..000000000
--- a/ports/sdl2-mixer/CONTROL
+++ /dev/null
@@ -1,33 +0,0 @@
-Source: sdl2-mixer
-Version: 2.0.4
-Port-Version: 10
-Homepage: https://www.libsdl.org/projects/SDL_mixer
-Description: Multi-channel audio mixer library for SDL.
-Build-Depends: sdl2
-Default-Features: nativemidi
-
-Feature: dynamic-load
-Description: Load plugins with dynamic call
-
-Feature: nativemidi
-Description: Support for MIDI audio format on Windows and macOS.
-
-Feature: libflac
-Description: Support for FLAC audio format.
-Build-Depends: libflac
-
-Feature: mpg123
-Description: Support for MP3 audio format.
-Build-Depends: mpg123
-
-Feature: libmodplug
-Description: Support for MOD audio format.
-Build-Depends: libmodplug
-
-Feature: libvorbis
-Description: Support for OGG Vorbis audio format.
-Build-Depends: libvorbis
-
-Feature: opusfile
-Description: Support for Opus audio format.
-Build-Depends: opusfile
diff --git a/ports/sdl2-mixer/vcpkg.json b/ports/sdl2-mixer/vcpkg.json
new file mode 100644
index 000000000..acd9b060e
--- /dev/null
+++ b/ports/sdl2-mixer/vcpkg.json
@@ -0,0 +1,51 @@
+{
+  "name": "sdl2-mixer",
+  "version": "2.0.4",
+  "port-version": 11,
+  "description": "Multi-channel audio mixer library for SDL.",
+  "homepage": "https://www.libsdl.org/projects/SDL_mixer",
+  "dependencies": [
+    "sdl2"
+  ],
+  "default-features": [
+    "nativemidi"
+  ],
+  "features": {
+    "dynamic-load": {
+      "description": "Load plugins with dynamic call."
+    },
+    "libflac": {
+      "description": "Support for FLAC audio format.",
+      "dependencies": [
+        "libflac"
+      ]
+    },
+    "libmodplug": {
+      "description": "Support for MOD audio format.",
+      "dependencies": [
+        "libmodplug"
+      ]
+    },
+    "libvorbis": {
+      "description": "Support for OGG Vorbis audio format.",
+      "dependencies": [
+        "libvorbis"
+      ]
+    },
+    "mpg123": {
+      "description": "Support for MP3 audio format.",
+      "dependencies": [
+        "mpg123"
+      ]
+    },
+    "nativemidi": {
+      "description": "Support for MIDI audio format on Windows and macOS."
+    },
+    "opusfile": {
+      "description": "Support for Opus audio format.",
+      "dependencies": [
+        "opusfile"
+      ]
+    }
+  }
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index f6a17b41b..bbf5cd5df 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5334,7 +5334,7 @@
     },
     "sdl2-mixer": {
       "baseline": "2.0.4",
-      "port-version": 10
+      "port-version": 11
     },
     "sdl2-net": {
       "baseline": "2.0.1-8",
diff --git a/versions/s-/sdl2-mixer.json b/versions/s-/sdl2-mixer.json
index 272aa9f6a..b563ccff5 100644
--- a/versions/s-/sdl2-mixer.json
+++ b/versions/s-/sdl2-mixer.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "1ccb56f06529841debee949a42b71f5ce4ad1f16",
+      "version": "2.0.4",
+      "port-version": 11
+    },
+    {
       "git-tree": "86c94f099112b8e743eaf9b34d7ae88d884335d7",
       "version-string": "2.0.4",
       "port-version": 10