@openziti/ziti-sdk-nodejs 0.15.0 → 0.17.0

package/vcpkg/ports/saucer/fix_findpkg.patch

@@ -0,0 +1,100 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d5eccb6..5f9ab71 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -131,51 +131,16 @@ endif()
+ include("cmake/cpm.cmake")
+ include("cmake/nuget.cmake")
+ 
+-CPMFindPackage(
+-  NAME           lockpp
+-  VERSION        2.6
+-  GIT_REPOSITORY "https://github.com/Soundux/lockpp"
+-)
+-
+-CPMFindPackage(
+-  NAME           boost_callable_traits
+-  GIT_TAG        boost-1.83.0
+-  GIT_REPOSITORY "https://github.com/boostorg/callable_traits"
+-)
+-
+-CPMFindPackage(
+-  NAME           tl-expected
+-  VERSION        1.1.0
+-  GIT_REPOSITORY "https://github.com/TartanLlama/expected"
+-  OPTIONS        "EXPECTED_BUILD_TESTS OFF"
+-)
+-
+-CPMFindPackage(
+-  NAME           ereignis
+-  VERSION        2.3
+-  GIT_REPOSITORY "https://github.com/Soundux/ereignis"
+-)
+-
+-CPMFindPackage(
+-  NAME           fmt
+-  GIT_TAG        10.1.1
+-  GIT_REPOSITORY "https://github.com/fmtlib/fmt"
+-)
+-
+-CPMFindPackage(
+-  NAME           glaze
+-  VERSION        1.5.4
+-  GIT_REPOSITORY "https://github.com/stephenberry/glaze"
+-)
+-
+-CPMFindPackage(
+-  NAME           flagpp
+-  VERSION        2.1
+-  GIT_REPOSITORY "https://github.com/Curve/flagpp"
+-)
++find_path(LOCKPP_INCLUDE_DIRS "lockpp")
++find_path(BOOST_CALLTRA_INCLUDE_DIRS "boost/callable_traits")
++find_package(tl-expected CONFIG REQUIRED)
++find_path(EREIGNIS_INCLUDE_DIRS "ereignis")
++find_package(fmt CONFIG REQUIRED)
++find_package(glaze CONFIG REQUIRED)
++find_path(FLAGPP_INCLUDE_DIRS "flagpp")
+ 
+-target_link_libraries(${PROJECT_NAME} PRIVATE cr::flagpp)
+-target_link_libraries(${PROJECT_NAME} PUBLIC  lockpp boost_callable_traits tl::expected glaze::glaze ereignis fmt)
++target_include_directories(${PROJECT_NAME} PRIVATE ${EREIGNIS_INCLUDE_DIRS} ${LOCKPP_INCLUDE_DIRS} ${BOOST_CALLTRA_INCLUDE_DIRS} ${FLAGPP_INCLUDE_DIRS})
++target_link_libraries(${PROJECT_NAME} PRIVATE glaze::glaze fmt::fmt tl::expected)
+ 
+ # --------------------------------------------------------------------------------------------------------
+ # Setup Linkage
+@@ -218,7 +183,7 @@ if (saucer_backend STREQUAL "WebView2")
+   target_compile_definitions(${PROJECT_NAME} PRIVATE UNICODE=1 _UNICODE=1 NOMINMAX=1)
+ 
+   include("cmake/webview2.cmake")
+-  target_link_libraries(${PROJECT_NAME} ${saucer_linkage} Shlwapi webview2::webview2)
++  target_link_libraries(${PROJECT_NAME} ${saucer_linkage} Shlwapi unofficial::webview2::webview2)
+ endif()
+ 
+ # --------------------------------------------------------------------------------------------------------
+@@ -258,6 +223,4 @@ if (saucer_prefer_remote AND saucer_backend STREQUAL "WebView2")
+ endif()
+ 
+ install(DIRECTORY "include/saucer" TYPE INCLUDE)
+-install(DIRECTORY "$<TARGET_PROPERTY:fmt,INTERFACE_INCLUDE_DIRECTORIES>/fmt" TYPE INCLUDE)
+-install(DIRECTORY "$<TARGET_PROPERTY:glaze_glaze,INTERFACE_INCLUDE_DIRECTORIES>/glaze" TYPE INCLUDE)
+-install(DIRECTORY "$<TARGET_PROPERTY:boost_callable_traits,INTERFACE_INCLUDE_DIRECTORIES>/boost" TYPE INCLUDE)
++install(DIRECTORY "${BOOST_CALLTRA_INCLUDE_DIRS}/boost/callable_traits" DESTINATION "include/boost/callable_traits")
+diff --git a/cmake/webview2.cmake b/cmake/webview2.cmake
+index 9ee3dbc..3827e94 100644
+--- a/cmake/webview2.cmake
++++ b/cmake/webview2.cmake
+@@ -1,11 +1,11 @@
+ include("cmake/nuget.cmake")
+ 
+ if (NOT saucer_prefer_remote)
+-    find_package(webview2 CONFIG REQUIRED)
++    find_package(unofficial-webview2 CONFIG REQUIRED)
+     return()
+ endif()
+ 
+-if (NOT TARGET webview2::webview2)
++if (NOT TARGET unofficial::webview2::webview2)
+     nuget_add(WebView2 "Microsoft.Web.WebView2" ${saucer_webview2_version})
+ 
+     add_library(webview2 STATIC IMPORTED)

