Install either qt6-shadertools-dev or qt6-shadertools-dev and drop sp…

…ecial case for bionic
mixxxdj · Jan 10, 2025 · fbcb19f · fbcb19f
1 parent a807be6
commit fbcb19f
Show file tree

Hide file tree

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

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),
@@ -27,6 +26,7 @@ Build-Depends: debhelper (>= 11),
                libogg-dev,
                libsndfile1-dev,
                libasound2-dev,
+               libavformat-dev,
                libvorbis-dev,
                libfaad-dev,
                libportmidi-dev,

diff --git a/tools/debian_buildenv.sh b/tools/debian_buildenv.sh
@@ -12,14 +12,14 @@ case "$1" in
     setup)
         source /etc/lsb-release 2>/dev/null
         case "${DISTRIB_CODENAME}" in
-            bionic) # Ubuntu 18.04 LTS
+            focal|jammy|bullseye) # <= Ubuntu 22.04.5 LTS
                 PACKAGES_EXTRA=(
-                    libmp4v2-dev
+                    libqt6shadertools6-dev
                 )
                 ;;
-            *) # libmp4v2 was removed from Debian 10 & Ubuntu 20.04 due to lack of maintenance, so use FFMPEG instead
+            *)
                 PACKAGES_EXTRA=(
-                    libavformat-dev
+                    qt6-shadertools-dev
                 )
         esac
 
@@ -58,6 +58,7 @@ case "$1" in
             fonts-ubuntu \
             g++ \
             lcov \
+            libavformat-dev \
             libbenchmark-dev \
             libchromaprint-dev \
             libdistro-info-perl \
@@ -80,9 +81,7 @@ case "$1" in
             libportmidi-dev \
             libprotobuf-dev \
             libqt6core5compat6-dev\
-            libqt6shadertools6-dev \
             libqt6opengl6-dev \
-            libqt6shadertools6-dev \
             libqt6sql6-sqlite \
             libqt6svg6-dev \
             librubberband-dev \