head 1.16; access; symbols netbsd-11-0-RC4:1.16 netbsd-11-0-RC3:1.16 netbsd-11-0-RC2:1.16 netbsd-11-0-RC1:1.16 perseant-exfatfs-base-20250801:1.16 netbsd-11:1.16.0.6 netbsd-11-base:1.16 netbsd-10-1-RELEASE:1.16 perseant-exfatfs-base-20240630:1.16 perseant-exfatfs:1.16.0.4 perseant-exfatfs-base:1.16 netbsd-8-3-RELEASE:1.14 netbsd-9-4-RELEASE:1.15 netbsd-10-0-RELEASE:1.16 netbsd-10-0-RC6:1.16 netbsd-10-0-RC5:1.16 netbsd-10-0-RC4:1.16 netbsd-10-0-RC3:1.16 netbsd-10-0-RC2:1.16 netbsd-10-0-RC1:1.16 netbsd-10:1.16.0.2 netbsd-10-base:1.16 netbsd-9-3-RELEASE:1.15 cjep_sun2x-base1:1.15 cjep_sun2x:1.15.0.8 cjep_sun2x-base:1.15 cjep_staticlib_x-base1:1.15 netbsd-9-2-RELEASE:1.15 cjep_staticlib_x:1.15.0.6 cjep_staticlib_x-base:1.15 netbsd-9-1-RELEASE:1.15 phil-wifi-20200421:1.15 phil-wifi-20200411:1.15 is-mlppp:1.15.0.4 is-mlppp-base:1.15 phil-wifi-20200406:1.15 netbsd-8-2-RELEASE:1.14 netbsd-9-0-RELEASE:1.15 netbsd-9-0-RC2:1.15 netbsd-9-0-RC1:1.15 phil-wifi-20191119:1.15 netbsd-9:1.15.0.2 netbsd-9-base:1.15 phil-wifi-20190609:1.15 netbsd-8-1-RELEASE:1.14 netbsd-8-1-RC1:1.14 pgoyette-compat-merge-20190127:1.14.12.1 pgoyette-compat-20190127:1.15 pgoyette-compat-20190118:1.15 pgoyette-compat-1226:1.14 pgoyette-compat-1126:1.14 pgoyette-compat-1020:1.14 pgoyette-compat-0930:1.14 pgoyette-compat-0906:1.14 netbsd-7-2-RELEASE:1.9 pgoyette-compat-0728:1.14 netbsd-8-0-RELEASE:1.14 phil-wifi:1.14.0.14 phil-wifi-base:1.14 pgoyette-compat-0625:1.14 netbsd-8-0-RC2:1.14 pgoyette-compat-0521:1.14 pgoyette-compat-0502:1.14 pgoyette-compat-0422:1.14 netbsd-8-0-RC1:1.14 pgoyette-compat-0415:1.14 pgoyette-compat-0407:1.14 pgoyette-compat-0330:1.14 pgoyette-compat-0322:1.14 pgoyette-compat-0315:1.14 netbsd-7-1-2-RELEASE:1.9 pgoyette-compat:1.14.0.12 pgoyette-compat-base:1.14 netbsd-7-1-1-RELEASE:1.9 matt-nb8-mediatek:1.14.0.10 matt-nb8-mediatek-base:1.14 perseant-stdc-iso10646:1.14.0.8 perseant-stdc-iso10646-base:1.14 netbsd-8:1.14.0.6 netbsd-8-base:1.14 prg-localcount2-base3:1.14 prg-localcount2-base2:1.14 prg-localcount2-base1:1.14 prg-localcount2:1.14.0.4 prg-localcount2-base:1.14 pgoyette-localcount-20170426:1.14 bouyer-socketcan-base1:1.14 pgoyette-localcount-20170320:1.14 netbsd-7-1:1.9.0.32 netbsd-7-1-RELEASE:1.9 netbsd-7-1-RC2:1.9 netbsd-7-nhusb-base-20170116:1.9 bouyer-socketcan:1.14.0.2 bouyer-socketcan-base:1.14 pgoyette-localcount-20170107:1.14 netbsd-7-1-RC1:1.9 pgoyette-localcount-20161104:1.14 netbsd-7-0-2-RELEASE:1.9 localcount-20160914:1.13 netbsd-7-nhusb:1.9.0.30 netbsd-7-nhusb-base:1.9 pgoyette-localcount-20160806:1.9 pgoyette-localcount-20160726:1.9 pgoyette-localcount:1.9.0.28 pgoyette-localcount-base:1.9 netbsd-7-0-1-RELEASE:1.9 netbsd-7-0:1.9.0.26 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.4.1 netbsd-5-1-5-RELEASE:1.5.4.1 netbsd-6-0-6-RELEASE:1.9 netbsd-6-1-5-RELEASE:1.9 netbsd-7:1.9.0.24 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.22 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.4.1 netbsd-5-1-4-RELEASE:1.5.4.1 netbsd-6-1-2-RELEASE:1.9 netbsd-6-0-3-RELEASE:1.9 netbsd-5-2-1-RELEASE:1.5.4.1 netbsd-5-1-3-RELEASE:1.5.4.1 netbsd-6-1-1-RELEASE:1.9 riastradh-drm2-base2:1.9 riastradh-drm2-base1:1.9 riastradh-drm2:1.9.0.16 riastradh-drm2-base:1.9 netbsd-6-1:1.9.0.20 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.18 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.4.1.0.6 netbsd-6-0-1-RELEASE:1.9 yamt-pagecache-base7:1.9 netbsd-5-2-RELEASE:1.5.4.1 netbsd-5-2-RC1:1.5.4.1 matt-nb6-plus-nbase:1.9 yamt-pagecache-base6:1.9 netbsd-6-0:1.9.0.14 netbsd-6-0-RELEASE:1.9 netbsd-6-0-RC2:1.9 tls-maxphys:1.9.0.12 tls-maxphys-base:1.9 matt-nb6-plus:1.9.0.10 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.8 netbsd-6-base:1.9 netbsd-5-1-2-RELEASE:1.5.4.1 netbsd-5-1-1-RELEASE:1.5.4.1 yamt-pagecache-base3:1.9 yamt-pagecache-base2:1.9 yamt-pagecache:1.9.0.6 yamt-pagecache-base:1.9 cherry-xenmp:1.9.0.4 cherry-xenmp-base:1.9 bouyer-quota2-nbase:1.9 bouyer-quota2:1.9.0.2 bouyer-quota2-base:1.9 matt-mips64-premerge-20101231:1.9 matt-nb5-mips64-premerge-20101231:1.5.10.1 matt-nb5-pq3:1.5.4.1.0.4 matt-nb5-pq3-base:1.5.4.1 pre-xorg-192:1.9 netbsd-5-1:1.5.4.1.0.2 netbsd-5-1-RELEASE:1.5.4.1 netbsd-5-1-RC4:1.5.4.1 matt-nb5-mips64-k15:1.5.10.1 netbsd-5-1-RC3:1.5.4.1 netbsd-5-1-RC2:1.5.4.1 netbsd-5-1-RC1:1.5.4.1 netbsd-5-0-2-RELEASE:1.5 matt-nb5-mips64-premerge-20091211:1.5 matt-premerge-20091211:1.8 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.10 netbsd-5-0-1-RELEASE:1.5 jym-xensuspend-nbase:1.5 netbsd-5-0:1.5.0.8 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.6 jym-xensuspend-base:1.5 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.4 netbsd-5-base:1.5 matt-mips64-base2:1.5 haad-dm:1.5.0.2 haad-dm-base1:1.5 wrstuden-revivesa-base-3:1.2 wrstuden-revivesa:1.2.0.2 wrstuden-revivesa-base-2:1.2; locks; strict; comment @# @; 1.16 date 2022.07.15.04.18.55; author mrg; state Exp; branches; next 1.15; commitid o4A4jy8xMVZZEWLD; 1.15 date 2018.12.31.11.14.04; author mrg; state Exp; branches; next 1.14; commitid TUVjjF1MdjrmtW5B; 1.14 date 2016.10.08.20.08.57; author mrg; state Exp; branches 1.14.12.1 1.14.14.1; next 1.13; commitid iFcxVQZlV1TOBnpz; 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.03.43.04; author mrg; state Exp; branches; next 1.11; commitid J271e7p9sa4wUdiz; 1.11 date 2016.08.12.01.15.49; author mrg; state Exp; branches; next 1.10; commitid 5GiziC5fk8bIaXhz; 1.10 date 2016.08.11.08.32.42; author mrg; state Exp; branches; next 1.9; commitid 8krHm1L1UVyjzRhz; 1.9 date 2010.05.22.05.45.01; author mrg; state Exp; branches 1.9.28.1; next 1.8; 1.8 date 2009.06.18.03.32.41; author mrg; state Exp; branches; next 1.7; 1.7 date 2009.06.12.01.59.05; author mrg; state Exp; branches; next 1.6; 1.6 date 2009.06.11.05.43.16; author mrg; state Exp; branches; next 1.5; 1.5 date 2008.10.06.10.33.44; author rtr; state Exp; branches 1.5.2.1 1.5.4.1 1.5.10.1; next 1.4; 1.4 date 2008.09.26.06.57.03; author rtr; state Exp; branches; next 1.3; 1.3 date 2008.09.25.14.15.06; author rtr; state Exp; branches; next 1.2; 1.2 date 2008.08.15.15.55.05; author rtr; state Exp; branches 1.2.2.1; next 1.1; 1.1 date 2008.08.06.07.16.39; author mrg; state Exp; branches; next ; 1.14.12.1 date 2019.01.18.08.49.07; author pgoyette; state Exp; branches; next ; commitid Lmlzg3OVT2cd6f8B; 1.14.14.1 date 2019.06.10.22.02.47; author christos; state Exp; branches; next ; commitid jtc8rnCzWiEEHGqB; 1.9.28.1 date 2016.11.04.14.48.49; author pgoyette; state Exp; branches; next ; commitid 2m1JRwYmpwPkOOsz; 1.5.2.1 date 2008.10.06.10.33.44; author haad; state dead; branches; next 1.5.2.2; 1.5.2.2 date 2008.10.19.22.41.18; author haad; state Exp; branches; next ; 1.5.4.1 date 2009.09.17.04.24.39; author snj; state Exp; branches; next ; 1.5.10.1 date 2010.04.21.05.24.44; author matt; state Exp; branches; next ; 1.2.2.1 date 2008.08.15.15.55.05; author wrstuden; state dead; branches; next 1.2.2.2; 1.2.2.2 date 2008.09.18.05.18.45; author wrstuden; state Exp; branches; next ; desc @@ 1.16 log @various updates to build with xorg-server 21.1.3. - the s3, tga, and trident drivers use old functionality and are disabled - dixmods/fb is removed, main fb has all these now (we retain our revert of an upstream change here.) - adjust source lists as necessary - remove vbe module, now part of int10 - use -lxcvt - misc clean up - ramdac loses IBM, BT and TI support (this is one of the problems for the disabled drivers, but also some structures in RamDac.h are gone entirely, not copied anywhere.) - old apm code is gone, all bsd uses pm_noop. now this probably require a clean build in at least xorg-server and the drivers, and perhaps the DESTDIR as well. will update src/UPDATING with details when they are fully known. @ text @# $NetBSD: Makefile,v 1.15 2018/12/31 11:14:04 mrg Exp $ .include "../../../Makefile.serverlib" .include "../../../Makefile.servermod" LIB= dixmods .PATH: ${X11SRCDIR.xorg-server}/mi SRCS= miinitext.c CPPFLAGS+= \ -I${DESTDIR}${X11INCDIR}/X11 \ -I${DESTDIR}${X11INCDIR}/pixman-1 \ -I${DESTDIR}${X11INCDIR}/xorg \ -I${X11SRCDIR.xorg-server}/Xext \ -I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \ -I${X11SRCDIR.xorg-server}/hw/xfree86/common \ -I${X11SRCDIR.xorg-server}/hw/xfree86/loader CPPFLAGS+= \ ${X11FLAGS.EXTENSION} \ -I${X11SRCDIR.xorg-server}/../include ${X11FLAGS.DIX} SUBDIR = \ glx \ shadow \ wfb COPTS.miinitext.c= -Wno-error # XXX xf86bigfstr.h .include LIBDIR= ${XMODULEDIR} .include .include @ 1.15 log @build updates for xorg-server 1.20.3: - moved/removed/new files - don't define HAVE_XORG_CONFIG_H or HAVE_DIX_CONFIG_H if using ${X11FLAGS.DIX} -- already included. put glxvnd into glx itself for now. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.14 2016/10/08 20:08:57 mrg Exp $ a24 1 fb \ @ 1.14 log @set XFree86LOADER for all xorg-server driver builds again, it's still needed for many drivers and would normally be set in xorg-server.h. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.13 2016/08/20 01:03:34 mrg Exp $ d28 1 a28 2 wfb \ xorgxkb @ 1.14.14.1 log @Sync with HEAD @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.15 2018/12/31 11:14:04 mrg Exp $ d28 2 a29 1 wfb @ 1.14.12.1 log @Synch with HEAD @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.14 2016/10/08 20:08:57 mrg Exp $ d28 2 a29 1 wfb @ 1.13 log @delete dead code. fix DIX flags for xorg-server 1.18 build after the no longer installed dix-config.h @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.12 2016/08/14 03:43:04 mrg Exp $ a21 2 -DXFree86LOADER CPPFLAGS+= \ @ 1.12 log @various updates: - port pkgsrc libxshmfence patches - Xextbuiltin/module is no longer a thing, make it normal - always need xorg-config.h/xorg-server.h for server components now - add present, damage, render, Xi, dri, pixman, extension where needed - fix various CPPFLAGS issues - deal with moved sdksyms.sh @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.11 2016/08/12 01:15:49 mrg Exp $ a21 1 -DHAVE_DIX_CONFIG_H \ d23 2 @ 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:42 mrg Exp $ d17 1 @ 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 2010/05/22 05:45:01 mrg Exp $ a24 1 dbe \ a26 1 record \ @ 1.9 log @XXX: use -Wno-error for files that use old foostr.h includes that now have XXX: #warning's in them. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.8 2009/06/18 03:32:41 mrg Exp $ a25 1 extmod \ @ 1.9.28.1 log @Sync with HEAD @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.14 2016/10/08 20:08:57 mrg Exp $ d21 2 a22 1 -I${X11SRCDIR.xorg-server}/../include ${X11FLAGS.DIX} @ 1.8 log @actually build glx extension. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.7 2009/06/12 01:59:05 mrg Exp $ d34 2 @ 1.7 log @build updates for xorg-server 1.6. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.6 2009/06/11 05:43:16 mrg Exp $ d28 1 @ 1.6 log @upgrade the build framework for xorg-server 1.6. this doesn't quite work yet. Xvfb and Xnest attempt to link but have missing symbols. Xorg doesn't build all its components yet. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.5 2008/10/06 10:33:44 rtr Exp $ a24 1 GLcore \ a27 1 glx \ @ 1.5 log @make sure libdixmods (linked into the Xorg server) is aware of MITSHM and other server extensions. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.4 2008/09/26 06:57:03 rtr Exp $ a25 3 afb \ cfb \ cfb32 \ a28 1 freetype \ a29 1 mfb \ a31 1 type1 \ d33 1 a33 2 xorgxkb \ xtrap @ 1.5.10.1 log @sync to netbsd-5 @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.5.4.1 2009/09/17 04:24:39 snj Exp $ d25 4 d32 1 d34 1 d37 1 d39 2 a40 1 xorgxkb @ 1.5.4.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.8 2009/06/18 03:32:41 mrg Exp $ d25 4 d32 1 d34 1 d37 1 d39 2 a40 1 xorgxkb @ 1.5.2.1 log @file Makefile was added on branch haad-dm on 2008-10-19 22:41:18 +0000 @ text @d1 45 @ 1.5.2.2 log @Sync with HEAD. @ text @a0 45 # $NetBSD: Makefile,v 1.5 2008/10/06 10:33:44 rtr Exp $ .include "../../../Makefile.serverlib" .include "../../../Makefile.servermod" LIB= dixmods .PATH: ${X11SRCDIR.xorg-server}/mi SRCS= miinitext.c CPPFLAGS+= \ -I${DESTDIR}${X11INCDIR}/X11 \ -I${DESTDIR}${X11INCDIR}/pixman-1 \ -I${DESTDIR}${X11INCDIR}/xorg \ -I${X11SRCDIR.xorg-server}/Xext \ -I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \ -I${X11SRCDIR.xorg-server}/hw/xfree86/loader CPPFLAGS+= \ ${X11FLAGS.EXTENSION} \ -DHAVE_DIX_CONFIG_H \ -DXFree86LOADER SUBDIR = \ GLcore \ afb \ cfb \ cfb32 \ dbe \ extmod \ fb \ freetype \ glx \ mfb \ record \ shadow \ type1 \ wfb \ xorgxkb \ xtrap .include LIBDIR= ${XMODULEDIR} .include .include @ 1.4 log @build and install the libGLcore server module @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.3 2008/09/25 14:15:06 rtr Exp $ d19 4 a22 1 CPPFLAGS+= -DXFree86LOADER @ 1.3 log @descend into GL/glx and build the libglx.a archive and the libglx.so extension module. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.2 2008/08/15 15:55:05 rtr Exp $ d11 7 a17 6 CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \ -I${X11SRCDIR.xorg-server}/hw/xfree86/loader \ -I${X11SRCDIR.xorg-server}/Xext \ -I${DESTDIR}${X11INCDIR}/X11 \ -I${DESTDIR}${X11INCDIR}/pixman-1 \ -I${DESTDIR}${X11INCDIR}/xorg d22 1 @ 1.2 log @stop using XSERVERINCDIR since it was referencing src/x11 reachover this is not correct for xorg reachover @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.1 2008/08/06 07:16:39 mrg Exp $ d20 16 a35 3 SUBDIR= extmod \ afb cfb cfb32 dbe fb freetype mfb record \ shadow type1 wfb xorgxkb xtrap @ 1.2.2.1 log @file Makefile was added on branch wrstuden-revivesa on 2008-09-18 05:18:45 +0000 @ text @d1 27 @ 1.2.2.2 log @Sync with wrstuden-revivesa-base-2. @ text @a0 27 # $NetBSD: Makefile,v 1.2 2008/08/15 15:55:05 rtr Exp $ .include "../../../Makefile.serverlib" .include "../../../Makefile.servermod" LIB= dixmods .PATH: ${X11SRCDIR.xorg-server}/mi SRCS= miinitext.c CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \ -I${X11SRCDIR.xorg-server}/hw/xfree86/loader \ -I${X11SRCDIR.xorg-server}/Xext \ -I${DESTDIR}${X11INCDIR}/X11 \ -I${DESTDIR}${X11INCDIR}/pixman-1 \ -I${DESTDIR}${X11INCDIR}/xorg CPPFLAGS+= -DXFree86LOADER SUBDIR= extmod \ afb cfb cfb32 dbe fb freetype mfb record \ shadow type1 wfb xorgxkb xtrap .include LIBDIR= ${XMODULEDIR} .include .include @ 1.1 log @build all the dixmod parts, completing all the interesting subdirs of hw/xfree86 i believe. @ text @d1 1 a1 1 # $NetBSD$ d16 1 a16 2 -I${DESTDIR}${X11INCDIR}/xorg \ -I${XSERVERINCDIR} @