qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make it possible to build dri support with XENOCARA_BUILD_DRI=yes in

Browse Source 
/etc/mk.conf. ok oga@
This commit is contained in:
matthieu 2008-02-02 17:19:57 +00:00
parent 1f6f240303
commit d33aacaadc
11 changed files with 77 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
driver/xf86-video-ati/Makefile.bsd-wrapper
View File

@ -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 <bsd.own.mk>
.if !defined(XENOCARA_BUILD_DRI) || ${XENOCARA_BUILD_DRI:L} != "yes"
CONFIGURE_ARGS+= --disable-dri
.endif
.include <bsd.xorg.mk>

8
driver/xf86-video-glint/Makefile.bsd-wrapper
View File

@ -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 <bsd.own.mk>
.if !defined(XENOCARA_BUILD_DRI) || ${XENOCARA_BUILD_DRI:L} != "yes"
CONFIGURE_ARGS+= --disable-dri
.endif
.include <bsd.xorg.mk>

8
driver/xf86-video-i810/Makefile.bsd-wrapper
View File

@ -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 <bsd.own.mk>
.if !defined(XENOCARA_BUILD_DRI) || ${XENOCARA_BUILD_DRI:L} != "yes"
CONFIGURE_ARGS+= --disable-dri
.endif
.include <bsd.xorg.mk>

8
driver/xf86-video-intel/Makefile.bsd-wrapper
View File

@ -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 <bsd.own.mk>
.if !defined(XENOCARA_BUILD_DRI) || ${XENOCARA_BUILD_DRI:L} != "yes"
CONFIGURE_ARGS+= --disable-dri
.endif
.include <bsd.xorg.mk>

8
driver/xf86-video-mga/Makefile.bsd-wrapper
View File

@ -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 <bsd.own.mk>
.if !defined(XENOCARA_BUILD_DRI) || ${XENOCARA_BUILD_DRI:L} != "yes"
CONFIGURE_ARGS+= --disable-dri
.endif
.include <bsd.xorg.mk>

8
driver/xf86-video-savage/Makefile.bsd-wrapper
View File

@ -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 <bsd.own.mk>
.if !defined(XENOCARA_BUILD_DRI) || ${XENOCARA_BUILD_DRI:L} != "yes"
CONFIGURE_ARGS+= --disable-dri
.endif
.include <bsd.xorg.mk>

8
driver/xf86-video-sis/Makefile.bsd-wrapper
View File

@ -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 <bsd.own.mk>
.if !defined(XENOCARA_BUILD_DRI) || ${XENOCARA_BUILD_DRI:L} != "yes"
CONFIGURE_ARGS+= --disable-dri
.endif
.include <bsd.xorg.mk>

8
driver/xf86-video-tdfx/Makefile.bsd-wrapper
View File

@ -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 <bsd.own.mk>
.if !defined(XENOCARA_BUILD_DRI) || ${XENOCARA_BUILD_DRI:L} != "yes"
CONFIGURE_ARGS+= --disable-dri
.endif
.include <bsd.xorg.mk>

8
driver/xf86-video-via/Makefile.bsd-wrapper
View File

@ -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 <bsd.own.mk>
.if !defined(XENOCARA_BUILD_DRI) || ${XENOCARA_BUILD_DRI:L} != "yes"
CONFIGURE_ARGS+= --disable-dri
.endif
.include <bsd.xorg.mk>

8
proto/Makefile
View File

@ -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 <bsd.own.mk>
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 <bsd.subdir.mk>
build: _SUBDIRUSE

10
xserver/Makefile.bsd-wrapper
View File

@ -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 <bsd.own.mk>
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 \