Merge remote-tracking branch 'mixxxdj/2.5' into 2.5-rel

# Conflicts: # .github/workflows/build.yml
daschuer · Feb 18, 2024 · a65f0d2 · a65f0d2
2 parents bea61fb + 22e5547
commit a65f0d2
Show file tree

Hide file tree

Showing 24 changed files with 3,055 additions and 19 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -17,32 +17,25 @@ jobs:
             vcpkg_buildtrees-root: C:\build
             vcpkg_bootstrap: .\bootstrap-vcpkg.bat
             vcpkg_triplet: x64-windows-release
-            vcpkg_host_triplet: x64-windows-release  
-            vcpkg_overlay_ports: overlay/windows;overlay/ports
+            vcpkg_host_triplet: x64-windows-release
             check_disk_space: Get-PSDrive
           - os: macos-11
             vcpkg_path: /Users/runner/mixxx-vcpkg
             vcpkg_buildtrees-root: /Users/runner/mixxx-vcpkg/buildtrees
             vcpkg_bootstrap: ./bootstrap-vcpkg.sh
             vcpkg_triplet: x64-osx-min1015-release
             vcpkg_host_triplet: x64-osx-min1015-release
-            vcpkg_overlay_ports: overlay/osx:overlay/ports
-            vcpkg_packages_extras:
             check_disk_space: df -h
           - os: macos-11
             vcpkg_path: /Users/runner/mixxx-vcpkg
             vcpkg_buildtrees-root: /Users/runner/mixxx-vcpkg/buildtrees
             vcpkg_bootstrap: ./bootstrap-vcpkg.sh
             vcpkg_triplet: arm64-osx-min1100-release
             vcpkg_host_triplet: x64-osx-min1015-release
-            vcpkg_overlay_ports: overlay/osx:overlay/ports
             check_disk_space: df -h
     env:
       VCPKG_DEFAULT_TRIPLET: ${{ matrix.vcpkg_triplet }}
       VCPKG_DEFAULT_HOST_TRIPLET: ${{ matrix.vcpkg_host_triplet }}
-      # Using the relative path overlay/triplets does not work (https://github.com/microsoft/vcpkg/issues/18764)
-      VCPKG_OVERLAY_TRIPLETS: ${{ matrix.vcpkg_path }}/overlay/triplets
-      VCPKG_OVERLAY_PORTS: ${{ matrix.vcpkg_overlay_ports }}
       DEPS_BASE_NAME: mixxx-deps
       DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer
       MIXXX_VERSION: 2.5

diff --git a/overlay/windows/libid3tag/10_utf16.diff → overlay/ports/libid3tag/10_utf16.diff b/overlay/windows/libid3tag/10_utf16.diff → overlay/ports/libid3tag/10_utf16.diff
diff --git a/...indows/libid3tag/11_unknown_encoding.diff → .../ports/libid3tag/11_unknown_encoding.diff b/...indows/libid3tag/11_unknown_encoding.diff → .../ports/libid3tag/11_unknown_encoding.diff
diff --git a/overlay/windows/libid3tag/CMakeLists.txt → overlay/ports/libid3tag/CMakeLists.txt b/overlay/windows/libid3tag/CMakeLists.txt → overlay/ports/libid3tag/CMakeLists.txt
diff --git a/...lay/windows/libid3tag/CVE-2008-2109.patch → overlay/ports/libid3tag/CVE-2008-2109.patch b/...lay/windows/libid3tag/CVE-2008-2109.patch → overlay/ports/libid3tag/CVE-2008-2109.patch
diff --git a/...y/windows/libid3tag/id3tagConfig.cmake.in → ...lay/ports/libid3tag/id3tagConfig.cmake.in b/...y/windows/libid3tag/id3tagConfig.cmake.in → ...lay/ports/libid3tag/id3tagConfig.cmake.in
diff --git a/overlay/windows/libid3tag/portfile.cmake → overlay/ports/libid3tag/portfile.cmake b/overlay/windows/libid3tag/portfile.cmake → overlay/ports/libid3tag/portfile.cmake
diff --git a/overlay/windows/libid3tag/vcpkg.json → overlay/ports/libid3tag/vcpkg.json b/overlay/windows/libid3tag/vcpkg.json → overlay/ports/libid3tag/vcpkg.json