Add and update a number of packages

11 files changed, 27 insertions, 24 deletions

diff --git a/data/libvncserver/LibVNCServer-0.9.11.tar.gz b/data/libvncserver/LibVNCServer-0.9.11.tar.gz
new file mode 100644
index 000000000..c33564ae6
--- /dev/null
+++ b/data/libvncserver/LibVNCServer-0.9.11.tar.gz
diff --git a/data/libvncserver/LibVNCServer-0.9.8.1.tar.gz b/data/libvncserver/LibVNCServer-0.9.8.1.tar.gz
deleted file mode 100644
index aad3ad8d8..000000000
--- a/data/libvncserver/LibVNCServer-0.9.8.1.tar.gz
+++ /dev/null
diff --git a/data/libvncserver/_metadata/gnutls.dep b/data/libvncserver/_metadata/gnutls.dep
new file mode 120000
index 000000000..2dbb733a2
--- /dev/null
+++ b/data/libvncserver/_metadata/gnutls.dep
@@ -0,0 +1 @@
+../../gnutls
\ No newline at end of file
diff --git a/data/libvncserver/_metadata/jpeg.dep b/data/libvncserver/_metadata/jpeg.dep
deleted file mode 120000
index 6a539ed63..000000000
--- a/data/libvncserver/_metadata/jpeg.dep
+++ /dev/null
@@ -1 +0,0 @@
-../../jpeg
\ No newline at end of file
diff --git a/data/libvncserver/_metadata/libjpeg-turbo.dep b/data/libvncserver/_metadata/libjpeg-turbo.dep
new file mode 120000
index 000000000..b905b9550
--- /dev/null
+++ b/data/libvncserver/_metadata/libjpeg-turbo.dep
@@ -0,0 +1 @@
+../../libjpeg-turbo
\ No newline at end of file
diff --git a/data/libvncserver/_metadata/p11-kit.dep b/data/libvncserver/_metadata/p11-kit.dep
new file mode 120000
index 000000000..1019ede75
--- /dev/null
+++ b/data/libvncserver/_metadata/p11-kit.dep
@@ -0,0 +1 @@
+../../p11-kit
\ No newline at end of file
diff --git a/data/libvncserver/_metadata/png.dep b/data/libvncserver/_metadata/png.dep
new file mode 120000
index 000000000..581f24e2a
--- /dev/null
+++ b/data/libvncserver/_metadata/png.dep
@@ -0,0 +1 @@
+../../png
\ No newline at end of file
diff --git a/data/libvncserver/_metadata/version b/data/libvncserver/_metadata/version
index b5343984c..8225a4ba4 100644
--- a/data/libvncserver/_metadata/version
+++ b/data/libvncserver/_metadata/version
@@ -1 +1 @@
-0.9.8.1
+0.9.11
diff --git a/data/libvncserver/clsockrace.diff b/data/libvncserver/clsockrace.diff
index 56b41e38e..9b1f2ad5d 100644
--- a/data/libvncserver/clsockrace.diff
+++ b/data/libvncserver/clsockrace.diff
@@ -1,12 +1,12 @@
-diff -ru LibVNCServer-0.9.8.1/libvncserver/main.c LibVNCServer-0.9.8.1+iPhone/libvncserver/main.c
---- LibVNCServer-0.9.8.1/libvncserver/main.c	2011-10-12 16:52:18.000000000 +0000
-+++ LibVNCServer-0.9.8.1+iPhone/libvncserver/main.c	2011-10-13 04:09:56.000000000 +0000
+diff -ur libvncserver-LibVNCServer-0.9.11/libvncserver/main.c libvncserver-LibVNCServer-0.9.11+iPhone/libvncserver/main.c
+--- libvncserver-LibVNCServer-0.9.11/libvncserver/main.c	2016-12-30 03:01:28.000000000 -1000
++++ libvncserver-LibVNCServer-0.9.11+iPhone/libvncserver/main.c	2018-08-29 11:20:52.000000000 -1000
 @@ -517,24 +517,26 @@
  	struct timeval tv;
  	int n;
  
 -	if (cl->sock == -1) {
-+        int sock = cl->sock;
++	int sock = cl->sock;
 +
 +	if (sock == -1) {
  	  /* Client has disconnected. */
@@ -43,6 +43,6 @@ diff -ru LibVNCServer-0.9.8.1/libvncserver/main.c LibVNCServer-0.9.8.1+iPhone/li
  
 -        if (FD_ISSET(cl->sock, &rfds) || FD_ISSET(cl->sock, &efds))
 +        if (FD_ISSET(sock, &rfds) || FD_ISSET(cl->sock, &efds))
-             rfbProcessClientMessage(cl);
-     }
- 
+         {
+ #ifdef LIBVNCSERVER_WITH_WEBSOCKETS
+             do {
diff --git a/data/libvncserver/make.sh b/data/libvncserver/make.sh
index 452a4bfd5..163b0e374 100644
--- a/data/libvncserver/make.sh
+++ b/data/libvncserver/make.sh
@@ -1,4 +1,5 @@
 pkg:setup
-pkg:configure
-make
+autoreconf -fiv
+pkg:configure --with-libgcrypt-prefix="$(PKG_DEST_ gcrypt)/usr" --disable-static
+make -j8
 pkg:install
diff --git a/data/libvncserver/subdirs.diff b/data/libvncserver/subdirs.diff
index 507e02d45..c2f61075b 100644
--- a/data/libvncserver/subdirs.diff
+++ b/data/libvncserver/subdirs.diff
@@ -1,14 +1,13 @@
-diff -ru LibVNCServer-0.9.8/Makefile.in LibVNCServer-0.9.8+iPhone/Makefile.in
---- LibVNCServer-0.9.8/Makefile.in	2011-03-30 11:34:39.000000000 +0000
-+++ LibVNCServer-0.9.8+iPhone/Makefile.in	2011-08-03 09:17:58.000000000 +0000
-@@ -266,8 +266,8 @@
- top_srcdir = @top_srcdir@
- with_ffmpeg = @with_ffmpeg@
- @WITH_X11VNC_TRUE@X11VNC = x11vnc
--SUBDIRS = libvncserver examples libvncclient vncterm classes client_examples test $(X11VNC)
--DIST_SUBDIRS = libvncserver examples libvncclient vncterm classes client_examples test
-+SUBDIRS = libvncserver libvncclient classes test $(X11VNC)
-+DIST_SUBDIRS = libvncserver libvncclient classes test
- EXTRA_DIST = CMakeLists.txt rfb/rfbint.h.cmake rfb/rfbconfig.h.cmake
+diff -ur libvncserver-LibVNCServer-0.9.11/Makefile.am libvncserver-LibVNCServer-0.9.11+iPhone/Makefile.am
+--- libvncserver-LibVNCServer-0.9.11/Makefile.am	2016-12-30 03:01:28.000000000 -1000
++++ libvncserver-LibVNCServer-0.9.11+iPhone/Makefile.am	2018-08-29 11:17:20.000000000 -1000
+@@ -1,7 +1,7 @@
+ ACLOCAL_AMFLAGS = -I m4
+ 
+-SUBDIRS=libvncserver examples libvncclient webclients client_examples test
+-DIST_SUBDIRS=libvncserver examples libvncclient webclients client_examples test
++SUBDIRS=libvncserver libvncclient test
++DIST_SUBDIRS=libvncserver libvncclient test
+ EXTRA_DIST = CMakeLists.txt rfb/rfbconfig.h.cmake
+ 
  bin_SCRIPTS = libvncserver-config
- pkgconfigdir = $(libdir)/pkgconfig