Merge remote-tracking branch 'mixxxdj/2.6' into update_26_rel_withlibdjinterop0_27_1

Author: JoergAtGithub

.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    target-branch: "2.6"

.github/deploy.sh

@@ -19,6 +19,8 @@ TMP_PATH="../../.tmp/${UPLOAD_ID}"
 
 echo "Deploying to ${TMP_PATH}, then to ${DEST_PATH}."
 
+mkdir -p $HOME/.ssh
+
 eval "$(ssh-agent -s)" >/dev/null
 
 cleanup() {

.github/workflows/build.yml

@@ -181,10 +181,11 @@ jobs:
 
     - name: Upload GitHub Actions artifacts of build logs
       if: always()
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: logs-${{ matrix.deps_name }}
         path: ${{ matrix.vcpkg_path  }}/buildtrees/**/*.log
+        archive: true
 
     - name: Create buildenv archive
       run: ./vcpkg export --vcpkg-root=${{ matrix.vcpkg_path }} --x-all-installed --zip --output=${{ env.DEPS_BASE_NAME }}-${{ env.MIXXX_VERSION }}-${{ matrix.deps_name }}-${{ steps.vars.outputs.sha_short }} --output-dir=${{ matrix.vcpkg_path }}
@@ -214,6 +215,7 @@ jobs:
       # Use retry loop to work around intermittent transfer issue
       uses: nick-fields/retry@9417ab499314dfe692edb043ded2ff9b3f5f0a68 # v3
       with:
+        shell: bash
         max_attempts: 10
         timeout_minutes: 20
         retry_wait_seconds: 5
@@ -230,10 +232,11 @@ jobs:
         UPLOAD_ID: ${{ github.run_id }}
 
     - name: Upload GitHub Actions artifacts
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: ${{ env.DEPS_BASE_NAME }}-${{ env.MIXXX_VERSION }}-${{ matrix.deps_name }}-${{ steps.vars.outputs.sha_short }}
         path: ${{ matrix.vcpkg_path }}/${{ env.DEPS_BASE_NAME }}-${{ env.MIXXX_VERSION }}-${{ matrix.deps_name }}-${{ steps.vars.outputs.sha_short }}.zip
+        archive: false
 
     # Workaround for https://github.com/actions/cache/issues/531
     - name: Use system tar & zstd from Chocolatey for caching

ports/libdjinterop/devendor_libs.diff

@@ -0,0 +1,45 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7ca2d6f..f317c4d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -226,6 +226,9 @@ configure_file(
+ include(GNUInstallDirs)
+ set(DJINTEROP_INSTALL_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}/djinterop")
+ 
++find_package(date CONFIG REQUIRED)
++find_path(SQLITE_MODERN_CPP_INCLUDE_DIRS "sqlite_modern_cpp.h")
++
+ target_include_directories(
+         DjInterop PUBLIC
+         $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
+@@ -234,13 +237,13 @@ target_include_directories(
+ target_include_directories(
+         DjInterop PRIVATE SYSTEM
+         ${ZLIB_INCLUDE_DIRS}
+-        ext/sqlite_modern_cpp
+-        ext/date)
++        ${SQLITE_MODERN_CPP_INCLUDE_DIRS})
+ 
+ target_link_libraries(
+     DjInterop PUBLIC
+-    ${ZLIB_LIBRARIES})
+-
++    ${ZLIB_LIBRARIES}
++    PRIVATE
++    date::date)
+ 
+ if(SYSTEM_SQLITE)
+     # Search for system installation of SQLite and use that.
+diff --git a/src/djinterop/util/chrono.cpp b/src/djinterop/util/chrono.cpp
+index 0d551dd..475aece 100644
+--- a/src/djinterop/util/chrono.cpp
++++ b/src/djinterop/util/chrono.cpp
+@@ -22,7 +22,7 @@
+ #include <stdexcept>
+ #include <string>
+ 
+-#include <date.h>
++#include <date/date.h>
+ 
+ namespace djinterop::util
+ {

ports/libdjinterop/portfile.cmake

@@ -2,10 +2,14 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO xsco/libdjinterop
     REF "${VERSION}"
-    SHA512 45969510c2a2c863bd9627ddc73f404c84d12cc0eea922c23a04dc3486420188936ef556e6a5372e3cc390b3b12d748d64d0cae82a845d6306a4da18227bb435
+    SHA512 3d10815725b4f7c9ae835609c1aaca5373d9b1ce010d0fdd64f8116847d90cbdcf50f160f73b590be95db49632e93bd82c4133be0bbdc84c34e543bc29573494
     HEAD_REF master
+    PATCHES
+        devendor_libs.diff
 )
 
+file(REMOVE_RECURSE "${SOURCE_PATH}/ext")
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS

ports/libdjinterop/vcpkg.json

@@ -1,11 +1,13 @@
 {
   "name": "libdjinterop",
-  "version": "0.27.0",
+  "version": "0.27.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",
   "supports": "!xbox",
   "dependencies": [
+    "date",
+    "sqlite-modern-cpp",
     "sqlite3",
     {
       "name": "vcpkg-cmake",

versions/baseline.json

@@ -4549,7 +4549,7 @@
       "port-version": 0
     },
     "libdjinterop": {
-      "baseline": "0.27.0",
+      "baseline": "0.27.1",
       "port-version": 0
     },
     "libdmtx": {

versions/l-/libdjinterop.json

@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "07808e552bb04ad62cb87a63a5249bf888162c57",
+      "version": "0.27.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "eb88b6ff11d18e737c84eafdf99e4c555d8d7056",
+      "version": "0.27.0",
+      "port-version": 1
+    },
     {
       "git-tree": "d49a24f19dcdfc7403bb37d41e30b9f7d96141e8",
       "version": "0.27.0",