Merge branch 'main' into dev

TurboVNC · Nov 6, 2024 · 4f73246 · 4f73246
2 parents 17ed47f + c826c52
commit 4f73246
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/cmakescripts/BuildPackages.cmake b/cmakescripts/BuildPackages.cmake
@@ -55,14 +55,17 @@ if(TVNC_BUILDSERVER)
 	if(TVNC_USEPAM)
 		set(DEBDEPENDS "libpam0g, ${DEBDEPENDS}")
 	endif()
-	set(DEBDEPENDS "${DEBDEPENDS}, dbus-x11, xauth, x11-xkb-utils, xkb-data, libxdmcp6, libxfont2, libpixman-1-0, libgl1-mesa-glx")
+	set(DEBDEPENDS "${DEBDEPENDS}, dbus-x11, xauth, x11-xkb-utils, xkb-data, libxdmcp6, libxfont2, libpixman-1-0, libgl1")
 	if(TVNC_DRI3)
 		set(DEBDEPENDS "${DEBDEPENDS}, libgbm1")
 	endif()
 	if(TVNC_BUILDWEBSERVER)
 		set(DEBDEPENDS "${DEBDEPENDS}, python3")
 	endif()
 endif()
+if(TVNC_BUILDVIEWER)
+	set(DEBDEPENDS "${DEBDEPENDS}, libxi6")
+endif()
 
 configure_file(release/makerpm.in pkgscripts/makerpm)
 configure_file(release/rpm.spec.in pkgscripts/rpm.spec @ONLY)

diff --git a/unix/Xvnc/CMakeLists.txt b/unix/Xvnc/CMakeLists.txt
@@ -92,7 +92,7 @@ option(TVNC_ZLIBNG
 boolean_number(TVNC_ZLIBNG)
 report_option(TVNC_ZLIBNG "zlib-ng")
 if(NOT TVNC_ZLIBNG)
-	include(FindZLIB)
+	find_package(ZLIB REQUIRED)
 else()
 	set(ZLIB_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/lib/zlib-ng)
 	set(ZLIB_LIBRARIES ${CMAKE_CURRENT_BINARY_DIR}/lib/zlib-ng/libz.a)

diff --git a/unix/Xvnc/programs/Xserver/hw/vnc/CMakeLists.txt b/unix/Xvnc/programs/Xserver/hw/vnc/CMakeLists.txt
@@ -37,15 +37,10 @@ set_property(CACHE TVNC_USETLS PROPERTY STRINGS OpenSSL None)
 string(TOLOWER "${TVNC_USETLS}" TVNC_USETLS)
 
 if(TVNC_USETLS STREQUAL "openssl")
-	include(FindOpenSSL)
-	if(NOT OPENSSL_FOUND)
-		message(STATUS "OpenSSL not found.  Disabling TLS encryption")
-		set(TVNC_USETLS "None" CACHE STRING ${TVNC_USETLS_DESC} FORCE)
-	else()
-		set(RFBSSLSRC rfbssl_openssl.c)
-		message(STATUS "Enabling TLS encryption using OpenSSL")
-		add_definitions(-DUSETLS)
-	endif()
+	message(STATUS "Enabling TLS encryption using OpenSSL")
+	find_package(OpenSSL REQUIRED)
+	set(RFBSSLSRC rfbssl_openssl.c)
+	add_definitions(-DUSETLS)
 	set(DEFAULT_TVNC_DLOPENSSL 1)
 	option(TVNC_DLOPENSSL "Load OpenSSL using dlopen()/dlsym() instead of linking directly with it"
 		${DEFAULT_TVNC_DLOPENSSL})