Only support the dri option if X11_TYPE is modular. Not very useful in and

of itself, but cuts down on noise from libdrm and MesaLib in X11_TYPE=native
bulk builds. Also, only enable the Present extension if building with DRI.

4 files changed, 20 insertions, 10 deletions

diff --git a/x11/modular-xorg-server/Makefile.common b/x11/modular-xorg-server/Makefile.common
index d5ae7175578..57f96d37655 100644
--- a/x11/modular-xorg-server/Makefile.common
+++ b/x11/modular-xorg-server/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2016/03/12 08:50:50 wiz Exp $
+# $NetBSD: Makefile.common,v 1.9 2016/03/14 02:13:33 tnn Exp $
 # used by x11/modular-xorg-server/Makefile
 # used by x11/modular-xorg-xephyr/Makefile
 
@@ -108,7 +108,7 @@ BUILDLINK_API_DEPENDS.damageproto+=	damageproto>=1.1
 BUILDLINK_API_DEPENDS.xcmiscproto+=	xcmiscproto>=1.2.0
 BUILDLINK_API_DEPENDS.xtrans+=		xtrans>=1.2.2
 BUILDLINK_API_DEPENDS.bigreqsproto+=	bigreqsproto>=1.1.0
-BUILDLINK_API_DEPENDS.xproto+=		xproto>=7.0.22
+BUILDLINK_API_DEPENDS.xproto+=		xproto>=7.0.28
 BUILDLINK_API_DEPENDS.xextproto+=	xextproto>=7.1.99
 BUILDLINK_API_DEPENDS.recordproto+=	recordproto>=1.13.99.1
 BUILDLINK_API_DEPENDS.scrnsaverproto+=	scrnsaverproto>=1.1
@@ -161,7 +161,6 @@ BUILDLINK_API_DEPENDS.libXext+=	libXext>=1.1.1
 .include "../../x11/libxkbfile/buildlink3.mk"
 .include "../../x11/libxkbui/buildlink3.mk"
 .include "../../x11/pixman/buildlink3.mk"
-.include "../../x11/presentproto/buildlink3.mk"
 .include "../../x11/randrproto/buildlink3.mk"
 .include "../../x11/recordproto/buildlink3.mk"
 .include "../../x11/renderproto/buildlink3.mk"
diff --git a/x11/modular-xorg-server/PLIST b/x11/modular-xorg-server/PLIST
index 1c2fa0326b7..404e2103ba6 100644
--- a/x11/modular-xorg-server/PLIST
+++ b/x11/modular-xorg-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2016/03/12 08:50:50 wiz Exp $
+@comment $NetBSD: PLIST,v 1.26 2016/03/14 02:13:33 tnn Exp $
 bin/X
 bin/Xnest
 bin/Xorg
@@ -89,8 +89,8 @@ include/xorg/picture.h
 include/xorg/picturestr.h
 include/xorg/pixmap.h
 include/xorg/pixmapstr.h
-include/xorg/present.h
-include/xorg/presentext.h
+${PLIST.dri}include/xorg/present.h
+${PLIST.dri}include/xorg/presentext.h
 include/xorg/privates.h
 include/xorg/property.h
 include/xorg/propertyst.h
diff --git a/x11/modular-xorg-server/buildlink3.mk b/x11/modular-xorg-server/buildlink3.mk
index 32c7d53790a..6e7e52e6cef 100644
--- a/x11/modular-xorg-server/buildlink3.mk
+++ b/x11/modular-xorg-server/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2016/01/05 13:04:23 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2016/03/14 02:13:33 tnn Exp $
 
 BUILDLINK_TREE+=	modular-xorg-server
 
@@ -35,11 +35,13 @@ BUILDLINK_DEPMETHOD.libpciaccess=	full
 .endif
 .include "../../x11/inputproto/buildlink3.mk"
 .include "../../x11/libXfont/buildlink3.mk"
+BUILDLINK_API_DEPENDS.randrproto+=	randrproto>=1.5.0
 .include "../../x11/randrproto/buildlink3.mk"
 .include "../../x11/renderproto/buildlink3.mk"
 .include "../../x11/videoproto/buildlink3.mk"
 .include "../../x11/xextproto/buildlink3.mk"
 .include "../../x11/xf86driproto/buildlink3.mk"
+BUILDLINK_API_DEPENDS.xproto+=		xproto>=7.0.28
 .include "../../x11/xproto/buildlink3.mk"
 .include "../../x11/xineramaproto/buildlink3.mk"
 .endif # MODULAR_XORG_SERVER_BUILDLINK3_MK
diff --git a/x11/modular-xorg-server/options.mk b/x11/modular-xorg-server/options.mk
index 6fae1441b2d..2b26acbf672 100644
--- a/x11/modular-xorg-server/options.mk
+++ b/x11/modular-xorg-server/options.mk
@@ -1,8 +1,12 @@
-# $NetBSD: options.mk,v 1.14 2016/02/09 01:17:37 wiz Exp $
+# $NetBSD: options.mk,v 1.15 2016/03/14 02:13:33 tnn Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.modular-xorg-server
-PKG_SUPPORTED_OPTIONS=	dri inet6 debug dtrace
-PKG_SUGGESTED_OPTIONS=	dri inet6
+PKG_SUPPORTED_OPTIONS=	inet6 debug dtrace
+PKG_SUGGESTED_OPTIONS=	inet6
+.if ${X11_TYPE} == "modular"
+PKG_SUPPORTED_OPTIONS+=	dri
+PKG_SUGGESTED_OPTIONS+=	dri
+.endif
 
 .include "../../mk/bsd.options.mk"
 
@@ -17,6 +21,7 @@ BUILDLINK_API_DEPENDS.MesaLib+=	MesaLib>=11
 .include "../../x11/dri3proto/buildlink3.mk"
 .include "../../x11/libdrm/buildlink3.mk"
 .include "../../x11/libxshmfence/buildlink3.mk"
+.include "../../x11/presentproto/buildlink3.mk"
 .include "../../x11/xf86driproto/buildlink3.mk"
 PLIST.dri=		yes
 CONFIGURE_ARGS+=	--enable-dri
@@ -25,12 +30,16 @@ CONFIGURE_ARGS+=	--enable-dri3
 CONFIGURE_ARGS+=	--enable-glx
 CONFIGURE_ARGS+=	--enable-aiglx
 CONFIGURE_ARGS+=	--enable-glamor
+CONFIGURE_ARGS+=	--enable-present
 .else
 ###
 ### XXX Perhaps we should allow for a built-in glx without dri enabled?
 ###
 CONFIGURE_ARGS+=	--disable-dri
+CONFIGURE_ARGS+=	--disable-dri2
+CONFIGURE_ARGS+=	--disable-dri3
 CONFIGURE_ARGS+=	--disable-glx
+CONFIGURE_ARGS+=	--disable-present
 pre-build: disable-modesetting
 .PHONY: disable-modesetting
 disable-modesetting: