head 1.13; access; symbols netbsd-11-0-RC4:1.13 netbsd-11-0-RC3:1.13 netbsd-11-0-RC2:1.13 netbsd-11-0-RC1:1.13 perseant-exfatfs-base-20250801:1.13 netbsd-11:1.13.0.28 netbsd-11-base:1.13 netbsd-10-1-RELEASE:1.13 perseant-exfatfs-base-20240630:1.13 perseant-exfatfs:1.13.0.26 perseant-exfatfs-base:1.13 netbsd-8-3-RELEASE:1.13 netbsd-9-4-RELEASE:1.13 netbsd-10-0-RELEASE:1.13 netbsd-10-0-RC6:1.13 netbsd-10-0-RC5:1.13 netbsd-10-0-RC4:1.13 netbsd-10-0-RC3:1.13 netbsd-10-0-RC2:1.13 netbsd-10-0-RC1:1.13 netbsd-10:1.13.0.24 netbsd-10-base:1.13 netbsd-9-3-RELEASE:1.13 cjep_sun2x-base1:1.13 cjep_sun2x:1.13.0.22 cjep_sun2x-base:1.13 cjep_staticlib_x-base1:1.13 netbsd-9-2-RELEASE:1.13 cjep_staticlib_x:1.13.0.20 cjep_staticlib_x-base:1.13 netbsd-9-1-RELEASE:1.13 phil-wifi-20200421:1.13 phil-wifi-20200411:1.13 is-mlppp:1.13.0.18 is-mlppp-base:1.13 phil-wifi-20200406:1.13 netbsd-8-2-RELEASE:1.13 netbsd-9-0-RELEASE:1.13 netbsd-9-0-RC2:1.13 netbsd-9-0-RC1:1.13 phil-wifi-20191119:1.13 netbsd-9:1.13.0.16 netbsd-9-base:1.13 phil-wifi-20190609:1.13 netbsd-8-1-RELEASE:1.13 netbsd-8-1-RC1:1.13 pgoyette-compat-merge-20190127:1.13 pgoyette-compat-20190127:1.13 pgoyette-compat-20190118:1.13 pgoyette-compat-1226:1.13 pgoyette-compat-1126:1.13 pgoyette-compat-1020:1.13 pgoyette-compat-0930:1.13 pgoyette-compat-0906:1.13 netbsd-7-2-RELEASE:1.9 pgoyette-compat-0728:1.13 netbsd-8-0-RELEASE:1.13 phil-wifi:1.13.0.14 phil-wifi-base:1.13 pgoyette-compat-0625:1.13 netbsd-8-0-RC2:1.13 pgoyette-compat-0521:1.13 pgoyette-compat-0502:1.13 pgoyette-compat-0422:1.13 netbsd-8-0-RC1:1.13 pgoyette-compat-0415:1.13 pgoyette-compat-0407:1.13 pgoyette-compat-0330:1.13 pgoyette-compat-0322:1.13 pgoyette-compat-0315:1.13 netbsd-7-1-2-RELEASE:1.9 pgoyette-compat:1.13.0.12 pgoyette-compat-base:1.13 netbsd-7-1-1-RELEASE:1.9 matt-nb8-mediatek:1.13.0.10 matt-nb8-mediatek-base:1.13 perseant-stdc-iso10646:1.13.0.8 perseant-stdc-iso10646-base:1.13 netbsd-8:1.13.0.6 netbsd-8-base:1.13 prg-localcount2-base3:1.13 prg-localcount2-base2:1.13 prg-localcount2-base1:1.13 prg-localcount2:1.13.0.4 prg-localcount2-base:1.13 pgoyette-localcount-20170426:1.13 bouyer-socketcan-base1:1.13 pgoyette-localcount-20170320:1.13 netbsd-7-1:1.9.0.28 netbsd-7-1-RELEASE:1.9 netbsd-7-1-RC2:1.9 netbsd-7-nhusb-base-20170116:1.9 bouyer-socketcan:1.13.0.2 bouyer-socketcan-base:1.13 pgoyette-localcount-20170107:1.13 netbsd-7-1-RC1:1.9 pgoyette-localcount-20161104:1.13 netbsd-7-0-2-RELEASE:1.9 localcount-20160914:1.13 netbsd-7-nhusb:1.9.0.26 netbsd-7-nhusb-base:1.9 pgoyette-localcount-20160806:1.9 pgoyette-localcount-20160726:1.9 pgoyette-localcount:1.9.0.24 pgoyette-localcount-base:1.9 netbsd-7-0-1-RELEASE:1.9 netbsd-7-0:1.9.0.22 netbsd-7-0-RELEASE:1.9 netbsd-7-0-RC3:1.9 netbsd-7-0-RC2:1.9 netbsd-7-0-RC1:1.9 netbsd-5-2-3-RELEASE:1.5.2.1 netbsd-5-1-5-RELEASE:1.5.2.1 netbsd-6-0-6-RELEASE:1.9 netbsd-6-1-5-RELEASE:1.9 netbsd-7:1.9.0.20 netbsd-7-base:1.9 yamt-pagecache-base9:1.9 yamt-pagecache-tag8:1.9 netbsd-6-1-4-RELEASE:1.9 netbsd-6-0-5-RELEASE:1.9 tls-earlyentropy:1.9.0.18 tls-earlyentropy-base:1.9 riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.9 riastradh-drm2-base3:1.9 netbsd-6-1-3-RELEASE:1.9 netbsd-6-0-4-RELEASE:1.9 netbsd-5-2-2-RELEASE:1.5.2.1 netbsd-5-1-4-RELEASE:1.5.2.1 netbsd-6-1-2-RELEASE:1.9 netbsd-6-0-3-RELEASE:1.9 netbsd-5-2-1-RELEASE:1.5.2.1 netbsd-5-1-3-RELEASE:1.5.2.1 netbsd-6-1-1-RELEASE:1.9 riastradh-drm2-base2:1.9 riastradh-drm2-base1:1.9 riastradh-drm2:1.9.0.12 riastradh-drm2-base:1.9 netbsd-6-1:1.9.0.16 netbsd-6-0-2-RELEASE:1.9 netbsd-6-1-RELEASE:1.9 netbsd-6-1-RC4:1.9 netbsd-6-1-RC3:1.9 agc-symver:1.9.0.14 agc-symver-base:1.9 netbsd-6-1-RC2:1.9 netbsd-6-1-RC1:1.9 yamt-pagecache-base8:1.9 netbsd-5-2:1.5.2.1.0.6 netbsd-6-0-1-RELEASE:1.9 yamt-pagecache-base7:1.9 netbsd-5-2-RELEASE:1.5.2.1 netbsd-5-2-RC1:1.5.2.1 matt-nb6-plus-nbase:1.9 yamt-pagecache-base6:1.9 netbsd-6-0:1.9.0.10 netbsd-6-0-RELEASE:1.9 netbsd-6-0-RC2:1.9 tls-maxphys:1.9.0.8 tls-maxphys-base:1.9 matt-nb6-plus:1.9.0.6 matt-nb6-plus-base:1.9 netbsd-6-0-RC1:1.9 yamt-pagecache-base5:1.9 yamt-pagecache-base4:1.9 netbsd-6:1.9.0.4 netbsd-6-base:1.9 netbsd-5-1-2-RELEASE:1.5.2.1 netbsd-5-1-1-RELEASE:1.5.2.1 yamt-pagecache-base3:1.9 yamt-pagecache-base2:1.9 yamt-pagecache:1.9.0.2 yamt-pagecache-base:1.9 cherry-xenmp:1.8.0.4 cherry-xenmp-base:1.8 bouyer-quota2-nbase:1.8 bouyer-quota2:1.8.0.2 bouyer-quota2-base:1.8 matt-mips64-premerge-20101231:1.8 matt-nb5-mips64-premerge-20101231:1.5.8.1 matt-nb5-pq3:1.5.2.1.0.4 matt-nb5-pq3-base:1.5.2.1 pre-xorg-192:1.7 netbsd-5-1:1.5.2.1.0.2 netbsd-5-1-RELEASE:1.5.2.1 netbsd-5-1-RC4:1.5.2.1 matt-nb5-mips64-k15:1.5.8.1 netbsd-5-1-RC3:1.5.2.1 netbsd-5-1-RC2:1.5.2.1 netbsd-5-1-RC1:1.5.2.1 netbsd-5-0-2-RELEASE:1.5 matt-nb5-mips64-premerge-20091211:1.5 matt-premerge-20091211:1.7 matt-nb5-mips64-u2-k2-k4-k7-k8-k9:1.5 matt-nb4-mips64-k7-u2a-k9b:1.5 matt-nb5-mips64-u1-k1-k5:1.5 matt-nb5-mips64:1.5.0.8 netbsd-5-0-1-RELEASE:1.5 jym-xensuspend-nbase:1.6 netbsd-5-0:1.5.0.6 netbsd-5-0-RELEASE:1.5 netbsd-5-0-RC4:1.5 netbsd-5-0-RC3:1.5 netbsd-5-0-RC2:1.5 jym-xensuspend:1.5.0.4 jym-xensuspend-base:1.6 netbsd-5-0-RC1:1.5 haad-dm-base:1.5 haad-dm-base2:1.5 haad-nbase2:1.5 netbsd-5:1.5.0.2 netbsd-5-base:1.5 matt-mips64-base2:1.5 haad-dm:1.4.0.6 haad-dm-base1:1.4 wrstuden-revivesa-base-3:1.4 wrstuden-revivesa:1.4.0.2 wrstuden-revivesa-base-2:1.4; locks; strict; comment @# @; 1.13 date 2016.08.20.01.03.34; author mrg; state Exp; branches; next 1.12; commitid 14YDhfwrEKaDQYiz; 1.12 date 2016.08.14.00.03.58; author mrg; state Exp; branches; next 1.11; commitid GTnYSwjk1lG4Iciz; 1.11 date 2016.08.12.01.15.51; author mrg; state Exp; branches; next 1.10; commitid 5GiziC5fk8bIaXhz; 1.10 date 2016.08.11.08.32.44; author mrg; state Exp; branches; next 1.9; commitid 8krHm1L1UVyjzRhz; 1.9 date 2011.08.02.09.11.38; author mrg; state Exp; branches; next 1.8; 1.8 date 2010.11.23.08.22.35; author mrg; state Exp; branches; next 1.7; 1.7 date 2009.08.22.02.40.27; author mrg; state Exp; branches; next 1.6; 1.6 date 2009.02.14.13.32.13; author abs; state Exp; branches; next 1.5; 1.5 date 2008.10.24.19.50.39; author macallan; state Exp; branches 1.5.2.1 1.5.4.1 1.5.8.1; next 1.4; 1.4 date 2008.09.01.10.20.20; author rtr; state Exp; branches 1.4.2.1 1.4.6.1; next 1.3; 1.3 date 2008.08.03.22.09.12; author mrg; state Exp; branches; next 1.2; 1.2 date 2008.08.03.03.17.16; author mrg; state Exp; branches; next 1.1; 1.1 date 2008.08.02.04.32.00; author mrg; state Exp; branches; next ; 1.5.2.1 date 2009.09.17.04.24.41; author snj; state Exp; branches; next ; 1.5.4.1 date 2009.05.13.18.53.29; author jym; state Exp; branches; next ; 1.5.8.1 date 2010.04.21.05.24.47; author matt; state Exp; branches; next ; 1.4.2.1 date 2008.09.01.10.20.20; author wrstuden; state dead; branches; next 1.4.2.2; 1.4.2.2 date 2008.09.18.05.18.47; author wrstuden; state Exp; branches; next ; 1.4.6.1 date 2008.09.01.10.20.20; author haad; state dead; branches; next 1.4.6.2; 1.4.6.2 date 2008.10.19.22.41.21; author haad; state Exp; branches; next ; desc @@ 1.13 log @delete dead code. fix DIX flags for xorg-server 1.18 build after the no longer installed dix-config.h @ text @# $NetBSD: Makefile,v 1.12 2016/08/14 00:03:58 mrg Exp $ .include "../Makefile.serverlib" .include "../Makefile.servermod" LIB= mi .PATH: ${X11SRCDIR.xorg-server}/mi SRCS= miarc.c mibitblt.c micopy.c \ micmap.c midash.c midispcur.c mieq.c \ miexpose.c mifillarc.c mifillrct.c \ migc.c miglblt.c mioverlay.c mipointer.c mipoly.c \ mipolypnt.c mipolyrect.c \ mipolyseg.c mipolytext.c mipushpxl.c \ miscrinit.c misprite.c \ mivaltree.c miwideline.c miwindow.c mizerarc.c \ mizerclip.c mizerline.c # XXX the order is important since there are headers with the same # name but differ depending on location CPPFLAGS+= -I${X11SRCDIR.xorg-server}/../include \ -I${X11SRCDIR.xorg-server}/render \ -I${DESTDIR}${X11INCDIR}/X11 \ -I${X11SRCDIR.xorg-server}/Xext \ -I${X11SRCDIR.xorg-server}/miext/damage \ -I${X11SRCDIR.xorg-server}/Xi \ -I${X11SRCDIR.xorg-server}/composite \ -I${X11SRCDIR.xorg-server}/damageext \ -I${X11SRCDIR.xorg-server}/xfixes \ -I${X11SRCDIR.xorg-server}/hw/xnest \ -I${DESTDIR}${X11INCDIR}/pixman-1 \ -I${DESTDIR}${X11INCDIR}/xorg \ ${X11FLAGS.DIX} \ -DHAVE_XNEST_CONFIG_H CPPFLAGS.miscrinit.c= ${X11FLAGS.EXTENSION} COPTS.micmap.c+= -Wno-error COPTS.miexpose.c+= -Wno-error .include .include @ 1.12 log @various build updates for xorg-server 1.18. with this and some other uncommited work, Xvfb and Xnest both link. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.11 2016/08/12 01:15:51 mrg Exp $ a37 9 .if 0 .if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64" || ${MACHINE} == "mac68k" SRCS+= miinitext.c CPPFLAGS.miinitext.c= ${X11FLAGS.EXTENSION} CPPFLAGS.miinitext.c+= -UXF86MISC -UXINPUT -UXF86VIDMODE -UXFreeXDGA CPPFLAGS.miscrinit.c+= -UXF86MISC -UXINPUT -UXF86VIDMODE -UXFreeXDGA .endif .endif @ 1.11 log @round do of reach over updates for xorg-server 1.18. again, untested, but this should be much closer to complete for the necessary changes. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.10 2016/08/11 08:32:44 mrg Exp $ d27 3 @ 1.10 log @first merge of xorg-server 1.18.4 reach over. not tested, and missing at these new subdirs, some which may not be needed: dri2 glamor hw/xfree86/drivers/modesetting hw/xfree86/parser present pseudoramiX @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.9 2011/08/02 09:11:38 mrg Exp $ d14 1 a14 1 mipolyseg.c mipolytext.c mipolyutil.c mipushpxl.c \ @ 1.9 log @various updates for xorg-server 1.10.3. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.8 2010/11/23 08:22:35 mrg Exp $ d10 2 a11 2 micmap.c micursor.c midash.c midispcur.c mieq.c \ miexpose.c mifillarc.c mifillrct.c mifpolycon.c \ d13 1 a13 1 mipolycon.c mipolygen.c mipolypnt.c mipolyrect.c \ d15 1 a15 1 miscrinit.c mispans.c misprite.c \ @ 1.8 log @many build updates and fixes for xorg-server 1.9.2. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.7 2009/08/22 02:40:27 mrg Exp $ d9 1 a9 1 SRCS= miarc.c mibitblt.c mibstore.c micopy.c \ @ 1.7 log @add -Wno-error for a bunch of files that use (xorg) deprecated symbols. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.6 2009/02/14 13:32:13 abs Exp $ d9 1 a9 1 SRCS= miarc.c mibank.c mibitblt.c mibstore.c \ d15 1 a15 1 miregion.c miscrinit.c mispans.c misprite.c \ @ 1.6 log @Use MACHINE_ARCH rather than MACHINE where relevant. At least one file had a nice mixture of amd64 and x86_64 tests... @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.5 2008/10/24 19:50:39 macallan Exp $ d44 3 @ 1.5 log @comment out some more cargo-culted special sparc treatment we can do without @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.4 2008/09/01 10:20:20 rtr Exp $ d36 1 a36 1 .if ${MACHINE} == "sparc" || ${MACHINE} == "sparc64" || ${MACHINE} == "mac68k" @ 1.5.8.1 log @sync to netbsd-5 @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.5.2.1 2009/09/17 04:24:41 snj Exp $ d36 1 a36 1 .if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64" || ${MACHINE} == "mac68k" a43 3 COPTS.micmap.c+= -Wno-error COPTS.miexpose.c+= -Wno-error @ 1.5.2.1 log @Apply patch (requested by mrg in ticket #958): Sync X.Org reachover build framework and setlists with the new X.Org. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.6 2009/02/14 13:32:13 abs Exp $ d36 1 a36 1 .if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64" || ${MACHINE} == "mac68k" a43 3 COPTS.micmap.c+= -Wno-error COPTS.miexpose.c+= -Wno-error @ 1.5.4.1 log @Sync with HEAD. Second commit. See http://mail-index.netbsd.org/source-changes/2009/05/13/msg221222.html @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.6 2009/02/14 13:32:13 abs Exp $ d36 1 a36 1 .if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64" || ${MACHINE} == "mac68k" @ 1.4 log @- build miext for netwinder, sparc64 - adjust CPPFLAGS for includes needed for sparc64 @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.3 2008/08/03 22:09:12 mrg Exp $ d35 1 d42 1 @ 1.4.6.1 log @file Makefile was added on branch haad-dm on 2008-10-19 22:41:21 +0000 @ text @d1 43 @ 1.4.6.2 log @Sync with HEAD. @ text @a0 43 # $NetBSD: Makefile,v 1.4 2008/09/01 10:20:20 rtr Exp $ .include "../Makefile.serverlib" .include "../Makefile.servermod" LIB= mi .PATH: ${X11SRCDIR.xorg-server}/mi SRCS= miarc.c mibank.c mibitblt.c mibstore.c \ micmap.c micursor.c midash.c midispcur.c mieq.c \ miexpose.c mifillarc.c mifillrct.c mifpolycon.c \ migc.c miglblt.c mioverlay.c mipointer.c mipoly.c \ mipolycon.c mipolygen.c mipolypnt.c mipolyrect.c \ mipolyseg.c mipolytext.c mipolyutil.c mipushpxl.c \ miregion.c miscrinit.c mispans.c misprite.c \ mivaltree.c miwideline.c miwindow.c mizerarc.c \ mizerclip.c mizerline.c # XXX the order is important since there are headers with the same # name but differ depending on location CPPFLAGS+= -I${X11SRCDIR.xorg-server}/../include \ -I${X11SRCDIR.xorg-server}/render \ -I${DESTDIR}${X11INCDIR}/X11 \ -I${X11SRCDIR.xorg-server}/Xext \ -I${X11SRCDIR.xorg-server}/miext/damage \ -I${X11SRCDIR.xorg-server}/Xi \ -I${X11SRCDIR.xorg-server}/hw/xnest \ -I${DESTDIR}${X11INCDIR}/pixman-1 \ -I${DESTDIR}${X11INCDIR}/xorg \ ${X11FLAGS.DIX} \ -DHAVE_XNEST_CONFIG_H CPPFLAGS.miscrinit.c= ${X11FLAGS.EXTENSION} .if ${MACHINE} == "sparc" || ${MACHINE} == "sparc64" || ${MACHINE} == "mac68k" SRCS+= miinitext.c CPPFLAGS.miinitext.c= ${X11FLAGS.EXTENSION} CPPFLAGS.miinitext.c+= -UXF86MISC -UXINPUT -UXF86VIDMODE -UXFreeXDGA CPPFLAGS.miscrinit.c+= -UXF86MISC -UXINPUT -UXF86VIDMODE -UXFreeXDGA .endif .include .include @ 1.4.2.1 log @file Makefile was added on branch wrstuden-revivesa on 2008-09-18 05:18:47 +0000 @ text @d1 43 @ 1.4.2.2 log @Sync with wrstuden-revivesa-base-2. @ text @a0 43 # $NetBSD: Makefile,v 1.4 2008/09/01 10:20:20 rtr Exp $ .include "../Makefile.serverlib" .include "../Makefile.servermod" LIB= mi .PATH: ${X11SRCDIR.xorg-server}/mi SRCS= miarc.c mibank.c mibitblt.c mibstore.c \ micmap.c micursor.c midash.c midispcur.c mieq.c \ miexpose.c mifillarc.c mifillrct.c mifpolycon.c \ migc.c miglblt.c mioverlay.c mipointer.c mipoly.c \ mipolycon.c mipolygen.c mipolypnt.c mipolyrect.c \ mipolyseg.c mipolytext.c mipolyutil.c mipushpxl.c \ miregion.c miscrinit.c mispans.c misprite.c \ mivaltree.c miwideline.c miwindow.c mizerarc.c \ mizerclip.c mizerline.c # XXX the order is important since there are headers with the same # name but differ depending on location CPPFLAGS+= -I${X11SRCDIR.xorg-server}/../include \ -I${X11SRCDIR.xorg-server}/render \ -I${DESTDIR}${X11INCDIR}/X11 \ -I${X11SRCDIR.xorg-server}/Xext \ -I${X11SRCDIR.xorg-server}/miext/damage \ -I${X11SRCDIR.xorg-server}/Xi \ -I${X11SRCDIR.xorg-server}/hw/xnest \ -I${DESTDIR}${X11INCDIR}/pixman-1 \ -I${DESTDIR}${X11INCDIR}/xorg \ ${X11FLAGS.DIX} \ -DHAVE_XNEST_CONFIG_H CPPFLAGS.miscrinit.c= ${X11FLAGS.EXTENSION} .if ${MACHINE} == "sparc" || ${MACHINE} == "sparc64" || ${MACHINE} == "mac68k" SRCS+= miinitext.c CPPFLAGS.miinitext.c= ${X11FLAGS.EXTENSION} CPPFLAGS.miinitext.c+= -UXF86MISC -UXINPUT -UXF86VIDMODE -UXFreeXDGA CPPFLAGS.miscrinit.c+= -UXF86MISC -UXINPUT -UXF86VIDMODE -UXFreeXDGA .endif .include .include @ 1.3 log @define HAVE_XNEST_CONFIG_H. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.2 2008/08/03 03:17:16 mrg Exp $ d21 1 a21 1 CPPFLAGS+= -I${X11SRCDIR.xorg-server}/include \ d27 1 @ 1.2 log @add X11INCDIR/xorg to the include path @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.1 2008/08/02 04:32:00 mrg Exp $ d29 2 a30 1 ${X11FLAGS.DIX} a31 1 CPPFLAGS.miinitext.c= ${X11FLAGS.EXTENSION} d36 1 @ 1.1 log @start of build-glue support for xorg-server bits. building so far: doc include dix fb mi miext randr render again based on the work rtr made for xorg support, and of course this is very much based on the work lukem did originally for src/x11, as is all the stuff in src/external/mit/xorg. hi luke! :) @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.8.4.2 2004/11/21 10:01:27 rtr Exp $ d28 1 @