From f7ef0e2dd1231a7ab7bafdb1f6863b9e3eef7077 Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@windriver.com>
Date: Thu, 13 Mar 2025 08:11:38 +0800
Subject: [PATCH] tigervnc: upgrade 1.14.1 -> 1.15.0

ChangeLog
https://github.com/TigerVNC/tigervnc/releases/tag/v1.15.0

* Refresh local patch
* Update xorg-server to 21.1.16

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...d-missing-dynamic-library-to-FLTK_LIBRARIES.patch | 10 +++++-----
 .../{tigervnc_1.14.1.bb => tigervnc_1.15.0.bb}       | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)
 rename meta-oe/recipes-graphics/tigervnc/{tigervnc_1.14.1.bb => tigervnc_1.15.0.bb} (88%)

diff --git a/meta-oe/recipes-graphics/tigervnc/files/0002-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch b/meta-oe/recipes-graphics/tigervnc/files/0002-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch
index 56bed4bbfe..101adaa82f 100644
--- a/meta-oe/recipes-graphics/tigervnc/files/0002-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch
+++ b/meta-oe/recipes-graphics/tigervnc/files/0002-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch
@@ -1,4 +1,4 @@
-From 7ca0b0a4f8a37f9dbe461e28a731364b9aaa60bb Mon Sep 17 00:00:00 2001
+From 4c7658b43f903599608c1fea4fbd7e37dc117119 Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <hongxu.jia@windriver.com>
 Date: Thu, 20 Jul 2017 05:06:00 -0400
 Subject: [PATCH] add missing dynamic library to FLTK_LIBRARIES
@@ -11,17 +11,17 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
  1 file changed, 2 insertions(+)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c47c9c0e..f4b576a0 100644
+index 80c2762c..eb581600 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -270,6 +270,8 @@ if(BUILD_VIEWER)
-   endif()
+@@ -315,6 +315,8 @@ if(BUILD_VIEWER)
+   set(CMAKE_REQUIRED_LIBRARIES)
  endif()
  
 +set(FLTK_LIBRARIES ${FLTK_LIBRARIES} -lm -ldl -lpng -ljpeg)
 +
  # Check for GNUTLS library
- option(ENABLE_GNUTLS "Enable protocol encryption and advanced authentication" ON)
+ trioption(ENABLE_GNUTLS "Enable protocol encryption and advanced authentication")
  if(ENABLE_GNUTLS)
 -- 
 2.25.1
diff --git a/meta-oe/recipes-graphics/tigervnc/tigervnc_1.14.1.bb b/meta-oe/recipes-graphics/tigervnc/tigervnc_1.15.0.bb
similarity index 88%
rename from meta-oe/recipes-graphics/tigervnc/tigervnc_1.14.1.bb
rename to meta-oe/recipes-graphics/tigervnc/tigervnc_1.15.0.bb
index ca737e48ba..079d3d0741 100644
--- a/meta-oe/recipes-graphics/tigervnc/tigervnc_1.14.1.bb
+++ b/meta-oe/recipes-graphics/tigervnc/tigervnc_1.15.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "TigerVNC remote display system"
 HOMEPAGE = "http://www.tigervnc.com/"
 LICENSE = "GPL-2.0-or-later"
 SECTION = "x11/utils"
-DEPENDS = "gettext-native xserver-xorg gnutls nettle jpeg pixman libxtst fltk libpam libx11 libxdamage libxfixes libxrandr"
+DEPENDS = "gettext-native xserver-xorg gnutls nettle jpeg pixman libxtst fltk libpam libx11 libxdamage libxfixes libxrandr xkbcomp"
 RDEPENDS:${PN} = "coreutils hicolor-icon-theme perl bash xkbcomp"
 
 LIC_FILES_CHKSUM = "file://LICENCE.TXT;md5=75b02c2872421380bbd47781d2bd75d3"
@@ -17,9 +17,9 @@ REQUIRED_DISTRO_FEATURES = "x11 pam"
 # out-of-tree builds.
 B = "${S}"
 
-SRCREV = "1b4af5c586eb7a30a38c82fd088c1fa47a83e72f"
+SRCREV = "8bdf8734ce12c8ed3c232496fc8a4ccdb04636b8"
 
-SRC_URI = "git://github.com/TigerVNC/tigervnc.git;branch=1.14-branch;protocol=https \
+SRC_URI = "git://github.com/TigerVNC/tigervnc.git;branch=1.15-branch;protocol=https \
            file://0001-do-not-build-tests-sub-directory.patch \
            file://0002-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch \
            file://0003-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch \
@@ -27,10 +27,10 @@ SRC_URI = "git://github.com/TigerVNC/tigervnc.git;branch=1.14-branch;protocol=ht
 
 # Keep sync with xorg-server in oe-core
 XORG_PN ?= "xorg-server"
-XORG_PV ?= "21.1.15"
+XORG_PV ?= "21.1.16"
 SRC_URI += "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${XORG_PV}.tar.xz;name=xorg"
 XORG_S = "${UNPACKDIR}/${XORG_PN}-${XORG_PV}"
-SRC_URI[xorg.sha256sum] = "841c82901282902725762df03adbbcd68153d4cdfb0d61df0cfd73ad677ae089"
+SRC_URI[xorg.sha256sum] = "b14a116d2d805debc5b5b2aac505a279e69b217dae2fae2dfcb62400471a9970"
 
 # It is the directory containing the Xorg source for the
 # machine on which you are building TigerVNC.
@@ -72,7 +72,7 @@ do_configure:append () {
 }
 
 do_compile:append () {
-    oe_runmake
+    oe_runmake 'TIGERVNC_BUILDDIR=${B}'
 }
 
 do_install:append() {