head	1.7;
access;
symbols
	perseant-exfatfs-base-20250801:1.7
	perseant-exfatfs-base-20240630:1.7
	perseant-exfatfs:1.7.0.16
	perseant-exfatfs-base:1.7
	cjep_sun2x:1.7.0.14
	cjep_sun2x-base:1.7
	cjep_staticlib_x-base1:1.7
	cjep_staticlib_x:1.7.0.12
	cjep_staticlib_x-base:1.7
	phil-wifi-20200421:1.7
	phil-wifi-20200411:1.7
	phil-wifi-20200406:1.7
	pgoyette-compat-merge-20190127:1.7
	pgoyette-compat-20190127:1.7
	pgoyette-compat-20190118:1.7
	pgoyette-compat-1226:1.7
	pgoyette-compat-1126:1.7
	pgoyette-compat-1020:1.7
	pgoyette-compat-0930:1.7
	pgoyette-compat-0906:1.7
	netbsd-7-2-RELEASE:1.6
	pgoyette-compat-0728:1.7
	pgoyette-compat-0625:1.7
	pgoyette-compat-0521:1.7
	pgoyette-compat-0502:1.7
	pgoyette-compat-0422:1.7
	pgoyette-compat-0415:1.7
	pgoyette-compat-0407:1.7
	pgoyette-compat-0330:1.7
	pgoyette-compat-0322:1.7
	pgoyette-compat-0315:1.7
	netbsd-7-1-2-RELEASE:1.6
	pgoyette-compat:1.7.0.10
	pgoyette-compat-base:1.7
	netbsd-7-1-1-RELEASE:1.6
	perseant-stdc-iso10646:1.7.0.8
	perseant-stdc-iso10646-base:1.7
	prg-localcount2-base3:1.7
	prg-localcount2-base2:1.7
	prg-localcount2-base1:1.7
	prg-localcount2:1.7.0.6
	prg-localcount2-base:1.7
	pgoyette-localcount-20170426:1.7
	bouyer-socketcan-base1:1.7
	pgoyette-localcount-20170320:1.7
	netbsd-7-1:1.6.0.30
	netbsd-7-1-RELEASE:1.6
	netbsd-7-1-RC2:1.6
	netbsd-7-nhusb-base-20170116:1.6
	bouyer-socketcan:1.7.0.4
	bouyer-socketcan-base:1.7
	pgoyette-localcount-20170107:1.7
	netbsd-7-1-RC1:1.6
	pgoyette-localcount-20161104:1.7
	netbsd-7-0-2-RELEASE:1.6
	localcount-20160914:1.7
	netbsd-7-nhusb:1.6.0.28
	netbsd-7-nhusb-base:1.6
	pgoyette-localcount-20160806:1.7
	pgoyette-localcount-20160726:1.7
	pgoyette-localcount:1.7.0.2
	pgoyette-localcount-base:1.7
	netbsd-7-0-1-RELEASE:1.6
	netbsd-7-0:1.6.0.26
	netbsd-7-0-RELEASE:1.6
	netbsd-7-0-RC3:1.6
	netbsd-7-0-RC2:1.6
	netbsd-7-0-RC1:1.6
	netbsd-5-2-3-RELEASE:1.4.6.1
	netbsd-5-1-5-RELEASE:1.4.6.1
	netbsd-6-0-6-RELEASE:1.6
	netbsd-6-1-5-RELEASE:1.6
	netbsd-7:1.6.0.24
	netbsd-7-base:1.6
	yamt-pagecache-base9:1.6
	yamt-pagecache-tag8:1.6
	netbsd-6-1-4-RELEASE:1.6
	netbsd-6-0-5-RELEASE:1.6
	tls-earlyentropy:1.6.0.22
	tls-earlyentropy-base:1.6
	riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.6
	riastradh-drm2-base3:1.6
	netbsd-6-1-3-RELEASE:1.6
	netbsd-6-0-4-RELEASE:1.6
	netbsd-5-2-2-RELEASE:1.4.6.1
	netbsd-5-1-4-RELEASE:1.4.6.1
	netbsd-6-1-2-RELEASE:1.6
	netbsd-6-0-3-RELEASE:1.6
	netbsd-5-2-1-RELEASE:1.4.6.1
	netbsd-5-1-3-RELEASE:1.4.6.1
	netbsd-6-1-1-RELEASE:1.6
	riastradh-drm2-base2:1.6
	riastradh-drm2-base1:1.6
	riastradh-drm2:1.6.0.16
	riastradh-drm2-base:1.6
	netbsd-6-1:1.6.0.20
	netbsd-6-0-2-RELEASE:1.6
	netbsd-6-1-RELEASE:1.6
	netbsd-6-1-RC4:1.6
	netbsd-6-1-RC3:1.6
	agc-symver:1.6.0.18
	agc-symver-base:1.6
	netbsd-6-1-RC2:1.6
	netbsd-6-1-RC1:1.6
	yamt-pagecache-base8:1.6
	netbsd-5-2:1.4.6.1.0.6
	netbsd-6-0-1-RELEASE:1.6
	yamt-pagecache-base7:1.6
	netbsd-5-2-RELEASE:1.4.6.1
	netbsd-5-2-RC1:1.4.6.1
	matt-nb6-plus-nbase:1.6
	yamt-pagecache-base6:1.6
	netbsd-6-0:1.6.0.14
	netbsd-6-0-RELEASE:1.6
	netbsd-6-0-RC2:1.6
	tls-maxphys:1.6.0.12
	tls-maxphys-base:1.6
	matt-nb6-plus:1.6.0.10
	matt-nb6-plus-base:1.6
	netbsd-6-0-RC1:1.6
	yamt-pagecache-base5:1.6
	yamt-pagecache-base4:1.6
	netbsd-6:1.6.0.8
	netbsd-6-base:1.6
	netbsd-5-1-2-RELEASE:1.4.6.1
	netbsd-5-1-1-RELEASE:1.4.6.1
	yamt-pagecache-base3:1.6
	yamt-pagecache-base2:1.6
	yamt-pagecache:1.6.0.6
	yamt-pagecache-base:1.6
	cherry-xenmp:1.6.0.4
	cherry-xenmp-base:1.6
	bouyer-quota2-nbase:1.6
	bouyer-quota2:1.6.0.2
	bouyer-quota2-base:1.6
	matt-mips64-premerge-20101231:1.6
	matt-nb5-mips64-premerge-20101231:1.4.12.1
	matt-nb5-pq3:1.4.6.1.0.4
	matt-nb5-pq3-base:1.4.6.1
	pre-xorg-192:1.6
	netbsd-5-1:1.4.6.1.0.2
	netbsd-5-1-RELEASE:1.4.6.1
	netbsd-5-1-RC4:1.4.6.1
	matt-nb5-mips64-k15:1.4.12.1
	netbsd-5-1-RC3:1.4.6.1
	netbsd-5-1-RC2:1.4.6.1
	netbsd-5-1-RC1:1.4.6.1
	netbsd-5-0-2-RELEASE:1.4
	matt-nb5-mips64-premerge-20091211:1.4
	matt-premerge-20091211:1.5
	matt-nb5-mips64-u2-k2-k4-k7-k8-k9:1.4
	matt-nb4-mips64-k7-u2a-k9b:1.4
	matt-nb5-mips64-u1-k1-k5:1.4
	matt-nb5-mips64:1.4.0.12
	netbsd-5-0-1-RELEASE:1.4
	jym-xensuspend-nbase:1.4
	netbsd-5-0:1.4.0.10
	netbsd-5-0-RELEASE:1.4
	netbsd-5-0-RC4:1.4
	netbsd-5-0-RC3:1.4
	netbsd-5-0-RC2:1.4
	jym-xensuspend:1.4.0.8
	jym-xensuspend-base:1.4
	netbsd-5-0-RC1:1.4
	haad-dm-base:1.4
	haad-dm-base2:1.4
	haad-nbase2:1.4
	netbsd-5:1.4.0.6
	netbsd-5-base:1.4
	matt-mips64-base2:1.4
	haad-dm:1.4.0.4
	haad-dm-base1:1.4
	wrstuden-revivesa-base-3:1.2
	wrstuden-revivesa:1.2.0.2
	wrstuden-revivesa-base-2:1.2;
