aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/x11vnc
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:12:41 +0000
commit1e1b59cd94a3fb3092b4334cd247d2d18c9e8071 (patch)
tree0f9cd14146725cc1c888b1530a51f977bd683b7d /meta/recipes-graphics/x11vnc
parent6a4cb991ea473a84c620b33fbb82b5ae860971a3 (diff)
downloadopenembedded-core-1e1b59cd94a3fb3092b4334cd247d2d18c9e8071.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. Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Diffstat (limited to 'meta/recipes-graphics/x11vnc')
-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 @@
+"-gui" & "-rfbport" require "wish" installed, or else x11vnc fails to start.
+Removing these 2 parameters makes x11vnc works well on poky sato image.
+
+
+Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
+Index: x11vnc-0.9.12/x11vnc/x11vnc.desktop
+===================================================================
+--- x11vnc-0.9.12.orig/x11vnc/x11vnc.desktop 2011-03-03 10:33:18.000000000 +0800
++++ x11vnc-0.9.12/x11vnc/x11vnc.desktop 2011-03-03 10:35:20.000000000 +0800
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ Name=X11VNC Server
+ Comment=Share this desktop by VNC
+-Exec=x11vnc -gui tray=setpass -rfbport PROMPT -bg -o %%HOME/.x11vnc.log.%%VNCDISPLAY
++Exec=x11vnc -bg -o %%HOME/.x11vnc.log.%%VNCDISPLAY
+ Icon=computer
+ Terminal=false
+ 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 \
DEPENDS = "openssl virtual/libx11 libxext avahi jpeg zlib"
-SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc-${PV}.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc-${PV}.tar.gz\
+ file://starting-fix.patch;patch=1"
SRC_URI[md5sum] = "1498a68d02aa7b6c97bf746c073c8d00"
SRC_URI[sha256sum] = "60a7cceee2c9a5f1c854340b2bae13f975ac55906237042f81f795b28a154a79"