From 9d4a7655a4bc5b7a434e5b51d035712b9cae9fbd Mon Sep 17 00:00:00 2001 From: Cezar Chirila Date: Thu, 4 Dec 2025 12:22:37 +0000 Subject: [PATCH 1/3] Update Ubuntu 24.04 required package versions --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 20f27a1df..c1473d63e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -344,7 +344,7 @@ if(LINUX) if(DISTRO_VER STREQUAL "22.04") set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.35-0), libpng16-16(>= 1.6.37-3), libsigc++-2.0-0v5 (>= 2.10.4-2), libyaml-cpp0.7(>= 0.7.0), libgomp1(>= 12.2.0), libvulkan1(>= 1.3.204.1-2), libglfw3(>= 3.3.6-1), libgtk-3-0(>= 3.24.33-1), zlib1g(>= 1:1.2.11), libhidapi-hidraw0(>= 0.11.2-1), liblxi1(>= 1.16-1), libtirpc3 (>= 1.3.2-2)" ) elseif(DISTRO_VER STREQUAL "24.04") - #set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.36-9), libpng16-16(>= 1.6.39-2), libsigc++-2.0-0v5 (>= 2.12.0-1), libyaml-cpp0.7(>= 0.7.0), libgomp1(>= 12.2.0), libvulkan1(>= 1.3.239), libglfw3(>= 3.3.8), libgtk-3-0(>= 3.24.38), zlib1g(>= 1.2.13), libhidapi-hidraw0(>= 0.13.1), liblxi1(>= 1.18), libtirpc3 (>= 1.3.3)" ) + set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.39-0), libpng16-16(>= 1.6.43-5), libsigc++-2.0-0v5 (>= 2.12.1-2), libyaml-cpp0.8(>= 0.8.0), libgomp1(>= 14.2.0), libvulkan1(>= 1.3.275.0-1), libglfw3(>= 3.3.10-1), libgtk-3-0(>= 3.24.41-4), zlib1g(>= 1:1.3), libhidapi-hidraw0(>= 0.14.0-1), liblxi1(>= 1.20-2), libtirpc3 (>= 1.3.4)" ) endif() # Unrecognized Debian-derived distro settings (assume Bookworm for now) From 7987ffc323527912ad9b3cce25feaf6fc65e03e7 Mon Sep 17 00:00:00 2001 From: Cezar Chirila Date: Tue, 9 Dec 2025 18:09:23 +0000 Subject: [PATCH 2/3] Automatically find dependencies when building the Debian package --- .github/workflows/build-debian.yml | 3 ++- CMakeLists.txt | 27 +-------------------------- 2 files changed, 3 insertions(+), 27 deletions(-) diff --git a/.github/workflows/build-debian.yml b/.github/workflows/build-debian.yml index 575630bbc..264c8c4ca 100644 --- a/.github/workflows/build-debian.yml +++ b/.github/workflows/build-debian.yml @@ -68,7 +68,8 @@ jobs: spirv-tools \ glslc \ lsb-release \ - libfftw3-dev + libfftw3-dev \ + dpkg-dev - name: Install Docs Dependencies if: ${{ matrix.docs }} diff --git a/CMakeLists.txt b/CMakeLists.txt index c1473d63e..04c8c0763 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -325,32 +325,7 @@ if(LINUX) # Debian specific packaging config set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Andrew Zonenberg ") - if(DISTRO_NAME STREQUAL "Debian") - - # Bookworm - # Versions are based on what Bookworm is shipping as of 2024-10-30 - if(DISTRO_VER STREQUAL "12") - set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.36-9), libpng16-16(>= 1.6.39-2), libsigc++-2.0-0v5 (>= 2.12.0-1), libyaml-cpp0.7(>= 0.7.0), libgomp1(>= 12.2.0), libvulkan1(>= 1.3.239), libglfw3(>= 3.3.8), libgtk-3-0(>= 3.24.38), zlib1g(>= 1.2.13), libhidapi-hidraw0(>= 0.13.1), liblxi1(>= 1.18), libtirpc3 (>= 1.3.3)" ) - - # Trixie - # Versions are based on what Trixie is shipping as of 2025-09-20 - elseif(DISTRO_VER STREQUAL "13") - set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.41-12), libpng16-16t64(>= 1.6.48), libsigc++-2.0-0v5 (>= 2.12.1), libyaml-cpp0.8(>= 0.8.0), libgomp1(>= 14.2.0-19), libvulkan1(>= 1.4.309.0), libglfw3(>= 3.4-3), libgtk-3-0t64(>= 3.24.49), zlib1g(>= 1:1.3.dfsg+really1.3.1-1), libhidapi-hidraw0(>= 0.14.0-1), liblxi1(>= 1.22-1), libtirpc3t64 (>= 1.3.6+ds-1)" ) - endif() - - # Ubuntu specific packaging config - elseif(DISTRO_NAME STREQUAL "Ubuntu") - - if(DISTRO_VER STREQUAL "22.04") - set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.35-0), libpng16-16(>= 1.6.37-3), libsigc++-2.0-0v5 (>= 2.10.4-2), libyaml-cpp0.7(>= 0.7.0), libgomp1(>= 12.2.0), libvulkan1(>= 1.3.204.1-2), libglfw3(>= 3.3.6-1), libgtk-3-0(>= 3.24.33-1), zlib1g(>= 1:1.2.11), libhidapi-hidraw0(>= 0.11.2-1), liblxi1(>= 1.16-1), libtirpc3 (>= 1.3.2-2)" ) - elseif(DISTRO_VER STREQUAL "24.04") - set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.39-0), libpng16-16(>= 1.6.43-5), libsigc++-2.0-0v5 (>= 2.12.1-2), libyaml-cpp0.8(>= 0.8.0), libgomp1(>= 14.2.0), libvulkan1(>= 1.3.275.0-1), libglfw3(>= 3.3.10-1), libgtk-3-0(>= 3.24.41-4), zlib1g(>= 1:1.3), libhidapi-hidraw0(>= 0.14.0-1), liblxi1(>= 1.20-2), libtirpc3 (>= 1.3.4)" ) - endif() - - # Unrecognized Debian-derived distro settings (assume Bookworm for now) - else() - set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.36-9), libpng16-16(>= 1.6.39-2), libsigc++-2.0-0v5 (>= 2.12.0-1), libyaml-cpp0.7(>= 0.7.0), libgomp1(>= 12.2.0), libvulkan1(>= 1.3.239), libglfw3(>= 3.3.8), libgtk-3-0(>= 3.24.38), zlib1g(>= 1.2.13), libhidapi-hidraw0(>= 0.13.1), liblxi1(>= 1.18), libtirpc3 (>= 1.3.3)" ) - endif() + set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) endif() From 19bc4bcfc77968a1ef2e6bff73c93b93540826af Mon Sep 17 00:00:00 2001 From: icamaster Date: Tue, 9 Dec 2025 19:48:42 +0000 Subject: [PATCH 3/3] Fix missing packages --- .github/workflows/build-debian.yml | 3 ++- .github/workflows/build-ubuntu.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-debian.yml b/.github/workflows/build-debian.yml index 264c8c4ca..396458335 100644 --- a/.github/workflows/build-debian.yml +++ b/.github/workflows/build-debian.yml @@ -69,7 +69,8 @@ jobs: glslc \ lsb-release \ libfftw3-dev \ - dpkg-dev + dpkg-dev \ + file - name: Install Docs Dependencies if: ${{ matrix.docs }} diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml index ea3990d17..7444162d4 100644 --- a/.github/workflows/build-ubuntu.yml +++ b/.github/workflows/build-ubuntu.yml @@ -59,7 +59,8 @@ jobs: xzip \ libhidapi-dev \ ccache \ - libfftw3-dev + libfftw3-dev \ + dpkg-dev - name: Install Docs Dependencies if: ${{ matrix.docs }}