5 files changed, 109 insertions, 155 deletions

diff --git a/meta-oe/recipes-graphics/tigervnc/files/0002-do-not-build-tests-sub-directory.patch b/meta-oe/recipes-graphics/tigervnc/files/0001-do-not-build-tests-sub-directory.patch
index 5a42e67d06..0d58d2502d 100644
--- a/meta-oe/recipes-graphics/tigervnc/files/0002-do-not-build-tests-sub-directory.patch
+++ b/meta-oe/recipes-graphics/tigervnc/files/0001-do-not-build-tests-sub-directory.patch
@@ -1,4 +1,4 @@
-From 076d0e12a7be6cd2108e4ca0dcde1cb658918fa5 Mon Sep 17 00:00:00 2001
+From e117ccc2b4ebb116ab63a3aa6097104964ee223b Mon Sep 17 00:00:00 2001
 From: Chen Qi <Qi.Chen@windriver.com>
 Date: Mon, 19 Apr 2021 23:02:45 -0700
 Subject: [PATCH] do not build tests sub directory
@@ -12,19 +12,19 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
  1 file changed, 3 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7bf99441..bda80598 100644
+index 468f4b54..c47c9c0e 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -304,9 +304,6 @@ if(BUILD_VIEWER)
+@@ -351,9 +351,6 @@ if(BUILD_VIEWER)
    add_subdirectory(media)
  endif()
  
 -add_subdirectory(tests)
 -
 -
- add_subdirectory(release)
- 
- # uninstall
+ if(BUILD_VIEWER)
+   add_subdirectory(release)
+ endif()
 -- 
-2.30.2
+2.25.1
 
diff --git a/meta-oe/recipes-graphics/tigervnc/files/0003-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 cfb84ac141..101adaa82f 100644
--- a/meta-oe/recipes-graphics/tigervnc/files/0003-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,7 +1,7 @@
-From 6369a5be2af2ed1fa443f40f48deaf318d22713e 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 3/4] add missing dynamic library to FLTK_LIBRARIES
+Subject: [PATCH] add missing dynamic library to FLTK_LIBRARIES
 
 Upstream-Status: Pending
 
@@ -11,18 +11,18 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
  1 file changed, 2 insertions(+)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fb72a00..5732dc8 100644
+index 80c2762c..eb581600 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -246,6 +246,8 @@ if(UNIX AND NOT APPLE)
-   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.7.4
+2.25.1
 
diff --git a/meta-oe/recipes-graphics/tigervnc/files/0004-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch b/meta-oe/recipes-graphics/tigervnc/files/0003-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch
index 5f14665b8d..c292df4a52 100644
--- a/meta-oe/recipes-graphics/tigervnc/files/0004-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch
+++ b/meta-oe/recipes-graphics/tigervnc/files/0003-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch
@@ -1,4 +1,4 @@
-From 7f8acd59bb2e54f9be25a98dd71534700a9e355a Mon Sep 17 00:00:00 2001
+From 36bf37cb638cd87d7f8eb96afaf69c2d95177614 Mon Sep 17 00:00:00 2001
 From: Chen Qi <Qi.Chen@windriver.com>
 Date: Mon, 19 Apr 2021 23:14:28 -0700
 Subject: [PATCH] tigervnc: add fPIC option to COMPILE_FLAGS
@@ -18,35 +18,35 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
  3 files changed, 3 insertions(+)
 
 diff --git a/common/network/CMakeLists.txt b/common/network/CMakeLists.txt
-index d00ca452..e84e0290 100644
+index f08eaa31..85c05951 100644
 --- a/common/network/CMakeLists.txt
 +++ b/common/network/CMakeLists.txt
-@@ -16,4 +16,5 @@ endif()
+@@ -15,4 +15,5 @@ endif()
  
  if(UNIX)
    libtool_create_control_file(network)
 +  set_target_properties(network PROPERTIES COMPILE_FLAGS -fPIC)
  endif()
 diff --git a/common/rdr/CMakeLists.txt b/common/rdr/CMakeLists.txt
-index 989ba2f4..20f6489d 100644
+index 30c2403a..94e1ff98 100644
 --- a/common/rdr/CMakeLists.txt
 +++ b/common/rdr/CMakeLists.txt
-@@ -27,4 +27,5 @@ target_link_libraries(rdr ${RDR_LIBRARIES})
+@@ -35,4 +35,5 @@ endif()
  
  if(UNIX)
    libtool_create_control_file(rdr)
 +  set_target_properties(rdr PROPERTIES COMPILE_FLAGS -fPIC)
  endif()
 diff --git a/common/rfb/CMakeLists.txt b/common/rfb/CMakeLists.txt
-index fc5a37bf..7f5ce131 100644
+index 360434a9..28566e90 100644
 --- a/common/rfb/CMakeLists.txt
 +++ b/common/rfb/CMakeLists.txt
-@@ -99,4 +99,5 @@ target_link_libraries(rfb ${RFB_LIBRARIES})
+@@ -116,4 +116,5 @@ endif()
  
  if(UNIX)
    libtool_create_control_file(rfb)
 +  set_target_properties(rfb PROPERTIES COMPILE_FLAGS -fPIC)
  endif()
 -- 
