From owner-svn-ports-head@freebsd.org  Sun Jun 26 22:25:53 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5FCC0B802C1;
 Sun, 26 Jun 2016 22:25:53 +0000 (UTC)
 (envelope-from woodsb02@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 16A192A79;
 Sun, 26 Jun 2016 22:25:53 +0000 (UTC)
 (envelope-from woodsb02@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5QMPqek095011;
 Sun, 26 Jun 2016 22:25:52 GMT (envelope-from woodsb02@FreeBSD.org)
Received: (from woodsb02@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5QMPqnp095009;
 Sun, 26 Jun 2016 22:25:52 GMT (envelope-from woodsb02@FreeBSD.org)
Message-Id: <201606262225.u5QMPqnp095009@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: woodsb02 set sender to
 woodsb02@FreeBSD.org using -f
From: Ben Woods <woodsb02@FreeBSD.org>
Date: Sun, 26 Jun 2016 22:25:52 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r417620 - in head/net/libvncserver: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Jun 2016 22:25:53 -0000

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 {