summaryrefslogtreecommitdiff
path: root/package/x11vnc
diff options
context:
space:
mode:
Diffstat (limited to 'package/x11vnc')
-rw-r--r--package/x11vnc/Makefile19
-rw-r--r--package/x11vnc/patches/patch-src_util_c12
-rw-r--r--package/x11vnc/patches/patch-src_util_h15
3 files changed, 39 insertions, 7 deletions
diff --git a/package/x11vnc/Makefile b/package/x11vnc/Makefile
index 9fad7e631..7105c928e 100644
--- a/package/x11vnc/Makefile
+++ b/package/x11vnc/Makefile
@@ -4,28 +4,33 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= x11vnc
-PKG_VERSION:= 0.9.13
+PKG_VERSION:= 0.9.16
PKG_RELEASE:= 1
-PKG_HASH:= f6829f2e629667a5284de62b080b13126a0736499fe47cdb447aedb07a59f13b
+PKG_HASH:= 885e5b5f5f25eec6f9e4a1e8be3d0ac71a686331ee1cfb442dba391111bd32bd
PKG_DESCR:= vnc server for x11 displays
PKG_SECTION:= x11/apps
-PKG_BUILDDEP:= libX11 libXtst libjpeg-turbo
+PKG_DEPENDS:= libvncserver libpng libjpeg-turbo zlib liblzo
+PKG_DEPENDS+= libgnutls libxi libxdamage libxtst cairo
+PKG_DEPENDS+= libxfixes libxrandr
+PKG_BUILDDEP:= libX11 libXtst libjpeg-turbo libvncserver
PKG_URL:= http://www.karlrunge.com/x11vnc/
-PKG_SITES:= http://sourceforge.net/projects/libvncserver/files/x11vnc/0.9.13/
-
-DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
+PKG_SITES:= https://github.com/LibVNC/x11vnc/archive/refs/tags/
+DISTFILES:= ${PKG_VERSION}.tar.gz
include $(ADK_TOPDIR)/mk/package.mk
$(eval $(call PKG_template,X11VNC,x11vnc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+TARGET_LDFLAGS+= -lssl -lcrypto
ifeq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),y)
MAKE_FLAGS+= CFLAGS="${TARGET_CFLAGS} -static" \
LIBS="-lxcb -lXau -lXdmcp -ldl -pthread -ljpeg -lz"
endif
-CONFIGURE_ARGS+= --without-ssl
+AUTOTOOL_STYLE:= autoreconf
+CONFIGURE_ARGS+= --without-ssl \
+ --without-crypto
x11vnc-install:
$(INSTALL_DIR) $(IDIR_X11VNC)/usr/bin
diff --git a/package/x11vnc/patches/patch-src_util_c b/package/x11vnc/patches/patch-src_util_c
new file mode 100644
index 000000000..c16d39ae6
--- /dev/null
+++ b/package/x11vnc/patches/patch-src_util_c
@@ -0,0 +1,12 @@
+--- x11vnc-0.9.16.orig/src/util.c 2019-01-05 14:22:11.000000000 +0100
++++ x11vnc-0.9.16/src/util.c 2022-12-30 16:45:15.602697333 +0100
+@@ -47,6 +47,9 @@ int hxl = 0;
+ #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
+ MUTEX(x11Mutex);
+ MUTEX(scrollMutex);
++MUTEX(clientMutex);
++MUTEX(inputMutex);
++MUTEX(pointerMutex);
+ #endif
+
+ int nfix(int i, int n);
diff --git a/package/x11vnc/patches/patch-src_util_h b/package/x11vnc/patches/patch-src_util_h
new file mode 100644
index 000000000..147534eb2
--- /dev/null
+++ b/package/x11vnc/patches/patch-src_util_h
@@ -0,0 +1,15 @@
+--- x11vnc-0.9.16.orig/src/util.h 2019-01-05 14:22:11.000000000 +0100
++++ x11vnc-0.9.16/src/util.h 2022-12-30 16:45:15.598697256 +0100
+@@ -102,9 +102,9 @@ extern struct timeval _mysleep;
+ #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
+ extern MUTEX(x11Mutex);
+ extern MUTEX(scrollMutex);
+-MUTEX(clientMutex);
+-MUTEX(inputMutex);
+-MUTEX(pointerMutex);
++extern MUTEX(clientMutex);
++extern MUTEX(inputMutex);
++extern MUTEX(pointerMutex);
+ #endif
+
+ #define X_INIT INIT_MUTEX(x11Mutex)