Skip to content

Commit 928dcb6

Browse files
authored
Merge pull request #921 from icamaster/master
Automatically find required package versions for Debian based distros
2 parents c87dae3 + 19bc4bc commit 928dcb6

3 files changed

Lines changed: 6 additions & 28 deletions

File tree

.github/workflows/build-debian.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,9 @@ jobs:
6868
spirv-tools \
6969
glslc \
7070
lsb-release \
71-
libfftw3-dev
71+
libfftw3-dev \
72+
dpkg-dev \
73+
file
7274
7375
- name: Install Docs Dependencies
7476
if: ${{ matrix.docs }}

.github/workflows/build-ubuntu.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ jobs:
5959
xzip \
6060
libhidapi-dev \
6161
ccache \
62-
libfftw3-dev
62+
libfftw3-dev \
63+
dpkg-dev
6364
6465
- name: Install Docs Dependencies
6566
if: ${{ matrix.docs }}

CMakeLists.txt

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -325,32 +325,7 @@ if(LINUX)
325325

326326
# Debian specific packaging config
327327
set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Andrew Zonenberg <andrew.zonenberg@antikernel.net>")
328-
if(DISTRO_NAME STREQUAL "Debian")
329-
330-
# Bookworm
331-
# Versions are based on what Bookworm is shipping as of 2024-10-30
332-
if(DISTRO_VER STREQUAL "12")
333-
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)" )
334-
335-
# Trixie
336-
# Versions are based on what Trixie is shipping as of 2025-09-20
337-
elseif(DISTRO_VER STREQUAL "13")
338-
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)" )
339-
endif()
340-
341-
# Ubuntu specific packaging config
342-
elseif(DISTRO_NAME STREQUAL "Ubuntu")
343-
344-
if(DISTRO_VER STREQUAL "22.04")
345-
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)" )
346-
elseif(DISTRO_VER STREQUAL "24.04")
347-
#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)" )
348-
endif()
349-
350-
# Unrecognized Debian-derived distro settings (assume Bookworm for now)
351-
else()
352-
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)" )
353-
endif()
328+
set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
354329

355330
endif()
356331

0 commit comments

Comments
 (0)