[pkgsrc/trunk]: pkgsrc/net/libvncserver libVNCServer: update to 0.9.12

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a63c01f2d46a
branches:  trunk
changeset: 391154:a63c01f2d46a
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Fri Feb 01 12:45:21 2019 +0000

description:
libVNCServer: update to 0.9.12

Overall changes:
  CMake now is the default build system, Autotools were removed.
  In addition to TravisCI, all commits are now build-tested by AppVeyorCI.

LibVNCServer/LibVNCClient:
  Numerous build fixes for Visual Studio compilers to the extent that
  one can now build the project with these. The needed changes for
  successfully running stuff will be implemented in 0.9.13.
  Fixed building for Android and added build instructions.
  Removed the unused PolarSSL wrapper.
  Updated the bundled noVNC to latest release 1.0.0.
  Allowed to use global LZO library instead of miniLZO.

LibVNCClient:
  Support for OpenSSL 1.1.x.
  Support for overriding the default rectangle decode handlers (with
  hardware-accelerated ones for instance) thanks to Balazs Ludmany.
  vnc2mpg updated.
  Added support for X509 server certificate verification as part of the
  handshake process thanks to Simon Waterman.
  Added a TRLE decoder thanks to Wiki Wang.
  Included Tight decoding optimizations from TurboVNC thanks to DRC.
  Ported the SDL viewer from SDL 1.2 to SDL 2.0.
  Numerous security fixes.
  Added support for custom auth handlers in order to support additional
  security types.

LibVNCServer:
  Websockets rework to remove obsolete code thanks to Andreas Weigel.
  Ensured compatibility with gtk-vnc 0.7.0+ thanks to Micha  K pie .
  The built-in webserver now sends correct MIME type for Javascript.
  Numerous memory management issues fixed.
  Made the TightVNC-style file transfer more stable.

diffstat:

 net/libvncserver/Makefile      |  43 +++++++++++++++++++++--------------------
 net/libvncserver/PLIST         |  11 ++++++---
 net/libvncserver/buildlink3.mk |  12 ++++++++--
 net/libvncserver/distinfo      |  10 ++++----
 net/libvncserver/options.mk    |  31 ++++++++++++++++-------------
 5 files changed, 60 insertions(+), 47 deletions(-)

diffs (194 lines):

diff -r 66bf07495962 -r a63c01f2d46a net/libvncserver/Makefile
--- a/net/libvncserver/Makefile Fri Feb 01 11:52:46 2019 +0000
+++ b/net/libvncserver/Makefile Fri Feb 01 12:45:21 2019 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2018/07/18 17:55:54 bouyer Exp $
+# $NetBSD: Makefile,v 1.26 2019/02/01 12:45:21 tnn Exp $
 #
 
-DISTNAME=              libvncserver-LibVNCServer-0.9.11
-PKGNAME=               libVNCServer-0.9.11
-PKGREVISION=           2
+DISTNAME=              libvncserver-LibVNCServer-0.9.12
+PKGNAME=               libVNCServer-0.9.12
 CATEGORIES=            net
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=LibVNC/}
 GITHUB_PROJECT=                libvncserver
@@ -14,29 +13,31 @@
 COMMENT=               Easy API to write one's own vnc server
 LICENSE=               gnu-gpl-v2
 
-USE_LIBTOOL=           yes
-GNU_CONFIGURE=         yes
-USE_TOOLS+=            automake
+# XXX doesn't really use c++ but cmake is being uncooperative
+USE_LANGUAGES=         c c++
+USE_TOOLS+=            pkg-config
+USE_CMAKE=             yes
 
-PKGCONFIG_OVERRIDE+=   libvncserver.pc.in
-PKGCONFIG_OVERRIDE+=   libvncclient.pc.in
+PKGCONFIG_OVERRIDE+=   libvncserver.pc.cmakein
+PKGCONFIG_OVERRIDE+=   libvncclient.pc.cmakein
 
-CONFIGURE_ARGS+=       --without-x
-CONFIGURE_ARGS+=       --without-sdl-config
-CONFIGURE_ARGS+=       --without-x11vnc
+CMAKE_ARGS+=           -DWITH_FFMPEG=OFF
+CMAKE_ARGS+=           -DWITH_SDL=OFF
+CMAKE_ARGS+=           -DWITH_SYSTEMD=OFF
 
