head 1.11; access; symbols perseant-exfatfs-base-20250801:1.11 perseant-exfatfs-base-20240630:1.11 cjep_sun2x:1.11.0.12 cjep_sun2x-base:1.11 cjep_staticlib_x-base1:1.11 cjep_staticlib_x:1.11.0.10 cjep_staticlib_x-base:1.11 phil-wifi-20200421:1.11 phil-wifi-20200411:1.11 phil-wifi-20200406:1.11 pgoyette-compat-merge-20190127:1.11 pgoyette-compat-20190127:1.11 pgoyette-compat-20190118:1.11 pgoyette-compat-1226:1.11 pgoyette-compat-1126:1.11 pgoyette-compat-1020:1.11 pgoyette-compat-0930:1.11 pgoyette-compat-0906:1.11 netbsd-7-2-RELEASE:1.10 pgoyette-compat-0728:1.11 pgoyette-compat-0625:1.11 pgoyette-compat-0521:1.11 pgoyette-compat-0502:1.11 pgoyette-compat-0422:1.11 pgoyette-compat-0415:1.11 pgoyette-compat-0407:1.11 pgoyette-compat-0330:1.11 pgoyette-compat-0322:1.11 pgoyette-compat-0315:1.11 netbsd-7-1-2-RELEASE:1.10 pgoyette-compat:1.11.0.8 pgoyette-compat-base:1.11 netbsd-7-1-1-RELEASE:1.10 prg-localcount2-base3:1.11 prg-localcount2-base2:1.11 prg-localcount2-base1:1.11 prg-localcount2:1.11.0.6 prg-localcount2-base:1.11 pgoyette-localcount-20170426:1.11 bouyer-socketcan-base1:1.11 pgoyette-localcount-20170320:1.11 netbsd-7-1:1.10.0.58 netbsd-7-1-RELEASE:1.10 netbsd-7-1-RC2:1.10 netbsd-7-nhusb-base-20170116:1.10 bouyer-socketcan:1.11.0.4 bouyer-socketcan-base:1.11 pgoyette-localcount-20170107:1.11 netbsd-7-1-RC1:1.10 pgoyette-localcount-20161104:1.11 netbsd-7-0-2-RELEASE:1.10 localcount-20160914:1.11 netbsd-7-nhusb:1.10.0.56 netbsd-7-nhusb-base:1.10 pgoyette-localcount-20160806:1.11 pgoyette-localcount-20160726:1.11 pgoyette-localcount:1.11.0.2 pgoyette-localcount-base:1.11 netbsd-7-0-1-RELEASE:1.10 netbsd-7-0:1.10.0.54 netbsd-7-0-RELEASE:1.10 netbsd-7-0-RC3:1.10 netbsd-7-0-RC2:1.10 netbsd-7-0-RC1:1.10 netbsd-5-2-3-RELEASE:1.10 netbsd-5-1-5-RELEASE:1.10 netbsd-6-0-6-RELEASE:1.10 netbsd-6-1-5-RELEASE:1.10 netbsd-7:1.10.0.52 netbsd-7-base:1.10 yamt-pagecache-base9:1.10 yamt-pagecache-tag8:1.10 netbsd-6-1-4-RELEASE:1.10 netbsd-6-0-5-RELEASE:1.10 tls-earlyentropy:1.10.0.50 tls-earlyentropy-base:1.10 riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.10 riastradh-drm2-base3:1.10 netbsd-6-1-3-RELEASE:1.10 netbsd-6-0-4-RELEASE:1.10 netbsd-5-2-2-RELEASE:1.10 netbsd-5-1-4-RELEASE:1.10 netbsd-6-1-2-RELEASE:1.10 netbsd-6-0-3-RELEASE:1.10 netbsd-5-2-1-RELEASE:1.10 netbsd-5-1-3-RELEASE:1.10 netbsd-6-1-1-RELEASE:1.10 riastradh-drm2-base2:1.10 riastradh-drm2-base1:1.10 riastradh-drm2:1.10.0.44 riastradh-drm2-base:1.10 netbsd-6-1:1.10.0.48 netbsd-6-0-2-RELEASE:1.10 netbsd-6-1-RELEASE:1.10 netbsd-6-1-RC4:1.10 netbsd-6-1-RC3:1.10 agc-symver:1.10.0.46 agc-symver-base:1.10 netbsd-6-1-RC2:1.10 netbsd-6-1-RC1:1.10 yamt-pagecache-base8:1.10 netbsd-5-2:1.10.0.42 netbsd-6-0-1-RELEASE:1.10 yamt-pagecache-base7:1.10 netbsd-5-2-RELEASE:1.10 netbsd-5-2-RC1:1.10 matt-nb6-plus-nbase:1.10 yamt-pagecache-base6:1.10 netbsd-6-0:1.10.0.40 netbsd-6-0-RELEASE:1.10 netbsd-6-0-RC2:1.10 tls-maxphys:1.10.0.38 tls-maxphys-base:1.10 matt-nb6-plus:1.10.0.36 matt-nb6-plus-base:1.10 netbsd-6-0-RC1:1.10 yamt-pagecache-base5:1.10 yamt-pagecache-base4:1.10 netbsd-6:1.10.0.34 netbsd-6-base:1.10 netbsd-5-1-2-RELEASE:1.10 netbsd-5-1-1-RELEASE:1.10 yamt-pagecache-base3:1.10 yamt-pagecache-base2:1.10 yamt-pagecache:1.10.0.32 yamt-pagecache-base:1.10 cherry-xenmp:1.10.0.30 cherry-xenmp-base:1.10 bouyer-quota2-nbase:1.10 bouyer-quota2:1.10.0.28 bouyer-quota2-base:1.10 matt-mips64-premerge-20101231:1.10 matt-nb5-mips64-premerge-20101231:1.10 matt-nb5-pq3:1.10.0.26 matt-nb5-pq3-base:1.10 netbsd-5-1:1.10.0.24 netbsd-5-1-RELEASE:1.10 netbsd-5-1-RC4:1.10 matt-nb5-mips64-k15:1.10 netbsd-5-1-RC3:1.10 netbsd-5-1-RC2:1.10 netbsd-5-1-RC1:1.10 netbsd-5-0-2-RELEASE:1.10 matt-nb5-mips64-premerge-20091211:1.10 matt-premerge-20091211:1.10 matt-nb5-mips64-u2-k2-k4-k7-k8-k9:1.10 matt-nb4-mips64-k7-u2a-k9b:1.10 matt-nb5-mips64-u1-k1-k5:1.10 matt-nb5-mips64:1.10.0.22 netbsd-5-0-1-RELEASE:1.10 jym-xensuspend-nbase:1.10 netbsd-5-0:1.10.0.20 netbsd-5-0-RELEASE:1.10 netbsd-5-0-RC4:1.10 netbsd-5-0-RC3:1.10 netbsd-5-0-RC2:1.10 jym-xensuspend:1.10.0.18 jym-xensuspend-base:1.10 netbsd-5-0-RC1:1.10 netbsd-5:1.10.0.16 netbsd-5-base:1.10 matt-mips64-base2:1.10 matt-mips64:1.10.0.14 netbsd-4-0-1-RELEASE:1.9.4.1 wrstuden-revivesa-base-3:1.10 wrstuden-revivesa-base-2:1.10 wrstuden-fixsa-newbase:1.9.4.1 wrstuden-revivesa-base-1:1.10 yamt-pf42-base4:1.10 yamt-pf42-base3:1.10 hpcarm-cleanup-nbase:1.10 yamt-pf42-baseX:1.10 yamt-pf42-base2:1.10 wrstuden-revivesa:1.10.0.12 wrstuden-revivesa-base:1.10 yamt-pf42:1.10.0.10 yamt-pf42-base:1.10 keiichi-mipv6-nbase:1.10 keiichi-mipv6:1.10.0.8 keiichi-mipv6-base:1.10 matt-armv6-nbase:1.10 matt-armv6-prevmlocking:1.10 wrstuden-fixsa-base-1:1.9.4.1 netbsd-4-0:1.9.4.1.0.2 netbsd-4-0-RELEASE:1.9.4.1 cube-autoconf:1.10.0.6 cube-autoconf-base:1.10 netbsd-4-0-RC5:1.9.4.1 netbsd-4-0-RC4:1.9.4.1 netbsd-4-0-RC3:1.9.4.1 netbsd-4-0-RC2:1.9.4.1 netbsd-4-0-RC1:1.9.4.1 matt-armv6:1.10.0.4 matt-armv6-base:1.10 matt-mips64-base:1.10 hpcarm-cleanup:1.10.0.2 hpcarm-cleanup-base:1.10 netbsd-3-1-1-RELEASE:1.7.4.2 netbsd-3-0-3-RELEASE:1.7.4.2 wrstuden-fixsa:1.9.0.6 wrstuden-fixsa-base:1.9.4.1 abandoned-netbsd-4-base:1.9 abandoned-netbsd-4:1.9.0.2 netbsd-3-1:1.7.4.2.0.4 netbsd-3-1-RELEASE:1.7.4.2 netbsd-3-0-2-RELEASE:1.7.4.2 netbsd-3-1-RC4:1.7.4.2 netbsd-3-1-RC3:1.7.4.2 netbsd-3-1-RC2:1.7.4.2 netbsd-3-1-RC1:1.7.4.2 netbsd-4:1.9.0.4 netbsd-4-base:1.9 netbsd-3-0-1-RELEASE:1.7.4.2 netbsd-3-0:1.7.4.2.0.2 netbsd-3-0-RELEASE:1.7.4.2 netbsd-3-0-RC6:1.7.4.2 netbsd-3-0-RC5:1.7.4.2 netbsd-3-0-RC4:1.7.4.2 netbsd-3-0-RC3:1.7.4.2 netbsd-3-0-RC2:1.7.4.2 netbsd-3-0-RC1:1.7.4.2 netbsd-2-0-3-RELEASE:1.5.2.1 netbsd-2-1:1.5.2.1.0.4 netbsd-2-1-RELEASE:1.5.2.1 netbsd-2-1-RC6:1.5.2.1 netbsd-2-1-RC5:1.5.2.1 netbsd-2-1-RC4:1.5.2.1 netbsd-2-1-RC3:1.5.2.1 netbsd-2-1-RC2:1.5.2.1 netbsd-2-1-RC1:1.5.2.1 netbsd-2-0-2-RELEASE:1.5.2.1 v4-5-0_beforeimport:1.7 netbsd-3:1.7.0.4 netbsd-3-base:1.7 netbsd-2-0-1-RELEASE:1.5.2.1 netbsd-2:1.5.2.1.0.2 netbsd-2-base:1.5.2.1 netbsd-2-0-RELEASE:1.5.2.1 rtr-xorg-branch:1.7.0.2 rtr-xorg-branch-base:1.7 netbsd-2-0-RC5:1.5.2.1 netbsd-2-0-RC4:1.5.2.1 netbsd-2-0-RC3:1.5.2.1 netbsd-2-0-RC2:1.5.2.1 netbsd-2-0-RC1:1.5.2.1 netbsd-2-0:1.5.0.2 netbsd-2-0-base:1.5 v4-4-0_beforeimport:1.3; locks; strict; comment @# @; 1.11 date 2015.07.23.08.03.26; author mrg; state dead; branches; next 1.10; commitid nfGa2DVpEPUUPnuy; 1.10 date 2007.04.08.09.36.35; author scw; state Exp; branches; next 1.9; 1.9 date 2005.05.14.19.27.56; author martin; state Exp; branches 1.9.4.1 1.9.6.1; next 1.8; 1.8 date 2005.03.19.21.41.58; author christos; state Exp; branches; next 1.7; 1.7 date 2004.05.14.07.21.24; author he; state Exp; branches 1.7.2.1 1.7.4.1; next 1.6; 1.6 date 2004.04.05.12.03.25; author lukem; state Exp; branches; next 1.5; 1.5 date 2004.03.07.13.50.25; author rtr; state Exp; branches 1.5.2.1; next 1.4; 1.4 date 2004.03.06.03.31.05; author rtr; state Exp; branches; next 1.3; 1.3 date 2004.02.07.06.52.04; author lukem; state Exp; branches; next 1.2; 1.2 date 2003.12.21.11.12.32; author rtr; state Exp; branches; next 1.1; 1.1 date 2003.12.21.03.07.01; author rtr; state Exp; branches; next ; 1.9.4.1 date 2007.07.19.14.38.23; author liamjfoy; state Exp; branches; next ; 1.9.6.1 date 2007.09.03.07.05.46; author wrstuden; state Exp; branches; next ; 1.7.2.1 date 2004.11.15.09.12.38; author rtr; state Exp; branches; next ; 1.7.4.1 date 2005.04.06.20.52.22; author tron; state Exp; branches; next 1.7.4.2; 1.7.4.2 date 2005.05.18.14.33.04; author tron; state Exp; branches; next ; 1.5.2.1 date 2004.05.14.07.43.58; author tron; state Exp; branches; next ; desc @@ 1.11 log @remove the xfree86 reachover makefiles and the vast majority of the support in the rest of the source tree. X11 sets could use some cleaning up perhaps (just deletion, as we've never really marked the old X11R6 as obsolete for native xorg using platforms so far either.) @ text @# $NetBSD: Makefile.GLcore,v 1.10 2007/04/08 09:36:35 scw Exp $ LIB= GLcore .PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/main .PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/glapi SRCS+= accum.c api_arrayelt.c api_loopback.c api_noop.c \ api_validate.c attrib.c blend.c buffers.c bufferobj.c clip.c \ colortab.c \ context.c convolve.c debug.c depth.c dispatch.c dlist.c \ drawpix.c enable.c enums.c eval.c extensions.c feedback.c \ fog.c get.c glapi.c glthread.c hash.c hint.c histogram.c \ image.c imports.c light.c lines.c matrix.c occlude.c pixel.c \ points.c polygon.c rastpos.c state.c stencil.c texcompress.c \ texformat.c texcompress_fxt1.c texcompress_s3tc.c teximage.c \ texobj.c texstate.c texstore.c varray.c vtxfmt.c .PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/array_cache SRCS+= ac_context.c ac_import.c .PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/math SRCS+= m_debug_clip.c m_debug_norm.c m_debug_xform.c m_eval.c \ m_matrix.c m_translate.c m_vector.c m_xform.c .PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/swrast SRCS+= s_aaline.c s_aatriangle.c s_accum.c s_alpha.c s_alphabuf.c \ s_bitmap.c s_blend.c s_buffers.c s_context.c s_copypix.c \ s_depth.c s_drawpix.c s_feedback.c s_fog.c \ s_imaging.c s_lines.c s_logic.c s_masking.c s_pixeltex.c \ s_points.c s_readpix.c s_span.c s_stencil.c s_texstore.c \ s_texture.c s_triangle.c s_zoom.c s_nvfragprog.c \ s_auxbuffer.c .PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/swrast_setup SRCS+= ss_context.c ss_triangle.c .PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/shader SRCS+= arbprogram.c nvprogram.c arbfragparse.c arbvertparse.c program.c \ nvvertexec.c nvfragparse.c arbprogparse.c grammar_mesa.c \ nvvertparse.c .PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/tnl SRCS+= t_array_api.c t_array_import.c t_context.c \ t_pipeline.c t_vb_fog.c t_vb_light.c t_vb_normals.c \ t_vb_points.c t_vb_program.c t_vb_render.c t_vb_texgen.c \ t_vb_texmat.c t_vb_vertex.c t_vtx_api.c t_vtx_generic.c \ t_vtx_eval.c t_save_api.c t_vtx_exec.c t_vertex.c t_vertex_c.c \ t_save_playback.c t_save_loopback.c .PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/drivers/x11 SRCS+= xm_api.c xm_dd.c xm_line.c xm_span.c xm_tri.c .PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/drivers/dri/common SRCS+= glcontextmodes.c .PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/drivers//common SRCS+= driverfuncs.c .PATH: ${X11SRCDIR.xc}/programs/Xserver/GL/mesa/X .PATH: ${X11SRCDIR.xc}/lib/GL/glx SRCS+= compsize.c xf86glx.c xf86glx_util.c CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 \ -I${DESTDIR}${X11INCDIR}/X11/extensions \ -I${X11SRCDIR.xc}/extras/Mesa/include \ -I${X11SRCDIR.xc}/lib/GL/glx \ -I${X11SRCDIR.xc}/lib/GL/include \ -I${X11SRCDIR.xc}/extras/Mesa/include \ -I${X11SRCDIR.xc}/extras/Mesa/src/mesa \ -I${X11SRCDIR.xc}/extras/Mesa/src/mesa/main \ -I${X11SRCDIR.xc}/extras/Mesa/src/mesa/glapi \ -I${X11SRCDIR.xc}/extras/Mesa/src/mesa/shader \ -I${X11SRCDIR.xc}/extras/Mesa/src/mesa/drivers/x11 \ -I${X11SRCDIR.xc}/extras/Mesa/src/mesa/drivers/dri/common \ -I${X11SRCDIR.xc}/programs/Xserver/include \ -I${XSERVERINCDIR} \ -I${X11SRCDIR.xc}/extras/Mesa/src/X \ -I${X11SRCDIR.xc}/programs/Xserver/GL/glx \ -I${X11SRCDIR.xc}/programs/Xserver/GL/include \ -I${X11SRCDIR.xc}/programs/Xserver/GL/mesa/X CPPFLAGS+= ${X11FLAGS.EXTENSION} -DGLXEXT -DGLX_USE_MESA .include LIBDIR= ${XMODULEDIR} .include @ 1.10 log @Remove support for NetBSD/{,evb}sh5. @ text @d1 1 a1 1 # $NetBSD: Makefile.GLcore,v 1.9 2005/05/14 19:27:56 martin Exp $ @ 1.9 log @We need ${X11FLAGS.EXTENSION} here, because it carries what xsrc calls GlxExtraDefines - and those are very important on 64 bit archs at least (-D__GLX_ALIGN64) @ text @d1 1 a1 1 # $NetBSD: Makefile.GLcore,v 1.8 2005/03/19 21:41:58 christos Exp $ a94 4 .if ${MACHINE_CPU} == "sh5" COPTS.s_triangle.c= -O0 .endif @ 1.9.6.1 log @Sync w/ NetBSD-4-RC_1 @ text @d1 1 a1 1 # $NetBSD: Makefile.GLcore,v 1.9.4.1 2007/07/19 14:38:23 liamjfoy Exp $ d95 4 @ 1.9.4.1 log @Pull up following revision(s) (requested by soren in ticket #774): build.sh: revision 1.169 gnu/usr.bin/gcc4/backend/Makefile: revision 1.9 sys/arch/evbsh5/README: revision 1.1 distrib/notes/common/contents: revision 1.124 usr.sbin/ndbootd/ndbootd.c: revision 1.12 gnu/lib/libopcodes/arch/sh3eb/defs.mk: revision 1.4 gnu/lib/libbfd/arch/sh3eb/defs.mk: revision 1.8 libexec/ld.elf_so/Makefile: revision 1.78 gnu/dist/binutils/bfd/config.bfd: revision 1.14 doc/HACKS: revision 1.93 distrib/cdrom/current.conf: revision 1.8 gnu/lib/libgcc4/Makefile.inc: revision 1.6 share/mk/sys.mk: revision 1.90 distrib/sets/lists/base/mi: revision 1.700 libexec/ld.elf_so/rtld.c: revision 1.112 distrib/sets/lists/base/mi: revision 1.702 sys/arch/sh5/README: revision 1.1 gnu/lib/libbfd/arch/sh3el/bfd.h: revision 1.7 usr.sbin/traceroute/traceroute.c: revision 1.69 distrib/notes/common/main: revision 1.330 distrib/notes/common/list-setsizes.sh: revision 1.2 sys/arch/Makefile: revision 1.35 gnu/lib/libopcodes/arch/sh3el/defs.mk: revision 1.4 gnu/lib/libbfd/arch/sh3el/defs.mk: revision 1.8 share/mk/bsd.own.mk: revision 1.495 gnu/lib/libbfd/arch/sh3eb/bfd.h: revision 1.7 x11/lib/OSmesa/Makefile: revision 1.20 sys/dev/dkwedge/dkwedge_bsdlabel.c: revision 1.13 gnu/dist/binutils/opcodes/configure.in: revision 1.2 gnu/dist/binutils/opcodes/configure: revision 1.2 gnu/usr.bin/send-pr/categories: revision 1.53 etc/mtree/NetBSD.dist: revision 1.339 sys/arch/README: revision 1.42 lib/libc/gdtoa/Makefile.inc: revision 1.6 usr.bin/crunch/crunchide/Makefile: revision 1.16 sys/lkm/net/bsdcomp/Makefile: revision 1.5 regress/sys/uvm/Makefile: revision 1.6 etc/MAKEDEV.awk: revision 1.18 x11/Xserver/GL/GLcore/Makefile.GLcore: revision 1.10 sys/contrib/dev/ath/netbsd/Makefile.ath.inc: revision 1.14 gnu/lib/libbfd/Makefile: revision 1.42 doc/RESPONSIBLE: revision 1.78 Remove evbsh5. @ text @d1 1 a1 1 # $NetBSD$ d95 4 @ 1.8 log @Adjust for the latest XFree86 import. Code now compiles, but libraries might be incomplete and sets are definitely still broken. @ text @d1 1 a1 1 # $NetBSD: Makefile.GLcore,v 1.7 2004/05/14 07:21:24 he Exp $ d93 1 a93 1 CPPFLAGS+= -DGLXEXT -DGLX_USE_MESA @ 1.7 log @Drop optmization to -O0 for sh5 for one file to work around an internal compiler error. @ text @d1 1 a1 1 # $NetBSD: Makefile.GLcore,v 1.6 2004/04/05 12:03:25 lukem Exp $ d5 5 a9 3 .PATH: ${X11SRCDIR.xc}/extras/Mesa/src SRCS+= accum.c api_arrayelt.c api_eval.c api_loopback.c api_noop.c \ api_validate.c attrib.c blend.c buffers.c clip.c colortab.c \ d13 1 a13 1 image.c imports.c light.c lines.c matrix.c mmath.c pixel.c \ d15 2 a16 3 texformat.c teximage.c texobj.c texstate.c texstore.c \ texutil.c varray.c vtxfmt.c vpexec.c vpexec.h vpparse.c \ vpstate.c d19 1 a19 1 .PATH: ${X11SRCDIR.xc}/extras/Mesa/src/array_cache d23 1 a23 1 .PATH: ${X11SRCDIR.xc}/extras/Mesa/src/math d28 1 a28 1 .PATH: ${X11SRCDIR.xc}/extras/Mesa/src/swrast d31 1 a31 1 s_depth.c s_drawpix.c s_feedback.c s_fog.c s_histogram.c \ d34 2 a35 1 s_texture.c s_triangle.c s_zoom.c d38 2 a40 2 .PATH: ${X11SRCDIR.xc}/extras/Mesa/src/swrast_setup SRCS+= ss_context.c ss_triangle.c ss_vb.c d42 4 d47 3 a49 4 .PATH: ${X11SRCDIR.xc}/extras/Mesa/src/tnl SRCS+= t_array_api.c t_array_import.c t_context.c t_eval_api.c \ t_imm_alloc.c t_imm_api.c t_imm_debug.c t_imm_dlist.c \ t_imm_elt.c t_imm_eval.c t_imm_exec.c t_imm_fixup.c \ d52 7 a58 1 t_vb_texmat.c t_vb_vertex.c d61 2 a63 2 .PATH: ${X11SRCDIR.xc}/extras/Mesa/src/X SRCS+= xm_api.c xm_dd.c xm_line.c xm_span.c xm_tri.c d65 2 d69 1 a69 1 .PATH: ${X11SRCDIR.xc}/programs/Xserver/GL/mesa/src/X d79 7 a85 1 -I${X11SRCDIR.xc}/extras/Mesa/src \ d91 1 a91 1 -I${X11SRCDIR.xc}/programs/Xserver/GL/mesa/src/X @ 1.7.4.1 log @Pull up revision 1.8 (requested by jmc in ticket #114): Adjust for the latest XFree86 import. Code now compiles, but libraries might be incomplete and sets are definitely still broken. @ text @d1 1 a1 1 # $NetBSD$ d5 3 a7 5 .PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/main .PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/glapi SRCS+= accum.c api_arrayelt.c api_loopback.c api_noop.c \ api_validate.c attrib.c blend.c buffers.c bufferobj.c clip.c \ colortab.c \ d11 1 a11 1 image.c imports.c light.c lines.c matrix.c occlude.c pixel.c \ d13 3 a15 2 texformat.c texcompress_fxt1.c texcompress_s3tc.c teximage.c \ texobj.c texstate.c texstore.c varray.c vtxfmt.c d18 1 a18 1 .PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/array_cache d22 1 a22 1 .PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/math d27 1 a27 1 .PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/swrast d30 1 a30 1 s_depth.c s_drawpix.c s_feedback.c s_fog.c \ d33 1 a33 2 s_texture.c s_triangle.c s_zoom.c s_nvfragprog.c \ s_auxbuffer.c a35 2 .PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/swrast_setup SRCS+= ss_context.c ss_triangle.c d37 2 a39 4 .PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/shader SRCS+= arbprogram.c nvprogram.c arbfragparse.c arbvertparse.c program.c \ nvvertexec.c nvfragparse.c arbprogparse.c grammar_mesa.c \ nvvertparse.c d41 4 a44 3 .PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/tnl SRCS+= t_array_api.c t_array_import.c t_context.c \ d47 2 a48 3 t_vb_texmat.c t_vb_vertex.c t_vtx_api.c t_vtx_generic.c \ t_vtx_eval.c t_save_api.c t_vtx_exec.c t_vertex.c t_vertex_c.c \ t_save_playback.c t_save_loopback.c d51 1 a51 1 .PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/drivers/x11 a54 3 .PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/drivers/dri/common SRCS+= glcontextmodes.c d56 1 a56 5 .PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/drivers//common SRCS+= driverfuncs.c .PATH: ${X11SRCDIR.xc}/programs/Xserver/GL/mesa/X d66 1 a66 7 -I${X11SRCDIR.xc}/extras/Mesa/include \ -I${X11SRCDIR.xc}/extras/Mesa/src/mesa \ -I${X11SRCDIR.xc}/extras/Mesa/src/mesa/main \ -I${X11SRCDIR.xc}/extras/Mesa/src/mesa/glapi \ -I${X11SRCDIR.xc}/extras/Mesa/src/mesa/shader \ -I${X11SRCDIR.xc}/extras/Mesa/src/mesa/drivers/x11 \ -I${X11SRCDIR.xc}/extras/Mesa/src/mesa/drivers/dri/common \ d72 1 a72 1 -I${X11SRCDIR.xc}/programs/Xserver/GL/mesa/X @ 1.7.4.2 log @Pull up revision 1.9 (requested by martin in ticket #303): We need ${X11FLAGS.EXTENSION} here, because it carries what xsrc calls GlxExtraDefines - and those are very important on 64 bit archs at least (-D__GLX_ALIGN64) @ text @d93 1 a93 1 CPPFLAGS+= ${X11FLAGS.EXTENSION} -DGLXEXT -DGLX_USE_MESA @ 1.7.2.1 log @static & xorg src/x11 build @ text @d1 1 a1 1 # $NetBSD: Makefile.GLcore,v 1.7 2004/05/14 07:21:24 he Exp $ d5 2 a6 2 .PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/main SRCS+= accum.c api_arrayelt.c api_loopback.c api_noop.c \ d10 2 a11 2 fog.c get.c glthread.c hash.c hint.c histogram.c \ image.c imports.c light.c lines.c matrix.c pixel.c \ d14 2 a15 2 varray.c vtxfmt.c occlude.c bufferobj.c s_nvfragprog.c \ texcompress_fxt1.c texcompress_s3tc.c a16 2 .PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/glapi SRCS+= glapi.c d18 2 a19 7 .PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/shader SRCS+= arbprogram.c arbvertparse.c arbprogparse.c program.c \ grammar_mesa.c arbfragparse.c nvprogram.c nvvertexec.c \ nvfragparse.c nvvertparse.c .PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/drivers/common SRCS+= driverfuncs.c a20 2 .PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/drivers/dri/common SRCS+= glcontextmodes.c d22 1 a22 4 .PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/array_cache SRCS+= ac_context.c ac_import.c .PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/math d26 2 a27 1 .PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/swrast d30 4 a33 4 s_depth.c s_drawpix.c s_feedback.c s_fog.c s_imaging.c \ s_lines.c s_logic.c s_masking.c s_pixeltex.c s_points.c \ s_readpix.c s_span.c s_stencil.c s_texstore.c s_texture.c \ s_triangle.c s_zoom.c s_auxbuffer.c a34 2 .PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/swrast_setup SRCS+= ss_context.c ss_triangle.c d36 9 a44 2 .PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/tnl SRCS+= t_array_api.c t_array_import.c t_context.c \ d47 3 a49 3 t_vb_texmat.c t_vb_vertex.c t_save_api.c t_save_playback.c \ t_save_loopback.c t_vtx_exec.c t_vtx_api.c t_vtx_generic.c \ t_vtx_eval.c t_vertex.c t_vertex_c.c d52 1 a52 1 SRCS+= xm_dd.c xm_line.c xm_span.c xm_tri.c a53 2 .PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/drivers/x11 SRCS+= xm_api.c a54 2 .PATH: ${X11SRCDIR.xc}/programs/Xserver/GL/mesa/X SRCS+= xf86glx.c d56 1 d58 1 a58 1 SRCS+= compsize.c xf86glx_util.c d72 1 a72 8 -I${X11SRCDIR.xc}/programs/Xserver/GL/mesa/src/X \ -I${X11SRCDIR.xc}/extras/Mesa/src/mesa/main \ -I${X11SRCDIR.xc}/extras/Mesa/src/mesa/glapi \ -I${X11SRCDIR.xc}/extras/Mesa/src/mesa \ -I${X11SRCDIR.xc}/extras/Mesa/src/mesa/shader \ -I${X11SRCDIR.xc}/extras/Mesa/src/mesa/drivers/x11 \ -I${X11SRCDIR.xc}/extras/Mesa/src/mesa/drivers/dri/common \ -I${X11SRCDIR.xc}/programs/Xserver/GL/mesa/X d74 1 a74 2 CPPFLAGS+= -DGLXEXT -DGLX_USE_MESA -DXFIXES -DDAMAGE -DCOMPOSITE \ -DXEVIE -DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT} @ 1.6 log @Add -I${X11SRCDIR.xc}/lib/xtrans, -I${X11SRCDIR.xc}/lib/GL/glx, (etc) as appropriate. Based on fix from Hubert Feyrer, cross-checked with the native Imakefiles. @ text @d1 1 a1 1 # $NetBSD: Makefile.GLcore,v 1.5 2004/03/07 13:50:25 rtr Exp $ d76 4 @ 1.5 log @remove commented out directives not needed @ text @d1 1 a1 1 # $NetBSD: Makefile.GLcore,v 1.4 2004/03/06 03:31:05 rtr Exp $ d64 1 @ 1.5.2.1 log @Pull up revision 1.7 (requested by he in ticket #332): Drop optmization to -O0 for sh5 for one file to work around an internal compiler error. @ text @d1 1 a1 1 # $NetBSD$ a74 4 .if ${MACHINE_CPU} == "sh5" COPTS.s_triangle.c= -O0 .endif @ 1.4 log @+ update reachover Xserver/* for xf4.4 @ text @d1 1 a1 1 # $NetBSD: Makefile.GLcore,v 1.3 2004/02/07 06:52:04 lukem Exp $ d17 1 a48 5 #.if ${MACHINE} == "i386" #.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/X86 #SRCS+= common_x86.c common_x86_asm.S glapi_x86.S x86.c \ # x86_cliptest.S x86_xform2.S x86_xform3.S x86_xform4.S #.endif d54 2 a55 3 #.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/X #.PATH: ${X11SRCDIR.xc}/programs/Xserver/GL/mesa/src/X #.PATH: ${X11SRCDIR.xc}/lib/GL/glx d60 1 @ 1.3 log @Cache XSERVERLIB determination in Makefile.serverlib rather than in 111 separate places. Speeds up empty "cleandir" from 27.17s to 13.75s. @ text @d1 1 a1 1 # $NetBSD: Makefile.GLcore,v 1.2 2003/12/21 11:12:32 rtr Exp $ d3 1 a3 1 LIB= GLcore d5 59 a63 46 .PATH: ${X11SRCDIR.xc}/extras/Mesa/src SRCS+= accum.c api_arrayelt.c api_eval.c api_loopback.c \ api_noop.c api_validate.c attrib.c blend.c buffers.c \ clip.c colortab.c config.c context.c convolve.c \ debug.c depth.c dispatch.c dlist.c drawpix.c enable.c \ enums.c eval.c extensions.c feedback.c fog.c get.c \ glapi.c glthread.c hash.c hint.c histogram.c image.c \ imports.c light.c lines.c matrix.c mem.c mmath.c \ pixel.c points.c polygon.c rastpos.c state.c \ stencil.c texformat.c teximage.c texobj.c texstate.c \ texstore.c texutil.c varray.c vtxfmt.c .PATH: ${X11SRCDIR.xc}/extras/Mesa/src/math SRCS+= m_debug_clip.c m_debug_norm.c m_debug_xform.c \ m_debug_vertex.c m_eval.c m_matrix.c m_translate.c \ m_vector.c m_vertices.c m_xform.c .PATH: ${X11SRCDIR.xc}/extras/Mesa/src/array_cache SRCS+= ac_context.c ac_import.c .PATH: ${X11SRCDIR.xc}/extras/Mesa/src/swrast SRCS+= s_aaline.c s_aatriangle.c s_accum.c s_alpha.c \ s_alphabuf.c s_bitmap.c s_blend.c s_buffers.c \ s_context.c s_copypix.c s_depth.c s_drawpix.c \ s_feedback.c s_fog.c s_histogram.c s_imaging.c \ s_lines.c s_logic.c s_masking.c s_pb.c s_pixeltex.c \ s_points.c s_readpix.c s_scissor.c s_span.c \ s_stencil.c s_texstore.c s_texture.c s_triangle.c \ s_zoom.c .PATH: ${X11SRCDIR.xc}/extras/Mesa/src/swrast_setup SRCS+= ss_context.c ss_triangle.c ss_vb.c .PATH: ${X11SRCDIR.xc}/extras/Mesa/src/tnl SRCS+= t_array_api.c t_array_import.c t_context.c t_eval_api.c \ t_imm_alloc.c t_imm_api.c t_imm_debug.c t_imm_dlist.c \ t_imm_elt.c t_imm_eval.c t_imm_exec.c t_imm_fixup.c \ t_pipeline.c t_vb_fog.c t_vb_light.c t_vb_normals.c \ t_vb_points.c t_vb_render.c t_vb_texgen.c t_vb_texmat.c \ t_vb_vertex.c .PATH: ${X11SRCDIR.xc}/extras/Mesa/src/X .PATH: ${X11SRCDIR.xc}/programs/Xserver/GL/mesa/src/X .PATH: ${X11SRCDIR.xc}/lib/GL/glx SRCS+= compsize.c xf86glx.c xf86glx_util.c xm_api.c xm_dd.c \ xm_line.c xm_span.c xm_tri.c @ 1.2 log @GLcoremodule.c is used for module only. @ text @d1 1 a1 3 # $NetBSD: Makefile.GLcore,v 1.1 2003/12/21 03:07:01 rtr Exp $ .include a51 2 XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} @ 1.1 log @Separate loadable modules Don't build or install modules for non-loadable xservers @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.3 2003/12/19 15:23:43 rtr Exp $ a53 3 .PATH: ${X11SRCDIR.xc}/programs/Xserver/GL/mesa/GLcore SRCS+= GLcoremodule.c @