Skip to content

Commit 1b4cab4

Browse files
committed
Merge remote-tracking branch 'upstream/2.5' into sync-branch-2.5-to-2.6
2 parents b44e2bc + f37edd8 commit 1b4cab4

2 files changed

Lines changed: 30 additions & 1 deletion

File tree

CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3588,6 +3588,7 @@ if(QT6)
35883588
if(QT_VERSION VERSION_GREATER_EQUAL 6.10)
35893589
# from Qt 6.10 GuiPrivate required for QShader/rendergraph (rhi/qshader.h)
35903590
list(APPEND QT_EXTRA_COMPONENTS "GuiPrivate")
3591+
set(QT_NO_PRIVATE_MODULE_WARNING ON)
35913592
endif()
35923593
else()
35933594
find_package(QT 5.12 NAMES Qt5 COMPONENTS Core REQUIRED)
@@ -5026,7 +5027,7 @@ target_precompile_headers(
50265027
mixxx-lib
50275028
PUBLIC ${MIXXX_LIB_PRECOMPILED_HEADER} ${MIXXX_COMMON_PRECOMPILED_HEADER}
50285029
)
5029-
if(BUILD_TESTING)
5030+
if(BUILD_TESTING AND NOT CMAKE_DISABLE_PRECOMPILE_HEADERS)
50305031
target_precompile_headers(mixxx-test REUSE_FROM mixxx-lib)
50315032
endif()
50325033

tools/archlinux_buildenv.sh

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
#!//bin/bash
2+
3+
set -o pipefail
4+
5+
sudo pacman -S --needed --noconfirm protobuf vamp-plugin-sdk \
6+
chromaprint libid3tag rubberband soundtouch \
7+
lame libogg libmad libvorbis libmp4v2 faad2 opusfile wavpack \
8+
libshout libsndfile portmidi portaudio \
9+
sqlite upower lilv libebur128 libmodplug \
10+
qt6-declarative qtkeychain-qt6 qt6-svg qt6-shadertools \
11+
qt6-5compat qt6-multimedia-ffmpeg qt6-scxml microsoft-gsl
12+
13+
# Checking if taglib is installed and build it from the AUR if this
14+
# is not the case
15+
if pacman -Qi taglib1 >/dev/null 2>&1; then
16+
taglib1_installed=true
17+
else
18+
taglib1_installed=false
19+
fi
20+
21+
if [ "$taglib1_installed" == false ]; then
22+
echo 'Building taglib1 from the AUR'
23+
rm -rf /tmp/taglib1 > /dev/null 2>&1
24+
git clone https://aur.archlinux.org/taglib1.git /tmp/taglib1 \
25+
&& cd /tmp/taglib1 \
26+
&& sed -i 's/arch=(x86_64)/arch=(x86_64 aarch64)/' PKGBUILD \
27+
&& makepkg -si --noconfirm
28+
fi

0 commit comments

Comments
 (0)