head 1.11; access; symbols netbsd-11-0-RC4:1.11 netbsd-11-0-RC3:1.11 netbsd-11-0-RC2:1.11 netbsd-11-0-RC1:1.11 perseant-exfatfs-base-20250801:1.11 netbsd-11:1.11.0.6 netbsd-11-base:1.11 netbsd-10-1-RELEASE:1.11 perseant-exfatfs-base-20240630:1.11 perseant-exfatfs:1.11.0.4 perseant-exfatfs-base:1.11 netbsd-8-3-RELEASE:1.9 netbsd-9-4-RELEASE:1.10 netbsd-10-0-RELEASE:1.11 netbsd-10-0-RC6:1.11 netbsd-10-0-RC5:1.11 netbsd-10-0-RC4:1.11 netbsd-10-0-RC3:1.11 netbsd-10-0-RC2:1.11 netbsd-10-0-RC1:1.11 netbsd-10:1.11.0.2 netbsd-10-base:1.11 netbsd-9-3-RELEASE:1.10 cjep_sun2x-base1:1.10 cjep_sun2x:1.10.0.8 cjep_sun2x-base:1.10 cjep_staticlib_x-base1:1.10 netbsd-9-2-RELEASE:1.10 cjep_staticlib_x:1.10.0.6 cjep_staticlib_x-base:1.10 netbsd-9-1-RELEASE:1.10 phil-wifi-20200421:1.10 phil-wifi-20200411:1.10 is-mlppp:1.10.0.4 is-mlppp-base:1.10 phil-wifi-20200406:1.10 netbsd-8-2-RELEASE:1.9 netbsd-9-0-RELEASE:1.10 netbsd-9-0-RC2:1.10 netbsd-9-0-RC1:1.10 phil-wifi-20191119:1.10 netbsd-9:1.10.0.2 netbsd-9-base:1.10 phil-wifi-20190609:1.10 netbsd-8-1-RELEASE:1.9 netbsd-8-1-RC1:1.9 pgoyette-compat-merge-20190127:1.9.14.1 pgoyette-compat-20190127:1.10 pgoyette-compat-20190118:1.10 pgoyette-compat-1226:1.9 pgoyette-compat-1126:1.9 pgoyette-compat-1020:1.9 pgoyette-compat-0930:1.9 pgoyette-compat-0906:1.9 netbsd-7-2-RELEASE:1.8 pgoyette-compat-0728:1.9 netbsd-8-0-RELEASE:1.9 phil-wifi:1.9.0.16 phil-wifi-base:1.9 pgoyette-compat-0625:1.9 netbsd-8-0-RC2:1.9 pgoyette-compat-0521:1.9 pgoyette-compat-0502:1.9 pgoyette-compat-0422:1.9 netbsd-8-0-RC1:1.9 pgoyette-compat-0415:1.9 pgoyette-compat-0407:1.9 pgoyette-compat-0330:1.9 pgoyette-compat-0322:1.9 pgoyette-compat-0315:1.9 netbsd-7-1-2-RELEASE:1.8 pgoyette-compat:1.9.0.14 pgoyette-compat-base:1.9 netbsd-7-1-1-RELEASE:1.8 matt-nb8-mediatek:1.9.0.12 matt-nb8-mediatek-base:1.9 perseant-stdc-iso10646:1.9.0.10 perseant-stdc-iso10646-base:1.9 netbsd-8:1.9.0.8 netbsd-8-base:1.9 prg-localcount2-base3:1.9 prg-localcount2-base2:1.9 prg-localcount2-base1:1.9 prg-localcount2:1.9.0.6 prg-localcount2-base:1.9 pgoyette-localcount-20170426:1.9 bouyer-socketcan-base1:1.9 pgoyette-localcount-20170320:1.9 netbsd-7-1:1.8.0.26 netbsd-7-1-RELEASE:1.8 netbsd-7-1-RC2:1.8 netbsd-7-nhusb-base-20170116:1.8 bouyer-socketcan:1.9.0.4 bouyer-socketcan-base:1.9 pgoyette-localcount-20170107:1.9 netbsd-7-1-RC1:1.8 pgoyette-localcount-20161104:1.9 netbsd-7-0-2-RELEASE:1.8 localcount-20160914:1.9 netbsd-7-nhusb:1.8.0.24 netbsd-7-nhusb-base:1.8 pgoyette-localcount-20160806:1.9 pgoyette-localcount-20160726:1.9 pgoyette-localcount:1.9.0.2 pgoyette-localcount-base:1.9 netbsd-7-0-1-RELEASE:1.8 netbsd-7-0:1.8.0.22 netbsd-7-0-RELEASE:1.8 netbsd-7-0-RC3:1.8 netbsd-7-0-RC2:1.8 netbsd-7-0-RC1:1.8 netbsd-5-2-3-RELEASE:1.3.8.1 netbsd-5-1-5-RELEASE:1.3.8.1 netbsd-6-0-6-RELEASE:1.8 netbsd-6-1-5-RELEASE:1.8 netbsd-7:1.8.0.20 netbsd-7-base:1.8 yamt-pagecache-base9:1.8 yamt-pagecache-tag8:1.8 netbsd-6-1-4-RELEASE:1.8 netbsd-6-0-5-RELEASE:1.8 tls-earlyentropy:1.8.0.18 tls-earlyentropy-base:1.8 riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.8 riastradh-drm2-base3:1.8 netbsd-6-1-3-RELEASE:1.8 netbsd-6-0-4-RELEASE:1.8 netbsd-5-2-2-RELEASE:1.3.8.1 netbsd-5-1-4-RELEASE:1.3.8.1 netbsd-6-1-2-RELEASE:1.8 netbsd-6-0-3-RELEASE:1.8 netbsd-5-2-1-RELEASE:1.3.8.1 netbsd-5-1-3-RELEASE:1.3.8.1 netbsd-6-1-1-RELEASE:1.8 riastradh-drm2-base2:1.8 riastradh-drm2-base1:1.8 riastradh-drm2:1.8.0.12 riastradh-drm2-base:1.8 netbsd-6-1:1.8.0.16 netbsd-6-0-2-RELEASE:1.8 netbsd-6-1-RELEASE:1.8 netbsd-6-1-RC4:1.8 netbsd-6-1-RC3:1.8 agc-symver:1.8.0.14 agc-symver-base:1.8 netbsd-6-1-RC2:1.8 netbsd-6-1-RC1:1.8 yamt-pagecache-base8:1.8 netbsd-5-2:1.3.8.1.0.6 netbsd-6-0-1-RELEASE:1.8 yamt-pagecache-base7:1.8 netbsd-5-2-RELEASE:1.3.8.1 netbsd-5-2-RC1:1.3.8.1 matt-nb6-plus-nbase:1.8 yamt-pagecache-base6:1.8 netbsd-6-0:1.8.0.10 netbsd-6-0-RELEASE:1.8 netbsd-6-0-RC2:1.8 tls-maxphys:1.8.0.8 tls-maxphys-base:1.8 matt-nb6-plus:1.8.0.6 matt-nb6-plus-base:1.8 netbsd-6-0-RC1:1.8 yamt-pagecache-base5:1.8 yamt-pagecache-base4:1.8 netbsd-6:1.8.0.4 netbsd-6-base:1.8 netbsd-5-1-2-RELEASE:1.3.8.1 netbsd-5-1-1-RELEASE:1.3.8.1 yamt-pagecache-base3:1.8 yamt-pagecache-base2:1.8 yamt-pagecache:1.8.0.2 yamt-pagecache-base:1.8 cherry-xenmp:1.7.0.4 cherry-xenmp-base:1.7 bouyer-quota2-nbase:1.7 bouyer-quota2:1.7.0.2 bouyer-quota2-base:1.7 matt-mips64-premerge-20101231:1.6 matt-nb5-mips64-premerge-20101231:1.3.14.1 matt-nb5-pq3:1.3.8.1.0.4 matt-nb5-pq3-base:1.3.8.1 pre-xorg-192:1.5 netbsd-5-1:1.3.8.1.0.2 netbsd-5-1-RELEASE:1.3.8.1 netbsd-5-1-RC4:1.3.8.1 matt-nb5-mips64-k15:1.3.14.1 netbsd-5-1-RC3:1.3.8.1 netbsd-5-1-RC2:1.3.8.1 netbsd-5-1-RC1:1.3.8.1 netbsd-5-0-2-RELEASE:1.3 matt-nb5-mips64-premerge-20091211:1.3 matt-premerge-20091211:1.5 matt-nb5-mips64-u2-k2-k4-k7-k8-k9:1.3 matt-nb4-mips64-k7-u2a-k9b:1.3 matt-nb5-mips64-u1-k1-k5:1.3 matt-nb5-mips64:1.3.0.14 netbsd-5-0-1-RELEASE:1.3 jym-xensuspend-nbase:1.3 netbsd-5-0:1.3.0.12 netbsd-5-0-RELEASE:1.3 netbsd-5-0-RC4:1.3 netbsd-5-0-RC3:1.3 netbsd-5-0-RC2:1.3 jym-xensuspend:1.3.0.10 jym-xensuspend-base:1.3 netbsd-5-0-RC1:1.3 haad-dm-base:1.3 haad-dm-base2:1.3 haad-nbase2:1.3 netbsd-5:1.3.0.8 netbsd-5-base:1.3 matt-mips64-base2:1.3 haad-dm:1.3.0.6 haad-dm-base1:1.3 wrstuden-revivesa-base-3:1.3 wrstuden-revivesa:1.3.0.2 wrstuden-revivesa-base-2:1.3; locks; strict; comment @# @; 1.11 date 2022.07.15.04.18.55; author mrg; state Exp; branches; next 1.10; commitid o4A4jy8xMVZZEWLD; 1.10 date 2018.12.31.21.38.53; author mrg; state Exp; branches; next 1.9; commitid VNgzUk9hKupDWZ5B; 1.9 date 2015.07.29.19.03.15; author christos; state Exp; branches 1.9.14.1 1.9.16.1; next 1.8; commitid tDrr2kkLJq7thdvy; 1.8 date 2011.08.11.23.15.41; author joerg; state Exp; branches; next 1.7; 1.7 date 2011.01.06.03.29.12; author macallan; state Exp; branches; next 1.6; 1.6 date 2010.11.25.16.02.02; author mrg; state Exp; branches; next 1.5; 1.5 date 2009.06.12.01.59.06; author mrg; state Exp; branches; next 1.4; 1.4 date 2009.06.11.05.43.17; author mrg; state Exp; branches; next 1.3; 1.3 date 2008.08.24.13.47.05; author rtr; state Exp; branches 1.3.2.1 1.3.6.1 1.3.8.1 1.3.14.1; next 1.2; 1.2 date 2008.08.15.15.55.06; author rtr; state Exp; branches; next 1.1; 1.1 date 2008.08.05.05.58.52; author mrg; state Exp; branches; next ; 1.9.14.1 date 2019.01.18.08.49.07; author pgoyette; state Exp; branches; next ; commitid Lmlzg3OVT2cd6f8B; 1.9.16.1 date 2019.06.10.22.02.48; author christos; state Exp; branches; next ; commitid jtc8rnCzWiEEHGqB; 1.3.2.1 date 2008.08.24.13.47.05; author wrstuden; state dead; branches; next 1.3.2.2; 1.3.2.2 date 2008.09.18.05.18.46; author wrstuden; state Exp; branches; next ; 1.3.6.1 date 2008.08.24.13.47.05; author haad; state dead; branches; next 1.3.6.2; 1.3.6.2 date 2008.10.19.22.41.20; author haad; state Exp; branches; next ; 1.3.8.1 date 2009.09.17.04.24.40; author snj; state Exp; branches; next ; 1.3.14.1 date 2010.04.21.05.24.45; author matt; state Exp; branches; next ; desc @@ 1.11 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.10 2018/12/31 21:38:53 mrg Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules .include "../../../Makefile.serverlib" .include "../../../Makefile.servermod" LIB= int10 .PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/int10 SRCS= x86emu.c generic.c xf86x86emu.c xf86int10.c helper_mem.c \ helper_exec.c xf86int10module.c vbe.c vbeModes.c CPPFLAGS+= -D__DRIVER__ -DFORCE_POST -D_CEXPORT= -DNO_LONG_LONG \ -D_X86EMU .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" CPPFLAGS+= -D_PC .endif # do not muck around in IO space trying to enable / disable non-PCI VGAs .if ${MACHINE} == "macppc" || ${MACHINE} == "sparc64" CPPFLAGS+= -DNO_LEGACY_VGA .endif CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/common \ -I${X11SRCDIR.xorg-server}/hw/xfree86/os-support \ -I${X11SRCDIR.xorg-server}/hw/xfree86/os-support/bus \ -I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \ -I${X11SRCDIR.xorg-server}/hw/xfree86/x86emu \ -I${X11SRCDIR.xorg-server}/hw/xfree86/ddc \ -I${X11SRCDIR.xorg-server}/hw/xfree86/modes \ -I${X11SRCDIR.xorg-server}/hw/xfree86/i2c \ -I${X11SRCDIR.xorg-server}/hw/xfree86/parser \ -I${X11SRCDIR.xorg-server}/Xext \ -I${X11SRCDIR.xorg-server}/include \ -I${DESTDIR}${X11INCDIR}/X11 \ -I${DESTDIR}${X11INCDIR}/X11/extensions \ -I${DESTDIR}${X11INCDIR}/xorg \ -I${DESTDIR}${X11INCDIR}/pixman-1 \ -I${X11SRCDIR.xorg-server}/../include COPTS.xf86x86emu.c= -Wno-error # XXX? CWARNFLAGS.clang+= -Wno-format .include LIBDIR= ${XMODULEDIR} .include @ 1.10 log @find all headers. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.9 2015/07/29 19:03:15 christos Exp $ d12 1 a12 1 helper_exec.c xf86int10module.c d31 4 @ 1.9 log @Don't use NO_SYS_HEADERS because is not included when you do that before the typedefs in /usr/xsrc/external/mit/xorg-server/dist/hw/\ xfree86/x86emu/x86emu/types.h, and then some source files include leading to uint redefinitions. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.8 2011/08/11 23:15:41 joerg Exp $ d36 2 a37 1 -I${DESTDIR}${X11INCDIR}/pixman-1 @ 1.9.16.1 log @Sync with HEAD @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.10 2018/12/31 21:38:53 mrg Exp $ d36 1 a36 2 -I${DESTDIR}${X11INCDIR}/pixman-1 \ -I${X11SRCDIR.xorg-server}/../include @ 1.9.14.1 log @Synch with HEAD @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.9 2015/07/29 19:03:15 christos Exp $ d36 1 a36 2 -I${DESTDIR}${X11INCDIR}/pixman-1 \ -I${X11SRCDIR.xorg-server}/../include @ 1.8 log @Various warning adjustments for clang @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.7 2011/01/06 03:29:12 macallan Exp $ d15 1 a15 1 -D_X86EMU -DNO_SYS_HEADERS @ 1.7 log @define NO_LEGACY_VGA on macppc and sparc64 May be necessary on other ports as well that have PCI but never use VGA text mode. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.6 2010/11/25 16:02:02 mrg Exp $ d40 2 @ 1.6 log @avoid i386 compile errors due to CARD32 lossage. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.5 2009/06/12 01:59:06 mrg Exp $ d21 5 @ 1.5 log @build updates for xorg-server 1.6. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.4 2009/06/11 05:43:17 mrg Exp $ d33 2 @ 1.4 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.3 2008/08/24 13:47:05 rtr Exp $ d23 1 d26 1 @ 1.3 log @use XORG_VERSION_CURRENT defined in Makefile.serverlib instead of defining it all over the shop @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.2 2008/08/15 15:55:06 rtr Exp $ d12 1 a12 1 helper_exec.c xf86int10module.c pci.c @ 1.3.14.1 log @sync to netbsd-5 @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.3.8.1 2009/09/17 04:24:40 snj Exp $ d12 1 a12 1 helper_exec.c xf86int10module.c a22 1 -I${X11SRCDIR.xorg-server}/hw/xfree86/os-support/bus \ a24 1 -I${X11SRCDIR.xorg-server}/Xext \ @ 1.3.8.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.5 2009/06/12 01:59:06 mrg Exp $ d12 1 a12 1 helper_exec.c xf86int10module.c a22 1 -I${X11SRCDIR.xorg-server}/hw/xfree86/os-support/bus \ a24 1 -I${X11SRCDIR.xorg-server}/Xext \ @ 1.3.6.1 log @file Makefile was added on branch haad-dm on 2008-10-19 22:41:20 +0000 @ text @d1 33 @ 1.3.6.2 log @Sync with HEAD. @ text @a0 33 # $NetBSD: Makefile,v 1.3 2008/08/24 13:47:05 rtr Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules .include "../../../Makefile.serverlib" .include "../../../Makefile.servermod" LIB= int10 .PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/int10 SRCS= x86emu.c generic.c xf86x86emu.c xf86int10.c helper_mem.c \ helper_exec.c xf86int10module.c pci.c CPPFLAGS+= -D__DRIVER__ -DFORCE_POST -D_CEXPORT= -DNO_LONG_LONG \ -D_X86EMU -DNO_SYS_HEADERS .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" CPPFLAGS+= -D_PC .endif CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/common \ -I${X11SRCDIR.xorg-server}/hw/xfree86/os-support \ -I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \ -I${X11SRCDIR.xorg-server}/hw/xfree86/x86emu \ -I${X11SRCDIR.xorg-server}/include \ -I${DESTDIR}${X11INCDIR}/X11 \ -I${DESTDIR}${X11INCDIR}/X11/extensions \ -I${DESTDIR}${X11INCDIR}/xorg \ -I${DESTDIR}${X11INCDIR}/pixman-1 .include LIBDIR= ${XMODULEDIR} .include @ 1.3.2.1 log @file Makefile was added on branch wrstuden-revivesa on 2008-09-18 05:18:46 +0000 @ text @d1 33 @ 1.3.2.2 log @Sync with wrstuden-revivesa-base-2. @ text @a0 33 # $NetBSD: Makefile,v 1.3 2008/08/24 13:47:05 rtr Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules .include "../../../Makefile.serverlib" .include "../../../Makefile.servermod" LIB= int10 .PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/int10 SRCS= x86emu.c generic.c xf86x86emu.c xf86int10.c helper_mem.c \ helper_exec.c xf86int10module.c pci.c CPPFLAGS+= -D__DRIVER__ -DFORCE_POST -D_CEXPORT= -DNO_LONG_LONG \ -D_X86EMU -DNO_SYS_HEADERS .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" CPPFLAGS+= -D_PC .endif CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/common \ -I${X11SRCDIR.xorg-server}/hw/xfree86/os-support \ -I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \ -I${X11SRCDIR.xorg-server}/hw/xfree86/x86emu \ -I${X11SRCDIR.xorg-server}/include \ -I${DESTDIR}${X11INCDIR}/X11 \ -I${DESTDIR}${X11INCDIR}/X11/extensions \ -I${DESTDIR}${X11INCDIR}/xorg \ -I${DESTDIR}${X11INCDIR}/pixman-1 .include LIBDIR= ${XMODULEDIR} .include @ 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/05 05:58:52 mrg Exp $ d15 1 a15 2 -D_X86EMU -DNO_SYS_HEADERS \ -DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT} @ 1.1 log @add dri, int10 & loader subdirs to hw/xfree86. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.4.2.2 2004/11/21 10:01:27 rtr Exp $ d30 1 a30 2 -I${DESTDIR}${X11INCDIR}/pixman-1 \ -I${XSERVERINCDIR} @