diff options
| author | Ioan-Adrian Ratiu <adrian.ratiu@ni.com> | 2016-01-05 14:24:22 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-07 13:40:09 +0000 |
| commit | 210b40b694e5ab03537c02baba453c9cdd11f4e0 (patch) | |
| tree | d3f7d00cc91d52275c8da7d56a697c4c9e3487f7 /meta | |
| parent | e6b1840ee9aeb933f86fd2a92a90b94c1bc9db7c (diff) | |
| download | openembedded-core-210b40b694e5ab03537c02baba453c9cdd11f4e0.tar.gz openembedded-core-210b40b694e5ab03537c02baba453c9cdd11f4e0.tar.bz2 openembedded-core-210b40b694e5ab03537c02baba453c9cdd11f4e0.zip | |
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.
Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-graphics/x11vnc/files/endian-fix.patch | 24 | ||||
| -rw-r--r-- | meta/recipes-graphics/x11vnc/files/starting-fix.patch | 25 |
2 files changed, 0 insertions, 49 deletions
diff --git a/meta/recipes-graphics/x11vnc/files/endian-fix.patch b/meta/recipes-graphics/x11vnc/files/endian-fix.patch deleted file mode 100644 index f2a538bf63..0000000000 --- a/meta/recipes-graphics/x11vnc/files/endian-fix.patch +++ /dev/null @@ -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); - diff --git a/meta/recipes-graphics/x11vnc/files/starting-fix.patch b/meta/recipes-graphics/x11vnc/files/starting-fix.patch deleted file mode 100644 index f62e405dd1..0000000000 --- a/meta/recipes-graphics/x11vnc/files/starting-fix.patch +++ /dev/null @@ -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 |