locks; strict;
comment	@# @;


1.7
date	2015.07.26.09.04.15;	author mrg;	state dead;
branches;
next	1.6;
commitid	k9pTXxOTKTZO4Muy;

1.6
date	2010.07.19.05.34.27;	author mrg;	state Exp;
branches;
next	1.5;

1.5
date	2009.10.08.19.06.51;	author snj;	state Exp;
branches;
next	1.4;

1.4
date	2008.09.25.15.02.58;	author rtr;	state Exp;
branches
	1.4.4.1
	1.4.6.1
	1.4.12.1;
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.03.22.11.10;	author mrg;	state Exp;
branches;
next	;

1.4.4.1
date	2008.09.25.15.02.58;	author haad;	state dead;
branches;
next	1.4.4.2;

1.4.4.2
date	2008.10.19.22.41.17;	author haad;	state Exp;
branches;
next	;

1.4.6.1
date	2009.10.10.19.53.24;	author sborrill;	state Exp;
branches;
next	;

1.4.12.1
date	2010.04.21.05.24.42;	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.43;	author wrstuden;	state Exp;
branches;
next	;


desc
@@


1.7
log
@remove unused files.
@
text
@#	$NetBSD: Makefile.glx,v 1.6 2010/07/19 05:34:27 mrg Exp $