-PTHREAD_AUTO_VARS=     yes
-SUBST_CLASSES+=                pthread
-SUBST_STAGE.pthread=   pre-configure
-SUBST_FILES.pthread=   configure.ac
-SUBST_SED.pthread=     -e 's|-lpthread||g'
+CMAKE_ARGS+=           -DWITH_THREADS=ON
+CMAKE_ARGS+=           -DWITH_TIGHTVNC_FILETRANSFER=ON
+CMAKE_ARGS+=           -DWITH_WEBSOCKETS=ON
+CMAKE_ARGS+=           -DWITH_24BPP=ON
+CMAKE_ARGS+=           -DWITH_SASL=ON
+CMAKE_ARGS+=           -DWITH_LZO=ON
+CMAKE_ARGS+=           -DWITH_ZLIB=ON
+CMAKE_ARGS+=           -DWITH_JPEG=ON
+CMAKE_ARGS+=           -DWITH_PNG=ON
 
 .include "options.mk"
 
-pre-configure:
-       set -e; cd ${WRKSRC}; \
-       libtoolize; aclocal; autoheader; automake -a --foreign -i; autoconf
-
+.include "../../archivers/lzo/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
diff -r 66bf07495962 -r a63c01f2d46a net/libvncserver/PLIST
--- a/net/libvncserver/PLIST    Fri Feb 01 11:52:46 2019 +0000
+++ b/net/libvncserver/PLIST    Fri Feb 01 12:45:21 2019 +0000
@@ -1,12 +1,15 @@
-@comment $NetBSD: PLIST,v 1.5 2017/01/09 07:55:15 ryoon Exp $
-bin/libvncserver-config
+@comment $NetBSD: PLIST,v 1.6 2019/02/01 12:45:21 tnn Exp $
 include/rfb/keysym.h
 include/rfb/rfb.h
 include/rfb/rfbclient.h
 include/rfb/rfbconfig.h
 include/rfb/rfbproto.h
 include/rfb/rfbregion.h
-lib/libvncclient.la
-lib/libvncserver.la
+lib/libvncclient.so
+lib/libvncclient.so.${PKGVERSION}
+lib/libvncclient.so.1
+lib/libvncserver.so
+lib/libvncserver.so.${PKGVERSION}
+lib/libvncserver.so.1
 lib/pkgconfig/libvncclient.pc
 lib/pkgconfig/libvncserver.pc
diff -r 66bf07495962 -r a63c01f2d46a net/libvncserver/buildlink3.mk
--- a/net/libvncserver/buildlink3.mk    Fri Feb 01 11:52:46 2019 +0000
+++ b/net/libvncserver/buildlink3.mk    Fri Feb 01 12:45:21 2019 +0000
@@ -1,15 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.18 2018/04/17 22:29:33 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2019/02/01 12:45:21 tnn Exp $
 
 BUILDLINK_TREE+=       libVNCServer
 
 .if !defined(LIBVNCSERVER_BUILDLINK3_MK)
 LIBVNCSERVER_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libVNCServer+=   libVNCServer>=0.9.11
-BUILDLINK_ABI_DEPENDS.libVNCServer+=   libVNCServer>=0.9.11nb1
+BUILDLINK_API_DEPENDS.libVNCServer+=   libVNCServer>=0.9.12
+BUILDLINK_ABI_DEPENDS.libVNCServer+=   libVNCServer>=0.9.12
 BUILDLINK_PKGSRCDIR.libVNCServer?=     ../../net/libvncserver
 
+.include "../../archivers/lzo/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 
 pkgbase := libVNCServer
@@ -23,6 +25,10 @@
 .include "../../security/libgcrypt/buildlink3.mk"
 .endif
 
+.if !empty(PKG_BUILD_OPTIONS.libVNCServer:Mopenssl)
+.include "../../security/openssl/buildlink3.mk"
+.endif
+
 .endif # LIBVNCSERVER_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libVNCServer
diff -r 66bf07495962 -r a63c01f2d46a net/libvncserver/distinfo
--- a/net/libvncserver/distinfo Fri Feb 01 11:52:46 2019 +0000
+++ b/net/libvncserver/distinfo Fri Feb 01 12:45:21 2019 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.15 2018/07/18 17:55:54 bouyer Exp $
+$NetBSD: distinfo,v 1.16 2019/02/01 12:45:21 tnn Exp $
 