-2.30.2
+2.25.1
 
diff --git a/meta-oe/recipes-graphics/tigervnc/tigervnc_1.11.0.bb b/meta-oe/recipes-graphics/tigervnc/tigervnc_1.11.0.bb
deleted file mode 100644
index 5cde7c9fb4..0000000000
--- a/meta-oe/recipes-graphics/tigervnc/tigervnc_1.11.0.bb
+++ /dev/null
@@ -1,133 +0,0 @@
-DESCRIPTION = "TigerVNC remote display system"
-HOMEPAGE = "http://www.tigervnc.com/"
-LICENSE = "GPL-2.0-or-later"
-SECTION = "x11/utils"
-DEPENDS = "xserver-xorg gnutls jpeg libxtst gettext-native fltk libpam"
-RDEPENDS:${PN} = "coreutils hicolor-icon-theme perl bash xkbcomp"
-
-LIC_FILES_CHKSUM = "file://LICENCE.TXT;md5=75b02c2872421380bbd47781d2bd75d3"
-
-S = "${WORKDIR}/git"
-
-inherit autotools cmake features_check pkgconfig
-
-REQUIRED_DISTRO_FEATURES = "x11 pam"
-
-B = "${S}"
-
-SRCREV = "540bfc3278e396321124d4b18a798ac2bc18b6ca"
-
-SRC_URI = "git://github.com/TigerVNC/tigervnc.git;branch=1.11-branch;protocol=https \
-           file://0002-do-not-build-tests-sub-directory.patch \
-           file://0003-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch \
-           file://0004-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch \
-"
-
-# Keep sync with xorg-server in oe-core
-XORG_PN ?= "xorg-server"
-XORG_PV ?= "1.20.6"
-SRC_URI += "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${XORG_PV}.tar.bz2;name=xorg"
-XORG_S = "${WORKDIR}/${XORG_PN}-${XORG_PV}"
-SRC_URI[xorg.md5sum] = "a98170084f2c8fed480d2ff601f8a14b"
-SRC_URI[xorg.sha256sum] = "6316146304e6e8a36d5904987ae2917b5d5b195dc9fc63d67f7aca137e5a51d1"
-
-# It is the directory containing the Xorg source for the
-# machine on which you are building TigerVNC.
-XSERVER_SOURCE_DIR="${S}/unix/xserver"
-
-do_patch[postfuncs] += "do_patch_xserver"
-do_patch_xserver () {
-    for subdir in Xext xkb GL hw/xquartz/bundle hw/xfree86/common; do
-        install -d ${XSERVER_SOURCE_DIR}/$subdir
-    done
-
-    for subdir in hw/dmx/doc man doc hw/dmx/doxygen; do
-        install -d ${XSERVER_SOURCE_DIR}/$subdir
-    done
-
-    sources="hw/xquartz/bundle/cpprules.in man/Xserver.man doc/smartsched \
-             hw/dmx/doxygen/doxygen.conf.in xserver.ent.in xkb/README.compiled \
-             hw/xfree86/xorgconf.cpp hw/xfree86/Xorg.sh.in"
-    for i in ${sources}; do
-        install -m 0644 ${XORG_S}/$i ${XSERVER_SOURCE_DIR}/$i;
-    done
-
-    cd ${XORG_S}
-    find . -type f | egrep '.*\.(c|h|am|ac|inc|m4|h.in|pc.in|man.pre|pl|txt)$' | \
-    xargs tar cf - | (cd ${XSERVER_SOURCE_DIR} && tar xf -)
-
-    cd ${XSERVER_SOURCE_DIR}
-    xserverpatch="${S}/unix/xserver120.patch"
-    echo "Apply $xserverpatch"
-    patch -p1 -b --suffix .vnc < $xserverpatch
-}
-
-EXTRA_OECONF = "--disable-xorg --disable-xnest --disable-xvfb --disable-dmx \
-        --disable-xwin --disable-xephyr --disable-kdrive --with-pic \
-        --disable-static --disable-xinerama \
-        --with-xkb-output=${localstatedir}/lib/xkb \
-        --disable-glx --disable-dri --disable-dri2 \
-        --disable-config-hal \
-        --disable-config-udev \
-        --without-dtrace \
-        --disable-unit-tests \
-        --disable-devel-docs \
-        --disable-selective-werror \
-        --disable-xshmfence \
-        --disable-config-udev \
-        --disable-dri3 \
-        --disable-libunwind \
-        --without-xmlto \
-        --enable-systemd-logind=no \
-        --disable-xinerama \
-        --disable-xwayland \
-"
-
-EXTRA_OECMAKE += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-DCMAKE_INSTALL_UNITDIR=${systemd_unitdir}', '-DINSTALL_SYSTEMD_UNITS=OFF', d)}"
-
-do_configure:append () {
-    olddir=`pwd`
-    cd ${XSERVER_SOURCE_DIR}
-
-    rm -rf aclocal-copy/
-    rm -f aclocal.m4
-
-    export ACLOCALDIR="${XSERVER_SOURCE_DIR}/aclocal-copy"
-    mkdir -p ${ACLOCALDIR}/
-    if [ -d ${STAGING_DATADIR_NATIVE}/aclocal ]; then
-        cp-noerror ${STAGING_DATADIR_NATIVE}/aclocal/ ${ACLOCALDIR}/
-    fi
-    if [ -d ${STAGING_DATADIR}/aclocal -a "${STAGING_DATADIR_NATIVE}/aclocal" != "${STAGING_DATADIR}/aclocal" ]; then
-        cp-noerror ${STAGING_DATADIR}/aclocal/ ${ACLOCALDIR}/
-    fi
-    ACLOCAL="aclocal --system-acdir=${ACLOCALDIR}/" autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths || bbfatal "autoreconf execution failed."
-    chmod +x ./configure
-    ${CACHED_CONFIGUREVARS} ./configure ${CONFIGUREOPTS} ${EXTRA_OECONF}
-    cd $olddir
-}
-
-do_compile:append () {
-    olddir=`pwd`
-    cd ${XSERVER_SOURCE_DIR}
-
-    oe_runmake
-
-    cd $olddir
-}
-
-do_install:append() {
-    olddir=`pwd`
-    cd ${XSERVER_SOURCE_DIR}/hw/vnc
-
-    oe_runmake 'DESTDIR=${D}' install
-
-    cd $olddir
-}
-
-FILES:${PN} += " \
-    ${libdir}/xorg/modules/extensions \
-    ${datadir}/icons \
-    ${systemd_unitdir} \
-"
-
-FILES:${PN}-dbg += "${libdir}/xorg/modules/extensions/.debug"
diff --git a/meta-oe/recipes-graphics/tigervnc/tigervnc_1.15.0.bb b/meta-oe/recipes-graphics/tigervnc/tigervnc_1.15.0.bb
new file mode 100644
index 0000000000..dd4f79c314
--- /dev/null
+++ b/meta-oe/recipes-graphics/tigervnc/tigervnc_1.15.0.bb
@@ -0,0 +1,87 @@
+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 xkbcomp"
+RDEPENDS:${PN} = "coreutils hicolor-icon-theme perl bash xkbcomp"
+
+LIC_FILES_CHKSUM = "file://LICENCE.TXT;md5=75b02c2872421380bbd47781d2bd75d3"
+
+
+inherit autotools cmake features_check pkgconfig systemd
+
+REQUIRED_DISTRO_FEATURES = "x11 pam"
+
+# For ease we do in-tree builds right now. It should be possible to do
+# out-of-tree builds.
+B = "${S}"
+
+SRCREV = "8bdf8734ce12c8ed3c232496fc8a4ccdb04636b8"
+
+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 \
+"
+
+# Keep sync with xorg-server in oe-core
+XORG_PN ?= "xorg-server"
+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] = "b14a116d2d805debc5b5b2aac505a279e69b217dae2fae2dfcb62400471a9970"
+
+# It is the directory containing the Xorg source for the
+# machine on which you are building TigerVNC.
+XSERVER_SOURCE_DIR = "${S}/unix/xserver"
+AUTOTOOLS_SCRIPT_PATH = "${XSERVER_SOURCE_DIR}"
+
+do_patch[postfuncs] += "do_patch_xserver"
+do_patch_xserver () {
+    # Put the xserver source in the right place in the tigervnc source tree
+    cp -rfl ${XORG_S}/* ${XSERVER_SOURCE_DIR}
+    # Apply the patch to integrate the vnc server
+    patch -p1 -b --suffix .vnc --directory ${XSERVER_SOURCE_DIR} <${S}/unix/xserver21.patch
+}
+
+EXTRA_OECONF = "--disable-xorg --disable-xnest --disable-xvfb \
+        --disable-xwin --disable-xephyr --disable-kdrive --with-pic \
+        --disable-static --disable-xinerama \
+        --with-xkb-output=${localstatedir}/lib/xkb \
+        --disable-glx --disable-dri --disable-dri2 \
+        --disable-config-hal \
+        --disable-config-udev \
+        --without-dtrace \
+        --disable-unit-tests \
+        --disable-devel-docs \
+        --disable-selective-werror \
+        --disable-xshmfence \
+        --disable-config-udev \
+        --disable-dri3 \
+        --disable-libunwind \
+        --without-xmlto \
+        --enable-systemd-logind=no \
+        --disable-xinerama \
+"
+
+EXTRA_OECMAKE += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-DCMAKE_INSTALL_UNITDIR=${systemd_system_unitdir}', '-DINSTALL_SYSTEMD_UNITS=OFF', d)}"
+
+do_configure:append () {
+    autotools_do_configure
+}
+
+do_compile:append () {
+    oe_runmake 'TIGERVNC_BUILDDIR=${B}'
+}
+
+do_install:append() {
+    oe_runmake -C ${B}/hw/vnc 'DESTDIR=${D}' install
+}
+
+FILES:${PN} += " \
+    ${libdir}/xorg/modules/extensions \
+    ${datadir}/icons \
+    ${datadir}/metainfo \
+"
+
+SYSTEMD_SERVICE:${PN} = "vncserver@.service"