.PATH:	${X11SRCDIR.xorg-server}/GL/glx
.PATH:	${X11SRCDIR.MesaLib}/src/mesa/glapi
.PATH:	${X11SRCDIR.MesaLib}/src/glx

SRCS.glx= \
	glxcmds.c \
	glxcmdsswap.c \
	glxext.c \
	glxglcore.c \
	glxscreens.c \
	glxutil.c \
	glxvisuals.c \
	indirect_dispatch.c \
	indirect_dispatch_swap.c \
	indirect_program.c \
	indirect_reqsize.c \
	indirect_size_get.c \
	indirect_table.c \
	indirect_texture_compression.c \
	indirect_util.c \
	render2.c \
	render2swap.c \
	renderpix.c \
	renderpixswap.c \
	rensize.c \
	single2.c \
	single2swap.c \
	singlepix.c \
	singlepixswap.c \
	singlesize.c \
	swap_interval.c \
	xfont.c

SRCS.glx+= \
	glapi.c \
	glcontextmodes.c \
	glthread.c

COPTS.glxcmds.c=		-Wno-error
COPTS.indirect_dispatch.c=	-Wno-error
COPTS.indirect_dispatch_swap.c=	-Wno-error

CPPFLAGS+= \
	-I${X11SRCDIR.xorg-server}/include \
	-I${X11SRCDIR.xorg-server}/GL/glx \
	-I${X11SRCDIR.MesaLib}/include \
	-I${X11SRCDIR.MesaLib}/src/glx \
	-I${X11SRCDIR.MesaLib}/src/mesa/main \
	-I${X11SRCDIR.MesaLib}/src/mesa/glapi \
	-I${DESTDIR}${X11INCDIR}/drm \
	-I${DESTDIR}${X11INCDIR}/xorg \
	-I${DESTDIR}${X11INCDIR}/pixman-1

CPPFLAGS+= \
	-DGLXEXT \
	-DGLX_USE_MESA \
	${X11FLAGS.DIX}

.include <bsd.x11.mk>
LIBDIR=	${XMODULEDIR}
.include <bsd.lib.mk>
@


1.6
log
@updates for Mesa 7.8.2:
- build glsl as a host tool
- add the glsl objects to libmesa
- add/remove new/deleted sources for various components
- adjust the libmesa/libGL builds to pull in the new glsl objects
- re-apply the BUILDSYMLINK hack for eval.c/pixel.c/pixelstore.c
- use glsl to build the slang headers on the fly
@
text
@d1 1
a1 1
#	$NetBSD: Makefile.glx,v 1.5 2009/10/08 19:06:51 snj Exp $
@


1.5
log
@Move libdrm headers up one level (out of the X11 directory) to match
the rest of the world and fix the inconsistency with libdrm.pc.
Fixes PR xsrc/42126.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile.glx,v 1.4 2008/09/25 15:02:58 rtr Exp $
d5 1
a5 1
.PATH:	${X11SRCDIR.MesaLib}/src/glx/x11
d49 1
a49 1
	-I${X11SRCDIR.MesaLib}/src/glx/x11 \
@


1.4
log
@add missing SRCS to libglx module and archive (now it works)
@
text
@d1 1
a1 1
#	$NetBSD: Makefile.glx,v 1.3 2008/09/25 14:15:06 rtr Exp $
d52 1
a52 1
	-I${DESTDIR}${X11INCDIR}/X11/drm \
@


1.4.12.1
log
@sync to netbsd-5
@
text
@d1 1
a1 1
#	$NetBSD: Makefile.glx,v 1.4.6.1 2009/10/10 19:53:24 sborrill Exp $
d52 1
a52 1
	-I${DESTDIR}${X11INCDIR}/drm \
@


