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:20 +0000 |
commit | 8f865e2c50c4aa68c08993265f0143466f01842b (patch) | |
tree | 5a38d8e21bb068d461c5849d52af698e28d95051 | |
parent | ae1fc966f79822c18c4ddd8463640cc9d2ff7ff2 (diff) | |
download | poky-8f865e2c50c4aa68c08993265f0143466f01842b.tar.gz |
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>
-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 @@ | |||
1 | libvncserver: replace LIBVNCSERVER_WORDS_BIGENDIAN with WORDS_BIGENDIAN | ||
2 | |||
3 | since macro AC_C_BIGENDIAN is used in autoconf and WORDS_BIGENDIAN is | ||
4 | automatically set for different arch, it is better to use WORDS_BIGENDIAN | ||
5 | instead of LIBVNCSERVER_WORDS_BIGENDIAN, which cuase issue in mips. | ||
6 | |||
7 | Signed-off-by: Yu Ke <ke.yu@intel.com> | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | diff --git a/libvncserver/main.c b/libvncserver/main.c | ||
12 | index b6bd930..8bbb7bf 100644 | ||
13 | --- a/libvncserver/main.c | ||
14 | +++ b/libvncserver/main.c | ||
15 | @@ -47,7 +47,7 @@ static MUTEX(extMutex); | ||
16 | |||
17 | static int rfbEnableLogging=1; | ||
18 | |||
19 | -#ifdef LIBVNCSERVER_WORDS_BIGENDIAN | ||
20 | +#ifdef WORDS_BIGENDIAN | ||
21 | char rfbEndianTest = (1==0); | ||
22 | #else | ||
23 | char rfbEndianTest = (1==1); | ||
24 | |||
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 @@ | |||
1 | "-gui" & "-rfbport" require "wish" installed, or else x11vnc fails to start. | ||
2 | Removing these 2 parameters makes x11vnc works well on poky sato image. | ||
3 | |||
4 | Add also -skip_lockkeys option to ignore all Caps_Lock, Shift_Lock, Num_Lock, | ||
5 | Scroll_Lock keysyms received from viewers, in order to leave the lock state on | ||
6 | the server side unchanged. Yet, the keys will appear correctly. | ||
7 | |||
8 | Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> | ||
9 | Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> | ||
10 | |||
11 | Upstream-Status: Inappropriate [configuration] | ||
12 | |||
13 | Index: x11vnc-0.9.12/x11vnc/x11vnc.desktop | ||
14 | =================================================================== | ||
15 | --- x11vnc-0.9.12.orig/x11vnc/x11vnc.desktop 2011-03-03 10:33:18.000000000 +0800 | ||
16 | +++ x11vnc-0.9.12/x11vnc/x11vnc.desktop 2011-03-03 10:35:20.000000000 +0800 | ||
17 | @@ -1,7 +1,7 @@ | ||
18 | [Desktop Entry] | ||
19 | Name=X11VNC Server | ||
20 | Comment=Share this desktop by VNC | ||
21 | -Exec=x11vnc -gui tray=setpass -rfbport PROMPT -bg -o %%HOME/.x11vnc.log.%%VNCDISPLAY | ||
22 | +Exec=x11vnc -bg -rfbport 5900 -skip_lockkeys -o %%HOME/.x11vnc.log.%%VNCDISPLAY | ||
23 | Icon=computer | ||
24 | Terminal=false | ||
25 | Type=Application | ||