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
This commit is contained in:
Ben Woods 2016-06-26 22:25:51 +00:00
parent 18fd1bce60
commit 2930c9b19a
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=417620
2 changed files with 17 additions and 1 deletions

View file

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

View file

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