mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-21 05:57:05 +00:00
tigervnc: upgrade 1.15.0 -> 1.16.0
1.ChangeLog https://github.com/TigerVNC/tigervnc/releases/tag/v1.16.0 2.Update 0002-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch for 1.16.0 3.Update xorg-server to 21.1.21 4.Fix do_install error Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
+6
-3
@@ -6,16 +6,19 @@ Subject: [PATCH] add missing dynamic library to FLTK_LIBRARIES
|
|||||||
Upstream-Status: Pending
|
Upstream-Status: Pending
|
||||||
|
|
||||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||||
|
|
||||||
|
Update for 1.16.0
|
||||||
|
Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com>
|
||||||
---
|
---
|
||||||
CMakeLists.txt | 2 ++
|
CMakeLists.txt | 2 ++
|
||||||
1 file changed, 2 insertions(+)
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
index 80c2762c..eb581600 100644
|
index a5981938..dd13d0df 100644
|
||||||
--- a/CMakeLists.txt
|
--- a/CMakeLists.txt
|
||||||
+++ b/CMakeLists.txt
|
+++ b/CMakeLists.txt
|
||||||
@@ -315,6 +315,8 @@ if(BUILD_VIEWER)
|
@@ -315,6 +315,8 @@ if(BUILD_VIEWER)
|
||||||
set(CMAKE_REQUIRED_LIBRARIES)
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
+set(FLTK_LIBRARIES ${FLTK_LIBRARIES} -lm -ldl -lpng -ljpeg)
|
+set(FLTK_LIBRARIES ${FLTK_LIBRARIES} -lm -ldl -lpng -ljpeg)
|
||||||
@@ -24,5 +27,5 @@ index 80c2762c..eb581600 100644
|
|||||||
trioption(ENABLE_GNUTLS "Enable protocol encryption and advanced authentication")
|
trioption(ENABLE_GNUTLS "Enable protocol encryption and advanced authentication")
|
||||||
if(ENABLE_GNUTLS)
|
if(ENABLE_GNUTLS)
|
||||||
--
|
--
|
||||||
2.25.1
|
2.43.0
|
||||||
|
|
||||||
|
|||||||
+5
-5
@@ -16,9 +16,9 @@ REQUIRED_DISTRO_FEATURES = "x11 pam"
|
|||||||
# out-of-tree builds.
|
# out-of-tree builds.
|
||||||
B = "${S}"
|
B = "${S}"
|
||||||
|
|
||||||
SRCREV = "8bdf8734ce12c8ed3c232496fc8a4ccdb04636b8"
|
SRCREV = "dc50022844dfad0a0e195d54b8499fcf242fff0c"
|
||||||
|
|
||||||
SRC_URI = "git://github.com/TigerVNC/tigervnc.git;branch=1.15-branch;protocol=https \
|
SRC_URI = "git://github.com/TigerVNC/tigervnc.git;branch=1.16-branch;protocol=https \
|
||||||
file://0001-do-not-build-tests-sub-directory.patch \
|
file://0001-do-not-build-tests-sub-directory.patch \
|
||||||
file://0002-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch \
|
file://0002-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch \
|
||||||
file://0003-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch \
|
file://0003-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch \
|
||||||
@@ -26,10 +26,10 @@ SRC_URI = "git://github.com/TigerVNC/tigervnc.git;branch=1.15-branch;protocol=ht
|
|||||||
|
|
||||||
# Keep sync with xorg-server in oe-core
|
# Keep sync with xorg-server in oe-core
|
||||||
XORG_PN ?= "xorg-server"
|
XORG_PN ?= "xorg-server"
|
||||||
XORG_PV ?= "21.1.18"
|
XORG_PV ?= "21.1.21"
|
||||||
SRC_URI += "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${XORG_PV}.tar.xz;name=xorg"
|
SRC_URI += "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${XORG_PV}.tar.xz;name=xorg"
|
||||||
XORG_S = "${UNPACKDIR}/${XORG_PN}-${XORG_PV}"
|
XORG_S = "${UNPACKDIR}/${XORG_PN}-${XORG_PV}"
|
||||||
SRC_URI[xorg.sha256sum] = "c878d1930d87725d4a5bf498c24f4be8130d5b2646a9fd0f2994deff90116352"
|
SRC_URI[xorg.sha256sum] = "c0cbe5545b3f645bae6024b830d1d1154a956350683a4e52b2fff5b0fa1ab519"
|
||||||
|
|
||||||
# It is the directory containing the Xorg source for the
|
# It is the directory containing the Xorg source for the
|
||||||
# machine on which you are building TigerVNC.
|
# machine on which you are building TigerVNC.
|
||||||
@@ -85,7 +85,7 @@ do_compile:append () {
|
|||||||
}
|
}
|
||||||
|
|
||||||
do_install:append() {
|
do_install:append() {
|
||||||
oe_runmake -C ${B}/hw/vnc 'DESTDIR=${D}' install
|
oe_runmake 'TIGERVNC_BUILDDIR=${B}' -C ${B}/hw/vnc 'DESTDIR=${D}' install
|
||||||
}
|
}
|
||||||
|
|
||||||
FILES:${PN} += " \
|
FILES:${PN} += " \
|
||||||
Reference in New Issue
Block a user