-SHA1 (libvncserver-LibVNCServer-0.9.11.tar.gz) = d844a2c9e69465d104a8468dce515a49e4db9585
-RMD160 (libvncserver-LibVNCServer-0.9.11.tar.gz) = a26da5e88d6571d112dfc48ef94a527b19760a36
-SHA512 (libvncserver-LibVNCServer-0.9.11.tar.gz) = e473c081b68dd3cdd96a1756b4f4945ece79d3c8e4cef62140be1699671555fc16d3080e81d764197a14ea83203ffcd0e18c3cc182e012d036e3faae943003fb
-Size (libvncserver-LibVNCServer-0.9.11.tar.gz) = 1413739 bytes
+SHA1 (libvncserver-LibVNCServer-0.9.12.tar.gz) = f2111a7d7e96d7101e7ff3834abd5b0c71c1ed5f
+RMD160 (libvncserver-LibVNCServer-0.9.12.tar.gz) = 62e65f56221e7274a4fb1b7f42cca00f7c5f2926
+SHA512 (libvncserver-LibVNCServer-0.9.12.tar.gz) = 60ff1cc93a937d6f8f97449bc58b763095846207112f7b1b3c43eb2d74448b595d6da949903a764bd484ee54e38ff6277e882adbe965dd6d26ba15ef6ff6fcb8
+Size (libvncserver-LibVNCServer-0.9.12.tar.gz) = 2237447 bytes
 SHA1 (patch-libvncserver_websockets.c) = eb4e50f8fcb8442dae54d1360e6950e2ebd4778b
 SHA1 (patch-rfb_rfbproto.h) = 6dcc68a90d444f88ab696616b1aee3eb66708877
diff -r 66bf07495962 -r a63c01f2d46a net/libvncserver/options.mk
--- a/net/libvncserver/options.mk       Fri Feb 01 11:52:46 2019 +0000
+++ b/net/libvncserver/options.mk       Fri Feb 01 12:45:21 2019 +0000
@@ -1,33 +1,36 @@
-# $NetBSD: options.mk,v 1.1 2011/04/04 09:13:44 obache Exp $
+# $NetBSD: options.mk,v 1.2 2019/02/01 12:45:21 tnn Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.libVNCServer
-PKG_SUPPORTED_OPTIONS= gnutls inet6 libgcrypt
+PKG_SUPPORTED_OPTIONS= gnutls inet6 libgcrypt openssl
 PKG_SUGGESTED_OPTIONS= gnutls inet6 libgcrypt
+PKG_OPTIONS_OPTIONAL_GROUPS+=  ssl
+PKG_OPTIONS_GROUP.ssl=         gnutls openssl
 
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mgnutls)
 .include "../../security/gnutls/buildlink3.mk"
-USE_TOOLS+=    pkg-config
-CONFIGURE_ARGS+=       --with-gnutls
-CONFIGURE_ARGS+=       --with-client-tls
+CMAKE_ARGS+=   -DWITH_GNUTLS=ON
 .else
-CONFIGURE_ARGS+=       --without-gnutls
-CONFIGURE_ARGS+=       --without-client-tls
+CMAKE_ARGS+=   -DWITH_GNUTLS=OFF
 .endif
 
 .if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+=       --with-ipv6
+CMAKE_ARGS+=   -DWITH_IPv6=ON
 .else
-CONFIGURE_ARGS+=       --without-ipv6
+CMAKE_ARGS+=   -DWITH_IPv6=OFF
 .endif
 
 .if !empty(PKG_OPTIONS:Mlibgcrypt)
 .include "../../security/libgcrypt/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-gcrypt
-CONFIGURE_ARGS+=       --with-client-gcrypt
-CONFIGURE_ARGS+=       --with-libgcrypt-prefix=${BUILDLINK_PREFIX.libgcrypt}
+CMAKE_ARGS+=           -DWITH_GCRYPT=ON
 .else
-CONFIGURE_ARGS+=       --without-gcrypt
-CONFIGURE_ARGS+=       --without-client-gcrypt
+CMAKE_ARGS+=           -DWITH_GCRYPT=OFF
 .endif
+
+.if !empty(PKG_OPTIONS:Mopenssl)
+.include "../../security/openssl/buildlink3.mk"
+CMAKE_ARGS+=   -DWITH_OPENSSL=ON
+.else
+CMAKE_ARGS+=   -DWITH_OPENSSL=OFF
+.endif