From d33aacaadc3fc628311e4a4d2b3787b3dbd4aa6f Mon Sep 17 00:00:00 2001 From: matthieu Date: Sat, 2 Feb 2008 17:19:57 +0000 Subject: [PATCH] Make it possible to build dri support with XENOCARA_BUILD_DRI=yes in /etc/mk.conf. ok oga@ --- driver/xf86-video-ati/Makefile.bsd-wrapper | 8 +++++++- driver/xf86-video-glint/Makefile.bsd-wrapper | 8 +++++++- driver/xf86-video-i810/Makefile.bsd-wrapper | 8 +++++++- driver/xf86-video-intel/Makefile.bsd-wrapper | 8 ++++++-- driver/xf86-video-mga/Makefile.bsd-wrapper | 8 +++++++- driver/xf86-video-savage/Makefile.bsd-wrapper | 8 +++++++- driver/xf86-video-sis/Makefile.bsd-wrapper | 8 +++++++- driver/xf86-video-tdfx/Makefile.bsd-wrapper | 8 +++++++- driver/xf86-video-via/Makefile.bsd-wrapper | 8 +++++++- proto/Makefile | 8 +++++++- xserver/Makefile.bsd-wrapper | 10 ++++++++-- 11 files changed, 77 insertions(+), 13 deletions(-) diff --git a/driver/xf86-video-ati/Makefile.bsd-wrapper b/driver/xf86-video-ati/Makefile.bsd-wrapper index cd59c5869..c685b99c9 100644 --- a/driver/xf86-video-ati/Makefile.bsd-wrapper +++ b/driver/xf86-video-ati/Makefile.bsd-wrapper @@ -1,3 +1,9 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:30:44 matthieu Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.3 2008/02/02 17:19:57 matthieu Exp $ + +.include + +.if !defined(XENOCARA_BUILD_DRI) || ${XENOCARA_BUILD_DRI:L} != "yes" +CONFIGURE_ARGS+= --disable-dri +.endif .include diff --git a/driver/xf86-video-glint/Makefile.bsd-wrapper b/driver/xf86-video-glint/Makefile.bsd-wrapper index cd59c5869..c685b99c9 100644 --- a/driver/xf86-video-glint/Makefile.bsd-wrapper +++ b/driver/xf86-video-glint/Makefile.bsd-wrapper @@ -1,3 +1,9 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:30:44 matthieu Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.3 2008/02/02 17:19:57 matthieu Exp $ + +.include + +.if !defined(XENOCARA_BUILD_DRI) || ${XENOCARA_BUILD_DRI:L} != "yes" +CONFIGURE_ARGS+= --disable-dri +.endif .include diff --git a/driver/xf86-video-i810/Makefile.bsd-wrapper b/driver/xf86-video-i810/Makefile.bsd-wrapper index 61ba03ff3..9a758047c 100644 --- a/driver/xf86-video-i810/Makefile.bsd-wrapper +++ b/driver/xf86-video-i810/Makefile.bsd-wrapper @@ -1,3 +1,9 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.1.1.1 2007/04/04 20:17:39 matthieu Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2008/02/02 17:19:57 matthieu Exp $ + +.include + +.if !defined(XENOCARA_BUILD_DRI) || ${XENOCARA_BUILD_DRI:L} != "yes" +CONFIGURE_ARGS+= --disable-dri +.endif .include diff --git a/driver/xf86-video-intel/Makefile.bsd-wrapper b/driver/xf86-video-intel/Makefile.bsd-wrapper index 55865b108..08823262d 100644 --- a/driver/xf86-video-intel/Makefile.bsd-wrapper +++ b/driver/xf86-video-intel/Makefile.bsd-wrapper @@ -1,5 +1,9 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.3 2007/11/25 18:44:17 matthieu Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.4 2008/02/02 17:19:57 matthieu Exp $ -CONFIGURE_ARGS += --disable-dri +.include + +.if !defined(XENOCARA_BUILD_DRI) || ${XENOCARA_BUILD_DRI:L} != "yes" +CONFIGURE_ARGS+= --disable-dri +.endif .include diff --git a/driver/xf86-video-mga/Makefile.bsd-wrapper b/driver/xf86-video-mga/Makefile.bsd-wrapper index cd59c5869..c685b99c9 100644 --- a/driver/xf86-video-mga/Makefile.bsd-wrapper +++ b/driver/xf86-video-mga/Makefile.bsd-wrapper @@ -1,3 +1,9 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:30:44 matthieu Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.3 2008/02/02 17:19:57 matthieu Exp $ + +.include + +.if !defined(XENOCARA_BUILD_DRI) || ${XENOCARA_BUILD_DRI:L} != "yes" +CONFIGURE_ARGS+= --disable-dri +.endif .include diff --git a/driver/xf86-video-savage/Makefile.bsd-wrapper b/driver/xf86-video-savage/Makefile.bsd-wrapper index cd59c5869..c685b99c9 100644 --- a/driver/xf86-video-savage/Makefile.bsd-wrapper +++ b/driver/xf86-video-savage/Makefile.bsd-wrapper @@ -1,3 +1,9 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:30:44 matthieu Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.3 2008/02/02 17:19:57 matthieu Exp $ + +.include + +.if !defined(XENOCARA_BUILD_DRI) || ${XENOCARA_BUILD_DRI:L} != "yes" +CONFIGURE_ARGS+= --disable-dri +.endif .include diff --git a/driver/xf86-video-sis/Makefile.bsd-wrapper b/driver/xf86-video-sis/Makefile.bsd-wrapper index cd59c5869..c685b99c9 100644 --- a/driver/xf86-video-sis/Makefile.bsd-wrapper +++ b/driver/xf86-video-sis/Makefile.bsd-wrapper @@ -1,3 +1,9 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:30:44 matthieu Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.3 2008/02/02 17:19:57 matthieu Exp $ + +.include + +.if !defined(XENOCARA_BUILD_DRI) || ${XENOCARA_BUILD_DRI:L} != "yes" +CONFIGURE_ARGS+= --disable-dri +.endif .include diff --git a/driver/xf86-video-tdfx/Makefile.bsd-wrapper b/driver/xf86-video-tdfx/Makefile.bsd-wrapper index cd59c5869..c685b99c9 100644 --- a/driver/xf86-video-tdfx/Makefile.bsd-wrapper +++ b/driver/xf86-video-tdfx/Makefile.bsd-wrapper @@ -1,3 +1,9 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:30:44 matthieu Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.3 2008/02/02 17:19:57 matthieu Exp $ + +.include + +.if !defined(XENOCARA_BUILD_DRI) || ${XENOCARA_BUILD_DRI:L} != "yes" +CONFIGURE_ARGS+= --disable-dri +.endif .include diff --git a/driver/xf86-video-via/Makefile.bsd-wrapper b/driver/xf86-video-via/Makefile.bsd-wrapper index cd59c5869..c685b99c9 100644 --- a/driver/xf86-video-via/Makefile.bsd-wrapper +++ b/driver/xf86-video-via/Makefile.bsd-wrapper @@ -1,3 +1,9 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:30:44 matthieu Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.3 2008/02/02 17:19:57 matthieu Exp $ + +.include + +.if !defined(XENOCARA_BUILD_DRI) || ${XENOCARA_BUILD_DRI:L} != "yes" +CONFIGURE_ARGS+= --disable-dri +.endif .include diff --git a/proto/Makefile b/proto/Makefile index 3aa09f27d..5ee4f56e7 100644 --- a/proto/Makefile +++ b/proto/Makefile @@ -1,4 +1,6 @@ -# $OpenBSD: Makefile,v 1.3 2006/12/17 19:52:56 matthieu Exp $ +# $OpenBSD: Makefile,v 1.4 2008/02/02 17:19:57 matthieu Exp $ + +.include SUBDIR= bigreqsproto compositeproto dmxproto damageproto evieproto \ fixesproto fontcacheproto fontsproto glproto inputproto \ @@ -8,6 +10,10 @@ SUBDIR= bigreqsproto compositeproto dmxproto damageproto evieproto \ xf86bigfontproto xf86dgaproto xf86miscproto \ xf86rushproto xf86vidmodeproto +.if defined(XENOCARA_BUILD_DRI) && ${XENOCARA_BUILD_DRI:L} == "yes" +SUBDIR+= xf86driproto +.endif + .include build: _SUBDIRUSE diff --git a/xserver/Makefile.bsd-wrapper b/xserver/Makefile.bsd-wrapper index da924bdc4..de04ebc6a 100644 --- a/xserver/Makefile.bsd-wrapper +++ b/xserver/Makefile.bsd-wrapper @@ -1,4 +1,6 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.18 2008/01/04 13:44:23 jsing Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.19 2008/02/02 17:19:57 matthieu Exp $ + +.include DIST= ${.CURDIR} @@ -29,6 +31,10 @@ NO_XF86_UTIL_OPTION=${NO_XF86_UTIL_${MACHINE}} MESA_SOURCE= --with-mesa-source=${XSRCDIR}/dist/Mesa .endif +.if defined(XENOCARA_BUILD_DRI) && ${XENOCARA_BUILD_DRI:L} == "yes" +DRI_OPTION= --enable-dri --with-dri-driver-path=${X11BASE}/lib/modules/dri +.endif + .if !defined(KDRIVE) CONFIGURE_ARGS= --localstatedir=/var --sysconfdir=/etc/X11 \ --with-xkb-path=/etc/X11/xkb \ @@ -36,7 +42,7 @@ CONFIGURE_ARGS= --localstatedir=/var --sysconfdir=/etc/X11 \ --with-module-dir=${LIBDIR}/modules ${MESA_SOURCE} \ --enable-install-setuid --enable-privsep \ --disable-dmx ${NO_XORG_OPTION} ${NO_XF86_UTIL_OPTION} \ - ${NO_XPRINT_OPTION} + ${NO_XPRINT_OPTION} ${DRI_OPTION} .else CONFIGURE_ARGS= --localstatedir=/var --sysconfdir=/etc/X11 \ --disable-xorg \