head 1.4; access; symbols netbsd-11-0-RC5:1.4 netbsd-11-0-RC4:1.4 netbsd-11-0-RC3:1.4 netbsd-11-0-RC2:1.4 netbsd-11-0-RC1:1.4 perseant-exfatfs-base-20250801:1.4 netbsd-11:1.4.0.6 netbsd-11-base:1.4 netbsd-10-1-RELEASE:1.4 perseant-exfatfs-base-20240630:1.4 perseant-exfatfs:1.4.0.4 perseant-exfatfs-base:1.4 netbsd-8-3-RELEASE:1.2 netbsd-9-4-RELEASE:1.3 netbsd-10-0-RELEASE:1.4 netbsd-10-0-RC6:1.4 netbsd-10-0-RC5:1.4 netbsd-10-0-RC4:1.4 netbsd-10-0-RC3:1.4 netbsd-10-0-RC2:1.4 netbsd-10-0-RC1:1.4 netbsd-10:1.4.0.2 netbsd-10-base:1.4 netbsd-9-3-RELEASE:1.3 cjep_sun2x-base1:1.3 cjep_sun2x:1.3.0.8 cjep_sun2x-base:1.3 cjep_staticlib_x-base1:1.3 netbsd-9-2-RELEASE:1.3 cjep_staticlib_x:1.3.0.6 cjep_staticlib_x-base:1.3 netbsd-9-1-RELEASE:1.3 phil-wifi-20200421:1.3 phil-wifi-20200411:1.3 is-mlppp:1.3.0.4 is-mlppp-base:1.3 phil-wifi-20200406:1.3 netbsd-8-2-RELEASE:1.2 netbsd-9-0-RELEASE:1.3 netbsd-9-0-RC2:1.3 netbsd-9-0-RC1:1.3 phil-wifi-20191119:1.3 netbsd-9:1.3.0.2 netbsd-9-base:1.3 phil-wifi-20190609:1.3 netbsd-8-1-RELEASE:1.2 netbsd-8-1-RC1:1.2 pgoyette-compat-merge-20190127:1.2.14.1 pgoyette-compat-20190127:1.3 pgoyette-compat-20190118:1.3 pgoyette-compat-1226:1.2 pgoyette-compat-1126:1.2 pgoyette-compat-1020:1.2 pgoyette-compat-0930:1.2 pgoyette-compat-0906:1.2 pgoyette-compat-0728:1.2 netbsd-8-0-RELEASE:1.2 phil-wifi:1.2.0.16 phil-wifi-base:1.2 pgoyette-compat-0625:1.2 netbsd-8-0-RC2:1.2 pgoyette-compat-0521:1.2 pgoyette-compat-0502:1.2 pgoyette-compat-0422:1.2 netbsd-8-0-RC1:1.2 pgoyette-compat-0415:1.2 pgoyette-compat-0407:1.2 pgoyette-compat-0330:1.2 pgoyette-compat-0322:1.2 pgoyette-compat-0315:1.2 pgoyette-compat:1.2.0.14 pgoyette-compat-base:1.2 matt-nb8-mediatek:1.2.0.12 matt-nb8-mediatek-base:1.2 perseant-stdc-iso10646:1.2.0.10 perseant-stdc-iso10646-base:1.2 netbsd-8:1.2.0.8 netbsd-8-base:1.2 prg-localcount2-base3:1.2 prg-localcount2-base2:1.2 prg-localcount2-base1:1.2 prg-localcount2:1.2.0.6 prg-localcount2-base:1.2 pgoyette-localcount-20170426:1.2 bouyer-socketcan-base1:1.2 pgoyette-localcount-20170320:1.2 bouyer-socketcan:1.2.0.4 bouyer-socketcan-base:1.2 pgoyette-localcount-20170107:1.2 pgoyette-localcount-20161104:1.2 pgoyette-localcount:1.2.0.2 localcount-20160914:1.2; locks; strict; comment @# @; 1.4 date 2022.07.15.04.18.56; author mrg; state Exp; branches; next 1.3; commitid o4A4jy8xMVZZEWLD; 1.3 date 2018.12.31.11.14.06; author mrg; state Exp; branches; next 1.2; commitid TUVjjF1MdjrmtW5B; 1.2 date 2016.08.14.00.03.58; author mrg; state Exp; branches 1.2.2.1 1.2.14.1 1.2.16.1; next 1.1; commitid GTnYSwjk1lG4Iciz; 1.1 date 2016.08.12.01.15.51; author mrg; state Exp; branches; next ; commitid 5GiziC5fk8bIaXhz; 1.2.2.1 date 2016.08.14.00.03.58; author pgoyette; state dead; branches; next 1.2.2.2; commitid 0FvUzdNwg07UHcmz; 1.2.2.2 date 2016.09.14.03.04.16; author pgoyette; state Exp; branches; next ; commitid 0FvUzdNwg07UHcmz; 1.2.14.1 date 2019.01.18.08.49.08; author pgoyette; state Exp; branches; next ; commitid Lmlzg3OVT2cd6f8B; 1.2.16.1 date 2019.06.10.22.02.50; author christos; state Exp; branches; next ; commitid jtc8rnCzWiEEHGqB; desc @@ 1.4 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.3 2018/12/31 11:14:06 mrg Exp $ .include "../Makefile.serverlib" .include "../Makefile.servermod" LIB= present .PATH: ${X11SRCDIR.xorg-server}/present SRCS= present.c \ present_event.c \ present_execute.c \ present_fake.c \ present_fence.c \ present_notify.c \ present_request.c \ present_scmd.c \ present_screen.c \ present_vblank.c CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/xorg \ -I${DESTDIR}${X11INCDIR}/pixman-1 \ -I${X11SRCDIR.xorg-server}/Xext \ -I${X11SRCDIR.xorg-server}/miext/sync \ -I${X11SRCDIR.xorg-server}/xfixes \ -I${X11SRCDIR.xorg-server}/Xi \ -I${X11SRCDIR.xorg-server}/../include CPPFLAGS+= ${X11FLAGS.DIX} .include .include @ 1.3 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.2 2016/08/14 00:03:58 mrg Exp $ d18 1 a18 2 present_vblank.c \ present_wnmd.c @ 1.2 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.1 2016/08/12 01:15:51 mrg Exp $ d11 1 d16 5 a20 1 present_screen.c @ 1.2.16.1 log @Sync with HEAD @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.3 2018/12/31 11:14:06 mrg Exp $ a10 1 present_execute.c \ d15 1 a15 5 present_scmd.c \ present_screen.c \ present_vblank.c \ present_wnmd.c @ 1.2.14.1 log @Synch with HEAD @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.2 2016/08/14 00:03:58 mrg Exp $ a10 1 present_execute.c \ d15 1 a15 5 present_scmd.c \ present_screen.c \ present_vblank.c \ present_wnmd.c @ 1.2.2.1 log @file Makefile was added on branch pgoyette-localcount on 2016-09-14 03:04:16 +0000 @ text @d1 27 @ 1.2.2.2 log @Sync with HEAD @ text @a0 27 # $NetBSD: Makefile,v 1.2 2016/08/14 00:03:58 mrg Exp $ .include "../Makefile.serverlib" .include "../Makefile.servermod" LIB= present .PATH: ${X11SRCDIR.xorg-server}/present SRCS= present.c \ present_event.c \ present_fake.c \ present_fence.c \ present_notify.c \ present_request.c \ present_screen.c CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/xorg \ -I${DESTDIR}${X11INCDIR}/pixman-1 \ -I${X11SRCDIR.xorg-server}/Xext \ -I${X11SRCDIR.xorg-server}/miext/sync \ -I${X11SRCDIR.xorg-server}/xfixes \ -I${X11SRCDIR.xorg-server}/Xi \ -I${X11SRCDIR.xorg-server}/../include CPPFLAGS+= ${X11FLAGS.DIX} .include .include @ 1.1 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$ d18 5 @