helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-09-30 12:46:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

tigervnc: 1.8.0 -> 1.9.0

Browse Source 
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Hongxu Jia 2018-08-01 15:21:35 +08:00 committed by Khem Raj
parent 4c258b784e
commit da13357948
3 changed files with 13 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
meta-oe/recipes-graphics/tigervnc/files/0001-tigervnc-remove-includedir.patch
View File

@ -1,6 +1,6 @@
From 4b423cd2e5e4296abca3be553bf64d8cc287180a Mon Sep 17 00:00:00 2001 From 47f175618a0b0817714ea557c9e93f22f327421e Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com> From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Thu, 20 Jul 2017 17:09:05 +0800 Date: Tue, 31 Jul 2018 16:39:52 +0800
Subject: [PATCH 1/4] tigervnc: remove includedir Subject: [PATCH 1/4] tigervnc: remove includedir
Upstream-Status: Pending Upstream-Status: Pending
@ -15,28 +15,28 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
1 file changed, 3 insertions(+), 3 deletions(-) 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/unix/xserver/hw/vnc/Makefile.am b/unix/xserver/hw/vnc/Makefile.am diff --git a/unix/xserver/hw/vnc/Makefile.am b/unix/xserver/hw/vnc/Makefile.am
index 0d6a4ac..854f078 100644 index 470424b..ee18bf9 100644
--- a/unix/xserver/hw/vnc/Makefile.am --- a/unix/xserver/hw/vnc/Makefile.am
+++ b/unix/xserver/hw/vnc/Makefile.am +++ b/unix/xserver/hw/vnc/Makefile.am
@@ -22,7 +22,7 @@ libvnccommon_la_SOURCES = $(HDRS) \ @@ -23,7 +23,7 @@ libvnccommon_la_SOURCES = $(HDRS) \
libvnccommon_la_CPPFLAGS = -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \ libvnccommon_la_CPPFLAGS = -DVENDOR_RELEASE="$(VENDOR_RELEASE)" -I$(TIGERVNC_SRCDIR)/unix/common \
-DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(TIGERVNC_SRCDIR)/common -UHAVE_CONFIG_H \ -DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(TIGERVNC_SRCDIR)/common -UHAVE_CONFIG_H \
- -I$(TIGERVNC_SRCDIR)/unix/vncconfig $(XVNC_CPPFLAGS) ${XSERVERLIBS_CFLAGS} -I$(includedir) \ - -I$(TIGERVNC_SRCDIR)/unix/vncconfig $(XVNC_CPPFLAGS) ${XSERVERLIBS_CFLAGS} -I$(includedir) \
+ -I$(TIGERVNC_SRCDIR)/unix/vncconfig $(XVNC_CPPFLAGS) ${XSERVERLIBS_CFLAGS} \ + -I$(TIGERVNC_SRCDIR)/unix/vncconfig $(XVNC_CPPFLAGS) ${XSERVERLIBS_CFLAGS} \
-I$(top_srcdir)/include -I$(top_srcdir)/include
bin_PROGRAMS = Xvnc bin_PROGRAMS = Xvnc
@@ -42,7 +42,7 @@ Xvnc_CPPFLAGS = $(XVNC_CPPFLAGS) -DTIGERVNC -DNO_MODULE_EXTS \ @@ -43,7 +43,7 @@ Xvnc_CPPFLAGS = $(XVNC_CPPFLAGS) -DTIGERVNC -DNO_MODULE_EXTS \
-UHAVE_CONFIG_H \ -UHAVE_CONFIG_H \
-DXFree86Server -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \ -DXFree86Server -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \
-DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(TIGERVNC_SRCDIR)/common \ -DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(TIGERVNC_SRCDIR)/common -I$(TIGERVNC_SRCDIR)/unix/common \
- -I$(top_srcdir)/include ${XSERVERLIBS_CFLAGS} -I$(includedir) - -I$(top_srcdir)/include ${XSERVERLIBS_CFLAGS} -I$(includedir)
+ -I$(top_srcdir)/include ${XSERVERLIBS_CFLAGS} + -I$(top_srcdir)/include ${XSERVERLIBS_CFLAGS}
Xvnc_LDADD = $(XVNC_LIBS) libvnccommon.la $(COMMON_LIBS) \ Xvnc_LDADD = $(XVNC_LIBS) libvnccommon.la $(COMMON_LIBS) \
$(XSERVER_LIBS) $(XSERVER_SYS_LIBS) $(XVNC_SYS_LIBS) -lX11 $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) $(XVNC_SYS_LIBS) -lX11
@@ -62,7 +62,7 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I$(TIGERVNC_SRCDIR)/common -UHAVE_CONFIG_ @@ -64,7 +64,7 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I$(TIGERVNC_SRCDIR)/common -UHAVE_CONFIG_
-I$(top_srcdir)/hw/xfree86/os-support \ -I$(top_srcdir)/hw/xfree86/os-support \
-I$(top_srcdir)/hw/xfree86/os-support/bus \ -I$(top_srcdir)/hw/xfree86/os-support/bus \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \

