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 (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,119 +1,132 @@ @@ -1,119 +1,132 @@
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
15 15
16.if (${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD" || \ 16.if (${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD" || \
17 ${OPSYS} == "DragonFly" || ${OPSYS} == "Linux" || \ 17 ${OPSYS} == "DragonFly" || ${OPSYS} == "Linux" || \
18 ${OPSYS} == "SunOS") || ${OPSYS} == "NetBSD" 18 ${OPSYS} == "SunOS") || ${OPSYS} == "NetBSD"
19PKG_SUGGESTED_OPTIONS+= dri 19PKG_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+= 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
53 66
54# Intel chipsets, x86 only 67# Intel chipsets, x86 only
55PLIST.i915= yes 68PLIST.i915= yes
56GALLIUM_DRIVERS+= i915 69GALLIUM_DRIVERS+= i915
57PLIST.i915_dri= yes 70PLIST.i915_dri= yes
58DRI_DRIVERS+= i915 71DRI_DRIVERS+= i915
59 72
60# Experimental Intel driver 73# Experimental Intel driver
61PLIST.ilo= yes 74PLIST.ilo= yes
62GALLIUM_DRIVERS+= ilo 75GALLIUM_DRIVERS+= ilo
63 76
64PLIST.i965_dri= yes 77PLIST.i965_dri= yes
65DRI_DRIVERS+= i965 78DRI_DRIVERS+= i965
66.endif 79.endif
67 80
68# AMD Radeon r600 81# AMD Radeon r600
69PLIST.r600= yes 82PLIST.r600= yes
70GALLIUM_DRIVERS+= r600 83GALLIUM_DRIVERS+= r600
71 84
72# Qualcomm SnapDragon, libdrm_freedreno.pc 85# Qualcomm SnapDragon, libdrm_freedreno.pc
73# GALLIUM_DRIVERS+= freedreno 86# GALLIUM_DRIVERS+= freedreno
74 87
75# Broadcom VideoCore 4 88# Broadcom VideoCore 4
76# GALLIUM_DRIVERS+= vc4 89# GALLIUM_DRIVERS+= vc4
77 90
78# nVidia 91# nVidia
79PLIST.nouveau= yes 92PLIST.nouveau= yes
80GALLIUM_DRIVERS+= nouveau 93GALLIUM_DRIVERS+= nouveau
81 94
82# classic DRI radeon 95# classic DRI radeon
83PLIST.radeon_dri= yes 96PLIST.radeon_dri= yes
84DRI_DRIVERS+= radeon 97DRI_DRIVERS+= radeon
85 98
86# classic DRI r200 99# classic DRI r200
87PLIST.r200_dri= yes 100PLIST.r200_dri= yes
88DRI_DRIVERS+= r200 101DRI_DRIVERS+= r200
89 102
90# classic DRI nouveau 103# classic DRI nouveau
91PLIST.nouveau_dri= yes 104PLIST.nouveau_dri= yes
92DRI_DRIVERS+= nouveau 105DRI_DRIVERS+= nouveau
93 106
94CONFIGURE_ARGS+= --with-egl-platforms=x11,drm 107CONFIGURE_ARGS+= --with-egl-platforms=x11,drm
95CONFIGURE_ARGS+= --with-gallium-drivers=${GALLIUM_DRIVERS:ts,} 108CONFIGURE_ARGS+= --with-gallium-drivers=${GALLIUM_DRIVERS:ts,}
96CONFIGURE_ARGS+= --with-dri-drivers=${DRI_DRIVERS:ts,} 109CONFIGURE_ARGS+= --with-dri-drivers=${DRI_DRIVERS:ts,}
97 110
98.if !empty(PKG_OPTIONS:Mllvm) 111.if !empty(PKG_OPTIONS:Mllvm)
99# AMD Radeon r300 112# AMD Radeon r300
100PLIST.r300= yes 113PLIST.r300= yes
101GALLIUM_DRIVERS+= r300 114GALLIUM_DRIVERS+= r300
102# AMD Canary Islands GPUs 115# AMD Canary Islands GPUs
103PLIST.radeonsi= yes 116PLIST.radeonsi= yes
104GALLIUM_DRIVERS+= radeonsi 117GALLIUM_DRIVERS+= radeonsi
105CONFIGURE_ARGS+= --enable-gallium-llvm 118CONFIGURE_ARGS+= --enable-gallium-llvm
106CONFIGURE_ARGS+= --enable-r600-llvm-compiler 119CONFIGURE_ARGS+= --enable-r600-llvm-compiler
107.include "../../lang/libLLVM/buildlink3.mk" 120.include "../../lang/libLLVM/buildlink3.mk"
108CONFIGURE_ENV+= ac_cv_path_ac_pt_LLVM_CONFIG=${LLVM_CONFIG_PATH} 121CONFIGURE_ENV+= ac_cv_path_ac_pt_LLVM_CONFIG=${LLVM_CONFIG_PATH}
109.else # !llvm 122.else # !llvm
110CONFIGURE_ARGS+= --disable-gallium-llvm 123CONFIGURE_ARGS+= --disable-gallium-llvm
111CONFIGURE_ARGS+= --disable-r600-llvm-compiler 124CONFIGURE_ARGS+= --disable-r600-llvm-compiler
112.endif # llvm 125.endif # llvm
113.else # !dri 126.else # !dri
114CONFIGURE_ARGS+= --with-gallium-drivers= 127CONFIGURE_ARGS+= --with-gallium-drivers=
115CONFIGURE_ARGS+= --with-dri-drivers= 128CONFIGURE_ARGS+= --with-dri-drivers=
116CONFIGURE_ARGS+= --disable-dri 129CONFIGURE_ARGS+= --disable-dri
117CONFIGURE_ARGS+= --disable-dri3 130CONFIGURE_ARGS+= --disable-dri3
118CONFIGURE_ARGS+= --enable-xlib-glx 131CONFIGURE_ARGS+= --enable-xlib-glx
119.endif 132.endif