ChangeLog: https://github.com/TigerVNC/tigervnc/releases/tag/v1.14.0
* Refresh patches * Update xorg-server to 21.1.13 Signed-off-by: Yi Zhao <[email protected]> --- ...01-do-not-build-tests-sub-directory.patch} | 14 ++++----- ...g-dynamic-library-to-FLTK_LIBRARIES.patch} | 10 +++--- ...nc-add-fPIC-option-to-COMPILE_FLAGS.patch} | 16 +++++----- ...{tigervnc_1.11.0.bb => tigervnc_1.14.0.bb} | 31 +++++++++---------- 4 files changed, 34 insertions(+), 37 deletions(-) rename meta-oe/recipes-graphics/tigervnc/files/{0002-do-not-build-tests-sub-directory.patch => 0001-do-not-build-tests-sub-directory.patch} (71%) rename meta-oe/recipes-graphics/tigervnc/files/{0003-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch => 0002-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch} (71%) rename meta-oe/recipes-graphics/tigervnc/files/{0004-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch => 0003-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch} (80%) rename meta-oe/recipes-graphics/tigervnc/{tigervnc_1.11.0.bb => tigervnc_1.14.0.bb} (80%) 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 similarity index 71% rename from meta-oe/recipes-graphics/tigervnc/files/0002-do-not-build-tests-sub-directory.patch rename to meta-oe/recipes-graphics/tigervnc/files/0001-do-not-build-tests-sub-directory.patch index 5a42e67d0..0d58d2502 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 <[email protected]> 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 <[email protected]> 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 similarity index 71% rename from meta-oe/recipes-graphics/tigervnc/files/0003-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch rename to meta-oe/recipes-graphics/tigervnc/files/0002-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch index cfb84ac14..56bed4bbf 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 7ca0b0a4f8a37f9dbe461e28a731364b9aaa60bb Mon Sep 17 00:00:00 2001 From: Hongxu Jia <[email protected]> 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,10 +11,10 @@ Signed-off-by: Hongxu Jia <[email protected]> 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index fb72a00..5732dc8 100644 +index c47c9c0e..f4b576a0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -246,6 +246,8 @@ if(UNIX AND NOT APPLE) +@@ -270,6 +270,8 @@ if(BUILD_VIEWER) endif() endif() @@ -24,5 +24,5 @@ index fb72a00..5732dc8 100644 option(ENABLE_GNUTLS "Enable protocol encryption and advanced authentication" ON) 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 similarity index 80% rename from meta-oe/recipes-graphics/tigervnc/files/0004-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch rename to meta-oe/recipes-graphics/tigervnc/files/0003-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch index 5f14665b8..c292df4a5 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 <[email protected]> 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 <[email protected]> 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.14.0.bb similarity index 80% rename from meta-oe/recipes-graphics/tigervnc/tigervnc_1.11.0.bb rename to meta-oe/recipes-graphics/tigervnc/tigervnc_1.14.0.bb index 668ca79dd..c5268fd2b 100644 --- a/meta-oe/recipes-graphics/tigervnc/tigervnc_1.11.0.bb +++ b/meta-oe/recipes-graphics/tigervnc/tigervnc_1.14.0.bb @@ -15,21 +15,20 @@ REQUIRED_DISTRO_FEATURES = "x11 pam" B = "${S}" -SRCREV = "540bfc3278e396321124d4b18a798ac2bc18b6ca" +SRCREV = "4a09a96661624dff14662d6e9849e06a6c70ae03" -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 \ +SRC_URI = "git://github.com/TigerVNC/tigervnc.git;branch=1.14-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 ?= "1.20.6" -SRC_URI += "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${XORG_PV}.tar.bz2;name=xorg" +XORG_PV ?= "21.1.13" +SRC_URI += "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${XORG_PV}.tar.xz;name=xorg" XORG_S = "${UNPACKDIR}/${XORG_PN}-${XORG_PV}" -SRC_URI[xorg.md5sum] = "a98170084f2c8fed480d2ff601f8a14b" -SRC_URI[xorg.sha256sum] = "6316146304e6e8a36d5904987ae2917b5d5b195dc9fc63d67f7aca137e5a51d1" +SRC_URI[xorg.sha256sum] = "b45a02d5943f72236a360d3cc97e75134aa4f63039ff88c04686b508a3dc740c" # It is the directory containing the Xorg source for the # machine on which you are building TigerVNC. @@ -37,16 +36,13 @@ 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 + subdirs="Xext xkb GL hw/xquartz/bundle hw/xfree86/common man doc" + for i in ${subdirs}; do + install -d ${XSERVER_SOURCE_DIR}/$i done sources="hw/xquartz/bundle/cpprules.in man/Xserver.man doc/smartsched \ - hw/dmx/doxygen/doxygen.conf.in xserver.ent.in xkb/README.compiled \ + 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; @@ -57,7 +53,7 @@ do_patch_xserver () { xargs tar cf - | (cd ${XSERVER_SOURCE_DIR} && tar xf -) cd ${XSERVER_SOURCE_DIR} - xserverpatch="${S}/unix/xserver120.patch" + xserverpatch="${S}/unix/xserver21.patch" echo "Apply $xserverpatch" patch -p1 -b --suffix .vnc < $xserverpatch } @@ -127,6 +123,7 @@ do_install:append() { FILES:${PN} += " \ ${libdir}/xorg/modules/extensions \ ${datadir}/icons \ + ${datadir}/metainfo \ ${systemd_unitdir} \ " -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#112782): https://lists.openembedded.org/g/openembedded-devel/message/112782 Mute This Topic: https://lists.openembedded.org/mt/108940192/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
