From 0cf509d681feefd319192a3135c9a9a137037106 Mon Sep 17 00:00:00 2001 From: Moritz Haase Date: Mon, 14 Jul 2025 13:26:30 +0200 Subject: libvncserver: upgrade 0.9.14 -> 0.9.15 Also pull in a patch to support builds with CMake 4+ that hasn't made it into a release yet. Release notes are available at [0]. [0]: https://github.com/LibVNC/libvncserver/releases/tag/LibVNCServer-0.9.15 Signed-off-by: Moritz Haase Signed-off-by: Khem Raj --- .../0001-CMake-require-at-least-CMake-3.5.patch | 25 ++++++++++ .../libvncserver/libvncserver_0.9.14.bb | 55 --------------------- .../libvncserver/libvncserver_0.9.15.bb | 57 ++++++++++++++++++++++ 3 files changed, 82 insertions(+), 55 deletions(-) create mode 100644 meta-oe/recipes-graphics/libvncserver/libvncserver/0001-CMake-require-at-least-CMake-3.5.patch delete mode 100644 meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.14.bb create mode 100644 meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.15.bb diff --git a/meta-oe/recipes-graphics/libvncserver/libvncserver/0001-CMake-require-at-least-CMake-3.5.patch b/meta-oe/recipes-graphics/libvncserver/libvncserver/0001-CMake-require-at-least-CMake-3.5.patch new file mode 100644 index 0000000000..68e3a08acb --- /dev/null +++ b/meta-oe/recipes-graphics/libvncserver/libvncserver/0001-CMake-require-at-least-CMake-3.5.patch @@ -0,0 +1,25 @@ +From e64fa928170f22a2e21b5bbd6d46c8f8e7dd7a96 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Matti=20Lehtim=C3=A4ki?= +Date: Tue, 13 May 2025 08:37:07 +0300 +Subject: [PATCH] CMake: require at least CMake 3.5 + +CMake 4 dropped support for version requirements < 3.5. + +Fixes building with CMake >= 4. + +Upstream-Status: Backport [e64fa928170f22a2e21b5bbd6d46c8f8e7dd7a96] +Signed-off-by: Moritz Haase +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 205f3928..9b8118c8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.4) ++cmake_minimum_required(VERSION 3.5) + + set(PROJECT_LANGUAGES C) + diff --git a/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.14.bb b/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.14.bb deleted file mode 100644 index ff5df428e8..0000000000 --- a/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.14.bb +++ /dev/null @@ -1,55 +0,0 @@ -DESCRIPTION = "library for easy implementation of a RDP/VNC server" -HOMEPAGE = "https://libvnc.github.io" -SECTION = "libs" -PRIORITY = "optional" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f" - -# ffmpeg support is not currently compatible with ffmpeg 5.0 -PACKAGECONFIG ??= " \ - 24bpp \ - filetransfer \ - gcrypt \ - gnutls \ - jpeg \ - lzo \ - png \ - pthread \ - ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '',d)} \ - sdl \ - websockets \ - zlib \ -" - -PACKAGECONFIG[24bpp] = "-DWITH_24BPP=ON,-DWITH_24BPP=OFF," -PACKAGECONFIG[filetransfer] = "-DWITH_TIGHTVNC_FILETRANSFER=ON,-DWITH_TIGHTVNC_FILETRANSFER=OFF," -PACKAGECONFIG[ffmpeg] = "-DWITH_FFMPEG=ON,-DWITH_FFMPEG=OFF,ffmpeg,ffmpeg" -PACKAGECONFIG[gcrypt] = "-DWITH_GCRYPT=ON,-DWITH_GCRYPT=OFF,libgcrypt,libgcrypt" -PACKAGECONFIG[gnutls] = "-DWITH_GNUTLS=ON,-DWITH_GNUTLS=OFF,gnutls" -PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON,-DWITH_JPEG=OFF,jpeg" -PACKAGECONFIG[ipv6] = "-DWITH_IPv6=ON,-DWITH_IPv6=OFF," -PACKAGECONFIG[lzo] = "-DWITH_LZO=ON,-DWITH_LZO=OFF,lzo" -PACKAGECONFIG[openssl] = "-DWITH_OPENSSL=ON,-DWITH_OPENSSL=OFF,openssl" -PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng,libpng" -PACKAGECONFIG[pthread] = "-DWITH_THREADS=ON,-DWITH_THREADS=OFF," -PACKAGECONFIG[systemd] = "-DWITH_SYSTEMD=ON,-DWITH_SYSTEMD=OFF,systemd" -PACKAGECONFIG[sasl] = "-DWITH_SASL=ON,-DWITH_SASL=OFF,cyrus-sasl" -PACKAGECONFIG[sdl] = "-DWITH_SDL=ON,-DWITH_SDL=OFF,virtual/libsdl2" -PACKAGECONFIG[websockets] = "-DWITH_WEBSOCKETS=ON,-DWITH_WEBSOCKETS=OFF," -PACKAGECONFIG[zlib] = "-DWITH_ZLIB=ON,-DWITH_ZLIB=OFF,zlib" - -PACKAGE_BEFORE_PN = "libvncclient" -FILES:libvncclient = "${libdir}/libvncclient.*" - -inherit cmake - -SRC_URI = "git://github.com/LibVNC/libvncserver;branch=master;protocol=https" -SRCREV = "10e9eb75f73e973725dc75c373de5d89807af028" - - -EXTRA_OECMAKE = "-DMAKE_INSTALL_LIBDIR=${libdir}" - -do_install:append() { - sed -i -e 's|${STAGING_DIR_HOST}||g' ${D}${libdir}/cmake/LibVNCServer/LibVNCServerTargets.cmake -} diff --git a/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.15.bb b/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.15.bb new file mode 100644 index 0000000000..9d2d0a5743 --- /dev/null +++ b/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.15.bb @@ -0,0 +1,57 @@ +DESCRIPTION = "library for easy implementation of a RDP/VNC server" +HOMEPAGE = "https://libvnc.github.io" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f" + +# ffmpeg support is not currently compatible with ffmpeg 5.0 +PACKAGECONFIG ??= " \ + 24bpp \ + filetransfer \ + gcrypt \ + gnutls \ + jpeg \ + lzo \ + png \ + pthread \ + ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '',d)} \ + sdl \ + websockets \ + zlib \ +" + +PACKAGECONFIG[24bpp] = "-DWITH_24BPP=ON,-DWITH_24BPP=OFF," +PACKAGECONFIG[filetransfer] = "-DWITH_TIGHTVNC_FILETRANSFER=ON,-DWITH_TIGHTVNC_FILETRANSFER=OFF," +PACKAGECONFIG[ffmpeg] = "-DWITH_FFMPEG=ON,-DWITH_FFMPEG=OFF,ffmpeg,ffmpeg" +PACKAGECONFIG[gcrypt] = "-DWITH_GCRYPT=ON,-DWITH_GCRYPT=OFF,libgcrypt,libgcrypt" +PACKAGECONFIG[gnutls] = "-DWITH_GNUTLS=ON,-DWITH_GNUTLS=OFF,gnutls" +PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON,-DWITH_JPEG=OFF,jpeg" +PACKAGECONFIG[ipv6] = "-DWITH_IPv6=ON,-DWITH_IPv6=OFF," +PACKAGECONFIG[lzo] = "-DWITH_LZO=ON,-DWITH_LZO=OFF,lzo" +PACKAGECONFIG[openssl] = "-DWITH_OPENSSL=ON,-DWITH_OPENSSL=OFF,openssl" +PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng,libpng" +PACKAGECONFIG[pthread] = "-DWITH_THREADS=ON,-DWITH_THREADS=OFF," +PACKAGECONFIG[systemd] = "-DWITH_SYSTEMD=ON,-DWITH_SYSTEMD=OFF,systemd" +PACKAGECONFIG[sasl] = "-DWITH_SASL=ON,-DWITH_SASL=OFF,cyrus-sasl" +PACKAGECONFIG[sdl] = "-DWITH_SDL=ON,-DWITH_SDL=OFF,virtual/libsdl2" +PACKAGECONFIG[websockets] = "-DWITH_WEBSOCKETS=ON,-DWITH_WEBSOCKETS=OFF," +PACKAGECONFIG[zlib] = "-DWITH_ZLIB=ON,-DWITH_ZLIB=OFF,zlib" + +PACKAGE_BEFORE_PN = "libvncclient" +FILES:libvncclient = "${libdir}/libvncclient.*" + +inherit cmake + +SRC_URI = "git://github.com/LibVNC/libvncserver;branch=master;protocol=https;tag=LibVNCServer-${PV} \ + file://0001-CMake-require-at-least-CMake-3.5.patch \ +" +SRCREV = "9b54b1ec32731bd23158ca014dc18014db4194c3" + + +EXTRA_OECMAKE = "-DMAKE_INSTALL_LIBDIR=${libdir}" + +do_install:append() { + sed -i -e 's|${STAGING_DIR_HOST}||g' ${D}${libdir}/cmake/LibVNCServer/LibVNCServerTargets.cmake +} -- cgit v1.2.3-54-g00ecf