Skip to content

Commit 356356d

Browse files
committed
chore: update VCPKG to use the latest TagLib version
1 parent 606f759 commit 356356d

4 files changed

Lines changed: 29 additions & 29 deletions

File tree

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4607,7 +4607,7 @@ target_link_libraries(mixxx-lib PRIVATE SoundTouch::SoundTouch)
46074607
# TagLib
46084608
if(STEM)
46094609
# We don't know yet which version will include the stem support yet, so for not we set it to high irrelevant value
4610-
set(TAGLIB_VERSION 9.9)
4610+
set(TAGLIB_VERSION 2.2beta)
46114611
else()
46124612
set(TAGLIB_VERSION 1.11)
46134613
endif()

tools/android_buildenv.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ if [ "$HOST_ARCH" == "x86_64" ]; then
3636
else
3737
VCPKG_TARGET_TRIPLET="arm64-android"
3838
BUILDENV_BRANCH="2.7"
39-
BUILDENV_NAME="mixxx-deps-2.7-arm64-android-36b8ec0"
40-
BUILDENV_SHA256="2e8de8c264ece2bcbe989c3da0f4e1e90b78331e0f625127d8e95b4303d88a2e"
39+
BUILDENV_NAME="mixxx-deps-2.7-arm64-android-900bf7e7"
40+
BUILDENV_SHA256="79c469a29b2665a791c77c7296761eb687ad59f7a7047aa7e24a0d63267e679a"
4141
fi
4242
else
4343
echo "ERROR: Unsupported architecture detected: $HOST_ARCH"

tools/macos_buildenv.sh

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -33,39 +33,39 @@ if [ "$HOST_ARCH" = "x86_64" ]; then
3333
if [ -n "${BUILDENV_ARM64_CROSS}" ]; then
3434
if [ -n "${BUILDENV_RELEASE}" ]; then
3535
VCPKG_TARGET_TRIPLET="arm64-osx-min1100-release"
36-
BUILDENV_BRANCH="2.6-rel"
37-
BUILDENV_NAME="mixxx-deps-2.6-arm64-osx-cross-rel-541a925"
38-
BUILDENV_SHA256="42a663c70426ecf9576ce9889d2b24c0aaf1ecfb44fef97a745c4f758bf397a3"
36+
BUILDENV_BRANCH="2.7-rel"
37+
BUILDENV_NAME="mixxx-deps-2.7-arm64-osx-cross-rel-4ddb048b"
38+
BUILDENV_SHA256="4c3f0c8f71cf0256ba137ce3e6a7e0e7b7405b2838e0d6d026479df111eb1b2f"
3939
else
4040
VCPKG_TARGET_TRIPLET="arm64-osx-min1100"
41-
BUILDENV_BRANCH="2.6"
42-
BUILDENV_NAME="mixxx-deps-2.6-arm64-osx-cross-6a4e01e"
43-
BUILDENV_SHA256="39ec4249f601e4764b07ba2c8a6b27887c9a8c676d5e8d326035489af967ceac"
41+
BUILDENV_BRANCH="2.7"
42+
BUILDENV_NAME="mixxx-deps-2.7-arm64-osx-cross-900bf7e7"
43+
BUILDENV_SHA256="8de30e7b06cc07f05c8c04d332e85071209bea93fc3bf0d3fb3cf099bf8cf41f"
4444
fi
4545
else
4646
if [ -n "${BUILDENV_RELEASE}" ]; then
4747
VCPKG_TARGET_TRIPLET="x64-osx-min1100-release"
48-
BUILDENV_BRANCH="2.6-rel"
49-
BUILDENV_NAME="mixxx-deps-2.6-x64-osx-rel-541a925"
50-
BUILDENV_SHA256="0aa4ba8850d948b58abc83fd9cdfa9cf65c63ebce35a87e19b6ab5bc14d3abeb"
48+
BUILDENV_BRANCH="2.7-rel"
49+
BUILDENV_NAME="mixxx-deps-2.7-x64-osx-rel-4ddb048b"
50+
BUILDENV_SHA256="1759835f292885e1204d85360b89e4a3ecf7858a2805cabf9c1f65a3b339efb4"
5151
else
5252
VCPKG_TARGET_TRIPLET="x64-osx-min1100"
53-
BUILDENV_BRANCH="2.6"
54-
BUILDENV_NAME="mixxx-deps-2.6-x64-osx-6a4e01e"
55-
BUILDENV_SHA256="1d12b5f496598fb2d740ac6b5fe540b2256556554b9b6db58846aa14f94c54b2"
53+
BUILDENV_BRANCH="2.7"
54+
BUILDENV_NAME="mixxx-deps-2.7-x64-osx-900bf7e7"
55+
BUILDENV_SHA256="6e980088b6b561a14dd3c8267d405d74439dc7a6923871f0dd50661a0ade8375"
5656
fi
5757
fi
5858
elif [ "$HOST_ARCH" = "arm64" ]; then
5959
if [ -n "${BUILDENV_RELEASE}" ]; then
6060
VCPKG_TARGET_TRIPLET="arm64-osx-min1100-release"
61-
BUILDENV_BRANCH="2.6-rel"
62-
BUILDENV_NAME="mixxx-deps-2.6-arm64-osx-rel-541a925"
63-
BUILDENV_SHA256="7c160d441802a891092b4e16f7429f32ae7eeed95b4eff5bf2ed403b796b5355"
61+
BUILDENV_BRANCH="2.7-rel"
62+
BUILDENV_NAME="mixxx-deps-2.7-arm64-osx-rel-4ddb048b"
63+
BUILDENV_SHA256="8cf962058e0595547c312a1d3ced1d1c0f1055e36c38ebc25dc53c50d8e1efe0"
6464
else
6565
VCPKG_TARGET_TRIPLET="arm64-osx-min1100"
66-
BUILDENV_BRANCH="2.6"
67-
BUILDENV_NAME="mixxx-deps-2.6-arm64-osx-6a4e01e"
68-
BUILDENV_SHA256="b883799559b8621af5fa799e7784d1ee0ce9e573e4fed22c846e197eaf5a275b"
66+
BUILDENV_BRANCH="2.7"
67+
BUILDENV_NAME="mixxx-deps-2.7-arm64-osx-900bf7e7"
68+
BUILDENV_SHA256="edf08894f9b1d249763060a4723b734a9dad60aad2d3c53533cc60ab55124424"
6969
fi
7070
else
7171
echo "ERROR: Unsupported architecture detected: $HOST_ARCH"

