diff options
author | Jean-Francois Dagenais <dagenaisj@sonatest.com> | 2019-02-11 13:45:48 -0500 |
---|---|---|
committer | Jean-Francois Dagenais <jeff.dagenais@gmail.com> | 2019-02-11 14:54:43 -0500 |
commit | 1752b6aa4e5e4ad7b0bd8b5fdf3c78b043da98a9 (patch) | |
tree | e29cb804f04503b4fbe622967c477087a14ee7b1 /meta-oe/recipes-graphics | |
parent | 876b48b5712c71dfa7b217e9cdb71989b3e0c147 (diff) | |
download | meta-openembedded-1752b6aa4e5e4ad7b0bd8b5fdf3c78b043da98a9.tar.gz |
x11vnc: uprev to 0.9.16
Diffstat (limited to 'meta-oe/recipes-graphics')
4 files changed, 41 insertions, 72 deletions
diff --git a/meta-oe/recipes-graphics/x11vnc/files/endian-fix.patch b/meta-oe/recipes-graphics/x11vnc/files/endian-fix.patch deleted file mode 100644 index f2a538bf6..000000000 --- a/meta-oe/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-oe/recipes-graphics/x11vnc/files/starting-fix.patch b/meta-oe/recipes-graphics/x11vnc/files/starting-fix.patch index f62e405dd..060319c76 100644 --- a/meta-oe/recipes-graphics/x11vnc/files/starting-fix.patch +++ b/meta-oe/recipes-graphics/x11vnc/files/starting-fix.patch | |||
@@ -10,10 +10,10 @@ Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> | |||
10 | 10 | ||
11 | Upstream-Status: Inappropriate [configuration] | 11 | Upstream-Status: Inappropriate [configuration] |
12 | 12 | ||
13 | Index: x11vnc-0.9.12/x11vnc/x11vnc.desktop | 13 | Index: x11vnc-0.9.12/x11vnc.desktop |
14 | =================================================================== | 14 | =================================================================== |
15 | --- x11vnc-0.9.12.orig/x11vnc/x11vnc.desktop 2011-03-03 10:33:18.000000000 +0800 | 15 | --- x11vnc-0.9.12.orig/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 | 16 | +++ x11vnc-0.9.12/x11vnc.desktop 2011-03-03 10:35:20.000000000 +0800 |
17 | @@ -1,7 +1,7 @@ | 17 | @@ -1,7 +1,7 @@ |
18 | [Desktop Entry] | 18 | [Desktop Entry] |
19 | Name=X11VNC Server | 19 | Name=X11VNC Server |
diff --git a/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb b/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb deleted file mode 100644 index 57bc4a56b..000000000 --- a/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | SUMMARY = "Exports your X session or FrameBuffer(fbdev) on-the-fly via VNC" | ||
2 | HOMEPAGE = "http://www.karlrunge.com/x11vnc/" | ||
3 | |||
4 | SECTION = "x11/utils" | ||
5 | AUTHOR = "Karl Runge" | ||
6 | LICENSE = "GPLv2+" | ||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f \ | ||
8 | file://x11vnc/x11vnc.h;endline=33;md5=6f95dc6535467d7ee1563fd434fb372e" | ||
9 | |||
10 | SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc/${PV}/x11vnc-${PV}.tar.gz\ | ||
11 | file://starting-fix.patch \ | ||
12 | file://endian-fix.patch \ | ||
13 | file://remove-redundant-RPATH.patch \ | ||
14 | " | ||
15 | |||
16 | SRC_URI[md5sum] = "a372ec4fe8211221547b1c108cf56e4c" | ||
17 | SRC_URI[sha256sum] = "f6829f2e629667a5284de62b080b13126a0736499fe47cdb447aedb07a59f13b" | ||
18 | |||
19 | DEPENDS = "\ | ||
20 | jpeg \ | ||
21 | libtasn1 \ | ||
22 | openssl \ | ||
23 | p11-kit \ | ||
24 | zlib \ | ||
25 | " | ||
26 | |||
27 | inherit autotools-brokensep distro_features_check | ||
28 | |||
29 | ANY_OF_DISTRO_FEATURES = "x11 fbdev" | ||
30 | |||
31 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} libvncserver" | ||
32 | PACKAGECONFIG[avahi] = "--with-avahi,--without-avahi,avahi" | ||
33 | PACKAGECONFIG[xinerama] = "--with-xinerama,--without-xinerama,libxinerama" | ||
34 | PACKAGECONFIG[x] = "--with-x,--without-x, libxdamage libxext libxfixes libxrandr libxtst virtual/libx11" | ||
35 | PACKAGECONFIG[libvncserver] = "--with-system-libvncserver,--without-system-libvncserver,libvncserver" | ||
36 | |||
37 | do_prepare_sources () { | ||
38 | # Remove old libtool macros from acinclude.m4 | ||
39 | sed -i -e '/^# libtool.m4/q' ${S}/acinclude.m4 | ||
40 | } | ||
41 | do_patch[postfuncs] += "do_prepare_sources" | ||
42 | |||
43 | do_install_append() { | ||
44 | rm -rf ${D}/usr/include/rfb | ||
45 | } | ||
diff --git a/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb b/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb new file mode 100644 index 000000000..794b2f048 --- /dev/null +++ b/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb | |||
@@ -0,0 +1,38 @@ | |||
1 | SUMMARY = "Exports your X session or FrameBuffer(fbdev) on-the-fly via VNC" | ||
2 | HOMEPAGE = "http://www.karlrunge.com/x11vnc/" | ||
3 | |||
4 | SECTION = "x11/utils" | ||
5 | AUTHOR = "Karl Runge" | ||
6 | LICENSE = "GPLv2+" | ||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | ||
8 | file://src/x11vnc.h;endline=31;md5=e871a2ad004776794b616822dcab6314" | ||
9 | |||
10 | SRC_URI = "https://github.com/LibVNC/x11vnc/archive/${PV}.tar.gz;downloadfilename=x11vnc-${PV}.tar.gz\ | ||
11 | file://starting-fix.patch \ | ||
12 | " | ||
13 | |||
14 | SRC_URI[md5sum] = "64172e8f896389ec963fff93415f0d93" | ||
15 | SRC_URI[sha256sum] = "885e5b5f5f25eec6f9e4a1e8be3d0ac71a686331ee1cfb442dba391111bd32bd" | ||
16 | |||
17 | DEPENDS = "\ | ||
18 | jpeg \ | ||
19 | libtasn1 \ | ||
20 | libvncserver \ | ||
21 | openssl \ | ||
22 | p11-kit \ | ||
23 | zlib \ | ||
24 | " | ||
25 | |||
26 | inherit pkgconfig autotools distro_features_check | ||
27 | |||
28 | ANY_OF_DISTRO_FEATURES = "x11 fbdev" | ||
29 | |||
30 | PACKAGECONFIG ??= "\ | ||
31 | ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ | ||
32 | ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} \ | ||
33 | " | ||
34 | |||
35 | PACKAGECONFIG[avahi] = "--with-avahi,--without-avahi,avahi" | ||
36 | PACKAGECONFIG[xinerama] = "--with-xinerama,--without-xinerama,libxinerama" | ||
37 | PACKAGECONFIG[x11] = "--with-x,--without-x, libxdamage libxext libxfixes libxrandr libxtst virtual/libx11" | ||
38 | |||