Fix build of Jammy packages

This commit is contained in:
Cameron Gutman
2025-09-06 03:38:48 +00:00
parent 2cb96a84c8
commit 1fc1e3b63a
2 changed files with 10 additions and 0 deletions

View File

@@ -27,6 +27,11 @@ else
exit 1
fi
# Jammy requires libqt6opengl6-dev to use Qt Quick Controls
if [ "$DISTRO" == "jammy" ]; then
EXTRA_BUILD_DEPS="$EXTRA_BUILD_DEPS libqt6opengl6-dev,"
fi
# Trixie and later require qt6-svg-plugins to render SVGs in QML
if [ "$DISTRO" != "bookworm" ] && [ "$DISTRO" != "jammy" ] && [ "$DISTRO" != "noble" ]; then
EXTRA_DEPS="$EXTRA_DEPS qt6-svg-plugins,"

View File

@@ -11,6 +11,11 @@ if [ "$TARGET" == "rpi" ] || [ "$TARGET" == "rpi64" ]; then
apt-get install -y libavcodec-dev libavformat-dev libswscale-dev
fi
# This is no longer a separate package on modern distros
if [ "$DISTRO" == "jammy" ]; then
apt-get install -y libqt6opengl6-dev
fi
if [ "$TARGET" == "embedded" ] && [ "$DISTRO" != "sid" ] && [ "$DISTRO" != "trixie" ]; then
# Grab latest kernel headers from Bookworm to pick up the latest V4L2 defs
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 6ED0E7B82643E131