4 files changed, 71 insertions, 7 deletions
diff --git a/package/libvncserver/Makefile b/package/libvncserver/Makefile
new file mode 100644
index 000000000..a3812648c
--- /dev/null
+++ b/package/libvncserver/Makefile
@@ -0,0 +1,33 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(ADK_TOPDIR)/rules.mk
+
+PKG_NAME:=		libvncserver
+PKG_VERSION:=		0.9.14
+PKG_RELEASE:=		1
+PKG_HASH:=		83104e4f7e28b02f8bf6b010d69b626fae591f887e949816305daebae527c9a5
+PKG_DESCR:=		VNC library
+PKG_SECTION:=		libs/misc
+PKG_BUILDDEP:=		cmake-host
+PKG_SITES:=		https://github.com/LibVNC/libvncserver/archive/refs/tags/
+PKG_OPTS:=		dev
+
+DISTFILES:=             LibVNCServer-$(PKG_VERSION).tar.gz
+
+WRKDIST=		${WRKDIR}/${PKG_NAME}-LibVNCServer-${PKG_VERSION}
+
+include $(ADK_TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBVNCSERVER,libvncserver,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
+
+CONFIG_STYLE:=		cmake
+
+libvncserver-install:
+	$(INSTALL_DIR) $(IDIR_LIBVNCSERVER)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libvncserver*.so* \
+		$(IDIR_LIBVNCSERVER)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libvncclient*.so* \
+		$(IDIR_LIBVNCSERVER)/usr/lib
+
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/x11vnc/Makefile b/package/x11vnc/Makefile
index 9fad7e631..dce2d0139 100644
--- a/package/x11vnc/Makefile
+++ b/package/x11vnc/Makefile
@@ -4,17 +4,19 @@
 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
 
@@ -25,7 +27,9 @@ 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)