Fixes merge conflicts, but leaves out-of-DDS-scope build errors (tbc)

This commit is contained in:
torsten committed 2026-09-21 17:04:53 +00:00
1 parent f6292cc244
commit 0997dcba79
6 files changed
+109 -17

No files matched your search

@@ -208,6 +208,7 @@ APT_PACKAGES=(
libvlc-dev
vlc-plugin-base
git
python3-pip
)
# INTERFACE libraries (header-only) are built automatically as dependencies
@@ -356,7 +357,7 @@ install_qt6_packages() {
# Install aqtinstall if not available
if ! command -v aqt &> /dev/null; then
log_info "Installing aqtinstall via pip3"
pip3 install --quiet aqtinstall
pip3 install --break-system-packages --quiet aqtinstall
fi
# Install Qt6 modules (same as app/Dockerfile)
@@ -592,6 +593,27 @@ log_info() {
printf 'INFO: %s\n' "$*"
}
install_qt6_packages() {
log_info "Installing Qt6 packages via aqtinstall"
# Install aqtinstall if not available
if ! command -v aqt &> /dev/null; then
log_info "Installing aqtinstall via pip3"
pip3 install --break-system-packages --quiet aqtinstall
fi
# Install Qt6 modules (same as app/Dockerfile)
# Modules: qtmultimedia, qtserialport, qtimageformats, qtwebsockets, qtwebengine,
# qtpdf, qtwebview, qt5compat, qtwebchannel, qtpositioning, qtlocation, qtsensors
# Note: qtsvg is NOT available via aqtinstall - it's provided by libqt6svg6-dev apt package
aqt install-qt linux desktop "${QT_VERSION:-6.10.2}" "${QT_ARCH:-linux_gcc_64}" \
-m qtmultimedia qtserialport qtimageformats qtwebsockets qtwebengine \
qtpdf qtwebview qt5compat qtwebchannel qtpositioning qtlocation qtsensors \
--outputdir "${QT_BASE_DIR:-/opt/Qt}"
log_info "Qt6 packages installed successfully"
}
run_build_group() {
local group_id="$1"
local enabled="$2"