Install either libqt6shadertools6-dev or qt6-shadertools-dev

daschuer · Jan 14, 2025 · 1a787d3 · 1a787d3
1 parent 3cd854b
commit 1a787d3
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/packaging/CPackDebUploadPPA.cmake b/packaging/CPackDebUploadPPA.cmake
@@ -88,6 +88,12 @@ endif()
 
 foreach(RELEASE ${CPACK_DEBIAN_DISTRIBUTION_RELEASES})
 
+  if (RELEASE STREQUAL "jammy")
+    set(CPACK_DEBIAN_PACKAGE_BUILD_DEPENDS_EXTRA "libqt6shadertools6-dev,")
+  else()
+    set(CPACK_DEBIAN_PACKAGE_BUILD_DEPENDS_EXTRA "qt6-shadertools-dev,")
+  endif()
+
   configure_file(${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}/packaging/debian/control.in
       ${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}/debian/control
       @ONLY)

diff --git a/packaging/debian/control.in b/packaging/debian/control.in
@@ -16,7 +16,6 @@ Build-Depends: debhelper (>= 11),
                qml6-module-qtquick-layouts,
                libqt6core5compat6-dev,
                libqt6opengl6-dev,
-               libqt6shadertools6-dev,
                libqt6sql6-sqlite,
                libqt6svg6-dev,
                cmake (>= 3.13),

diff --git a/tools/debian_buildenv.sh b/tools/debian_buildenv.sh
@@ -10,6 +10,19 @@ case "$1" in
         ;;
 
     setup)
+        source /etc/lsb-release 2>/dev/null
+        case "${DISTRIB_CODENAME}" in
+            focal|jammy|bullseye) # <= Ubuntu 22.04.5 LTS
+                PACKAGES_EXTRA=(
+                    libqt6shadertools6-dev
+                )
+                ;;
+            *)
+                PACKAGES_EXTRA=(
+                    qt6-shadertools-dev
+                )
+        esac
+
         sudo apt-get update
 
         # If jackd2 is installed as per dpkg database, install libjack-jackd2-dev.
@@ -68,9 +81,7 @@ case "$1" in
             libportmidi-dev \
             libprotobuf-dev \
             libqt6core5compat6-dev\
-            libqt6shadertools6-dev \
             libqt6opengl6-dev \
-            libqt6shadertools6-dev \
             libqt6sql6-sqlite \
             libqt6svg6-dev \
             librubberband-dev \