Update libvncserver to the latest stable version.
Notable Changes:
- Switch so CMake
- bump SHARED_LIBS (Checked with check_sym)
- Take the same cmake configure args from Net and FreeBSD (more or less)
- Add patch to avoid links with shared libs
All consumers build fine. Real word test welcome. I need this update for
an upcoming kde-application.
OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/libvncserver/Makefile,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 Makefile
--- Makefile 9 Aug 2018 15:05:29 -0000 1.9
+++ Makefile 12 Mar 2019 19:52:19 -0000
@@ -2,12 +2,11 @@
COMMENT= library for easy implementation of a VNC server
-DISTNAME= LibVNCServer-0.9.10
-REVISION= 5
+DISTNAME= LibVNCServer-0.9.12
PKGNAME= ${DISTNAME:L}
-SHARED_LIBS += vncclient 0.0 # 0.0
-SHARED_LIBS += vncserver 0.0 # 0.0
+SHARED_LIBS += vncclient 1.0 # 0.0
+SHARED_LIBS += vncserver 2.0 # 0.0
CATEGORIES= net devel
@@ -16,32 +15,34 @@ HOMEPAGE= https://libvnc.github.io/
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB = crypto ffi gcrypt gmp gnutls gpg-error hogweed iconv idn2
-WANTLIB += intl jpeg m nettle p11-kit png pthread ssl tasn1 unistring z
+WANTLIB += crypto gcrypt gnutls jpeg lzo2 png16 pthread sasl2
+WANTLIB += ssl z
MASTER_SITES= https://github.com/LibVNC/libvncserver/archive/
-WRKDIST= ${WRKDIR}/libvncserver-${DISTNAME}
-
-CONFIGURE_STYLE= gnu
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+MODULES = devel/cmake
-LIB_DEPENDS= graphics/jpeg \
+LIB_DEPENDS= archivers/lzo2 \
+ graphics/jpeg \
graphics/png \
+ security/cyrus-sasl2 \
security/gnutls \
security/libgcrypt
-AUTOCONF_VERSION= 2.69
-AUTOMAKE_VERSION= 1.15
-BUILD_DEPENDS += ${MODGNU_AUTOCONF_DEPENDS} \
- ${MODGNU_AUTOMAKE_DEPENDS} \
- devel/libtool
-
-pre-configure:
- cd ${WRKSRC} && \
- AUTOCONF_VERSION=${AUTOCONF_VERSION} \
- AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
- autoreconf -fi
+WRKDIST= ${WRKDIR}/libvncserver-${DISTNAME}
+
+CONFIGURE_ARGS += -DWITH_24BPP=ON \
+ -DWITH_JPEG=ON \
+ -DWITH_LZO=ON \
+ -DWITH_PNG=ON \
+ -DWITH_THREADS=ON \
+ -DWITH_TIGHTVNC_FILETRANSFER=ON \
+ -DWITH_WEBSOCKETS=ON \
+ -DWITH_ZLIB=ON \
+ -DWITH_SASL=ON \
+ -DWITH_IPv6=ON \
+ -DWITH_FFMPEG=OFF \
+ -DWITH_SDL=OFF \
+ -DWITH_SYSTEMD=OFF\
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/libvncserver/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo 7 Nov 2015 09:23:17 -0000 1.1.1.1
+++ distinfo 12 Mar 2019 19:52:19 -0000
@@ -1,2 +1,2 @@
-SHA256 (LibVNCServer-0.9.10.tar.gz) =
7RCBmlv78mmWn5fwdZOcw4JzzBttKLzPsJmfukiUEfc=
-SIZE (LibVNCServer-0.9.10.tar.gz) = 1415191
+SHA256 (LibVNCServer-0.9.12.tar.gz) =
M8u7ThW7OQ9yPDEbMjzvSkO894GYT5LZKt2jJDoRYTY=
+SIZE (LibVNCServer-0.9.12.tar.gz) = 2237447
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-CMakeLists_txt 12 Mar 2019 19:52:19 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -666,8 +666,8 @@ get_link_libraries(PRIVATE_LIBS vncclient)
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libvncclient.pc.cmakein
${CMAKE_CURRENT_BINARY_DIR}/libvncclient.pc @ONLY)
+
+
+-install_targets(/lib vncserver)
+-install_targets(/lib vncclient)
++install(TARGETS vncserver DESTINATION "lib")
++install(TARGETS vncclient DESTINATION "lib")
+ install_files(/include/rfb FILES
+ rfb/keysym.h
+ rfb/rfb.h
Index: patches/patch-Makefile_am
===================================================================
RCS file: patches/patch-Makefile_am
diff -N patches/patch-Makefile_am
--- patches/patch-Makefile_am 1 Dec 2017 16:09:54 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-Makefile_am,v 1.1 2017/12/01 16:09:54 jca Exp $
-
-Skip subdirectory which builds programs that need optional deps (sdl,
-gtk), for which there is no easy --without-dep switch.
-
-Index: Makefile.am
---- Makefile.am.orig
-+++ Makefile.am
-@@ -1,6 +1,6 @@
- ACLOCAL_AMFLAGS = -I m4
-
--SUBDIRS=libvncserver examples libvncclient webclients client_examples test
-+SUBDIRS=libvncserver examples libvncclient webclients test
- DIST_SUBDIRS=libvncserver examples libvncclient webclients client_examples
test
- EXTRA_DIST = CMakeLists.txt rfb/rfbint.h.cmake rfb/rfbconfig.h.cmake
-
Index: patches/patch-libvncclient_sasl_c
===================================================================
RCS file: patches/patch-libvncclient_sasl_c
diff -N patches/patch-libvncclient_sasl_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libvncclient_sasl_c 12 Mar 2019 19:52:19 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: libvncclient/sasl.c
+--- libvncclient/sasl.c.orig
++++ libvncclient/sasl.c
+@@ -35,6 +35,7 @@
+ #define _XOPEN_SOURCE 600
+ #endif
+
++#include <sys/socket.h>
+ #include <errno.h>
+ #include <rfb/rfbclient.h>
+
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/libvncserver/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- pkg/PLIST 9 Aug 2018 15:05:29 -0000 1.3
+++ pkg/PLIST 12 Mar 2019 19:52:19 -0000
@@ -1,19 +1,13 @@
@comment $OpenBSD: PLIST,v 1.3 2018/08/09 15:05:29 sthen Exp $
@conflict x11vnc-<0.9.15
-bin/libvncserver-config
include/rfb/
include/rfb/keysym.h
include/rfb/rfb.h
include/rfb/rfbclient.h
include/rfb/rfbconfig.h
-include/rfb/rfbint.h
include/rfb/rfbproto.h
include/rfb/rfbregion.h
-lib/libvncclient.a
-lib/libvncclient.la
@lib lib/libvncclient.so.${LIBvncclient_VERSION}
-lib/libvncserver.a
-lib/libvncserver.la
@lib lib/libvncserver.so.${LIBvncserver_VERSION}
lib/pkgconfig/libvncclient.pc
lib/pkgconfig/libvncserver.pc