package/vcpkg/ports/saucer/portfile.cmake

@@ -3,29 +3,24 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO saucer/saucer
-    REF 6ae482092cca4d4a408e6bdf24714153d9203797
-    SHA512 1865f6178b2885483f0b43c1641e602f957d4e64e77b802e64a64038b709dbf63fa2dd6037720e7180434e91341f2e1a0eb86424c1ee1556db5971cba3434bb0
+    REF "v${VERSION}"
+    SHA512 29abb465a888aa4284795e293624598c09e0ba690bb430adb7a2122d82985daa1cfcfd594120f5657fc70349f8480e63554d72bff1b23f9dca86bcdbb930d953
     HEAD_REF dev
     PATCHES
-        unofficial-webview2.patch
-        fix-source-generation.patch
+        fix_findpkg.patch
 )
 
-if(VCPKG_TARGET_IS_WINDOWS)
-    set(BACKEND_OPTION "-Dsaucer_backend=WebView2")
-else()
-    set(BACKEND_OPTION "-Dsaucer_backend=Qt6")
-endif()
-
 vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH} 
     OPTIONS
         ${BACKEND_OPTION}
         -Dsaucer_prefer_remote=OFF
         -Dsaucer_remote_webview2=OFF
+    MAYBE_UNUSED_VARIABLES
+        saucer_remote_webview2
 )
 
 vcpkg_cmake_install()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

package/vcpkg/ports/saucer/vcpkg.json

@@ -1,14 +1,16 @@
 {
   "name": "saucer",
-  "version": "1.0.1",
-  "port-version": 3,
+  "version": "2.1.0",
   "description": "Next-gen desktop apps with web-frontend in C++",
   "homepage": "https://saucer.github.io/",
   "license": "MIT",
   "supports": "!uwp",
   "dependencies": [
+    "boost-callable-traits",
     "ereignis",
+    "flagpp",
     "fmt",
+    "glaze",
     "lockpp",
     "nlohmann-json",
     {
@@ -27,10 +29,6 @@
     {
       "name": "webview2",
       "platform": "windows"
-    },
-    {
-      "name": "wil",
-      "platform": "windows"
     }
   ]
 }

package/vcpkg/ports/sciter-js/portfile.cmake

@@ -6,8 +6,8 @@ endif()
 
 set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled)
 
-set(SCITER_REVISION c039754b11eb3b3b39024ba3257a28a63d581c7e)
-set(SCITER_SHA 77314cb55a01ceca39f00382e78ba65507d439b9302e97dae6f5bf10d7bc308df64d440dc97c9f90c06176121710102a75767d706972700f5b4f968e9740dc96)
+set(SCITER_REVISION 6f18e8725a8d14b8ba44b2c0d00ca126f119ed21)
+set(SCITER_SHA 93fdc1046b325ba7bf705665cb09f9adab3c198d4e8cb40febd4ccffe48077760907440c8eb7d7d44e1f619184bc070835c5c3d5aada363eb70528b8259aa74f)
 
 if(VCPKG_TARGET_ARCHITECTURE STREQUAL x64)
     set(SCITER_ARCH x64)

package/vcpkg/ports/sciter-js/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "sciter-js",
-  "version": "5.0.2.17",
+  "version": "5.0.3.0",
   "description": "Sciter.JS - Sciter but with QuickJS on board instead of TIScript. Sciter is an embeddable HTML/CSS/scripting engine.",
   "homepage": "https://gitlab.com/sciter-engine/sciter-js-sdk",
   "supports": "!uwp & !arm & !static",

package/vcpkg/ports/sdbus-cpp/portfile.cmake

@@ -22,7 +22,7 @@ vcpkg_cmake_configure(
 )
 
 vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/sdbus-c++)
