[pkgsrc/trunk]: pkgsrc/graphics/MesaLib MesaLib: pull in vdpau and vaapi only...

[maya <maya%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bf624cb57f86
branches:  trunk
changeset: 359190:bf624cb57f86
user:      maya <maya%pkgsrc.org@localhost>
date:      Thu Mar 02 04:40:33 2017 +0000

description:
MesaLib: pull in vdpau and vaapi only if dri option is selected.
This fixes a PLIST mismatch in the -dri -llvm case, pointed out by
Joern Clausen in PR pkg/52021.

diffstat:

 graphics/MesaLib/Makefile   |  16 +---------------
 graphics/MesaLib/options.mk |  17 +++++++++++++++--
 2 files changed, 16 insertions(+), 17 deletions(-)

diffs (68 lines):

diff -r 5a2e0ef9dc3c -r bf624cb57f86 graphics/MesaLib/Makefile
--- a/graphics/MesaLib/Makefile Thu Mar 02 03:56:59 2017 +0000
+++ b/graphics/MesaLib/Makefile Thu Mar 02 04:40:33 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.133 2017/02/24 13:48:33 maya Exp $
+# $NetBSD: Makefile,v 1.134 2017/03/02 04:40:33 maya Exp $
 
 DISTNAME=      mesa-11.2.2
 PKGNAME=       ${DISTNAME:S/mesa/MesaLib/}
@@ -105,20 +105,6 @@
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/src/mesa/drivers/dri/common/drirc ${DESTDIR}${PREFIX}/share/examples/MesaLib
 
-PLIST_VARS+=   vdpau vaapi
-
-.include "../../multimedia/libvdpau/available.mk"
-.if ${VDPAU_AVAILABLE} == "yes"
-PLIST.vdpau=   yes
-.include "../../multimedia/libvdpau/buildlink3.mk"
-.endif
-
-.include "../../multimedia/libva/available.mk"
-.if ${VAAPI_AVAILABLE} == "yes"
-PLIST.vaapi=   yes
-.include "../../multimedia/libva/buildlink3.mk"
-.endif
-
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libxcb/buildlink3.mk"
diff -r 5a2e0ef9dc3c -r bf624cb57f86 graphics/MesaLib/options.mk
--- a/graphics/MesaLib/options.mk       Thu Mar 02 03:56:59 2017 +0000
+++ b/graphics/MesaLib/options.mk       Thu Mar 02 04:40:33 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.49 2016/02/25 13:37:46 jperkin Exp $
+# $NetBSD: options.mk,v 1.50 2017/03/02 04:40:33 maya Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.MesaLib
 PKG_SUPPORTED_OPTIONS=         llvm dri
@@ -37,7 +37,7 @@
 # classic DRI
 PLIST_VARS+=   dri swrast_dri i915_dri nouveau_dri i965_dri radeon_dri r200_dri
 # other features
-PLIST_VARS+=   gbm wayland xatracker
+PLIST_VARS+=   gbm vaapi vdpau wayland xatracker
 
 .if !empty(PKG_OPTIONS:Mdri)
 
@@ -52,6 +52,19 @@
 CONFIGURE_ARGS+=       --enable-gles1
 CONFIGURE_ARGS+=       --enable-gles2
 
+# VA-API and VDPAU
+.include "../../multimedia/libva/available.mk"
+.if ${VAAPI_AVAILABLE} == "yes"
+PLIST.vaapi=   yes
+.include "../../multimedia/libva/buildlink3.mk"
+.endif
+
+.include "../../multimedia/libvdpau/available.mk"
+.if ${VDPAU_AVAILABLE} == "yes"
+PLIST.vdpau=   yes
+.include "../../multimedia/libvdpau/buildlink3.mk"
+.endif
+
 # Use Thread Local Storage in GLX where it is supported by Mesa and works.
 .if \
        !empty(MACHINE_PLATFORM:MNetBSD-[789].*-i386) ||        \