Merge pull request #72 from fwcd/update-vcpkg

Bump vcpkg to latest 2.5
fwcd · Apr 23, 2024 · d2b7671 · d2b7671
2 parents 023db3e + 73a33c4
commit d2b7671
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -24,7 +24,7 @@ jobs:
           os: macos-11
           suffix: ''
           triplet: arm64-osx-min1100-release
-          host_triplet: x64-osx-min1015-release
+          host_triplet: x64-osx-min1100-release
           ccache_path: ~/Library/Caches/ccache
           cpack_generator: DragNDrop
           package_extension: dmg
@@ -33,8 +33,8 @@ jobs:
         - name: macOS (x86_64)
           os: macos-11
           suffix: ''
-          triplet: x64-osx-min1015-release
-          host_triplet: x64-osx-min1015-release
+          triplet: x64-osx-min1100-release
+          host_triplet: x64-osx-min1100-release
           ccache_path: ~/Library/Caches/ccache
           cpack_generator: DragNDrop
           package_extension: dmg
@@ -44,7 +44,7 @@ jobs:
           os: macos-11
           suffix: '-debugasserts'
           triplet: arm64-osx-min1100-release
-          host_triplet: x64-osx-min1015-release
+          host_triplet: x64-osx-min1100-release
           ccache_path: ~/Library/Caches/ccache
           cpack_generator: DragNDrop
           package_extension: dmg
@@ -54,8 +54,8 @@ jobs:
         - name: macOS (x86_64, Debug Assertions)
           os: macos-11
           suffix: '-debugasserts'
-          triplet: x64-osx-min1015-release
-          host_triplet: x64-osx-min1015-release
+          triplet: x64-osx-min1100-release
+          host_triplet: x64-osx-min1100-release
           ccache_path: ~/Library/Caches/ccache
           cpack_generator: DragNDrop
           package_extension: dmg

diff --git a/vcpkg b/vcpkg
+9 −3		.github/workflows/build.yml
+385 −0		overlay/ports/portmidi/ios-support.patch
+31 −0		overlay/ports/portmidi/portfile.cmake
+4 −0		overlay/ports/portmidi/usage
+23 −0		overlay/ports/portmidi/vcpkg.json
+7 −1		overlay/triplets/x64-osx-min1100-release.cmake
+6 −1		overlay/triplets/x64-osx-min1100.cmake
+19 −5		ports/icu/portfile.cmake
+13 −0		ports/icu/vcpkg-cross-data.patch
+1 −0		ports/icu/vcpkg.json
+1 −0		ports/libflac/portfile.cmake
+11 −0		ports/libflac/vcpkg.json
+17 −0		ports/libmad/portfile.cmake
+14 −2		ports/libmad/vcpkg.json
+10 −1		ports/libmodplug/portfile.cmake
+1 −1		ports/libmodplug/vcpkg.json
+3 −3		ports/pcre2/vcpkg.json
+4 −3		ports/qtbase/portfile.cmake
+14 −1		ports/qtbase/vcpkg.json
+7 −1		ports/qtkeychain-qt6/vcpkg.json
+6 −3		ports/rubberband/portfile.cmake
+3 −2		ports/rubberband/vcpkg.json
+2 −0		ports/soundtouch/portfile.cmake
+34 −0		ports/soundtouch/use-o3-emscripten.patch
+1 −1		ports/soundtouch/vcpkg.json
+3 −6		vcpkg.json
+8 −8		versions/baseline.json
+10 −0		versions/i-/icu.json
+10 −0		versions/l-/libflac.json
+10 −0		versions/l-/libmad.json
+5 −0		versions/l-/libmodplug.json
+5 −0		versions/p-/pcre2.json
+5 −0		versions/q-/qtkeychain-qt6.json
+5 −0		versions/r-/rubberband.json
+10 −0		versions/s-/soundtouch.json