+vcpkg_cmake_config_fixup(PACKAGE_NAME sdbus-c++ CONFIG_PATH lib/cmake/sdbus-c++)
 vcpkg_fixup_pkgconfig()
 file(REMOVE_RECURSE
     "${CURRENT_PACKAGES_DIR}/debug/include"

package/vcpkg/ports/sdbus-cpp/vcpkg.json

@@ -1,6 +1,7 @@
 {
   "name": "sdbus-cpp",
   "version": "1.3.0",
+  "port-version": 1,
   "description": "High-level C++ D-Bus library for Linux designed to provide easy-to-use yet powerful API in modern C++",
   "homepage": "https://github.com/Kistler-Group/sdbus-cpp",
   "license": "LGPL-2.1",

package/vcpkg/ports/sdl2/portfile.cmake

@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libsdl-org/SDL
     REF "release-${VERSION}"
-    SHA512 3199e535033c8728bd12b97931d5c5d7a7dcc9b0f502109ff722982601b6fbb00995d71cbaab7d3b780c738deece235ef76ab1963ce946084c482c2d31a4abe8
+    SHA512 d3cf7d356b79184dd211c9fbbfcb2a83d1acb68ee549ab82be109cd899039f18f0dbf3aedbf0800793c3a68580688014863b5d9bf79bcd366ff0e88252955e3c
     HEAD_REF main
     PATCHES
         deps.patch

package/vcpkg/ports/sdl2/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "sdl2",
-  "version": "2.28.4",
+  "version": "2.28.5",
   "port-version": 1,
   "description": "Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D.",
   "homepage": "https://www.libsdl.org/download-2.0.php",
@@ -8,6 +8,7 @@
   "dependencies": [
     {
       "name": "dbus",
+      "default-features": false,
       "platform": "linux"
     },
     {
@@ -20,7 +21,18 @@
     }
   ],
   "default-features": [
-    "base"
+    {
+      "name": "ibus",
+      "platform": "linux"
+    },
+    {
+      "name": "wayland",
+      "platform": "linux"
+    },
+    {
+      "name": "x11",
+      "platform": "linux"
+    }
   ],
   "features": {
     "alsa": {
@@ -32,21 +44,6 @@
         }
       ]
     },
-    "base": {
-      "description": "Base functionality for SDL",
-      "dependencies": [
-        {
-          "name": "sdl2",
-          "default-features": false,
-          "features": [
-            "ibus",
-            "wayland",
-            "x11"
-          ],
-          "platform": "linux"
-        }
-      ]
-    },
     "ibus": {
       "description": "Build with ibus IME support",
       "supports": "linux"

package/vcpkg/ports/sdl2-gfx/vcpkg.json

@@ -1,10 +1,13 @@
 {
   "name": "sdl2-gfx",
   "version": "1.0.4",
-  "port-version": 10,
+  "port-version": 11,
   "description": "Graphics primitives (line, circle, rectangle etc.) with AA support, rotozoomer and other drawing related support functions wrapped up in a C based add-on library for the Simple Direct Media (SDL) cross-platform API layer.",
   "dependencies": [
-    "sdl2",
+    {
+      "name": "sdl2",
+      "default-features": false
+    },
     {
       "name": "vcpkg-cmake",
       "host": true

package/vcpkg/ports/sdl2-image/vcpkg.json

@@ -1,12 +1,16 @@
 {
   "name": "sdl2-image",
   "version": "2.6.3",
+  "port-version": 1,
   "description": "SDL_image is an image file loading library. It loads images as SDL surfaces and textures, and supports the following formats: BMP, GIF, JPEG, LBM, PCX, PNG, PNM, TGA, TIFF, WEBP, XCF, XPM, XV",
   "homepage": "https://github.com/libsdl-org/SDL_image",
   "license": "Zlib",
   "dependencies": [
     "libpng",
-    "sdl2",
+    {
+      "name": "sdl2",
+      "default-features": false
+    },
     {
       "name": "vcpkg-cmake",
       "host": true

package/vcpkg/ports/sdl2-mixer/vcpkg.json

@@ -1,13 +1,16 @@
 {
   "name": "sdl2-mixer",
   "version": "2.6.3",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Multi-channel audio mixer library for SDL.",
   "homepage": "https://github.com/libsdl-org/SDL_mixer",
   "license": "Zlib",
   "dependencies": [
     "libvorbis",
-    "sdl2",
+    {
+      "name": "sdl2",
+      "default-features": false
+    },
     {
       "name": "vcpkg-cmake",
       "host": true

package/vcpkg/ports/sdl2-mixer-ext/fix-dependencies.patch

@@ -1,5 +1,68 @@
+diff --git a/SDL2_mixer_extConfig.cmake.in b/SDL2_mixer_extConfig.cmake.in
+index 997d4e828150d10fa4113b3341220ca185fc29a5..2d781528151075385a2e837df3863900b8d36573 100644
+--- a/SDL2_mixer_extConfig.cmake.in
++++ b/SDL2_mixer_extConfig.cmake.in
+@@ -6,10 +6,58 @@ set_package_properties(SDL2_mixer_ext PROPERTIES
+ 
+ @PACKAGE_INIT@
+ 
++set(SDL_MIXER_X_USE_OGG_VORBIS              @USE_OGG_VORBIS@)
++set(SDL_MIXER_X_USE_OPUS                    @USE_OPUS@)
++set(SDL_MIXER_X_USE_USE_FLAC                @USE_FLAC@)
++set(SDL_MIXER_X_USE_USE_WAVPACK             @USE_WAVPACK@)
++set(SDL_MIXER_X_USE_MP3_MPG123              @USE_MP3_MPG123@)
++set(SDL_MIXER_X_USE_XMP                     @USE_XMP@)
++set(SDL_MIXER_X_USE_MIDI_ADLMIDI            @USE_MIDI_ADLMIDI@)
++set(SDL_MIXER_X_USE_MIDI_OPNMIDI            @USE_MIDI_OPNMIDI@)
++set(SDL_MIXER_X_USE_MIDI_FLUIDSYNTH         @USE_MIDI_FLUIDSYNTH@)
++
+ if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/SDL2_mixer_ext-shared-targets.cmake")
+     include("${CMAKE_CURRENT_LIST_DIR}/SDL2_mixer_ext-shared-targets.cmake")
+ endif()
+ 
+ if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/SDL2_mixer_ext-static-targets.cmake")
++    include(CMakeFindDependencyMacro)
++
++    if(SDL_MIXER_X_USE_OGG_VORBIS AND NOT TARGET Vorbis::vorbisfile)
++        find_dependency(Vorbis CONFIG)
++    endif()
++
++    if(SDL_MIXER_X_USE_OPUS AND NOT TARGET OpusFile::opusfile)
++        find_dependency(OpusFile CONFIG)
++    endif()
++
++    if(SDL_MIXER_X_USE_USE_FLAC AND NOT TARGET FLAC::FLAC)
++        find_dependency(FLAC CONFIG)
++    endif()
++
++    if(SDL_MIXER_X_USE_USE_WAVPACK AND NOT TARGET WavPack::WavPack)
++        find_dependency(WavPack CONFIG)
++    endif()
++
++    if(SDL_MIXER_X_USE_MP3_MPG123 AND NOT TARGET MPG123::libmpg123)
++        find_dependency(MPG123 CONFIG)
++    endif()
++
++    if(SDL_MIXER_X_USE_XMP AND NOT TARGET libxmp::xmp_static)
++        find_dependency(libxmp CONFIG)
++    endif()
++
++    if(SDL_MIXER_X_USE_MIDI_ADLMIDI AND NOT TARGET libADLMIDI::ADLMIDI_static)
++        find_dependency(libADLMIDI CONFIG)
++    endif()
++
++    if(SDL_MIXER_X_USE_MIDI_OPNMIDI AND NOT TARGET libOPNMIDI::OPNMIDI_static)
++        find_dependency(libOPNMIDI CONFIG)
++    endif()
++
++    if(SDL_MIXER_X_USE_MIDI_FLUIDSYNTH AND NOT TARGET FluidSynth::libfluidsynth)
++        find_dependency(FluidSynth CONFIG)
++    endif()
++
+     include("${CMAKE_CURRENT_LIST_DIR}/SDL2_mixer_ext-static-targets.cmake")
+ endif()
 diff --git a/src/codecs/music_ffmpeg.cmake b/src/codecs/music_ffmpeg.cmake
-index c4f69f9dfba4cf77d6f7ba513ff0a6bdb7a7fb71..a6a6bb8cd382ee0cb3d5eb05ed97d2ac430ca50d 100644
+index 285d54df037a1bb126f3c680102ca08d27e83d6e..d2305f39b7c5bfeba6b9fc566764320354833765 100644
 --- a/src/codecs/music_ffmpeg.cmake
 +++ b/src/codecs/music_ffmpeg.cmake
 @@ -3,7 +3,7 @@ if(USE_FFMPEG AND MIXERX_LGPL)
@@ -9,11 +72,11 @@ index c4f69f9dfba4cf77d6f7ba513ff0a6bdb7a7fb71..a6a6bb8cd382ee0cb3d5eb05ed97d2ac
 -        find_package(FFMPEG QUIET)
 +        find_package(FFMPEG REQUIRED)
          message("FFMPEG: [${FFMPEG_avcodec_FOUND}] ${FFMPEG_INCLUDE_DIRS} ${FFMPEG_swresample_LIBRARY} ${FFMPEG_avformat_LIBRARY} ${FFMPEG_avcodec_LIBRARY} ${FFMPEG_avutil_LIBRARY}")
+ 
          if(USE_FFMPEG_DYNAMIC)
-             list(APPEND SDL_MIXER_DEFINITIONS
-@@ -16,10 +16,7 @@ if(USE_FFMPEG AND MIXERX_LGPL)
-             message("Dynamic FFMPEG: ${FFMPEG_avutil_DYNAMIC_LIBRARY} ${FFMPEG_avcodec_DYNAMIC_LIBRARY} ${FFMPEG_avformat_DYNAMIC_LIBRARY} ${FFMPEG_swresample_DYNAMIC_LIBRARY}")
+@@ -18,10 +18,7 @@ if(USE_FFMPEG AND MIXERX_LGPL)
          endif()
+ 
          set(FFMPEG_LINK_LIBRARIES
 -            ${FFMPEG_swresample_LIBRARY}
 -            ${FFMPEG_avformat_LIBRARY}
@@ -23,7 +86,7 @@ index c4f69f9dfba4cf77d6f7ba513ff0a6bdb7a7fb71..a6a6bb8cd382ee0cb3d5eb05ed97d2ac
          )
      else()
          message(WARNING "FFMPEG libraries are not a part of AudioCodecs yet. Using any available from the system.")
-@@ -41,7 +38,7 @@ if(USE_FFMPEG AND MIXERX_LGPL)
+@@ -43,7 +40,7 @@ if(USE_FFMPEG AND MIXERX_LGPL)
          set(FFMPEG_swresample_FOUND 1)
      endif()
  
@@ -33,7 +96,7 @@ index c4f69f9dfba4cf77d6f7ba513ff0a6bdb7a7fb71..a6a6bb8cd382ee0cb3d5eb05ed97d2ac
      endif()
  
 diff --git a/src/codecs/music_flac.cmake b/src/codecs/music_flac.cmake
-index 8fb69ed54894dc2657e6da326015a606f567eb9d..9caf2b1a817258b957416f20aa57a5cd21f06c3c 100644
+index 1a39a4984c6bb36c8a09978540ebdd3b8031d7ef..6726655de7ef622fbb872660cfc0a3d49b00a058 100644
 --- a/src/codecs/music_flac.cmake
 +++ b/src/codecs/music_flac.cmake
 @@ -3,7 +3,10 @@ if(USE_FLAC)
@@ -49,7 +112,7 @@ index 8fb69ed54894dc2657e6da326015a606f567eb9d..9caf2b1a817258b957416f20aa57a5cd
          if(USE_FLAC_DYNAMIC)
              list(APPEND SDL_MIXER_DEFINITIONS -DFLAC_DYNAMIC=\"${FLAC_DYNAMIC_LIBRARY}\")
 diff --git a/src/codecs/music_fluidsynth.cmake b/src/codecs/music_fluidsynth.cmake
-index ee90c2708aa3857514dd4154dcc94ec17a8f22ec..d4d8d921e9863857a4bdce45b87b30e330379b2c 100644
+index 8dd54447317cba97928f320ce2bd5cc8364a8967..ad7a302173e06302d8a5313302445151f9c14c70 100644
 --- a/src/codecs/music_fluidsynth.cmake
 +++ b/src/codecs/music_fluidsynth.cmake
 @@ -6,7 +6,10 @@ if(USE_MIDI_FLUIDSYNTH AND NOT USE_MIDI_FLUIDLITE AND MIXERX_LGPL)
@@ -65,7 +128,7 @@ index ee90c2708aa3857514dd4154dcc94ec17a8f22ec..d4d8d921e9863857a4bdce45b87b30e3
      if(USE_MIDI_FLUIDSYNTH_DYNAMIC)
          list(APPEND SDL_MIXER_DEFINITIONS -DFLUIDSYNTH_DYNAMIC=\"${FluidSynth_DYNAMIC_LIBRARY}\")
 diff --git a/src/codecs/music_gme.cmake b/src/codecs/music_gme.cmake
-index 7e0df24427f4793bd19f2def937853d949957340..a407ccb4c41eb3c900e3a07687e2a15eae166b96 100644
+index e8a455391489080a88685e4501250f37138b38d6..124d3f3e63eff2e125cbce8139a2958a78088b15 100644
 --- a/src/codecs/music_gme.cmake
 +++ b/src/codecs/music_gme.cmake
 @@ -3,7 +3,14 @@ if(USE_GME AND MIXERX_LGPL)
@@ -85,7 +148,7 @@ index 7e0df24427f4793bd19f2def937853d949957340..a407ccb4c41eb3c900e3a07687e2a15e
          if(USE_GME_DYNAMIC)
              list(APPEND SDL_MIXER_DEFINITIONS -DGME_DYNAMIC=\"${GME_DYNAMIC_LIBRARY}\")
 diff --git a/src/codecs/music_midi_adl.cmake b/src/codecs/music_midi_adl.cmake
-index 0d3b302f1d73ba01ec6a3b187559f1892f8a4c76..26864407f0e26d2affde07829d28407d8eea1a9f 100644
+index c8f7bbdbfdb62e1fd0a20e5006c4a4d1b4ab8452..0be6f3b9e761263857dba8c1931e84cf22640535 100644
 --- a/src/codecs/music_midi_adl.cmake
 +++ b/src/codecs/music_midi_adl.cmake
 @@ -3,7 +3,15 @@ if(USE_MIDI_ADLMIDI AND MIXERX_GPL)
@@ -103,10 +166,10 @@ index 0d3b302f1d73ba01ec6a3b187559f1892f8a4c76..26864407f0e26d2affde07829d28407d
 +        set(ADLMIDI_LIBRARIES ${_adlmidi})
 +        set(ADLMIDI_FOUND 1)
          message("ADLMIDI: [${ADLMIDI_FOUND}] ${ADLMIDI_INCLUDE_DIRS} ${ADLMIDI_LIBRARIES}")
+ 
          if(USE_MIDI_ADLMIDI_DYNAMIC)
-             list(APPEND SDL_MIXER_DEFINITIONS -DADLMIDI_DYNAMIC=\"${ADLMIDI_DYNAMIC_LIBRARY}\")
 diff --git a/src/codecs/music_midi_opn.cmake b/src/codecs/music_midi_opn.cmake
-index 34169046fe51bd6d1b27d314733b2a13209b7968..3dc4409dc7ea6b6a340f7082c0567bbf946c9132 100644
+index 62b9dda0c2771ef25a7bc91949cdce0c55ea5250..26bb304d720f7d93eb3d8b24fd81dbc33df513cc 100644
 --- a/src/codecs/music_midi_opn.cmake
 +++ b/src/codecs/music_midi_opn.cmake
 @@ -3,7 +3,15 @@ if(USE_MIDI_OPNMIDI AND MIXERX_GPL)
@@ -124,8 +187,8 @@ index 34169046fe51bd6d1b27d314733b2a13209b7968..3dc4409dc7ea6b6a340f7082c0567bbf
 +        set(OPNMIDI_LIBRARIES ${_opnmidi})
 +        set(OPNMIDI_FOUND 1)
          message("OPNMIDI: [${OPNMIDI_FOUND}] ${OPNMIDI_INCLUDE_DIRS} ${OPNMIDI_LIBRARIES}")
+ 
          if(USE_MIDI_OPNMIDI_DYNAMIC)
-             list(APPEND SDL_MIXER_DEFINITIONS -DOPNMIDI_DYNAMIC=\"${OPNMIDI_DYNAMIC_LIBRARY}\")
 diff --git a/src/codecs/music_modplug.cmake b/src/codecs/music_modplug.cmake
 index 555bcd91574d1c65761121648b331715a5fe8dad..ad065be36cd0176aa7f08631a6df48e857f76e42 100644
 --- a/src/codecs/music_modplug.cmake
@@ -171,7 +234,7 @@ index e7930f9c7e1a583f77306f6838933b991382872f..33a8a59e72e30e3cabd4e834895a23ae
          find_package(OGG REQUIRED)
      else()
 diff --git a/src/codecs/music_ogg_vorbis.cmake b/src/codecs/music_ogg_vorbis.cmake
-index 475c7ea67663d114a4fc0fef243e15fbf66a00c1..66fa87521c91d1f25fc335b026078b384509dc6a 100644
+index 0de2bec5d9327af7b38f09993dd884be786f3a5b..42b94340956fb8b28a03485ddc68282e3cf57ee9 100644
 --- a/src/codecs/music_ogg_vorbis.cmake
 +++ b/src/codecs/music_ogg_vorbis.cmake
 @@ -10,7 +10,10 @@ if(USE_OGG_VORBIS)
@@ -203,11 +266,11 @@ index 61fb32e7ec1bcb4e21cb77607399f1f36317c481..44e0b5da00146492a2b34a65ab0c1684
          if(USE_OPUS_DYNAMIC)
              list(APPEND SDL_MIXER_DEFINITIONS -DOPUS_DYNAMIC=\"${OpusFile_DYNAMIC_LIBRARY}\")
 diff --git a/src/codecs/music_wavpack.cmake b/src/codecs/music_wavpack.cmake
-index ab841b8c8c9720d50ce15534361cc4ba80e6595d..688f7459789eae14df641e53c003daedc1916c12 100644
+index f93acdb4315e0f44311efdbc254a3fcd69964151..95d0372e2b8d0503864edf41f01977cf28a480f9 100644
 --- a/src/codecs/music_wavpack.cmake
 +++ b/src/codecs/music_wavpack.cmake
-@@ -3,7 +3,10 @@ if(USE_WAVPACK)
-     option(USE_WAVPACK_DYNAMIC "Use dynamical loading of WAVPACK" OFF)
+@@ -4,7 +4,10 @@ if(USE_WAVPACK)
+     option(USE_WAVPACK_DSD "Enable WavPack DSD music support" OFF)
  
      if(USE_SYSTEM_AUDIO_LIBRARIES)
 -        find_package(WavPack QUIET)
@@ -219,10 +282,10 @@ index ab841b8c8c9720d50ce15534361cc4ba80e6595d..688f7459789eae14df641e53c003daed
          if(USE_WAVPACK_DYNAMIC)
              list(APPEND SDL_MIXER_DEFINITIONS -DWAVPACK_DYNAMIC=\"${WavPack_DYNAMIC_LIBRARY}\")
 diff --git a/src/codecs/music_xmp.cmake b/src/codecs/music_xmp.cmake
-index 2b41037b9cdb4160515982eb8511500baf9961ce..698c34fa2dc8fb8175d8b1ab61255bd0aa7c9d9f 100644
+index 52f2048b0b8cb9c72a27f16777fb7d9112be1c2d..2eab53c039e875733f18fc2f20b2e9f178371425 100644
 --- a/src/codecs/music_xmp.cmake
 +++ b/src/codecs/music_xmp.cmake
-@@ -19,7 +19,15 @@ if(USE_XMP)
+@@ -25,7 +25,15 @@ if(USE_XMP)
              set(XMP_LIBRARIES ${XMPLITE_LIBRARIES})
              set(XMP_FOUND ${XMPLITE_FOUND})
          else()
@@ -239,66 +302,3 @@ index 2b41037b9cdb4160515982eb8511500baf9961ce..698c34fa2dc8fb8175d8b1ab61255bd0
              message("XMP: [${XMP_FOUND}] ${XMP_INCLUDE_DIRS} ${XMP_LIBRARIES}")
              if(USE_XMP_DYNAMIC)
                  list(APPEND SDL_MIXER_DEFINITIONS -DXMP_DYNAMIC=\"${XMP_DYNAMIC_LIBRARY}\")
-diff --git a/SDL2_mixer_extConfig.cmake.in b/SDL2_mixer_extConfig.cmake.in
-index 997d4e828150d10fa4113b3341220ca185fc29a5..2d781528151075385a2e837df3863900b8d36573 100644
---- a/SDL2_mixer_extConfig.cmake.in
-+++ b/SDL2_mixer_extConfig.cmake.in
-@@ -6,10 +6,58 @@ set_package_properties(SDL2_mixer_ext PROPERTIES
- 
- @PACKAGE_INIT@
- 
-+set(SDL_MIXER_X_USE_OGG_VORBIS              @USE_OGG_VORBIS@)
-+set(SDL_MIXER_X_USE_OPUS                    @USE_OPUS@)
-+set(SDL_MIXER_X_USE_USE_FLAC                @USE_FLAC@)
-+set(SDL_MIXER_X_USE_USE_WAVPACK             @USE_WAVPACK@)
-+set(SDL_MIXER_X_USE_MP3_MPG123              @USE_MP3_MPG123@)
-+set(SDL_MIXER_X_USE_XMP                     @USE_XMP@)
-+set(SDL_MIXER_X_USE_MIDI_ADLMIDI            @USE_MIDI_ADLMIDI@)
-+set(SDL_MIXER_X_USE_MIDI_OPNMIDI            @USE_MIDI_OPNMIDI@)
-+set(SDL_MIXER_X_USE_MIDI_FLUIDSYNTH         @USE_MIDI_FLUIDSYNTH@)
-+
- if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/SDL2_mixer_ext-shared-targets.cmake")
-     include("${CMAKE_CURRENT_LIST_DIR}/SDL2_mixer_ext-shared-targets.cmake")
- endif()
- 
- if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/SDL2_mixer_ext-static-targets.cmake")
-+    include(CMakeFindDependencyMacro)
-+
-+    if(SDL_MIXER_X_USE_OGG_VORBIS AND NOT TARGET Vorbis::vorbisfile)
-+        find_dependency(Vorbis CONFIG)
-+    endif()
-+
-+    if(SDL_MIXER_X_USE_OPUS AND NOT TARGET OpusFile::opusfile)
-+        find_dependency(OpusFile CONFIG)
-+    endif()
-+
-+    if(SDL_MIXER_X_USE_USE_FLAC AND NOT TARGET FLAC::FLAC)
-+        find_dependency(FLAC CONFIG)
-+    endif()
-+
-+    if(SDL_MIXER_X_USE_USE_WAVPACK AND NOT TARGET WavPack::WavPack)
-+        find_dependency(WavPack CONFIG)
-+    endif()
-+
-+    if(SDL_MIXER_X_USE_MP3_MPG123 AND NOT TARGET MPG123::libmpg123)
-+        find_dependency(MPG123 CONFIG)
-+    endif()
-+
-+    if(SDL_MIXER_X_USE_XMP AND NOT TARGET libxmp::xmp_static)
-+        find_dependency(libxmp CONFIG)
-+    endif()
-+
-+    if(SDL_MIXER_X_USE_MIDI_ADLMIDI AND NOT TARGET libADLMIDI::ADLMIDI_static)
-+        find_dependency(libADLMIDI CONFIG)
-+    endif()
-+
-+    if(SDL_MIXER_X_USE_MIDI_OPNMIDI AND NOT TARGET libOPNMIDI::OPNMIDI_static)
-+        find_dependency(libOPNMIDI CONFIG)
-+    endif()
-+
-+    if(SDL_MIXER_X_USE_MIDI_FLUIDSYNTH AND NOT TARGET FluidSynth::libfluidsynth)
-+        find_dependency(FluidSynth CONFIG)
-+    endif()
-+
-     include("${CMAKE_CURRENT_LIST_DIR}/SDL2_mixer_ext-static-targets.cmake")
- endif()

package/vcpkg/ports/sdl2-mixer-ext/portfile.cmake

@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO WohlSoft/SDL-Mixer-X
-    REF 1bd1111949036645e92cf0f7aa635e904c590318
-    SHA512 b3c87580ff639b015d0e3f00d584878f141896ac812ec036945025416019f7849e952a76135095358f427eb2d04ed8f68fd9721e1869dade78517f7372ad2f9c
+    REF "${VERSION}"
+    SHA512 bdb39122ecf8492723615421c37c0d2a8d5958110d7bf2f0a01f5c54cc1f3f6e9a54887df7d348e9dc7e34906cff67794b0f5d61ca6fe5e4019f84ed88cf07e5
     HEAD_REF master
     PATCHES
         fix-dependencies.patch
@@ -24,6 +24,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
         libxmp      USE_XMP
         libgme      USE_GME
         ffmpeg      USE_FFMPEG
+        pxtone      USE_PXTONE
         cmd         USE_CMD
         libadlmidi  USE_MIDI_ADLMIDI
         libopnmidi  USE_MIDI_OPNMIDI
@@ -59,12 +60,14 @@ vcpkg_cmake_configure(
         -DUSE_SYSTEM_AUDIO_LIBRARIES=ON
         -DUSE_OGG_VORBIS_STB=OFF
         -DUSE_DRFLAC=OFF
+        -USE_WAVPACK_DSD=ON
         -DUSE_MP3_DRMP3=OFF
         -DUSE_FFMPEG_DYNAMIC=OFF
         -DUSE_MIDI=${USE_MIDI}
         -DUSE_MIDI_EDMIDI=OFF
         -DUSE_MIDI_FLUIDLITE=OFF
     MAYBE_UNUSED_VARIABLES
+        USE_WAVPACK_DSD
         USE_FFMPEG_DYNAMIC
         USE_CMD
         USE_MIDI_NATIVE

package/vcpkg/ports/sdl2-mixer-ext/vcpkg.json

@@ -1,11 +1,15 @@
 {
   "name": "sdl2-mixer-ext",
-  "version-date": "2023-05-04",
+  "version": "2.6.0",
+  "port-version": 1,
   "description": "An audio mixer library based on the SDL library, a fork of SDL_mixer",
   "homepage": "https://wohlsoft.github.io/SDL-Mixer-X",
   "license": "Zlib OR LGPL-2.1-or-later OR GPL-2.0-or-later OR GPL-3.0-or-later",
   "dependencies": [
-    "sdl2",
+    {
+      "name": "sdl2",
+      "default-features": false
+    },
     {
       "name": "vcpkg-cmake",
       "host": true
@@ -100,7 +104,7 @@
     },
     "nativemidi": {
       "description": "Use Native MIDI Player to play MIDI audio format.",
-      "supports": "windows | osx"
+      "supports": "(windows & !uwp) | osx"
     },
     "opusfile": {
       "description": "Use opusfile to play Opus audio format.",
@@ -108,6 +112,9 @@
         "opusfile"
       ]
     },
+    "pxtone": {
+      "description": "Use pxtone to play PPTUNE and PTCOP audio formats."
+    },
     "timidity": {
       "description": "Use Timidity to play MIDI audio format."
     },