Added support for distro version specific CPack dependencies. Should now work on Debian 12/13, but not yet updated for Ubuntu

Author: azonenberg

CMakeLists.txt

@@ -321,10 +321,39 @@ set(CPACK_PACKAGE_HOMEPAGE_URL "https://www.ngscopeclient.org/")
 set(CPACK_THREADS 0)
 set(CPACK_STRIP_FILES TRUE)
 
-# Debian / Ubuntu specific packaging config
-# Versions are based on what Bookworm is shipping as of 2024-10-30
-set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Andrew Zonenberg <andrew.zonenberg@antikernel.net>")
-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)" )
+# Figure out what distro version we're on
+if(LINUX)
+	find_program(LSB_RELEASE_EXEC lsb_release)
+	execute_process(COMMAND ${LSB_RELEASE_EXEC} -is 2>&1
+		OUTPUT_VARIABLE DISTRO_NAME
+		OUTPUT_STRIP_TRAILING_WHITESPACE)
+	execute_process(COMMAND ${LSB_RELEASE_EXEC} -rs 2>&1
+		OUTPUT_VARIABLE DISTRO_VER
+		OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+	message(STATUS "Linux distribution target for packaging: name ${DISTRO_NAME}, version ${DISTRO_VER}")
+
+	# Debian specific packaging config
+	set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Andrew Zonenberg <andrew.zonenberg@antikernel.net>")
+	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()
+
+	# Default Debian-derived distro settings
+	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()
+
+endif()
 
 if(APPLE)
     set(CPACK_BUNDLE "ON")

release-notes/CHANGELOG.md

@@ -4,9 +4,10 @@ This is a running list of significant bug fixes and new features since the last
 
 ## New features since v0.1
 
-* None yet
+* ThunderScope: updates for API changes in ThunderScope driver
 
 ## Bugs fixed since v0.1
 
+* (in progress) Incorrect version dependencies on Debian/Ubuntu packages (https://github.com/ngscopeclient/scopehal-apps/issues/896)
 * Crash with vk::OutOfHostMemoryError when application is minimized on a Windows system with an Intel ARC GPU (https://github.com/ngscopeclient/scopehal-apps/issues/893)
 * Incorrect loading of CSV files with Windows line endings (https://github.com/ngscopeclient/scopehal/issues/1002)