tools/windows_buildenv.bat

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,25 +36,25 @@ IF /I "%PLATFORM%"=="arm64" (
3636
IF DEFINED BUILDENV_RELEASE (
3737
SET BUILDENV_BRANCH=2.6-rel
3838
SET VCPKG_TARGET_TRIPLET=arm64-windows-release
39-
SET BUILDENV_NAME=mixxx-deps-2.6-arm64-windows-rel-541a925
40-
SET BUILDENV_SHA256=ae9ac857fd8119b18da0116fe3c4239d938f3efba6b3baad46c8f3f62042942c
39+
SET BUILDENV_NAME=mixxx-deps-2.7-arm64-windows-rel-31c456d
40+
SET BUILDENV_SHA256=9978312d2856e784cf315865a9733fb67fa67adfa3992ebee78103cdba6f2c9e
4141
) ELSE (
4242
SET BUILDENV_BRANCH=2.6
4343
SET VCPKG_TARGET_TRIPLET=arm64-windows
44-
SET BUILDENV_NAME=mixxx-deps-2.6-arm64-windows-6a4e01e
45-
SET BUILDENV_SHA256=7ab9bf4fc18ac72a6bf4cf2b440eb0972591f9c1e0b031ecd3177633c235c3b6
44+
SET BUILDENV_NAME=mixxx-deps-2.7-arm64-windows-aecdb15b
45+
SET BUILDENV_SHA256=dc670b9ebbf4ec581fe36a111ca342bfeaee93a4e9b1b3ee30040cf04c89ccd3
4646
)
4747
) ELSE IF /I "%PLATFORM%"=="x64" (
4848
IF DEFINED BUILDENV_RELEASE (
4949
SET BUILDENV_BRANCH=2.6-rel
5050
SET VCPKG_TARGET_TRIPLET=x64-windows-release
51-
SET BUILDENV_NAME=mixxx-deps-2.6-x64-windows-rel-541a925
52-
SET BUILDENV_SHA256=2bf68831539271050ad19a74d0ed881c9d15f1c8ac0b3cb3b84cf58e7ab6dbd3
51+
SET BUILDENV_NAME=mixxx-deps-2.7-x64-windows-rel-31c456d
52+
SET BUILDENV_SHA256=8ed73369b1f19a8828822a4efe5092fff11c32ba956da871b6632726498ccc92
5353
) ELSE (
5454
SET BUILDENV_BRANCH=2.6
5555
SET VCPKG_TARGET_TRIPLET=x64-windows
56-
SET BUILDENV_NAME=mixxx-deps-2.6-x64-windows-6a4e01e
57-
SET BUILDENV_SHA256=034ba4f49660947819864f3ff3ee1a5cc494187876a62366346783cdf28ddf36
56+
SET BUILDENV_NAME=mixxx-deps-2.7-x64-windows-aecdb15b
57+
SET BUILDENV_SHA256=9f893fda1de2a0cd748b62b3072bea8a414ac242cf0722f7d9e460b39c9f8af2
5858
)
5959
) ELSE (
6060
ECHO ^ERROR: Unsupported PLATFORM: %PLATFORM%

0 commit comments

Comments
 (0)