libva: fix build with netbsd base X11.

netbsd base X11 will have MesaLib already, which we can't do for pkgsrc
Xorg as it introduces a circular dependency. disable building the dummy
driver (which isn't really useful anyway).

disable some glx stuff that is auto-detected in the base Xorg case, again
to avoid a PLIST mismatch.

bump PKGREVISION

4 files changed, 13 insertions, 18 deletions

diff --git a/multimedia/libva/Makefile b/multimedia/libva/Makefile
index 62c654bb219..13cfb83f4e0 100644
--- a/multimedia/libva/Makefile
+++ b/multimedia/libva/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2017/02/24 16:44:03 maya Exp $
+# $NetBSD: Makefile,v 1.13 2017/02/24 19:14:17 maya Exp $
 #
 
 DISTNAME=	libva-1.7.3
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.freedesktop.org/software/vaapi/releases/libva/
 EXTRACT_SUFX=	.tar.bz2
@@ -20,7 +20,6 @@ USE_TOOLS+=	autoreconf autoconf automake gmake pkg-config
 
 DRIVER_SEARCH_PATH=	${X11BASE}/lib/dri
 
-CONFIGURE_ARGS+=	--enable-i965-driver
 CONFIGURE_ARGS+=	--enable-shared
 CONFIGURE_ARGS+=	--with-drivers-path=${DRIVER_SEARCH_PATH:Q}
 
@@ -37,14 +36,10 @@ PKGCONFIG_OVERRIDE+=	libva.pc.in
 pre-configure:
 	cd ${WRKSRC} && autoreconf -i
 
-# XXX introduces a circular dependency if this package
-# is a dependency to MesaLib, but seems to work anyway
-# worth checking if it's necessary for anything
-#PLIST_VARS+=		egl
-#.include "../../graphics/MesaLib/buildlink3.mk"
-#.if !empty(MESALIB_SUPPORTS_EGL:Myes)
-#PLIST.egl=		yes
-#.endif
+# To avoid a PLIST mismatch with base Xorg
+CONFIGURE_ARGS+=	--disable-glx
+CONFIGURE_ARGS+=	--disable-egl
+
 .include "../../x11/libXfixes/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
diff --git a/multimedia/libva/PLIST b/multimedia/libva/PLIST
index dd493bc9aac..336d4735c97 100644
--- a/multimedia/libva/PLIST
+++ b/multimedia/libva/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2017/02/24 16:44:03 maya Exp $
+@comment $NetBSD: PLIST,v 1.8 2017/02/24 19:14:17 maya Exp $
 include/va/va.h
 include/va/va_backend.h
 include/va/va_backend_tpi.h
@@ -22,7 +22,6 @@ include/va/va_tpi.h
 include/va/va_version.h
 include/va/va_vpp.h
 include/va/va_x11.h
-lib/dri/dummy_drv_video.la
 lib/libva-drm.la
 lib/libva-tpi.la
 lib/libva-x11.la
diff --git a/multimedia/libva/distinfo b/multimedia/libva/distinfo
index f117d8c54f6..fa2ed13f75e 100644
--- a/multimedia/libva/distinfo
+++ b/multimedia/libva/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.7 2017/02/24 16:44:03 maya Exp $
+$NetBSD: distinfo,v 1.8 2017/02/24 19:14:17 maya Exp $
 
 SHA1 (libva-1.7.3.tar.bz2) = 18e46f3d5a0e971eb0ec9fe14bc021e69eb13fb8
 RMD160 (libva-1.7.3.tar.bz2) = d29e432f666df9df8b312c45cd7d9ec2f6ef6e3c
 SHA512 (libva-1.7.3.tar.bz2) = ecc1ba17e2afea2efe4d36e8d9358d420015b3ad9d2a510ee2b263274c889caf39915a8b8da2d16329184bf4f42d0cbd124af3d070b83235b6a7453afd30b3a0
 Size (libva-1.7.3.tar.bz2) = 824490 bytes
 SHA1 (patch-aa) = 3e4966037c46fada25cc869b672a7e78dda5b04b
-SHA1 (patch-ac) = 776cd2f381ec974bf25054b949912a713d832ae3
+SHA1 (patch-ac) = d5cf7bb9175617d3d152e8c6fbc9d2ef823eba42
 SHA1 (patch-va_Makefile.am) = 0bf9bb930bce79994ef060e6ad44cb1bf9eb0773
 SHA1 (patch-va_glx_va__glx__private.h) = daf6552189295a86f1f073ef107b7449e4098251
 SHA1 (patch-va_va.c) = 6987c93b7be0d2c9fda780b73e48894faaed60f1
diff --git a/multimedia/libva/patches/patch-ac b/multimedia/libva/patches/patch-ac
index c1498575187..aec87393230 100644
--- a/multimedia/libva/patches/patch-ac
+++ b/multimedia/libva/patches/patch-ac
@@ -1,6 +1,7 @@
-$NetBSD: patch-ac,v 1.2 2013/04/14 00:30:02 cheusov Exp $
+$NetBSD: patch-ac,v 1.3 2017/02/24 19:14:17 maya Exp $
 
-Don't build tests.
+Don't build tests or the dummy_drv.
+dummy_drv isn't useful, and causes PLIST mismatches
 
 --- Makefile.am.orig	2012-09-28 14:04:28.000000000 +0000
 +++ Makefile.am
@@ -9,7 +10,7 @@ Don't build tests.
  AUTOMAKE_OPTIONS = foreign
  
 -SUBDIRS = va dummy_drv_video pkgconfig test debian.upstream doc
-+SUBDIRS = va dummy_drv_video pkgconfig debian.upstream doc
++SUBDIRS = va pkgconfig debian.upstream doc
  
  # Extra clean files so that maintainer-clean removes *everything*
  MAINTAINERCLEANFILES = \