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

mixxxdj · Oct 12, 2024 · c616147 · c616147
2 parents 5dd1f25 + 74ff6c7
commit c616147
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 13 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,14 +19,14 @@ jobs:
             vcpkg_triplet: x64-windows-release
             vcpkg_host_triplet: x64-windows-release
             check_disk_space: Get-PSDrive
-          - os: macos-11
+          - os: macos-12
             vcpkg_path: /Users/runner/mixxx-vcpkg
             vcpkg_buildtrees-root: /Users/runner/mixxx-vcpkg/buildtrees
             vcpkg_bootstrap: ./bootstrap-vcpkg.sh
             vcpkg_triplet: x64-osx-min1100-release
             vcpkg_host_triplet: x64-osx-min1100-release
             check_disk_space: df -h
-          - os: macos-11
+          - os: macos-12
             vcpkg_path: /Users/runner/mixxx-vcpkg
             vcpkg_buildtrees-root: /Users/runner/mixxx-vcpkg/buildtrees
             vcpkg_bootstrap: ./bootstrap-vcpkg.sh
@@ -37,7 +37,7 @@ jobs:
       VCPKG_DEFAULT_TRIPLET: ${{ matrix.vcpkg_triplet }}
       VCPKG_DEFAULT_HOST_TRIPLET: ${{ matrix.vcpkg_host_triplet }}
       DEPS_BASE_NAME: mixxx-deps
-      DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_13.1.app/Contents/Developer
       MIXXX_VERSION: 2.5
     name: ${{ matrix.vcpkg_triplet }}
     runs-on: ${{ matrix.os }}
@@ -89,7 +89,7 @@ jobs:
       if: runner.os == 'macOS'
       run: |
           brew update && brew install nasm autoconf-archive
-          /bin/bash -c "sudo xcode-select --switch /Applications/Xcode_12.4.app/Contents/Developer"
+          /bin/bash -c "sudo xcode-select --switch /Applications/Xcode_13.1.app/Contents/Developer"
           xcrun --show-sdk-version
 
     - name: Check available disk space
@@ -103,13 +103,13 @@ jobs:
       env:
         AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
       if: runner.os == 'Windows' && env.AZURE_TENANT_ID
-      uses: azure/azure-code-signing-action@v0.2.22
+      uses: azure/trusted-signing-action@v0.4.0
       with:
         azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
         azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
         azure-client-secret: ${{ secrets.AZURE_CLIENT_SECRET }}
         endpoint: https://weu.codesigning.azure.net/
-        code-signing-account-name: mixxx
+        trusted-signing-account-name: mixxx
         certificate-profile-name: mixxx
         files-folder: ${{ matrix.vcpkg_path }}/vcpkg_installed/${{ matrix.vcpkg_triplet }}/bin
         files-folder-filter: dll
@@ -122,13 +122,13 @@ jobs:
       env:
         AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
       if: runner.os == 'Windows' && env.AZURE_TENANT_ID
-      uses: azure/azure-code-signing-action@v0.2.22
+      uses: azure/trusted-signing-action@v0.4.0
       with:
         azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
         azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
         azure-client-secret: ${{ secrets.AZURE_CLIENT_SECRET }}
         endpoint: https://weu.codesigning.azure.net/
-        code-signing-account-name: mixxx
+        trusted-signing-account-name: mixxx
         certificate-profile-name: mixxx
         files-folder: ${{ matrix.vcpkg_path }}/vcpkg_installed/${{ matrix.vcpkg_triplet }}/Qt6/plugins
         files-folder-filter: dll
@@ -142,13 +142,13 @@ jobs:
       env:
         AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
       if: runner.os == 'Windows' && env.AZURE_TENANT_ID
-      uses: azure/azure-code-signing-action@v0.2.22
+      uses: azure/trusted-signing-action@v0.4.0
       with:
         azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
         azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
         azure-client-secret: ${{ secrets.AZURE_CLIENT_SECRET }}
         endpoint: https://weu.codesigning.azure.net/
-        code-signing-account-name: mixxx
+        trusted-signing-account-name: mixxx
         certificate-profile-name: mixxx
         files-folder: ${{ matrix.vcpkg_path }}/vcpkg_installed/${{ matrix.vcpkg_triplet }}/Qt6/qml
         files-folder-filter: dll

diff --git a/ports/libdjinterop/portfile.cmake b/ports/libdjinterop/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO xsco/libdjinterop
     REF "${VERSION}"
-    SHA512 c2784ffc6b0ddc9ad92a227621bb00cd1c88aa8f8abe82401774102f9be16dfbe9f0745523d517594faecba60b650a53613c7867afe57e6bcd8a2cc6288dd9ff
+    SHA512 1c35d8609342f133cf002d1908d5746c411a9d5e74b42a7ec045545f07a3f4b8a89ce9a95d2fc17edd8970facafbee1b6d8a9283fcd8c74c9cb96ff61f15d47d
     HEAD_REF master
 )
 

diff --git a/ports/libdjinterop/vcpkg.json b/ports/libdjinterop/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "libdjinterop",
-  "version": "0.21.0",
+  "version": "0.22.1",
   "description": "C++ library for access to DJ record libraries. Currently only supports Denon Engine Prime databases",
   "homepage": "https://github.com/xsco/libdjinterop",
   "license": "LGPL-3.0-or-later",

diff --git a/vcpkg.json b/vcpkg.json
@@ -56,6 +56,7 @@
       "name": "libmad",
       "platform": "!osx & !ios"
     },
+    "liblo",
     "libmodplug",
     "libogg",
     "libopusenc",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -4117,7 +4117,7 @@
       "port-version": 1
     },
     "libdjinterop": {
-      "baseline": "0.21.0",
+      "baseline": "0.22.1",
       "port-version": 0
     },
     "libdmx": {

diff --git a/versions/l-/libdjinterop.json b/versions/l-/libdjinterop.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "fda458a81fa4a8520df2baf8dcf5211f60669707",
+      "version": "0.22.1",
+      "port-version": 0
+    },
     {
       "git-tree": "c643a7969afe7b095d0c6e779adbe14b09ad39d0",
       "version": "0.21.0",