diff mbox series

[meta-oe,05/10] libvncserver: upgrade 0.9.14 -> 0.9.15

Message ID 20250714112642.121146-5-Moritz.Haase@bmw.de
State Under Review
Headers show
Series [meta-oe,01/10] leveldb: Disable ptests to allow to build with CMake 4+ | expand

Commit Message

Haase Moritz, JD-62 July 14, 2025, 11:26 a.m. UTC 
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 <Moritz.Haase@bmw.de>
---
 ...001-CMake-require-at-least-CMake-3.5.patch | 25 +++++++++++++++++++
 ...erver_0.9.14.bb => libvncserver_0.9.15.bb} |  6 +++--
 2 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 meta-oe/recipes-graphics/libvncserver/libvncserver/0001-CMake-require-at-least-CMake-3.5.patch
 rename meta-oe/recipes-graphics/libvncserver/{libvncserver_0.9.14.bb => libvncserver_0.9.15.bb} (92%)
diff mbox series

Patch

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?= <matti.lehtimaki@jolla.com>
+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 <Moritz.Haase@bmw.de>
+---
+ 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.15.bb
similarity index 92%
rename from meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.14.bb
rename to meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.15.bb
index ff5df428e8..9d2d0a5743 100644
--- a/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.14.bb
+++ b/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.15.bb
@@ -44,8 +44,10 @@  FILES:libvncclient = "${libdir}/libvncclient.*"
 
 inherit cmake
 
-SRC_URI = "git://github.com/LibVNC/libvncserver;branch=master;protocol=https"
-SRCREV = "10e9eb75f73e973725dc75c373de5d89807af028"
+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}"