Sat Jul 1 12:48:10 2017 UTC ()
Revert previous. joerg thinks this will break too hard due to having two
libstdc++s in use.


(maya)
diff -r1.56 -r1.57 pkgsrc/graphics/MesaLib/options.mk
cvs diff -r1.56 -r1.57 pkgsrc/graphics/MesaLib/options.mk (expand / switch to unified diff)

--- pkgsrc/graphics/MesaLib/options.mk 2017/07/01 06:40:45 1.56
+++ pkgsrc/graphics/MesaLib/options.mk 2017/07/01 12:48:10 1.57
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.56 2017/07/01 06:40:45 maya Exp $ 1# $NetBSD: options.mk,v 1.57 2017/07/01 12:48:10 maya Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.MesaLib 3PKG_OPTIONS_VAR= PKG_OPTIONS.MesaLib
4PKG_SUPPORTED_OPTIONS= llvm dri 4PKG_SUPPORTED_OPTIONS= llvm dri
5PKG_SUGGESTED_OPTIONS= 5PKG_SUGGESTED_OPTIONS=
6 6
7# The LLVM option enables JIT accelerated software rendering and 7# The LLVM option enables JIT accelerated software rendering and
8# is also required to support the latest RADEON GPUs, so enable it 8# is also required to support the latest RADEON GPUs, so enable it
9# by default on platforms where such GPUs might be encountered. 9# by default on platforms where such GPUs might be encountered.
10.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && \ 10.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && \
11 ${OPSYS} != "SunOS" && ${OPSYS} != "Darwin" 11 ${OPSYS} != "SunOS" && ${OPSYS} != "Darwin"
12PKG_SUGGESTED_OPTIONS+= llvm 12PKG_SUGGESTED_OPTIONS+= llvm
13.endif 13.endif
14 14
@@ -20,27 +20,27 @@ PKG_SUGGESTED_OPTIONS+= dri @@ -20,27 +20,27 @@ PKG_SUGGESTED_OPTIONS+= dri
20.endif 20.endif
21 21
22.include "../../mk/bsd.options.mk" 22.include "../../mk/bsd.options.mk"
23 23
24# gallium 24# gallium
25PLIST_VARS+= freedreno ilo i915 i965 nouveau r300 r600 radeonsi \ 25PLIST_VARS+= freedreno ilo i915 i965 nouveau r300 r600 radeonsi \
26 swrast svga vc4 virgl 26 swrast svga vc4 virgl
27# classic DRI 27# classic DRI
28PLIST_VARS+= dri swrast_dri i915_dri nouveau_dri i965_dri radeon_dri r200_dri 28PLIST_VARS+= dri swrast_dri i915_dri nouveau_dri i965_dri radeon_dri r200_dri
29# other features 29# other features
30PLIST_VARS+= gbm vaapi vdpau wayland xatracker 30PLIST_VARS+= gbm vaapi vdpau wayland xatracker
31 31
32.if !empty(PKG_OPTIONS:Mdri) 32.if !empty(PKG_OPTIONS:Mdri)
33GCC_REQD+= 4.8 33
34CONFIGURE_ARGS+= --enable-dri 34CONFIGURE_ARGS+= --enable-dri
35CONFIGURE_ARGS+= --enable-egl 35CONFIGURE_ARGS+= --enable-egl
36.if ${OPSYS} != "Darwin" 36.if ${OPSYS} != "Darwin"
37CFLAGS+= -DHAVE_DRI3 37CFLAGS+= -DHAVE_DRI3
38CONFIGURE_ARGS+= --enable-dri3 38CONFIGURE_ARGS+= --enable-dri3
39CONFIGURE_ARGS+= --enable-gbm 39CONFIGURE_ARGS+= --enable-gbm
40PLIST.gbm= yes 40PLIST.gbm= yes
41.endif 41.endif
42CONFIGURE_ARGS+= --enable-gles1 42CONFIGURE_ARGS+= --enable-gles1
43CONFIGURE_ARGS+= --enable-gles2 43CONFIGURE_ARGS+= --enable-gles2
44 44
45# Use Thread Local Storage in GLX where it is supported by Mesa and works. 45# Use Thread Local Storage in GLX where it is supported by Mesa and works.
46.if \ 46.if \