x11vnc: move recipe from oe-core

x11vnc will be configured to use the external libvncserver which is
added to meta-oe. Since oe-core recipes should not depend on meta-oe
recipes, we move x11vnc to meta-oe.

Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Ioan-Adrian Ratiu
2015-12-03 12:14:07 +02:00
committed by Martin Jansa
parent 50d303bc46
commit 7a28b679a6
3 changed files with 74 additions and 0 deletions
@@ -0,0 +1,24 @@
libvncserver: replace LIBVNCSERVER_WORDS_BIGENDIAN with WORDS_BIGENDIAN
since macro AC_C_BIGENDIAN is used in autoconf and WORDS_BIGENDIAN is
automatically set for different arch, it is better to use WORDS_BIGENDIAN
instead of LIBVNCSERVER_WORDS_BIGENDIAN, which cuase issue in mips.
Signed-off-by: Yu Ke <ke.yu@intel.com>
Upstream-Status: Pending
diff --git a/libvncserver/main.c b/libvncserver/main.c
index b6bd930..8bbb7bf 100644
--- a/libvncserver/main.c
+++ b/libvncserver/main.c
@@ -47,7 +47,7 @@ static MUTEX(extMutex);
static int rfbEnableLogging=1;
-#ifdef LIBVNCSERVER_WORDS_BIGENDIAN
+#ifdef WORDS_BIGENDIAN
char rfbEndianTest = (1==0);
#else
char rfbEndianTest = (1==1);
@@ -0,0 +1,25 @@
"-gui" & "-rfbport" require "wish" installed, or else x11vnc fails to start.
Removing these 2 parameters makes x11vnc works well on poky sato image.
Add also -skip_lockkeys option to ignore all Caps_Lock, Shift_Lock, Num_Lock,
Scroll_Lock keysyms received from viewers, in order to leave the lock state on
the server side unchanged. Yet, the keys will appear correctly.
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Upstream-Status: Inappropriate [configuration]
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 -rfbport 5900 -skip_lockkeys -o %%HOME/.x11vnc.log.%%VNCDISPLAY
Icon=computer
Terminal=false
Type=Application
@@ -0,0 +1,25 @@
SUMMARY = "Exports your X session on-the-fly via VNC"
HOMEPAGE = "http://www.karlrunge.com/x11vnc/"
SECTION = "x11/utils"
AUTHOR = "Karl Runge"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f \
file://x11vnc/x11vnc.h;endline=33;md5=6f95dc6535467d7ee1563fd434fb372e"
SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc/${PV}/x11vnc-${PV}.tar.gz\
file://starting-fix.patch \
file://endian-fix.patch "
SRC_URI[md5sum] = "a372ec4fe8211221547b1c108cf56e4c"
SRC_URI[sha256sum] = "f6829f2e629667a5284de62b080b13126a0736499fe47cdb447aedb07a59f13b"
DEPENDS = "openssl virtual/libx11 libxext jpeg zlib libxfixes libxrandr libxdamage libxtst"
inherit autotools-brokensep distro_features_check
# depends on virtual/libx11
REQUIRED_DISTRO_FEATURES = "x11"
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)}"
PACKAGECONFIG[avahi] = "--with-avahi,--without-avahi,avahi"
PACKAGECONFIG[xinerama] = "--with-xinerama,--without-xinerama,libxinerama"