summaryrefslogtreecommitdiff
path: root/graphics/MesaLib
diff options
context:
space:
mode:
authormaya <maya>2017-03-02 05:37:22 +0000
committermaya <maya>2017-03-02 05:37:22 +0000
commitee642b6e9a5f309488ac3db2cab35e7fe35d0a65 (patch)
tree1afbe0244904716d82837d0c18f8d9fc581efd74 /graphics/MesaLib
parent3322ebe384d7a2663d508ed2f7e9b040415ab279 (diff)
downloadpkgsrc-ee642b6e9a5f309488ac3db2cab35e7fe35d0a65.tar.gz
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 (limited to 'graphics/MesaLib')
-rw-r--r--graphics/MesaLib/options.mk27
1 files changed, 13 insertions, 14 deletions
diff --git a/graphics/MesaLib/options.mk b/graphics/MesaLib/options.mk
index 88426f2fc89..cb56dc4099f 100644
--- a/graphics/MesaLib/options.mk
+++ b/graphics/MesaLib/options.mk
@@ -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=${GALLIUM_DRIVERS:ts,}
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