Merge pull request #13790 from JoergAtGithub/pr/13709

DjInterop PR #13709 with new VCPKG buildenv
mixxxdj · Oct 21, 2024 · 9e1efe2 · 9e1efe2
2 parents 04ba685 + fa1c7ae
commit 9e1efe2
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 16 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2261,7 +2261,7 @@ option(ENGINEPRIME "Support for library export to Denon Engine Prime" ON)
 if(ENGINEPRIME)
   # libdjinterop does not currently have a stable ABI, so we fetch sources for a specific tag, build here, and link
   # statically.  This situation should be reviewed once libdjinterop hits version 1.x.
-  set(LIBDJINTEROP_VERSION 0.21.0)
+  set(LIBDJINTEROP_VERSION 0.22.1)
   # Look whether an existing installation of libdjinterop matches the required version.
   find_package(DjInterop  ${LIBDJINTEROP_VERSION} EXACT CONFIG)
   if(NOT DjInterop_FOUND)
@@ -2293,11 +2293,18 @@ if(ENGINEPRIME)
     # For offline builds download the archive file from the URL and
     # copy it into DOWNLOAD_DIR under DOWNLOAD_NAME prior to starting
     # the configuration.
+    #
+    # If you want to test (locally) an experimental fork/branch of libdjinterop,
+    # you can comment out URL and URL_HASH and use GIT_REPOSITORY instead:
+    #
+    # GIT_REPOSITORY "https://github.com/abcd/your-fork-of-libdjinterop"
+    # GIT_TAG "origin/name-of-your-branch"
+    #
     ExternalProject_Add(libdjinterop
       URL
         "https://github.com/xsco/libdjinterop/archive/refs/tags/${LIBDJINTEROP_VERSION}.tar.gz"
         "https://launchpad.net/~xsco/+archive/ubuntu/djinterop/+sourcefiles/libdjinterop/${LIBDJINTEROP_VERSION}-0ubuntu1/libdjinterop_${LIBDJINTEROP_VERSION}.orig.tar.gz"
-      URL_HASH SHA256=160d4e09b25e859816a6b664058e7c6bc5cd889adeb188a9721c2b65d2133641
+      URL_HASH SHA256=e811158d42c3864f5b682bcf76e0af78278050439d82d14d592dd0a391da6b20
       DOWNLOAD_DIR "${CMAKE_CURRENT_BINARY_DIR}/downloads"
       DOWNLOAD_NAME "libdjinterop-${LIBDJINTEROP_VERSION}.tar.gz"
       INSTALL_DIR ${DJINTEROP_INSTALL_DIR}

diff --git a/src/library/export/engineprimeexportjob.cpp b/src/library/export/engineprimeexportjob.cpp
@@ -13,7 +13,6 @@
 #include "library/trackset/crate/crate.h"
 #include "moc_engineprimeexportjob.cpp"
 #include "track/track.h"
-#include "util/optional.h"
 #include "util/thread_affinity.h"
 #include "waveform/waveformfactory.h"
 
@@ -184,7 +183,7 @@ void exportMetadata(
 
     snapshot.track_number = pTrack->getTrackNumber().toInt();
     if (snapshot.track_number == 0) {
-        snapshot.track_number = djinterop::stdx::nullopt;
+        snapshot.track_number = std::nullopt;
     }
 
     snapshot.duration = std::chrono::milliseconds{

diff --git a/tools/macos_buildenv.sh b/tools/macos_buildenv.sh
@@ -23,25 +23,25 @@ if [ -n "${BUILDENV_ARM64}" ] || [ "$(uname -m)" = "arm64" ]; then
     if [ -n "${BUILDENV_RELEASE}" ]; then
         VCPKG_TARGET_TRIPLET="arm64-osx-min1100-release"
         BUILDENV_BRANCH="2.4-rel"
-        BUILDENV_NAME="mixxx-deps-2.4-$VCPKG_TARGET_TRIPLET-07b9859"
-        BUILDENV_SHA256="2ea804641b6ca973d246cdea9b3ce7913521e49e8e0845c95bbc1cdb6842d6a7"
+        BUILDENV_NAME="mixxx-deps-2.4-$VCPKG_TARGET_TRIPLET-626a761"
+        BUILDENV_SHA256="127233bee4fcb70529d8d00de18c6aded803fdf254a165f79c204bad88768154"
     else
         VCPKG_TARGET_TRIPLET="arm64-osx-min1100"
         BUILDENV_BRANCH="2.4"
-        BUILDENV_NAME="mixxx-deps-2.4-$VCPKG_TARGET_TRIPLET-ecdfdcd"
-        BUILDENV_SHA256="9c80be159aede678cea0a2a643e064374e3badd93c264b772d6c9665a976dde8"
+        BUILDENV_NAME="mixxx-deps-2.4-$VCPKG_TARGET_TRIPLET-df95974"
+        BUILDENV_SHA256="88e59aa566d5d7c17d9f8f8c3c8dd70436d9527509d691e9b922aee29f72ea93"
     fi
 else
     if [ -n "${BUILDENV_RELEASE}" ]; then
         VCPKG_TARGET_TRIPLET="x64-osx-min1012-release"
         BUILDENV_BRANCH="2.4-rel"
-        BUILDENV_NAME="mixxx-deps-2.4-$VCPKG_TARGET_TRIPLET-07b9859"
-        BUILDENV_SHA256="efe301c8b07aac90713143ae2c533f0ad793472e24b5d06be793d1d9824cbeb0"
+        BUILDENV_NAME="mixxx-deps-2.4-$VCPKG_TARGET_TRIPLET-626a761"
+        BUILDENV_SHA256="a0d4f98e3e10c55a30757c0745e96d4b0025a82bea71b37035d26d42752f901c"
     else
         VCPKG_TARGET_TRIPLET="x64-osx-min1012"
         BUILDENV_BRANCH="2.4"
-        BUILDENV_NAME="mixxx-deps-2.4-$VCPKG_TARGET_TRIPLET-ecdfdcd"
-        BUILDENV_SHA256="eb8b1111399e5f169e2299120342760a0a7fcb817b6ced705e6bdd3b0c7dbbf5"
+        BUILDENV_NAME="mixxx-deps-2.4-$VCPKG_TARGET_TRIPLET-df95974"
+        BUILDENV_SHA256="b1743b1dc262c5cbd389fa1aa147756b11af869c3799826290ed4ecaa1108698"
     fi
 fi
 

diff --git a/tools/windows_buildenv.bat b/tools/windows_buildenv.bat
@@ -23,13 +23,13 @@ IF NOT DEFINED INSTALL_ROOT (
 IF DEFINED BUILDENV_RELEASE (
     SET BUILDENV_BRANCH=2.4-rel
     set VCPKG_TARGET_TRIPLET=x64-windows-release
-    SET BUILDENV_NAME=mixxx-deps-2.4-x64-windows-release-07b9859
-    SET BUILDENV_SHA256=e627f36774b07aaa8845317cfab2c441d196c833279c5de3e34e8b7737fbb907
+    SET BUILDENV_NAME=mixxx-deps-2.4-x64-windows-release-626a761
+    SET BUILDENV_SHA256=a1972094c93bbedfb9c4d012a7e16b2d930824203fc99815c458393448f75437
 ) ELSE (
     SET BUILDENV_BRANCH=2.4
     set VCPKG_TARGET_TRIPLET=x64-windows
-    SET BUILDENV_NAME=mixxx-deps-2.4-x64-windows-ecdfdcd
-    SET BUILDENV_SHA256=90f2785eba6f370fa03933fe61bde1a85a36c7dcdcbad418a4715379f0d2ba95
+    SET BUILDENV_NAME=mixxx-deps-2.4-x64-windows-df95974
+    SET BUILDENV_SHA256=a33873d631977ce6fc5b375dc35a2f56d0b4a843c43fe5c672ea64bc97bb43fa
 )
 
 IF "%~1"=="" (