mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-10 16:40:03 +00:00
x11vnc: uprev to 0.9.16
This commit is contained in:
committed by
Jean-Francois Dagenais
parent
876b48b571
commit
1752b6aa4e
@@ -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);
|
|
||||||
|
|
||||||
@@ -10,10 +10,10 @@ Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
|
|||||||
|
|
||||||
Upstream-Status: Inappropriate [configuration]
|
Upstream-Status: Inappropriate [configuration]
|
||||||
|
|
||||||
Index: x11vnc-0.9.12/x11vnc/x11vnc.desktop
|
Index: x11vnc-0.9.12/x11vnc.desktop
|
||||||
===================================================================
|
===================================================================
|
||||||
--- x11vnc-0.9.12.orig/x11vnc/x11vnc.desktop 2011-03-03 10:33:18.000000000 +0800
|
--- x11vnc-0.9.12.orig/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
|
+++ x11vnc-0.9.12/x11vnc.desktop 2011-03-03 10:35:20.000000000 +0800
|
||||||
@@ -1,7 +1,7 @@
|
@@ -1,7 +1,7 @@
|
||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
Name=X11VNC Server
|
Name=X11VNC Server
|
||||||
|
|||||||
@@ -1,45 +0,0 @@
|
|||||||
SUMMARY = "Exports your X session or FrameBuffer(fbdev) 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 \
|
|
||||||
file://remove-redundant-RPATH.patch \
|
|
||||||
"
|
|
||||||
|
|
||||||
SRC_URI[md5sum] = "a372ec4fe8211221547b1c108cf56e4c"
|
|
||||||
SRC_URI[sha256sum] = "f6829f2e629667a5284de62b080b13126a0736499fe47cdb447aedb07a59f13b"
|
|
||||||
|
|
||||||
DEPENDS = "\
|
|
||||||
jpeg \
|
|
||||||
libtasn1 \
|
|
||||||
openssl \
|
|
||||||
p11-kit \
|
|
||||||
zlib \
|
|
||||||
"
|
|
||||||
|
|
||||||
inherit autotools-brokensep distro_features_check
|
|
||||||
|
|
||||||
ANY_OF_DISTRO_FEATURES = "x11 fbdev"
|
|
||||||
|
|
||||||
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} libvncserver"
|
|
||||||
PACKAGECONFIG[avahi] = "--with-avahi,--without-avahi,avahi"
|
|
||||||
PACKAGECONFIG[xinerama] = "--with-xinerama,--without-xinerama,libxinerama"
|
|
||||||
PACKAGECONFIG[x] = "--with-x,--without-x, libxdamage libxext libxfixes libxrandr libxtst virtual/libx11"
|
|
||||||
PACKAGECONFIG[libvncserver] = "--with-system-libvncserver,--without-system-libvncserver,libvncserver"
|
|
||||||
|
|
||||||
do_prepare_sources () {
|
|
||||||
# Remove old libtool macros from acinclude.m4
|
|
||||||
sed -i -e '/^# libtool.m4/q' ${S}/acinclude.m4
|
|
||||||
}
|
|
||||||
do_patch[postfuncs] += "do_prepare_sources"
|
|
||||||
|
|
||||||
do_install_append() {
|
|
||||||
rm -rf ${D}/usr/include/rfb
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,38 @@
|
|||||||
|
SUMMARY = "Exports your X session or FrameBuffer(fbdev) 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=b234ee4d69f5fce4486a80fdaf4a4263 \
|
||||||
|
file://src/x11vnc.h;endline=31;md5=e871a2ad004776794b616822dcab6314"
|
||||||
|
|
||||||
|
SRC_URI = "https://github.com/LibVNC/x11vnc/archive/${PV}.tar.gz;downloadfilename=x11vnc-${PV}.tar.gz\
|
||||||
|
file://starting-fix.patch \
|
||||||
|
"
|
||||||
|
|
||||||
|
SRC_URI[md5sum] = "64172e8f896389ec963fff93415f0d93"
|
||||||
|
SRC_URI[sha256sum] = "885e5b5f5f25eec6f9e4a1e8be3d0ac71a686331ee1cfb442dba391111bd32bd"
|
||||||
|
|
||||||
|
DEPENDS = "\
|
||||||
|
jpeg \
|
||||||
|
libtasn1 \
|
||||||
|
libvncserver \
|
||||||
|
openssl \
|
||||||
|
p11-kit \
|
||||||
|
zlib \
|
||||||
|
"
|
||||||
|
|
||||||
|
inherit pkgconfig autotools distro_features_check
|
||||||
|
|
||||||
|
ANY_OF_DISTRO_FEATURES = "x11 fbdev"
|
||||||
|
|
||||||
|
PACKAGECONFIG ??= "\
|
||||||
|
${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \
|
||||||
|
${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} \
|
||||||
|
"
|
||||||
|
|
||||||
|
PACKAGECONFIG[avahi] = "--with-avahi,--without-avahi,avahi"
|
||||||
|
PACKAGECONFIG[xinerama] = "--with-xinerama,--without-xinerama,libxinerama"
|
||||||
|
PACKAGECONFIG[x11] = "--with-x,--without-x, libxdamage libxext libxfixes libxrandr libxtst virtual/libx11"
|
||||||
|
|
||||||
Reference in New Issue
Block a user