[pkgsrc/trunk]: pkgsrc/graphics/MesaLib MesaLib: the actual condition for vdp...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/950d6c29031c
branches:  trunk
changeset: 359191:950d6c29031c
user:      maya <maya%pkgsrc.org@localhost>
date:      Thu Mar 02 05:37:22 2017 +0000

description:
MesaLib: the actual condition for vdpau should be llvm&dri, not just dri.

should fix plist mismatch for CentOS 6.8, for some reason we are not using
llvm option there, even though linux users are most likely to benefit from
llvm.

diffstat:

 graphics/MesaLib/options.mk |  27 +++++++++++++--------------
 1 files changed, 13 insertions(+), 14 deletions(-)

diffs (48 lines):

diff -r bf624cb57f86 -r 950d6c29031c graphics/MesaLib/options.mk
--- a/graphics/MesaLib/options.mk       Thu Mar 02 04:40:33 2017 +0000
+++ b/graphics/MesaLib/options.mk       Thu Mar 02 05:37:22 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.50 2017/03/02 04:40:33 maya Exp $
+# $NetBSD: options.mk,v 1.51 2017/03/02 05:37:22 maya Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.MesaLib
 PKG_SUPPORTED_OPTIONS=         llvm dri
@@ -52,19 +52,6 @@
 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) ||        \
@@ -176,6 +163,18 @@
 CONFIGURE_ARGS+=       --with-dri-drivers=${DRI_DRIVERS:ts,}
 
 .if !empty(PKG_OPTIONS:Mllvm)
+# 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
+
 # XA is useful for accelerating xf86-video-vmware
 CONFIGURE_ARGS+=       --enable-xa
 PLIST.xatracker=       yes