1.4.6.1
log
@Pull up the following revisions(s) (requested by snj in ticket #1079):
	distrib/sets/lists/base/mi:	patch
	etc/mtree/NetBSD.dist:		patch
	distrib/sets/lists/xcomp/mi:	revision 1.100
	external/mit/xorg/lib/dri/dri.mk:	revision 1.8
	external/mit/xorg/lib/dri/libmesa/Makefile:	revision 1.4
	external/mit/xorg/lib/libGL/Makefile:	revision 1.10
	external/mit/xorg/lib/libdrm/Makefile:	revision 1.5
	external/mit/xorg/lib/libdrm/drm/Makefile:	revision 1.3
	external/mit/xorg/lib/libdrm_intel/Makefile:	revision 1.3
	external/mit/xorg/server/drivers/Makefile.xf86-driver:	revision 1.16
	external/mit/xorg/server/drivers/xf86-video-glint/Makefile:	revision 1.7
	external/mit/xorg/server/drivers/xf86-video-intel/Makefile:	revision 1.7
	external/mit/xorg/server/drivers/xf86-video-intel/ch7017/Makefile:	revision 1.2
	external/mit/xorg/server/drivers/xf86-video-intel/ch7xxx/Makefile:	revision 1.2
	external/mit/xorg/server/drivers/xf86-video-intel/ivch/Makefile:	revision 1.2
	external/mit/xorg/server/drivers/xf86-video-intel/sil164/Makefile:	revision 1.2
	external/mit/xorg/server/drivers/xf86-video-intel/tfp410/Makefile:	revision 1.2
	external/mit/xorg/server/drivers/xf86-video-mga/Makefile:	revision 1.7
	external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:	revision 1.5
	external/mit/xorg/server/drivers/xf86-video-savage/Makefile:	revision 1.7
	external/mit/xorg/server/drivers/xf86-video-sis/Makefile:	revision 1.7
	external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile:	revision 1.6
	external/mit/xorg/server/drivers/xf86-video-via/Makefile:	revision 1.5
	external/mit/xorg/server/xorg-server/GL/glx/Makefile.glx:	revision 1.5
	external/mit/xorg/server/xorg-server/glx/Makefile.glx:	revision 1.4
	external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile:	revision 1.7
	external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile:	revision 1.4

Move libdrm headers up one level (out of the X11 directory) to match
the rest of the world and fix the inconsistency with libdrm.pc.
Fixes PR xsrc/42126.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile.glx,v 1.4 2008/09/25 15:02:58 rtr Exp $
d52 1
a52 1
	-I${DESTDIR}${X11INCDIR}/drm \
@


1.4.4.1
log
@file Makefile.glx was added on branch haad-dm on 2008-10-19 22:41:17 +0000
@
text
@d1 63
@


1.4.4.2
log
@Sync with HEAD.
@
text
@a0 63
#	$NetBSD: Makefile.glx,v 1.4 2008/09/25 15:02:58 rtr Exp $

.PATH:	${X11SRCDIR.xorg-server}/GL/glx
.PATH:	${X11SRCDIR.MesaLib}/src/mesa/glapi
.PATH:	${X11SRCDIR.MesaLib}/src/glx/x11

SRCS.glx= \
	glxcmds.c \
	glxcmdsswap.c \
	glxext.c \
	glxglcore.c \
	glxscreens.c \
	glxutil.c \
	glxvisuals.c \
	indirect_dispatch.c \
	indirect_dispatch_swap.c \
	indirect_program.c \
	indirect_reqsize.c \
	indirect_size_get.c \
	indirect_table.c \
	indirect_texture_compression.c \
	indirect_util.c \
	render2.c \
	render2swap.c \
	renderpix.c \
	renderpixswap.c \
	rensize.c \
	single2.c \
	single2swap.c \
	singlepix.c \
	singlepixswap.c \
	singlesize.c \
	swap_interval.c \
	xfont.c

SRCS.glx+= \
	glapi.c \
	glcontextmodes.c \
	glthread.c

COPTS.glxcmds.c=		-Wno-error
COPTS.indirect_dispatch.c=	-Wno-error
COPTS.indirect_dispatch_swap.c=	-Wno-error

CPPFLAGS+= \
	-I${X11SRCDIR.xorg-server}/include \
	-I${X11SRCDIR.xorg-server}/GL/glx \
	-I${X11SRCDIR.MesaLib}/include \
	-I${X11SRCDIR.MesaLib}/src/glx/x11 \
	-I${X11SRCDIR.MesaLib}/src/mesa/main \
	-I${X11SRCDIR.MesaLib}/src/mesa/glapi \
	-I${DESTDIR}${X11INCDIR}/X11/drm \
	-I${DESTDIR}${X11INCDIR}/xorg \
	-I${DESTDIR}${X11INCDIR}/pixman-1

CPPFLAGS+= \
	-DGLXEXT \
	-DGLX_USE_MESA \
	${X11FLAGS.DIX}

.include <bsd.x11.mk>
LIBDIR=	${XMODULEDIR}
.include <bsd.lib.mk>
@


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.glx,v 1.2 2008/08/15 15:55:05 rtr Exp $
d4 2
d36 5
@


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.glx,v 1.1 2008/08/03 22:11:10 mrg Exp $
d3 34
a36 1
LIB=		glx
d38 10
a47 25
.PATH:	${X11SRCDIR.xorg-server}/GL/glx
.PATH:	${X11SRCDIR.xorg-server}/GL/glx
SRCS+=	glxcmds.c glxcmdsswap.c glxext.c glxglcore.c glxscreens.c \
	glxutil.c glxvisuals.c indirect_dispatch.c \
	indirect_dispatch_swap.c indirect_program.c indirect_reqsize.c \
	indirect_size_get.c indirect_table.c \
	indirect_texture_compression.c indirect_util.c render2.c \
	render2swap.c renderpix.c renderpixswap.c rensize.c single2.c \
	single2swap.c singlepix.c singlepixswap.c singlesize.c \
	swap_interval.c xfont.c

CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/GL/glx \
		-I${X11SRCDIR.xorg-server}/GL/include \
		-I${X11SRCDIR.xorg-server}/include \
		-I${X11SRCDIR.MesaLib}/include \
		-I${X11SRCDIR.MesaLib}/src/mesa/glapi \
		-I${X11SRCDIR.MesaLib}/src/mesa/main \
		-I${X11SRCDIR.MesaLib}/src/glx/x11 \
		-I${DESTDIR}${X11INCDIR}/X11 \
		-I${X11SRCDIR.xorg-server}/mi \
		-I${DESTDIR}${X11INCDIR}/X11/extensions \
		-I${DESTDIR}${X11INCDIR}/pixman-1 \
		-I${DESTDIR}${X11INCDIR}/xorg \
		-I${DESTDIR}${X11INCDIR}/X11/drm \
		${X11FLAGS.DIX}
d49 4
a52 2
CPPFLAGS+=	-DGLXEXT -DGLX_USE_MESA \
		-DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}
