summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorZhai Edwin <edwin.zhai@intel.com>2011-03-03 19:54:09 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-03-03 23:49:11 +0000
commit7e850ac6817f98abde35f931cdd69faedbb32ea5 (patch)
tree780f4e2b769e987035dc2179eb70a2b893d801d1 /meta
parent763d783c6265aa6ffbb6de999becda40e3db3985 (diff)
downloadpoky-7e850ac6817f98abde35f931cdd69faedbb32ea5.tar.gz
x11vnc: Fix the start failure
Default parameter "-gui" and "-rfbport" make x11vnc failed to start if no "wish" installed. [BUGID #781] got fixed. (From OE-Core rev: 1e1b59cd94a3fb3092b4334cd247d2d18c9e8071) Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/x11vnc/files/starting-fix.patch18
-rw-r--r--meta/recipes-graphics/x11vnc/x11vnc_0.9.12.bb3
2 files changed, 20 insertions, 1 deletions
diff --git a/meta/recipes-graphics/x11vnc/files/starting-fix.patch b/meta/recipes-graphics/x11vnc/files/starting-fix.patch
new file mode 100644
index 0000000000..f59e8016ae
--- /dev/null
+++ b/meta/recipes-graphics/x11vnc/files/starting-fix.patch
@@ -0,0 +1,18 @@
1"-gui" & "-rfbport" require "wish" installed, or else x11vnc fails to start.
2Removing these 2 parameters makes x11vnc works well on poky sato image.
3
4
5Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
6Index: x11vnc-0.9.12/x11vnc/x11vnc.desktop
7===================================================================
8--- x11vnc-0.9.12.orig/x11vnc/x11vnc.desktop 2011-03-03 10:33:18.000000000 +0800
9+++ x11vnc-0.9.12/x11vnc/x11vnc.desktop 2011-03-03 10:35:20.000000000 +0800
10@@ -1,7 +1,7 @@
11 [Desktop Entry]
12 Name=X11VNC Server
13 Comment=Share this desktop by VNC
14-Exec=x11vnc -gui tray=setpass -rfbport PROMPT -bg -o %%HOME/.x11vnc.log.%%VNCDISPLAY
15+Exec=x11vnc -bg -o %%HOME/.x11vnc.log.%%VNCDISPLAY
16 Icon=computer
17 Terminal=false
18 Type=Application
diff --git a/meta/recipes-graphics/x11vnc/x11vnc_0.9.12.bb b/meta/recipes-graphics/x11vnc/x11vnc_0.9.12.bb
index 87cda2c9cc..129343be02 100644
--- a/meta/recipes-graphics/x11vnc/x11vnc_0.9.12.bb
+++ b/meta/recipes-graphics/x11vnc/x11vnc_0.9.12.bb
@@ -9,7 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f \
9 9
10DEPENDS = "openssl virtual/libx11 libxext avahi jpeg zlib" 10DEPENDS = "openssl virtual/libx11 libxext avahi jpeg zlib"
11 11
12SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc-${PV}.tar.gz" 12SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc-${PV}.tar.gz\
13 file://starting-fix.patch;patch=1"
13 14
14SRC_URI[md5sum] = "1498a68d02aa7b6c97bf746c073c8d00" 15SRC_URI[md5sum] = "1498a68d02aa7b6c97bf746c073c8d00"
15SRC_URI[sha256sum] = "60a7cceee2c9a5f1c854340b2bae13f975ac55906237042f81f795b28a154a79" 16SRC_URI[sha256sum] = "60a7cceee2c9a5f1c854340b2bae13f975ac55906237042f81f795b28a154a79"