Vcpkg update 2.4

CMakeLists.txt

@@ -2283,7 +2283,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.20.1)
+  set(LIBDJINTEROP_VERSION 0.20.2)
   # Look whether an existing installation of libdjinterop matches the required version.
   find_package(DjInterop  ${LIBDJINTEROP_VERSION} EXACT CONFIG)
   if(NOT DjInterop_FOUND)
@@ -2319,7 +2319,7 @@ if(ENGINEPRIME)
       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=69bdbd0e68f12858b79795a76a6023962f93f819ca36ea56a9d4680901865d13
+      URL_HASH SHA256=3024b8b49bc0bd673a7f032e7da7b73ce61144951e810683ec89650fedd45b85
       DOWNLOAD_DIR "${CMAKE_CURRENT_BINARY_DIR}/downloads"
       DOWNLOAD_NAME "libdjinterop-${LIBDJINTEROP_VERSION}.tar.gz"
       INSTALL_DIR ${DJINTEROP_INSTALL_DIR}

cmake/modules/FindSndFile.cmake

@@ -1,5 +1,5 @@
 # This file is part of Mixxx, Digital DJ'ing software.
-# Copyright (C) 2001-2023 Mixxx Development Team
+# Copyright (C) 2001-2024 Mixxx Development Team
 # Distributed under the GNU General Public Licence (GPL) version 2 or any later
 # later version. See the LICENSE file for details.
 
@@ -43,6 +43,8 @@ The following cache variables may also be set:
 
 #]=======================================================================]
 
+include(IsStaticLibrary)
+
 find_package(PkgConfig QUIET)
 if(PkgConfig_FOUND)
   pkg_check_modules(PC_SndFile QUIET sndfile)
@@ -94,5 +96,24 @@ if(SndFile_FOUND)
         INTERFACE_COMPILE_OPTIONS "${PC_SndFile_CFLAGS_OTHER}"
         INTERFACE_INCLUDE_DIRECTORIES "${SndFile_INCLUDE_DIR}"
     )
+    is_static_library(SndFile_IS_STATIC SndFile::sndfile)
+    if(SndFile_IS_STATIC)
+      find_package(FLAC)
+      if(FLAC_FOUND)
+        set_property(TARGET SndFile::sndfile APPEND PROPERTY INTERFACE_LINK_LIBRARIES
+          FLAC::FLAC
+        )
+      endif()
+
+      # The mpg123 dependency was introduced in libsndfile 1.1.0
+      if(SndFile_VERSION VERSION_GREATER_EQUAL "1.1.0")
+        find_package(mpg123 CONFIG)
+        if(mpg123_FOUND)
+          set_property(TARGET SndFile::sndfile APPEND PROPERTY INTERFACE_LINK_LIBRARIES
+            MPG123::libmpg123
+          )
+        endif()
+      endif()
+    endif()
   endif()
 endif()

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-5940548"
-        BUILDENV_SHA256="ffd756acac4a9c83789b4f0babff0fb3609ca2344a9420ff12f30ffa96cf34d3"
+        BUILDENV_NAME="mixxx-deps-2.4-$VCPKG_TARGET_TRIPLET-498634a"
+        BUILDENV_SHA256="920dd5b0d81cb046c5cb69efbdcc00be7e27b4f92534f84c74814614d3c54691"
     else
         VCPKG_TARGET_TRIPLET="arm64-osx-min1100"
         BUILDENV_BRANCH="2.4"
-        BUILDENV_NAME="mixxx-deps-2.4-$VCPKG_TARGET_TRIPLET-24ad21f"
-        BUILDENV_SHA256="cefbb728f42367e722a4001502bfd5a5fed6fbdbdde85c7f08b90c21bafa4915"
+        BUILDENV_NAME="mixxx-deps-2.4-$VCPKG_TARGET_TRIPLET-00e79d1"
+        BUILDENV_SHA256="188f766b26c56a275025425310ff634bd64945884b8454739c62c0a07f537719"
     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-5940548"
-        BUILDENV_SHA256="cafc88109d55363e6681b949bf3943396ab6f1a44da211f575bdb52db7933477"
+        BUILDENV_NAME="mixxx-deps-2.4-$VCPKG_TARGET_TRIPLET-498634a"
+        BUILDENV_SHA256="f40555dbac972a31dbc0bca68a4214422135fd8fbed2771b3ca932fc0d323b18"
     else
         VCPKG_TARGET_TRIPLET="x64-osx-min1012"
         BUILDENV_BRANCH="2.4"
-        BUILDENV_NAME="mixxx-deps-2.4-$VCPKG_TARGET_TRIPLET-24ad21f"
-        BUILDENV_SHA256="6f05f3094a142c92e0f1fa76631c046dd2f4e70bafb9e7f0380c2bb8d115a342"
+        BUILDENV_NAME="mixxx-deps-2.4-$VCPKG_TARGET_TRIPLET-00e79d1"
+        BUILDENV_SHA256="ee692aad92fda47f76161b837f54c59dcc0c8c304e7e9532ae0e35c6df3013eb"
     fi
 fi
 

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-5940548
-    SET BUILDENV_SHA256=cb44696a981f23dfcb3abce810bd3354cec3c25b8d7eea62f3176bc9b64d6bf9
+    SET BUILDENV_NAME=mixxx-deps-2.4-x64-windows-release-498634a
+    SET BUILDENV_SHA256=369eb68e3a5daba3af85f990d1b60740260825e2685687d0fdb787c1ba42a542
 ) ELSE (
     SET BUILDENV_BRANCH=2.4
     set VCPKG_TARGET_TRIPLET=x64-windows
-    SET BUILDENV_NAME=mixxx-deps-2.4-x64-windows-24ad21f
-    SET BUILDENV_SHA256=27d104d6d5ad56bf52e750643b924f0bf1c40672b370c05569a622f372ccc527
+    SET BUILDENV_NAME=mixxx-deps-2.4-x64-windows-00e79d1
+    SET BUILDENV_SHA256=088bf27e8701edf132ce0e23e8947028653f3e5c5d1df54af9f0c0cc72f71196
 )
 
 IF "%~1"=="" (