Package sdl2pp (#3430)

* Fix mpg123 build in macOS and Linux, fix sdl2-mixer find mpg123 libarry

* Add package sdl2pp

* [mpg123] Use Windows logic in Windows Desktop

* [sdl2-mixer] Bump package version

* [sdl2pp] Use patch instead of replacing CMakeLists.txt. Use vcpkg_from_github()

2 files changed, 115 insertions, 42 deletions

diff --git a/ports/mpg123/CONTROL b/ports/mpg123/CONTROL
index 488ca7a90..ca4f01835 100644
--- a/ports/mpg123/CONTROL
+++ b/ports/mpg123/CONTROL
@@ -1,3 +1,3 @@
 Source: mpg123
-Version: 1.25.8-4
-Description: mpg123 is a real time MPEG 1.0/2.0/2.5 audio player/decoder for layers 1, 2 and 3 (MPEG 1.0 layer 3 also known as MP3).
\ No newline at end of file
+Version: 1.25.8-5
+Description: mpg123 is a real time MPEG 1.0/2.0/2.5 audio player/decoder for layers 1, 2 and 3 (MPEG 1.0 layer 3 also known as MP3).
diff --git a/ports/mpg123/portfile.cmake b/ports/mpg123/portfile.cmake
index 891542f00..ff7645390 100644
--- a/ports/mpg123/portfile.cmake
+++ b/ports/mpg123/portfile.cmake
@@ -29,55 +29,128 @@ vcpkg_find_acquire_program(YASM)
 get_filename_component(YASM_EXE_PATH ${YASM} DIRECTORY)
 set(ENV{PATH} "$ENV{PATH};${YASM_EXE_PATH}")
 
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH} 
-    PATCHES
-        "${CURRENT_PORT_DIR}/0001-fix-crt-linking.patch"
-        "${CURRENT_PORT_DIR}/0002-fix-x86-build.patch")
-
-vcpkg_build_msbuild(
-    PROJECT_PATH ${SOURCE_PATH}/ports/MSVC++/2015/win32/libmpg123/libmpg123.vcxproj
-    RELEASE_CONFIGURATION Release_x86${MPG123_CONFIGURATION_SUFFIX}
-    DEBUG_CONFIGURATION Debug_x86${MPG123_CONFIGURATION_SUFFIX}
-)
+if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+    vcpkg_apply_patches(
+        SOURCE_PATH ${SOURCE_PATH}
+        PATCHES
+            "${CURRENT_PORT_DIR}/0001-fix-crt-linking.patch"
+            "${CURRENT_PORT_DIR}/0002-fix-x86-build.patch")
 