@


1.2.2.1
log
@file Makefile.glx was added on branch wrstuden-revivesa on 2008-09-18 05:18:43 +0000
@
text
@d1 36
@


1.2.2.2
log
@Sync with wrstuden-revivesa-base-2.
@
text
@a0 36
#	$NetBSD: Makefile.glx,v 1.2 2008/08/15 15:55:05 rtr Exp $

LIB=		glx

.PATH:	${X11SRCDIR.xorg-server}/GL/glx
.PATH:	${X11SRCDIR.xorg-server}/GL/glx
SRCS+=	glxcmds.c glxcmdsswap.c glxext.c glxglcore.c glxscreens.c \
	glxutil.c glxvisuals.c indirect_dispatch.c \
	indirect_dispatch_swap.c indirect_program.c indirect_reqsize.c \
	indirect_size_get.c indirect_table.c \
	indirect_texture_compression.c indirect_util.c render2.c \
	render2swap.c renderpix.c renderpixswap.c rensize.c single2.c \
	single2swap.c singlepix.c singlepixswap.c singlesize.c \
	swap_interval.c xfont.c

CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/GL/glx \
		-I${X11SRCDIR.xorg-server}/GL/include \
		-I${X11SRCDIR.xorg-server}/include \
		-I${X11SRCDIR.MesaLib}/include \
		-I${X11SRCDIR.MesaLib}/src/mesa/glapi \
		-I${X11SRCDIR.MesaLib}/src/mesa/main \
		-I${X11SRCDIR.MesaLib}/src/glx/x11 \
		-I${DESTDIR}${X11INCDIR}/X11 \
		-I${X11SRCDIR.xorg-server}/mi \
		-I${DESTDIR}${X11INCDIR}/X11/extensions \
		-I${DESTDIR}${X11INCDIR}/pixman-1 \
		-I${DESTDIR}${X11INCDIR}/xorg \
		-I${DESTDIR}${X11INCDIR}/X11/drm \
		${X11FLAGS.DIX}

CPPFLAGS+=	-DGLXEXT -DGLX_USE_MESA \
		-DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}

.include <bsd.x11.mk>
LIBDIR=	${XMODULEDIR}
.include <bsd.lib.mk>
@


1.1
log
@build libglx.a.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile.glx,v 1.5.4.1 2004/11/15 09:12:38 rtr Exp $
a22 1
		-I${XSERVERINCDIR} \
@