diff --git a/CMakeLists.txt b/CMakeLists.txt index 9198bd4b25bc..3783304fb742 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2282,7 +2282,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.2) + set(LIBDJINTEROP_VERSION 0.21.0) # Look whether an existing installation of libdjinterop matches the required version. find_package(DjInterop ${LIBDJINTEROP_VERSION} EXACT CONFIG) if(NOT DjInterop_FOUND) @@ -2318,7 +2318,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=3024b8b49bc0bd673a7f032e7da7b73ce61144951e810683ec89650fedd45b85 + URL_HASH SHA256=160d4e09b25e859816a6b664058e7c6bc5cd889adeb188a9721c2b65d2133641 DOWNLOAD_DIR "${CMAKE_CURRENT_BINARY_DIR}/downloads" DOWNLOAD_NAME "libdjinterop-${LIBDJINTEROP_VERSION}.tar.gz" INSTALL_DIR ${DJINTEROP_INSTALL_DIR} diff --git a/tools/macos_buildenv.sh b/tools/macos_buildenv.sh index 28ec9a428e42..2327c1b6ba8c 100755 --- 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-498634a" - BUILDENV_SHA256="920dd5b0d81cb046c5cb69efbdcc00be7e27b4f92534f84c74814614d3c54691" + BUILDENV_NAME="mixxx-deps-2.4-$VCPKG_TARGET_TRIPLET-07b9859" + BUILDENV_SHA256="2ea804641b6ca973d246cdea9b3ce7913521e49e8e0845c95bbc1cdb6842d6a7" else VCPKG_TARGET_TRIPLET="arm64-osx-min1100" BUILDENV_BRANCH="2.4" - BUILDENV_NAME="mixxx-deps-2.4-$VCPKG_TARGET_TRIPLET-00e79d1" - BUILDENV_SHA256="188f766b26c56a275025425310ff634bd64945884b8454739c62c0a07f537719" + BUILDENV_NAME="mixxx-deps-2.4-$VCPKG_TARGET_TRIPLET-ecdfdcd" + BUILDENV_SHA256="9c80be159aede678cea0a2a643e064374e3badd93c264b772d6c9665a976dde8" 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-498634a" - BUILDENV_SHA256="f40555dbac972a31dbc0bca68a4214422135fd8fbed2771b3ca932fc0d323b18" + BUILDENV_NAME="mixxx-deps-2.4-$VCPKG_TARGET_TRIPLET-07b9859" + BUILDENV_SHA256="efe301c8b07aac90713143ae2c533f0ad793472e24b5d06be793d1d9824cbeb0" else VCPKG_TARGET_TRIPLET="x64-osx-min1012" BUILDENV_BRANCH="2.4" - BUILDENV_NAME="mixxx-deps-2.4-$VCPKG_TARGET_TRIPLET-00e79d1" - BUILDENV_SHA256="ee692aad92fda47f76161b837f54c59dcc0c8c304e7e9532ae0e35c6df3013eb" + BUILDENV_NAME="mixxx-deps-2.4-$VCPKG_TARGET_TRIPLET-ecdfdcd" + BUILDENV_SHA256="eb8b1111399e5f169e2299120342760a0a7fcb817b6ced705e6bdd3b0c7dbbf5" fi fi diff --git a/tools/windows_buildenv.bat b/tools/windows_buildenv.bat index cae62b4a0062..b72c11ec920f 100644 --- 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-498634a - SET BUILDENV_SHA256=369eb68e3a5daba3af85f990d1b60740260825e2685687d0fdb787c1ba42a542 + SET BUILDENV_NAME=mixxx-deps-2.4-x64-windows-release-07b9859 + SET BUILDENV_SHA256=e627f36774b07aaa8845317cfab2c441d196c833279c5de3e34e8b7737fbb907 ) ELSE ( SET BUILDENV_BRANCH=2.4 set VCPKG_TARGET_TRIPLET=x64-windows - SET BUILDENV_NAME=mixxx-deps-2.4-x64-windows-00e79d1 - SET BUILDENV_SHA256=088bf27e8701edf132ce0e23e8947028653f3e5c5d1df54af9f0c0cc72f71196 + SET BUILDENV_NAME=mixxx-deps-2.4-x64-windows-ecdfdcd + SET BUILDENV_SHA256=90f2785eba6f370fa03933fe61bde1a85a36c7dcdcbad418a4715379f0d2ba95 ) IF "%~1"=="" (