| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
1 | # $NetBSD: options.mk,v 1.15 2016/03/14 02:13:33 tnn Exp $ | | 1 | # $NetBSD: options.mk,v 1.16 2016/11/22 16:02:54 wiz Exp $ |
2 | | | 2 | |
3 | PKG_OPTIONS_VAR= PKG_OPTIONS.modular-xorg-server | | 3 | PKG_OPTIONS_VAR= PKG_OPTIONS.modular-xorg-server |
4 | PKG_SUPPORTED_OPTIONS= inet6 debug dtrace | | 4 | PKG_SUPPORTED_OPTIONS= inet6 debug dtrace |
5 | PKG_SUGGESTED_OPTIONS= inet6 | | 5 | PKG_SUGGESTED_OPTIONS= inet6 |
6 | .if ${X11_TYPE} == "modular" | | 6 | .if ${X11_TYPE} == "modular" |
7 | PKG_SUPPORTED_OPTIONS+= dri | | 7 | PKG_SUPPORTED_OPTIONS+= dri |
8 | PKG_SUGGESTED_OPTIONS+= dri | | 8 | PKG_SUGGESTED_OPTIONS+= dri |
9 | .endif | | 9 | .endif |
10 | | | 10 | |
11 | .include "../../mk/bsd.options.mk" | | 11 | .include "../../mk/bsd.options.mk" |
12 | | | 12 | |
13 | PLIST_VARS+= dri dtrace | | 13 | PLIST_VARS+= dri dtrace |
14 | | | 14 | |
| @@ -18,27 +18,26 @@ BUILDLINK_API_DEPENDS.MesaLib+= MesaLib> | | | @@ -18,27 +18,26 @@ BUILDLINK_API_DEPENDS.MesaLib+= MesaLib> |
18 | .include "../../graphics/MesaLib/buildlink3.mk" | | 18 | .include "../../graphics/MesaLib/buildlink3.mk" |
19 | .include "../../x11/glproto/buildlink3.mk" | | 19 | .include "../../x11/glproto/buildlink3.mk" |
20 | .include "../../x11/dri2proto/buildlink3.mk" | | 20 | .include "../../x11/dri2proto/buildlink3.mk" |
21 | .include "../../x11/dri3proto/buildlink3.mk" | | 21 | .include "../../x11/dri3proto/buildlink3.mk" |
22 | .include "../../x11/libdrm/buildlink3.mk" | | 22 | .include "../../x11/libdrm/buildlink3.mk" |
23 | .include "../../x11/libxshmfence/buildlink3.mk" | | 23 | .include "../../x11/libxshmfence/buildlink3.mk" |
24 | .include "../../x11/presentproto/buildlink3.mk" | | 24 | .include "../../x11/presentproto/buildlink3.mk" |
25 | .include "../../x11/xf86driproto/buildlink3.mk" | | 25 | .include "../../x11/xf86driproto/buildlink3.mk" |
26 | PLIST.dri= yes | | 26 | PLIST.dri= yes |
27 | CONFIGURE_ARGS+= --enable-dri | | 27 | CONFIGURE_ARGS+= --enable-dri |
28 | CONFIGURE_ARGS+= --enable-dri2 | | 28 | CONFIGURE_ARGS+= --enable-dri2 |
29 | CONFIGURE_ARGS+= --enable-dri3 | | 29 | CONFIGURE_ARGS+= --enable-dri3 |
30 | CONFIGURE_ARGS+= --enable-glx | | 30 | CONFIGURE_ARGS+= --enable-glx |
31 | CONFIGURE_ARGS+= --enable-aiglx | | | |
32 | CONFIGURE_ARGS+= --enable-glamor | | 31 | CONFIGURE_ARGS+= --enable-glamor |
33 | CONFIGURE_ARGS+= --enable-present | | 32 | CONFIGURE_ARGS+= --enable-present |
34 | .else | | 33 | .else |
35 | ### | | 34 | ### |
36 | ### XXX Perhaps we should allow for a built-in glx without dri enabled? | | 35 | ### XXX Perhaps we should allow for a built-in glx without dri enabled? |
37 | ### | | 36 | ### |
38 | CONFIGURE_ARGS+= --disable-dri | | 37 | CONFIGURE_ARGS+= --disable-dri |
39 | CONFIGURE_ARGS+= --disable-dri2 | | 38 | CONFIGURE_ARGS+= --disable-dri2 |
40 | CONFIGURE_ARGS+= --disable-dri3 | | 39 | CONFIGURE_ARGS+= --disable-dri3 |
41 | CONFIGURE_ARGS+= --disable-glx | | 40 | CONFIGURE_ARGS+= --disable-glx |
42 | CONFIGURE_ARGS+= --disable-present | | 41 | CONFIGURE_ARGS+= --disable-present |
43 | pre-build: disable-modesetting | | 42 | pre-build: disable-modesetting |
44 | .PHONY: disable-modesetting | | 43 | .PHONY: disable-modesetting |