From cb27210c5e9448b67135089804c3c377a7ce1078 Mon Sep 17 00:00:00 2001
From: Lily Wang <v-lilywang@microsoft.com>
Date: Thu, 16 Dec 2021 01:10:42 -0800
Subject: [PATCH 1/2] [sdl2-mixer] Fix link mpg123 error

---
 ports/sdl2-mixer/CMakeLists.txt | 10 ++++++----
 ports/sdl2-mixer/vcpkg.json     |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ports/sdl2-mixer/CMakeLists.txt b/ports/sdl2-mixer/CMakeLists.txt
index 338509b90c28d5..2ab5e00ad91cc2 100644
--- a/ports/sdl2-mixer/CMakeLists.txt
+++ b/ports/sdl2-mixer/CMakeLists.txt
@@ -12,8 +12,9 @@ set(SDL_MIXER_DEFINES MUSIC_WAV)
 
 # MP3 support
 if(SDL_MIXER_ENABLE_MP3)
-    find_package(mpg123 CONFIG REQUIRED)
-    set(MPG123_LIBRARY MPG123::libmpg123)
+    find_path(MPG123_INCLUDE_DIR mpg123.h)
+    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)
@@ -24,8 +25,9 @@ endif()
 
 # FLAC support
 if(SDL_MIXER_ENABLE_FLAC)
-    find_package(flac CONFIG REQUIRED)
-    set(FLAC_LIBRARY FLAC::FLAC)
+    find_path(FLAC_INCLUDE_DIR FLAC/all.h)
+    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)
diff --git a/ports/sdl2-mixer/vcpkg.json b/ports/sdl2-mixer/vcpkg.json
index bd56698c397fed..a0286dd919b1d8 100644
--- a/ports/sdl2-mixer/vcpkg.json
+++ b/ports/sdl2-mixer/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "sdl2-mixer",
   "version": "2.0.4",
-  "port-version": 15,
+  "port-version": 16,
   "description": "Multi-channel audio mixer library for SDL.",
   "homepage": "https://www.libsdl.org/projects/SDL_mixer",
   "dependencies": [

From a8354db46746b00dc87764944166f9dd3c88cd51 Mon Sep 17 00:00:00 2001
From: Lily Wang <v-lilywang@microsoft.com>
Date: Thu, 16 Dec 2021 01:12:02 -0800
Subject: [PATCH 2/2] update version

---
 versions/baseline.json      | 2 +-
 versions/s-/sdl2-mixer.json | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/versions/baseline.json b/versions/baseline.json
index 05665c938c4017..7d0b1289bac1ab 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6214,7 +6214,7 @@
     },
     "sdl2-mixer": {
       "baseline": "2.0.4",
-      "port-version": 15
+      "port-version": 16
     },
     "sdl2-net": {
       "baseline": "2.0.1",
diff --git a/versions/s-/sdl2-mixer.json b/versions/s-/sdl2-mixer.json
index 425451f5d8747d..dc799edf6ae75a 100644
--- a/versions/s-/sdl2-mixer.json
+++ b/versions/s-/sdl2-mixer.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "23eb6562f5153eb39a84eb2673d5dc9bd2ce78aa",
+      "version": "2.0.4",
+      "port-version": 16
+    },
     {
       "git-tree": "981b981d938287223eb7ebbe365cfbb371ba71ef",
       "version": "2.0.4",