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

- Disable OpenGL parts on vax and sgi

Browse Source 
- Disable Xprt on vax and landisk
Xenocara now builds on vax
This commit is contained in:
matthieu 2007-05-12 14:24:59 +00:00
parent dc24f310db
commit 987805ed7b
3 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
driver/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.13 2007/05/10 19:35:29 matthieu Exp $ # $OpenBSD: Makefile,v 1.14 2007/05/12 14:24:59 matthieu Exp $
# Broken # Broken
# xf86-input-calcomp xf86-input-citron xf86-input-dmc # xf86-input-calcomp xf86-input-citron xf86-input-dmc
@ -41,6 +41,8 @@ INPUT_DRV_sgi=
INPUT_DRV_sparc64= ${INPUT_DRV_COMMON} INPUT_DRV_sparc64= ${INPUT_DRV_COMMON}
INPUT_DRV_vax=
INPUT_DRV_zaurus= ${INPUT_DRV_DEFAULT} INPUT_DRV_zaurus= ${INPUT_DRV_DEFAULT}
.if defined(INPUT_DRV_${MACHINE}) .if defined(INPUT_DRV_${MACHINE})
@ -88,6 +90,8 @@ VIDEO_DRV_sgi=
VIDEO_DRV_sparc64= \ VIDEO_DRV_sparc64= \
xf86-video-ati xf86-video-wsfb xf86-video-ati xf86-video-wsfb
VIDEO_DRV_vax=
.if defined(VIDEO_DRV_${MACHINE}) .if defined(VIDEO_DRV_${MACHINE})
VIDEO_DRV= ${VIDEO_DRV_${MACHINE}} VIDEO_DRV= ${VIDEO_DRV_${MACHINE}}
.else .else

4
lib/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.4 2007/04/04 22:33:46 david Exp $ # $OpenBSD: Makefile,v 1.5 2007/05/12 14:24:59 matthieu Exp $
SUBDIR= freetype expat fontconfig libxtrans libXau libXdmcp \ SUBDIR= freetype expat fontconfig libxtrans libXau libXdmcp \
libX11 libXext libXrender libXft libdmx libfontenc \ libX11 libXext libXrender libXft libdmx libfontenc \
@ -9,7 +9,9 @@ SUBDIR= freetype expat fontconfig libxtrans libXau libXdmcp \
libXprintAppUtil libXrandr libXRes libXScrnSaver libXTrap \ libXprintAppUtil libXrandr libXRes libXScrnSaver libXTrap \
libXtst libXv libXvMC libXxf86dga libXxf86misc libXxf86vm libXtst libXv libXvMC libXxf86dga libXxf86misc libXxf86vm
.if ${MACHINE} != "sgi" && ${MACHINE} != "vax"
SUBDIR+= libGL libGLU libGLw SUBDIR+= libGL libGLU libGLw
.endif
DRM_ARCHES= alpha amd64 i386 macppc sparc64 DRM_ARCHES= alpha amd64 i386 macppc sparc64

22
xserver/Makefile.bsd-wrapper
View File

@ -1,29 +1,39 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.12 2007/04/15 17:42:08 matthieu Exp $ # $OpenBSD: Makefile.bsd-wrapper,v 1.13 2007/05/12 14:24:59 matthieu Exp $
DIST= ${.CURDIR} DIST= ${.CURDIR}
# Machines for which we don't build the Xorg Xserver # Machines for which we don't build the Xorg Xserver
NO_XORG_MACHINES= aviion hppa hppa64 landisk \ NO_XORG_MACHINES= aviion hppa hppa64 landisk \
mvme68k mvme88k mvmeppc sgi solbourne mvme68k mvme88k mvmeppc sgi solbourne vax
NO_XF86UTIL_MACHINES= hp300 mac68k sparc vax NO_XF86UTIL_MACHINES= hp300 landisk mac68k sparc vax
NO_XPRINT_MACHINES= landisk vax
.for M in ${NO_XORG_MACHINES} .for M in ${NO_XORG_MACHINES}
NO_XORG_${M} = --disable-xorg NO_XORG_${M} = --disable-xorg
.endfor .endfor
NO_XORG_OPTION=${NO_XORG_${MACHINE}} NO_XORG_OPTION=${NO_XORG_${MACHINE}}
.for M in ${NO_XPRINT_MACHINES}
NO_XPRINT_OPTION= --disable-xprint
.endfor
.for M in ${NO_XF86UTIL_MACHINES} .for M in ${NO_XF86UTIL_MACHINES}
NO_XF86_UTIL_${M} = --disable-xfree86-utils NO_XF86_UTIL_${M} = --disable-xfree86-utils
.endfor .endfor
NO_XF86_UTIL_OPTION=${NO_XF86_UTIL_${MACHINE}} NO_XF86_UTIL_OPTION=${NO_XF86_UTIL_${MACHINE}}
.if ${MACHINE} != "sgi" && ${MACHINE} != "vax"
MESA_SOURCE= --with-mesa-source=${XSRCDIR}/dist/Mesa
.endif
CONFIGURE_ARGS= --localstatedir=/var --sysconfdir=/etc/X11 \ CONFIGURE_ARGS= --localstatedir=/var --sysconfdir=/etc/X11 \
--with-xkb-path=/etc/X11/xkb \ --with-xkb-path=/etc/X11/xkb \
--with-xkb-output=/var/db/xkb \ --with-xkb-output=/var/db/xkb \
--with-module-dir=${LIBDIR}/modules \ --with-module-dir=${LIBDIR}/modules ${MESA_SOURCE} \
--with-mesa-source=${XSRCDIR}/dist/Mesa \
--enable-install-setuid --enable-privsep \ --enable-install-setuid --enable-privsep \
--disable-dmx ${NO_XORG_OPTION} ${NO_XF86_UTIL_OPTION} --disable-dmx ${NO_XORG_OPTION} ${NO_XF86_UTIL_OPTION} \
${NO_XPRINT_OPTION}
.include <bsd.xorg.mk> .include <bsd.xorg.mk>