mirror of
https://git.yoctoproject.org/poky
synced 2026-04-26 00:32:12 +02:00
x11vnc: move recipe to meta-oe
x11vnc can be configured with --use-system-libvncserver to use an external libvncserver which will be added to meta-oe. Since oe-core should not depend on meta-oe, we move x11vnc there. (From OE-Core rev: 210b40b694e5ab03537c02baba453c9cdd11f4e0) Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
ae1fc966f7
commit
8f865e2c50
@@ -1,24 +0,0 @@
|
||||
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);
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
"-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
|
||||
Reference in New Issue
Block a user