Update libvncserver to 0.9.12

Notable Changes:
- Move from GNU autotools to cmake.
- Take the same cmake configure args from  Net and FreeBSD (more or less)
- Add patch to avoid links with shared libs
- bump SHARED_LIBS

Tested by Tracey Emery. Thanks!
This commit is contained in:
rsadowski 2019-05-12 13:36:34 +00:00
parent 19484e0639
commit bdd2b546ea
5 changed files with 56 additions and 32 deletions

View File

@ -1,13 +1,12 @@
# $OpenBSD: Makefile,v 1.9 2018/08/09 15:05:29 sthen Exp $
# $OpenBSD: Makefile,v 1.10 2019/05/12 13:36:34 rsadowski Exp $
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 png pthread sasl2
WANTLIB += ssl z
MASTER_SITES= https://github.com/LibVNC/libvncserver/archive/
WRKDIST= ${WRKDIR}/libvncserver-${DISTNAME}
MODULES= devel/cmake
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
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
WRKDIST= ${WRKDIR}/libvncserver-${DISTNAME}
pre-configure:
cd ${WRKSRC} && \
AUTOCONF_VERSION=${AUTOCONF_VERSION} \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
autoreconf -fi
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>

View File

@ -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

View File

@ -0,0 +1,16 @@
$OpenBSD: patch-CMakeLists_txt,v 1.1 2019/05/12 13:36:34 rsadowski Exp $
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

View File

@ -0,0 +1,13 @@
$OpenBSD: patch-libvncclient_sasl_c,v 1.1 2019/05/12 13:36:34 rsadowski Exp $
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>

View File

@ -1,19 +1,13 @@
@comment $OpenBSD: PLIST,v 1.3 2018/08/09 15:05:29 sthen Exp $
@comment $OpenBSD: PLIST,v 1.4 2019/05/12 13:36:34 rsadowski 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