Date: Sun, 26 Jun 2016 22:25:52 +0000 (UTC) From: Ben Woods <woodsb02@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r417620 - in head/net/libvncserver: . files Message-ID: <201606262225.u5QMPqnp095009@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: woodsb02 Date: Sun Jun 26 22:25:51 2016 New Revision: 417620 URL: https://svnweb.freebsd.org/changeset/ports/417620 Log: net/libvncserver: Fix build with libva - Add new option to select whether to compile with VAAPI support, so that if multimedia/libva is already installed on the system during the build process, it is not linked to unless desired. - Add patch to allow h.264 support to build using libva deprecated API PR: 210533 Submitted by: cpm Reported by: Walter Schwarzenfeld <w.schwarzenfeld@utanet.at> Approved by: adamw (mentor) Differential Revision: https://reviews.freebsd.org/D6974 Added: head/net/libvncserver/files/ head/net/libvncserver/files/patch-libvncclient_h264.c (contents, props changed) Modified: head/net/libvncserver/Makefile Modified: head/net/libvncserver/Makefile ============================================================================== --- head/net/libvncserver/Makefile Sun Jun 26 21:41:08 2016 (r417619) +++ head/net/libvncserver/Makefile Sun Jun 26 22:25:51 2016 (r417620) @@ -24,7 +24,7 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip -OPTIONS_DEFINE= GCRYPT IPV6 +OPTIONS_DEFINE= GCRYPT IPV6 VAAPI OPTIONS_SINGLE= SSL OPTIONS_SINGLE_SSL= GNUTLS OPENSSL OPTIONS_DEFAULT= OPENSSL @@ -43,6 +43,9 @@ GCRYPT_CONFIGURE_WITH= gcrypt IPV6_CONFIGURE_WITH= ipv6 +VAAPI_LIB_DEPENDS= libva.so:multimedia/libva +VAAPI_CONFIGURE_WITH= libva + post-install: ${INSTALL_DATA} ${WRKSRC}/rfb/default8x16.h ${STAGEDIR}${PREFIX}/include/rfb Added: head/net/libvncserver/files/patch-libvncclient_h264.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/libvncserver/files/patch-libvncclient_h264.c Sun Jun 26 22:25:51 2016 (r417620) @@ -0,0 +1,13 @@ +--- libvncclient/h264.c.orig 2016-06-26 17:53:47 UTC ++++ libvncclient/h264.c +@@ -20,6 +20,10 @@ + #ifdef LIBVNCSERVER_CONFIG_LIBVA + + #include <X11/Xlib.h> ++#include <va/va_version.h> ++#if VA_CHECK_VERSION(0,39,2) ++#include <va/va_compat.h> ++#endif + #include <va/va_x11.h> + + enum _slice_types {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606262225.u5QMPqnp095009>