From 241557429cbb018102944b86b6346baa7b74bf81 Mon Sep 17 00:00:00 2001 From: woodsb02 Date: Sun, 26 Jun 2016 22:25:51 +0000 Subject: 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 Approved by: adamw (mentor) Differential Revision: https://reviews.freebsd.org/D6974 --- net/libvncserver/Makefile | 5 ++++- net/libvncserver/files/patch-libvncclient_h264.c | 13 +++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 net/libvncserver/files/patch-libvncclient_h264.c (limited to 'net') diff --git a/net/libvncserver/Makefile b/net/libvncserver/Makefile index 35a55037ca6e..22363e4a41b3 100644 --- a/net/libvncserver/Makefile +++ b/net/libvncserver/Makefile @@ -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 diff --git a/net/libvncserver/files/patch-libvncclient_h264.c b/net/libvncserver/files/patch-libvncclient_h264.c new file mode 100644 index 000000000000..f81e0ece8350 --- /dev/null +++ b/net/libvncserver/files/patch-libvncclient_h264.c @@ -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 ++#include ++#if VA_CHECK_VERSION(0,39,2) ++#include ++#endif + #include + + enum _slice_types { -- cgit