27
meta-oe/recipes-graphics/tigervnc/files/0005-Remove-INITARGS-from-xserver119.patch.patch
View File

@ -1,27 +0,0 @@
From e4ec992984983ac9107efae1f1cc552007e4229e Mon Sep 17 00:00:00 2001
From: Vishal Biswas <vshlbiswas@ymail.com>
Date: Mon, 8 May 2017 11:06:11 +0530
Subject: [PATCH] Remove INITARGS from xserver119.patch
Upstream-Status: Backport
---
unix/xserver119.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/unix/xserver119.patch b/unix/xserver119.patch
index 614f104..7adf314 100644
--- a/unix/xserver119.patch
+++ b/unix/xserver119.patch
@@ -66,7 +66,7 @@ diff -up xserver/mi/miinitext.c.xserver116-rebased xserver/mi/miinitext.c
#include "globals.h"
+#ifdef TIGERVNC
-+extern void vncExtensionInit(INITARGS);
++extern void vncExtensionInit(void);
+#endif
+
/* The following is only a small first step towards run-time
--
2.7.4

11
meta-oe/recipes-graphics/tigervnc/tigervnc_1.8.0.bb → meta-oe/recipes-graphics/tigervnc/tigervnc_1.9.0.bb
View File

@ -15,23 +15,22 @@ REQUIRED_DISTRO_FEATURES = "x11"
inherit autotools cmake inherit autotools cmake
B = "${S}" B = "${S}"
SRCREV = "4d6e1b8306a8cca8ad5e15ff8201f6ea24459cfd" SRCREV = "6f2301d08e64a965ad36b401ec8dc2b24bc47075"
SRC_URI = "git://github.com/TigerVNC/tigervnc.git;branch=1.8-branch \ SRC_URI = "git://github.com/TigerVNC/tigervnc.git;branch=1.9-branch \
file://0001-tigervnc-remove-includedir.patch \ file://0001-tigervnc-remove-includedir.patch \
file://0002-do-not-build-tests-sub-directory.patch \ file://0002-do-not-build-tests-sub-directory.patch \
file://0003-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch \ file://0003-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch \
file://0004-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch \ file://0004-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch \
file://0005-Remove-INITARGS-from-xserver119.patch.patch \
" "
# 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 ?= "1.19.3" XORG_PV ?= "1.19.6"
SRC_URI += "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${XORG_PV}.tar.bz2;name=xorg" SRC_URI += "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${XORG_PV}.tar.bz2;name=xorg"
XORG_S = "${WORKDIR}/${XORG_PN}-${XORG_PV}" XORG_S = "${WORKDIR}/${XORG_PN}-${XORG_PV}"
SRC_URI[xorg.md5sum] = "015d2fc4b9f2bfe7a626edb63a62c65e" SRC_URI[xorg.md5sum] = "3e47777ff034a331aed2322b078694a8"
SRC_URI[xorg.sha256sum] = "677a8166e03474719238dfe396ce673c4234735464d6dadf2959b600d20e5a98" SRC_URI[xorg.sha256sum] = "a732502f1db000cf36a376cd0c010ffdbf32ecdd7f1fa08ba7f5bdf9601cc197"
# 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.