CVS commit: pkgsrc/graphics/MesaLib

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Thu Mar  2 05:37:22 UTC 2017

Modified Files:
        pkgsrc/graphics/MesaLib: options.mk

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 pkgsrc/graphics/MesaLib/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/MesaLib/options.mk
diff -u pkgsrc/graphics/MesaLib/options.mk:1.50 pkgsrc/graphics/MesaLib/options.mk:1.51
--- pkgsrc/graphics/MesaLib/options.mk:1.50     Thu Mar  2 04:40:33 2017
+++ pkgsrc/graphics/MesaLib/options.mk  Thu Mar  2 05:37:22 2017
@@ -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 @@ PLIST.gbm=           yes
 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-gallium-drivers=
 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