From 1fc1e3b63a208cf1ed9486014e1836fcbe23e439 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Sat, 6 Sep 2025 03:38:48 +0000
Subject: [PATCH] Fix build of Jammy packages

---
 scripts/build-package.sh     | 5 +++++
 scripts/install-base-deps.sh | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/scripts/build-package.sh b/scripts/build-package.sh
index 3f2b0a1..e506da8 100755
--- a/scripts/build-package.sh
+++ b/scripts/build-package.sh
@@ -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,"
diff --git a/scripts/install-base-deps.sh b/scripts/install-base-deps.sh
index 040fec8..e87391c 100755
--- a/scripts/install-base-deps.sh
+++ b/scripts/install-base-deps.sh
@@ -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