summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-graphics/tigervnc/tigervnc_1.10.1.bb (renamed from meta-oe/recipes-graphics/tigervnc/tigervnc_1.9.0.bb)15
1 files changed, 7 insertions, 8 deletions
diff --git a/meta-oe/recipes-graphics/tigervnc/tigervnc_1.9.0.bb b/meta-oe/recipes-graphics/tigervnc/tigervnc_1.10.1.bb
index d0ee2a50ec..16937792eb 100644
--- a/meta-oe/recipes-graphics/tigervnc/tigervnc_1.9.0.bb
+++ b/meta-oe/recipes-graphics/tigervnc/tigervnc_1.10.1.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.tigervnc.com/"
3LICENSE = "GPLv2+" 3LICENSE = "GPLv2+"
4SECTION = "x11/utils" 4SECTION = "x11/utils"
5DEPENDS = "xserver-xorg gnutls jpeg libxtst gettext-native fltk" 5DEPENDS = "xserver-xorg gnutls jpeg libxtst gettext-native fltk"
6RDEPENDS_${PN} = "chkconfig coreutils hicolor-icon-theme" 6RDEPENDS_${PN} = "chkconfig coreutils hicolor-icon-theme perl"
7 7
8LIC_FILES_CHKSUM = "file://LICENCE.TXT;md5=75b02c2872421380bbd47781d2bd75d3" 8LIC_FILES_CHKSUM = "file://LICENCE.TXT;md5=75b02c2872421380bbd47781d2bd75d3"
9 9
@@ -15,10 +15,9 @@ REQUIRED_DISTRO_FEATURES = "x11"
15inherit autotools cmake 15inherit autotools cmake
16B = "${S}" 16B = "${S}"
17 17
18SRCREV = "6f2301d08e64a965ad36b401ec8dc2b24bc47075" 18SRCREV = "4739493b635372bd40a34640a719f79fa90e4dba"
19 19
20SRC_URI = "git://github.com/TigerVNC/tigervnc.git;branch=1.9-branch \ 20SRC_URI = "git://github.com/TigerVNC/tigervnc.git;branch=1.10-branch \
21 file://0001-tigervnc-remove-includedir.patch \
22 file://0002-do-not-build-tests-sub-directory.patch \ 21 file://0002-do-not-build-tests-sub-directory.patch \
23 file://0003-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch \ 22 file://0003-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch \
24 file://0004-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch \ 23 file://0004-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch \
@@ -26,11 +25,11 @@ SRC_URI = "git://github.com/TigerVNC/tigervnc.git;branch=1.9-branch \
26 25
27# Keep sync with xorg-server in oe-core 26# Keep sync with xorg-server in oe-core
28XORG_PN ?= "xorg-server" 27XORG_PN ?= "xorg-server"
29XORG_PV ?= "1.19.6" 28XORG_PV ?= "1.20.6"
30SRC_URI += "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${XORG_PV}.tar.bz2;name=xorg" 29SRC_URI += "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${XORG_PV}.tar.bz2;name=xorg"
31XORG_S = "${WORKDIR}/${XORG_PN}-${XORG_PV}" 30XORG_S = "${WORKDIR}/${XORG_PN}-${XORG_PV}"
32SRC_URI[xorg.md5sum] = "3e47777ff034a331aed2322b078694a8" 31SRC_URI[xorg.md5sum] = "a98170084f2c8fed480d2ff601f8a14b"
33SRC_URI[xorg.sha256sum] = "a732502f1db000cf36a376cd0c010ffdbf32ecdd7f1fa08ba7f5bdf9601cc197" 32SRC_URI[xorg.sha256sum] = "6316146304e6e8a36d5904987ae2917b5d5b195dc9fc63d67f7aca137e5a51d1"
34 33
35# It is the directory containing the Xorg source for the 34# It is the directory containing the Xorg source for the
36# machine on which you are building TigerVNC. 35# machine on which you are building TigerVNC.
@@ -58,7 +57,7 @@ do_patch_xserver () {
58 xargs tar cf - | (cd ${XSERVER_SOURCE_DIR} && tar xf -) 57 xargs tar cf - | (cd ${XSERVER_SOURCE_DIR} && tar xf -)
59 58
60 cd ${XSERVER_SOURCE_DIR} 59 cd ${XSERVER_SOURCE_DIR}
61 xserverpatch="${S}/unix/xserver119.patch" 60 xserverpatch="${S}/unix/xserver120.patch"
62 echo "Apply $xserverpatch" 61 echo "Apply $xserverpatch"
63 patch -p1 -b --suffix .vnc < $xserverpatch 62 patch -p1 -b --suffix .vnc < $xserverpatch
64} 63}