Wed Apr 29 14:36:36 2015 UTC ()
Fix DRI3 build on Linux


(tnn)
diff -r1.30 -r1.31 pkgsrc/graphics/MesaLib/options.mk
cvs diff -r1.30 -r1.31 pkgsrc/graphics/MesaLib/options.mk (expand / switch to unified diff)

--- pkgsrc/graphics/MesaLib/options.mk 2015/04/28 21:06:32 1.30
+++ pkgsrc/graphics/MesaLib/options.mk 2015/04/29 14:36:36 1.31
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.30 2015/04/28 21:06:32 tnn Exp $ 1# $NetBSD: options.mk,v 1.31 2015/04/29 14:36:36 tnn 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.if !empty(MACHINE_PLATFORM:MNetBSD-[789].*-*) && ( \ 7.if !empty(MACHINE_PLATFORM:MNetBSD-[789].*-*) && ( \
8 ${MACHINE_ARCH} == "i386" || \ 8 ${MACHINE_ARCH} == "i386" || \
9 ${MACHINE_ARCH} == "x86_64" || \ 9 ${MACHINE_ARCH} == "x86_64" || \
10 ${MACHINE_ARCH} == "sparc64" || \ 10 ${MACHINE_ARCH} == "sparc64" || \
11 ${MACHINE_ARCH} == "powerpc" || \ 11 ${MACHINE_ARCH} == "powerpc" || \
12 !empty(MACHINE_ARCH:M*arm*)) 12 !empty(MACHINE_ARCH:M*arm*))
13#PKG_SUGGESTED_OPTIONS+= llvm 13#PKG_SUGGESTED_OPTIONS+= llvm
14.endif 14.endif
@@ -23,30 +23,43 @@ PKG_SUGGESTED_OPTIONS+= dri @@ -23,30 +23,43 @@ PKG_SUGGESTED_OPTIONS+= dri
23 23
24# gallium 24# gallium
25PLIST_VARS+= swrast svga ilo i915 i965 nouveau r300 r600 radeonsi 25PLIST_VARS+= swrast svga ilo i915 i965 nouveau r300 r600 radeonsi
26# classic DRI 26# classic DRI
27PLIST_VARS+= dri swrast_dri i915_dri nouveau_dri i965_dri radeon_dri r200_dri 27PLIST_VARS+= dri swrast_dri i915_dri nouveau_dri i965_dri radeon_dri r200_dri
28 28
29.if !empty(PKG_OPTIONS:Mdri) 29.if !empty(PKG_OPTIONS:Mdri)
30 30
31# (EE) Failed to load /usr/pkg/lib/xorg/modules/extensions/libglx.so: 31# (EE) Failed to load /usr/pkg/lib/xorg/modules/extensions/libglx.so:
32# /usr/pkg/lib/libGL.so.1: Use of initialized Thread Local Storage with model initial-exec and dlopen is not supported 32# /usr/pkg/lib/libGL.so.1: Use of initialized Thread Local Storage with model initial-exec and dlopen is not supported
33CONFIGURE_ARGS+= --disable-glx-tls 33CONFIGURE_ARGS+= --disable-glx-tls
34 34
35PLIST.dri= yes 35PLIST.dri= yes
 36
36BUILDLINK_DEPMETHOD.libpciaccess= full 37BUILDLINK_DEPMETHOD.libpciaccess= full
37.include "../../sysutils/libpciaccess/buildlink3.mk" 38.include "../../sysutils/libpciaccess/buildlink3.mk"
38.include "../../graphics/MesaLib/dri.mk" 39.include "../../graphics/MesaLib/dri.mk"
39 40
 41# Linux supports dri3
 42.if ${OPSYS} == "Linux"
 43.include "../../x11/dri3proto/buildlink3.mk"
 44.include "../../x11/presentproto/buildlink3.mk"
 45.include "../../x11/libxshmfence/buildlink3.mk"
 46CONFIGURE_ARGS+= --enable-dri3
 47# DRI on Linux needs either sysfs or udev
 48CONFIGURE_ARGS+= --enable-sysfs
 49.else
 50CONFIGURE_ARGS+= --disable-dri3
 51.endif
 52
40DRI_DRIVERS= # 53DRI_DRIVERS= #
41PLIST.swrast_dri= yes 54PLIST.swrast_dri= yes
42DRI_DRIVERS+= swrast 55DRI_DRIVERS+= swrast
43 56
44# Software rasterizer 57# Software rasterizer
45GALLIUM_DRIVERS= # 58GALLIUM_DRIVERS= #
46PLIST.swrast= yes 59PLIST.swrast= yes
47GALLIUM_DRIVERS+= swrast 60GALLIUM_DRIVERS+= swrast
48 61
49.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" 62.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
50# svga / VMWare driver 63# svga / VMWare driver
51PLIST.svga= yes 64PLIST.svga= yes
52GALLIUM_DRIVERS+= svga 65GALLIUM_DRIVERS+= svga