-message(STATUS "Installing")
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    file(INSTALL
-        ${SOURCE_PATH}/ports/MSVC++/2015/win32/libmpg123/${MPG123_ARCH}/Debug/libmpg123.dll
-        ${SOURCE_PATH}/ports/MSVC++/2015/win32/libmpg123/${MPG123_ARCH}/Debug/libmpg123.pdb
-        DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin
-    )
-    file(INSTALL
-        ${SOURCE_PATH}/ports/MSVC++/2015/win32/libmpg123/${MPG123_ARCH}/Release/libmpg123.dll
-        ${SOURCE_PATH}/ports/MSVC++/2015/win32/libmpg123/${MPG123_ARCH}/Release/libmpg123.pdb
-        DESTINATION ${CURRENT_PACKAGES_DIR}/bin
+    vcpkg_build_msbuild(
+        PROJECT_PATH ${SOURCE_PATH}/ports/MSVC++/2015/win32/libmpg123/libmpg123.vcxproj
+        RELEASE_CONFIGURATION Release_x86${MPG123_CONFIGURATION_SUFFIX}
+        DEBUG_CONFIGURATION Debug_x86${MPG123_CONFIGURATION_SUFFIX}
     )
-else()
+
+    message(STATUS "Installing")
+    if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+        file(INSTALL
+            ${SOURCE_PATH}/ports/MSVC++/2015/win32/libmpg123/${MPG123_ARCH}/Debug/libmpg123.dll
+            ${SOURCE_PATH}/ports/MSVC++/2015/win32/libmpg123/${MPG123_ARCH}/Debug/libmpg123.pdb
+            DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin
+        )
+        file(INSTALL
+            ${SOURCE_PATH}/ports/MSVC++/2015/win32/libmpg123/${MPG123_ARCH}/Release/libmpg123.dll
+            ${SOURCE_PATH}/ports/MSVC++/2015/win32/libmpg123/${MPG123_ARCH}/Release/libmpg123.pdb
+            DESTINATION ${CURRENT_PACKAGES_DIR}/bin
+        )
+    else()
+        file(INSTALL
+            ${SOURCE_PATH}/ports/MSVC++/2015/win32/libmpg123/${MPG123_ARCH}/Debug_x86/libmpg123.pdb
+            DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
+        )
+        file(INSTALL
+            ${SOURCE_PATH}/ports/MSVC++/2015/win32/libmpg123/${MPG123_ARCH}/Release_x86/libmpg123.pdb
+            DESTINATION ${CURRENT_PACKAGES_DIR}/lib
+        )
+    endif()
+
     file(INSTALL
-        ${SOURCE_PATH}/ports/MSVC++/2015/win32/libmpg123/${MPG123_ARCH}/Debug_x86/libmpg123.pdb
+        ${SOURCE_PATH}/ports/MSVC++/2015/win32/libmpg123/${MPG123_ARCH}/Debug/libmpg123.lib
         DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
     )
     file(INSTALL
-        ${SOURCE_PATH}/ports/MSVC++/2015/win32/libmpg123/${MPG123_ARCH}/Release_x86/libmpg123.pdb
+        ${SOURCE_PATH}/ports/MSVC++/2015/win32/libmpg123/${MPG123_ARCH}/Release/libmpg123.lib
         DESTINATION ${CURRENT_PACKAGES_DIR}/lib
     )
-endif()
+    file(INSTALL
+        ${SOURCE_PATH}/ports/MSVC++/mpg123.h
+        ${SOURCE_PATH}/src/libmpg123/fmt123.h
+        ${SOURCE_PATH}/src/libmpg123/mpg123.h.in
+        DESTINATION ${CURRENT_PACKAGES_DIR}/include
+    )
+elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    file(REMOVE_RECURSE ${SOURCE_PATH}/build/debug)
+    file(REMOVE_RECURSE ${SOURCE_PATH}/build/release)
 
-file(INSTALL
-    ${SOURCE_PATH}/ports/MSVC++/2015/win32/libmpg123/${MPG123_ARCH}/Debug/libmpg123.lib
-    DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
-)
-file(INSTALL
-    ${SOURCE_PATH}/ports/MSVC++/2015/win32/libmpg123/${MPG123_ARCH}/Release/libmpg123.lib
-    DESTINATION ${CURRENT_PACKAGES_DIR}/lib
-)
-file(INSTALL
-    ${SOURCE_PATH}/ports/MSVC++/mpg123.h
-    ${SOURCE_PATH}/src/libmpg123/fmt123.h
-    ${SOURCE_PATH}/src/libmpg123/mpg123.h.in
-    DESTINATION ${CURRENT_PACKAGES_DIR}/include
-)
+    ################
+    # Debug build
+    ################
+    message(STATUS "Configuring ${TARGET_TRIPLET}-dbg")
+    vcpkg_execute_required_process(
+        COMMAND "${SOURCE_PATH}/configure" --prefix=${SOURCE_PATH}/build/debug --enable-debug=yes --enable-static=yes --disable-dependency-tracking --with-default-audio=coreaudio --with-module-suffix=.so
+        WORKING_DIRECTORY ${SOURCE_PATH}
+        LOGNAME config-${TARGET_TRIPLET}-dbg
+    )
+    message(STATUS "Configuring ${TARGET_TRIPLET}-dbg done.")
+
+    message(STATUS "Installing ${TARGET_TRIPLET}-dbg")
+    vcpkg_execute_required_process(
+        COMMAND make -j install
+        WORKING_DIRECTORY ${SOURCE_PATH}
+        LOGNAME build-${TARGET_TRIPLET}-dbg
+    )
+    message(STATUS "Installing ${TARGET_TRIPLET}-dbg done.")
+
+    ################
+    # Release build
+    ################
+    message(STATUS "Configuring ${TARGET_TRIPLET}-rel")
+    vcpkg_execute_required_process(
+        COMMAND make distclean
+        WORKING_DIRECTORY ${SOURCE_PATH}
+        LOGNAME config-${TARGET_TRIPLET}-dbg
+    )
+    vcpkg_execute_required_process(
+        COMMAND "${SOURCE_PATH}/configure" --prefix=${SOURCE_PATH}/build/release --enable-static=yes --disable-dependency-tracking --with-default-audio=coreaudio --with-module-suffix=.so
+        WORKING_DIRECTORY ${SOURCE_PATH}
+        LOGNAME config-${TARGET_TRIPLET}-rel
+    )
+    message(STATUS "Configuring ${TARGET_TRIPLET}-rel done.")
+
+    message(STATUS "Installing ${TARGET_TRIPLET}-rel")
+    vcpkg_execute_required_process(
+        COMMAND make -j install
+        WORKING_DIRECTORY ${SOURCE_PATH}
+        LOGNAME build-${TARGET_TRIPLET}-rel
+    )
+    message(STATUS "Installing ${TARGET_TRIPLET}-rel done.")
+
+    file(
+        INSTALL
+            "${SOURCE_PATH}/build/debug/include/fmt123.h"
+            "${SOURCE_PATH}/build/debug/include/mpg123.h"
+            "${SOURCE_PATH}/build/debug/include/out123.h"
+        DESTINATION
+            ${CURRENT_PACKAGES_DIR}/include
+    )
+
+    file(
+        INSTALL
+            "${SOURCE_PATH}/build/debug/lib/libmpg123.a"
+            "${SOURCE_PATH}/build/debug/lib/libout123.a"
+        DESTINATION
+            ${CURRENT_INSTALLED_DIR}/debug/lib
+    )
+
+    file(
+        INSTALL
+            "${SOURCE_PATH}/build/release/lib/libmpg123.a"
+            "${SOURCE_PATH}/build/release/lib/libout123.a"
+        DESTINATION
+            ${CURRENT_PACKAGES_DIR}/lib
+    )
+endif()
 
 file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/mpg123 RENAME copyright)