head	1.15;
access;
symbols
	perseant-exfatfs-base-20250801:1.15
	perseant-exfatfs-base-20240630:1.15
	perseant-exfatfs:1.15.0.16
	perseant-exfatfs-base:1.15
	cjep_sun2x:1.15.0.14
	cjep_sun2x-base:1.15
	cjep_staticlib_x-base1:1.15
	cjep_staticlib_x:1.15.0.12
	cjep_staticlib_x-base:1.15
	phil-wifi-20200421:1.15
	phil-wifi-20200411:1.15
	phil-wifi-20200406:1.15
	pgoyette-compat-merge-20190127:1.15
	pgoyette-compat-20190127:1.15
	pgoyette-compat-20190118:1.15
	pgoyette-compat-1226:1.15
	pgoyette-compat-1126:1.15
	pgoyette-compat-1020:1.15
	pgoyette-compat-0930:1.15
	pgoyette-compat-0906:1.15
	netbsd-7-2-RELEASE:1.13.2.2
	pgoyette-compat-0728:1.15
	pgoyette-compat-0625:1.15
	pgoyette-compat-0521:1.15
	pgoyette-compat-0502:1.15
	pgoyette-compat-0422:1.15
	pgoyette-compat-0415:1.15
	pgoyette-compat-0407:1.15
	pgoyette-compat-0330:1.15
	pgoyette-compat-0322:1.15
	pgoyette-compat-0315:1.15
	netbsd-7-1-2-RELEASE:1.13.2.2
	pgoyette-compat:1.15.0.10
	pgoyette-compat-base:1.15
	netbsd-7-1-1-RELEASE:1.13.2.2
	perseant-stdc-iso10646:1.15.0.8
	perseant-stdc-iso10646-base:1.15
	prg-localcount2-base3:1.15
	prg-localcount2-base2:1.15
	prg-localcount2-base1:1.15
	prg-localcount2:1.15.0.6
	prg-localcount2-base:1.15
	pgoyette-localcount-20170426:1.15
	bouyer-socketcan-base1:1.15
	pgoyette-localcount-20170320:1.15
	netbsd-7-1:1.13.2.2.0.4
	netbsd-7-1-RELEASE:1.13.2.2
	netbsd-7-1-RC2:1.13.2.2
	bouyer-socketcan:1.15.0.4
	bouyer-socketcan-base:1.15
	pgoyette-localcount-20170107:1.15
	netbsd-7-1-RC1:1.13.2.2
	pgoyette-localcount-20161104:1.15
	netbsd-7-0-2-RELEASE:1.13.2.2
	localcount-20160914:1.15
	pgoyette-localcount-20160806:1.15
	pgoyette-localcount-20160726:1.15
	pgoyette-localcount:1.15.0.2
	pgoyette-localcount-base:1.15
	netbsd-7-0-1-RELEASE:1.13.2.2
	netbsd-7-0:1.13.2.2.0.2
	netbsd-7-0-RELEASE:1.13.2.2
	netbsd-7-0-RC3:1.13.2.2
	netbsd-7-0-RC2:1.13.2.2
	netbsd-7-0-RC1:1.13.2.2
	netbsd-5-2-3-RELEASE:1.1.2.6
	netbsd-5-1-5-RELEASE:1.1.2.6
	netbsd-6-0-6-RELEASE:1.9
	netbsd-6-1-5-RELEASE:1.9
	netbsd-7:1.13.0.2
	netbsd-7-base:1.13
	yamt-pagecache-base9:1.11
	yamt-pagecache-tag8:1.9.2.1
	netbsd-6-1-4-RELEASE:1.9
	netbsd-6-0-5-RELEASE:1.9
	tls-earlyentropy:1.11.0.6
	tls-earlyentropy-base:1.13
	riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.11
	riastradh-drm2-base3:1.11
	netbsd-6-1-3-RELEASE:1.9
	netbsd-6-0-4-RELEASE:1.9
	netbsd-5-2-2-RELEASE:1.1.2.6
	netbsd-5-1-4-RELEASE:1.1.2.6
	netbsd-6-1-2-RELEASE:1.9
	netbsd-6-0-3-RELEASE:1.9
	netbsd-5-2-1-RELEASE:1.1.2.6
	netbsd-5-1-3-RELEASE:1.1.2.6
	netbsd-6-1-1-RELEASE:1.9
	riastradh-drm2-base2:1.11
	riastradh-drm2-base1:1.11
	riastradh-drm2:1.11.0.2
	riastradh-drm2-base:1.11
	netbsd-6-1:1.9.0.10
	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.11.0.4
	agc-symver-base:1.11
	netbsd-6-1-RC2:1.9
	netbsd-6-1-RC1:1.9
	yamt-pagecache-base8:1.10
	netbsd-5-2:1.1.2.6.0.6
	netbsd-6-0-1-RELEASE:1.9
	yamt-pagecache-base7:1.10
	netbsd-5-2-RELEASE:1.1.2.6
	netbsd-5-2-RC1:1.1.2.6
	matt-nb6-plus-nbase:1.9
	yamt-pagecache-base6:1.10
	netbsd-6-0:1.9.0.8
	netbsd-6-0-RELEASE:1.9
	netbsd-6-0-RC2:1.9
	tls-maxphys:1.10.0.2
	tls-maxphys-base:1.13
	matt-nb6-plus:1.9.0.6
	matt-nb6-plus-base:1.9
	netbsd-6-0-RC1:1.9
	yamt-pagecache-base5:1.10
	yamt-pagecache-base4:1.10
	netbsd-6:1.9.0.4
	netbsd-6-base:1.9
	netbsd-5-1-2-RELEASE:1.1.2.6
	netbsd-5-1-1-RELEASE:1.1.2.6
	yamt-pagecache-base3:1.9
	yamt-pagecache-base2:1.9
	yamt-pagecache:1.9.0.2
	yamt-pagecache-base:1.9
	cherry-xenmp:1.8.0.4
	cherry-xenmp-base:1.8
	bouyer-quota2-nbase:1.8
	bouyer-quota2:1.8.0.2
	bouyer-quota2-base:1.8
	matt-mips64-premerge-20101231:1.8
	matt-nb5-mips64-premerge-20101231:1.1.2.3.4.1
	matt-nb5-pq3:1.1.2.6.0.4
	matt-nb5-pq3-base:1.1.2.6
	netbsd-5-1:1.1.2.6.0.2
	netbsd-5-1-RELEASE:1.1.2.6
	netbsd-5-1-RC4:1.1.2.6
	matt-nb5-mips64-k15:1.1.2.3.4.1
	netbsd-5-1-RC3:1.1.2.6
	netbsd-5-1-RC2:1.1.2.6
	netbsd-5-1-RC1:1.1.2.6
	netbsd-5-0-2-RELEASE:1.1.2.3
	matt-nb5-mips64-premerge-20091211:1.1.2.3
	matt-premerge-20091211:1.4
	matt-nb5-mips64-u2-k2-k4-k7-k8-k9:1.1.2.3
	matt-nb4-mips64-k7-u2a-k9b:1.1.2.3
	matt-nb5-mips64-u1-k1-k5:1.1.2.3
	matt-nb5-mips64:1.1.2.3.0.4
	netbsd-5-0-1-RELEASE:1.1.2.3
	jym-xensuspend-nbase:1.2
	netbsd-5-0:1.1.2.3.0.2
	netbsd-5-0-RELEASE:1.1.2.3
	netbsd-5-0-RC4:1.1.2.3
	netbsd-5-0-RC3:1.1.2.3
	netbsd-5-0-RC2:1.1.2.2
	jym-xensuspend:1.1.0.4
	jym-xensuspend-base:1.2
	netbsd-5-0-RC1:1.1.2.2
	haad-dm-base:1.1
	haad-dm-base2:1.1
	haad-nbase2:1.1
	netbsd-5:1.1.0.2;
locks; strict;
comment	@# @;


1.15
date	2014.12.18.06.24.29;	author mrg;	state dead;
branches;
next	1.14;
commitid	piX5MfsAjDSmgu2y;

1.14
date	2014.12.15.00.20.29;	author mrg;	state Exp;
branches;
next	1.13;
commitid	gOa1i3AQClDsl42y;

1.13
date	2014.07.13.16.35.49;	author joerg;	state Exp;
branches
	1.13.2.1;
next	1.12;
commitid	iu7LjDPlUCSZIeIx;

1.12
date	2014.07.09.20.22.55;	author riastradh;	state Exp;
branches;
next	1.11;
commitid	TCU62SXGWdah6KHx;

1.11
date	2013.02.09.17.18.01;	author christos;	state Exp;
branches
	1.11.6.1;
next	1.10;

1.10
date	2012.03.22.23.46.27;	author joerg;	state Exp;
branches
	1.10.2.1;
next	1.9;

1.9
date	2011.08.11.23.15.36;	author joerg;	state Exp;
branches
	1.9.2.1;
next	1.8;

1.8
date	2010.07.19.05.34.24;	author mrg;	state Exp;
branches;
next	1.7;

1.7
date	2010.05.23.21.31.52;	author mrg;	state Exp;
branches;
next	1.6;

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

1.5
date	2010.04.07.20.04.16;	author yhardy;	state Exp;
branches;
next	1.4;

1.4
date	2009.10.08.19.06.50;	author snj;	state Exp;
branches;
next	1.3;

1.3
date	2009.06.16.05.16.12;	author mrg;	state Exp;
branches;
next	1.2;

1.2
date	2009.02.15.19.00.22;	author mrg;	state Exp;
branches;
next	1.1;

1.1
date	2008.11.24.02.03.52;	author cube;	state Exp;
branches
	1.1.2.1
	1.1.4.1;
next	;

1.13.2.1
date	2014.12.23.01.44.24;	author snj;	state Exp;
branches;
next	1.13.2.2;
commitid	tJrwtBpHnY9px63y;

1.13.2.2
date	2015.01.05.21.23.52;	author martin;	state dead;
branches;
next	;
commitid	P7SGAjfX1jg9FS4y;

1.11.6.1
date	2014.08.10.06.50.56;	author tls;	state Exp;
branches;
next	;
commitid	DgL6ai6yRo4DAMLx;

1.10.2.1
date	2013.02.25.00.27.41;	author tls;	state Exp;
branches;
next	1.10.2.2;

1.10.2.2
date	2014.08.20.00.00.10;	author tls;	state Exp;
branches;
next	;
commitid	jTnpym9Qu0o4R1Nx;

1.9.2.1
date	2012.04.17.00.04.48;	author yamt;	state Exp;
branches;
next	1.9.2.2;

1.9.2.2
date	2014.05.22.14.09.40;	author yamt;	state Exp;
branches;
next	;
commitid	FFQX08bYGKywAxBx;

1.1.2.1
date	2008.11.24.02.03.52;	author snj;	state dead;
branches;
next	1.1.2.2;

1.1.2.2
date	2008.12.01.00.38.35;	author snj;	state Exp;
branches;
next	1.1.2.3;

1.1.2.3
date	2009.02.25.03.02.19;	author snj;	state Exp;
branches
	1.1.2.3.4.1;
next	1.1.2.4;

1.1.2.4
date	2009.09.17.04.24.30;	author snj;	state Exp;
branches;
next	1.1.2.5;

1.1.2.5
date	2009.10.10.19.53.22;	author sborrill;	state Exp;
branches;
next	1.1.2.6;

1.1.2.6
date	2010.04.08.23.14.27;	author snj;	state Exp;
branches;
next	;

1.1.2.3.4.1
date	2010.04.21.05.24.34;	author matt;	state Exp;
branches;
next	;

1.1.4.1
date	2009.05.13.18.53.25;	author jym;	state Exp;
branches;
next	;


desc
@@


1.15
log
@update sets and reachover makefiles for mesa 10.3.5.
@
text
@#	$NetBSD: Makefile,v 1.14 2014/12/15 00:20:29 mrg Exp $

.include <bsd.own.mk>

_LIB_PREFIX=	lib
LIB=		mesa_dri
LIBISMODULE=	yes
LIBISCXX=	yes

SHLIB_MAJOR=	0

MESA_SRC_MODULES=	main math vbo tnl program swrast ss common

CPPFLAGS+=	\
	-I${X11SRCDIR.MesaLib}/include \
	-I${X11SRCDIR.MesaLib}/src/glsl \
	-I${X11SRCDIR.MesaLib}/src/mesa \
	-I${X11SRCDIR.MesaLib}/src/mapi

CPPFLAGS+=	${X11FLAGS.THREADLIB} \
		-DPTHREADS -D_NETBSD_SOURCE -DUSE_EXTERNAL_DXTN_LIB=1 \
		-DHAVE_ALIAS -DIN_DRI_DRIVER
#CPPFLAGS+=	-DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING -DHAVE_POSIX_MEMALIGN
CFLAGS+=	-pthread

.include "../../libOSMesa/libmesa.mk"
.include "../../libGL/Makefile.glslsrcs"

SRCS+=  ${SRCS.glsl}

.include <bsd.x11.mk>

LIBDIR=		${X11USRLIBDIR}/modules/dri

#LIBDPLIBS+=	GL	${.CURDIR}/../../libGL

CWARNFLAGS.clang+=	-Wno-format -Wno-constant-conversion \
			-Wno-tautological-compare

.include <bsd.lib.mk>
@


1.14
log
@delete tools/glsl, is hasn't been used for a while.
move Makefile.glsl into libGL.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.13 2014/07/13 16:35:49 joerg Exp $
@


1.13
log
@Disable more warnings for clang build to deal with xsrc changes.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.12 2014/07/09 20:22:55 riastradh Exp $
d27 1
a27 1
.include "../../../tools/glsl/Makefile.glslsrcs"
@


1.13.2.1
log
@Pull up following revision(s) (requested by mrg in ticket #340):
	external/mit/xorg/tools/glsl/Makefile.glslsrcs: file removal
	external/mit/xorg/lib/libGL/Makefile: revision 1.20
	external/mit/xorg/lib/libGL/Makefile.glslsrcs: revision 1.1
	external/mit/xorg/lib/libOSMesa/libmesa.mk: revision 1.9
	external/mit/xorg/lib/dri/libmesa/Makefile: revision 1.14
	external/mit/xorg/tools/glsl/Makefile: file removal
	external/mit/xorg/tools/glsl/Makefile.glsl: file removal
delete tools/glsl, is hasn't been used for a while.
move Makefile.glsl into libGL.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.13 2014/07/13 16:35:49 joerg Exp $
d27 1
a27 1
.include "../../libGL/Makefile.glslsrcs"
@


1.13.2.2
log
@Pull up following revision(s) (requested by mrg in ticket #381):
	distrib/sets/lists/xdebug/md.amd64: revision 1.7
	external/mit/xorg/lib/libGL/internal/Makefile: revision 1.2
	distrib/sets/lists/xdebug/md.amd64: revision 1.8
	distrib/sets/lists/xserver/md.sparc64: revision 1.55
	distrib/sets/lists/xdebug/md.sparc64: revision 1.4
	external/mit/xorg/lib/Makefile: revision 1.30
	external/mit/xorg/lib/libglapi/Makefile: revision 1.1
	distrib/sets/lists/xserver/md.macppc: revision 1.67
	external/mit/xorg/lib/dri/radeon/Makefile: file removal
	external/mit/xorg/lib/asm.mk: revision 1.1
	external/mit/xorg/lib/dri/dri.mk: file removal
	external/mit/xorg/lib/dri/mach64/Makefile: file removal
	external/mit/xorg/lib/libGL/Makefile: revision 1.21
	external/mit/xorg/lib/libGL/Makefile.glslsrcs: file removal
	external/mit/xorg/lib/dri/Makefile: revision 1.20
	external/mit/xorg/lib/driver.mk: revision 1.1
	external/mit/xorg/lib/dri/r600/Makefile: file removal
	external/mit/xorg/lib/dri/r128/Makefile: file removal
	external/mit/xorg/lib/dri/i915/Makefile: file removal
	external/mit/xorg/lib/dri/Makefile: revision 1.23
	external/mit/xorg/lib/gallium/Makefile: revision 1.1
	external/mit/xorg/lib/gallium/Makefile: revision 1.2
	distrib/sets/lists/xcomp/mi: revision 1.154
	external/mit/xorg/lib/libOSMesa/libmesa.mk: file removal
	external/mit/xorg/lib/libGL/mesa-ver.mk: revision 1.2
	distrib/sets/lists/xserver/mi: revision 1.34
	external/mit/xorg/bin/glxgears/Makefile: revision 1.4
	distrib/sets/lists/xserver/md.alpha: revision 1.38
	external/mit/xorg/lib/libOSMesa/shlib_version: file removal
	external/mit/xorg/lib/dri/trident/Makefile: file removal
	external/mit/xorg/lib/dri/i810/Makefile: file removal
	external/mit/xorg/lib/libGLw/Makefile: revision 1.4
	external/mit/xorg/TODO: file removal
	external/mit/xorg/lib/dri/sis/Makefile: file removal
	distrib/sets/lists/xserver/md.sparc: revision 1.57
	distrib/sets/lists/xserver/md.prep: revision 1.15
	distrib/sets/lists/xcomp/shl.mi: revision 1.38
	external/mit/xorg/lib/dri/tdfx/Makefile: file removal
	external/mit/xorg/lib/dri/mga/Makefile: file removal
	distrib/sets/lists/xdebug/md.macppc: revision 1.4
	external/mit/xorg/lib/libOSMesa/Makefile: file removal
	distrib/sets/lists/xdebug/shl.mi: revision 1.16
	external/mit/xorg/lib/libGL/Makefile.mesa: file removal
	distrib/sets/lists/xdebug/mi: revision 1.9
	distrib/sets/lists/xdebug/md.i386: revision 1.7
	external/mit/xorg/lib/dri/swrast/Makefile: file removal
	distrib/sets/lists/xdebug/md.i386: revision 1.8
	external/mit/xorg/lib/dri/savage/Makefile: file removal
	external/mit/xorg/lib/dri/r200/Makefile: file removal
	distrib/sets/lists/xetc/mi: revision 1.24
	distrib/sets/lists/xbase/shl.mi: revision 1.57
	distrib/sets/lists/xdebug/md.sparc: revision 1.5
	external/mit/xorg/lib/dri/i965/Makefile: file removal
	external/mit/xorg/lib/libloader.mk: revision 1.1
	external/mit/xorg/bin/glxinfo/Makefile: revision 1.5
	distrib/sets/lists/xserver/md.ofppc: revision 1.20
	external/mit/xorg/lib/libmesa.mk: revision 1.1
	external/mit/xorg/lib/dri/libmesa/Makefile: file removal
	external/mit/xorg/lib/dri/Makefile: revision 1.19
	distrib/sets/lists/xserver/md.amd64: revision 1.74
	distrib/sets/lists/xserver/md.bebox: revision 1.11
	distrib/sets/lists/xdebug/md.ofppc: revision 1.4
	external/mit/xorg/lib/libglsl.mk: revision 1.1
	external/mit/xorg/lib/dri/r300/Makefile: file removal
	external/mit/xorg/lib/dri/unichrome/Makefile: file removal
	external/mit/xorg/lib/dri/s3v/Makefile: file removal
	distrib/sets/lists/xserver/md.i386: revision 1.93
update sets and reachover makefiles for mesa 10.3.5.
fix build problem with radeon_*.c files.
- mesa_dri_drivers.so.0.debug is not obsolete for amd64
- kms_swrast_dri.so.0.debug was missing
- Don't install absolute symlinks
- Add missing debug symlinks
- consistently install symlinks (like we do for everything else)
- add missing debug libs
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.13.2.1 2014/12/23 01:44:24 snj Exp $
@


1.12
log
@Update reachover makefiles for MesaLib 7.11.2.

With the new GL shader compiler, glsl-compile is no longer needed as
a tool, but the shader compiler is now duplicated in several
libraries, so (XXX) external/mit/xorg/tools/glsl should be turned
into a proper library that libGL and libmesa can link against.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.11 2013/02/09 17:18:01 christos Exp $
d37 2
a38 1
CWARNFLAGS.clang+=	-Wno-format -Wno-constant-conversion
@


1.11
log
@explicitly set the prefix here.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.10 2012/03/22 23:46:27 joerg Exp $
d8 1
d12 1
a12 9
MESA_SRC_MODULES=	glapi main math vbo tnl shader swrast slang ss common

CPPFLAGS+=	-I${X11SRCDIR.MesaLib}/src/mesa/main \
		-I${X11SRCDIR.MesaLib}/src/mesa/glapi \
		-I${X11SRCDIR.MesaLib}/src/mesa/shader \
		-I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/common \
		-I${X11SRCDIR.MesaLib}/src/mesa \
		-I${X11SRCDIR.MesaLib}/include \
		-I${DESTDIR}${X11INCDIR}/X11
d14 5
d29 1
a29 1
SRCS+=  ${SRCS.pp} ${SRCS.cl}
@


1.11.6.1
log
@Rebase.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.13 2014/07/13 16:35:49 joerg Exp $
a7 1
LIBISCXX=	yes
d11 9
a19 1
MESA_SRC_MODULES=	main math vbo tnl program swrast ss common
a20 5
CPPFLAGS+=	\
	-I${X11SRCDIR.MesaLib}/include \
	-I${X11SRCDIR.MesaLib}/src/glsl \
	-I${X11SRCDIR.MesaLib}/src/mesa \
	-I${X11SRCDIR.MesaLib}/src/mapi
d31 1
a31 1
SRCS+=  ${SRCS.glsl}
d39 1
a39 2
CWARNFLAGS.clang+=	-Wno-format -Wno-constant-conversion \
			-Wno-tautological-compare
@


1.10
log
@Disable a bunch of additional warnings for now for the clang build.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.9 2011/08/11 23:15:36 joerg Exp $
d5 1
@


1.10.2.1
log
@resync with head
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.10 2012/03/22 23:46:27 joerg Exp $
a4 1
_LIB_PREFIX=	lib
@


1.10.2.2
log
@Rebase to HEAD as of a few days ago.
@
text
@d1 1
a1 1
#	$NetBSD$
a7 1
LIBISCXX=	yes
d11 9
a19 1
MESA_SRC_MODULES=	main math vbo tnl program swrast ss common
a20 5
CPPFLAGS+=	\
	-I${X11SRCDIR.MesaLib}/include \
	-I${X11SRCDIR.MesaLib}/src/glsl \
	-I${X11SRCDIR.MesaLib}/src/mesa \
	-I${X11SRCDIR.MesaLib}/src/mapi
d31 1
a31 1
SRCS+=  ${SRCS.glsl}
d39 1
a39 2
CWARNFLAGS.clang+=	-Wno-format -Wno-constant-conversion \
			-Wno-tautological-compare
@


1.9
log
@Various warning adjustments for clang
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.8 2010/07/19 05:34:24 mrg Exp $
d38 1
a38 1
CWARNFLAGS.clang+=	-Wno-format
@


1.9.2.1
log
@sync with head
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.9 2011/08/11 23:15:36 joerg Exp $
d38 1
a38 1
CWARNFLAGS.clang+=	-Wno-format -Wno-constant-conversion
@


1.9.2.2
log
@sync with head.

for a reference, the tree before this commit was tagged
as yamt-pagecache-tag8.

this commit was splitted into small chunks to avoid
a limitation of cvs.  ("Protocol error: too many arguments")
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.9.2.1 2012/04/17 00:04:48 yamt Exp $
a4 1
_LIB_PREFIX=	lib
@


1.8
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,v 1.7 2010/05/23 21:31:52 mrg Exp $
d38 2
@


1.7
log
@build fixes for Mesa 7.7.1.  introduce r600 driver!
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.6 2010/05/23 01:59:12 mrg Exp $
d28 3
@


1.6
log
@remove unnecessary includes
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.5 2010/04/07 20:04:16 yhardy Exp $
d10 1
a10 1
MESA_SRC_MODULES=	glapi main math vbo tnl shader swrast slang ss
d20 1
d23 2
a24 1
		-DHAVE_ALIAS
d33 2
@


1.5
log
@i915 and i965 dri modules need glapi.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.4 2009/10/08 19:06:50 snj Exp $
a17 1
		-I${DESTDIR}${X11INCDIR}/drm \
@


1.4
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,v 1.3 2009/06/16 05:16:12 mrg Exp $
d10 1
a10 1
MESA_SRC_MODULES=	main math vbo tnl shader swrast slang ss
@


1.3
log
@be sure to link in the swrast_setup code, too
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.2 2009/02/15 19:00:22 mrg Exp $
d18 1
a18 1
		-I${DESTDIR}${X11INCDIR}/X11/drm \
@


1.2
log
@from yorick hardy:
 - build mesa_dri.so, saving ~1.8MB per module (yay, the size of the
   xsetrver set goes down massively now)
 - use the right includes so that dri * mesa use the same headers
 - correct LIBDPLIBS for libdri

tested by jmcneill, and builds fine for me.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.1 2008/11/24 02:03:52 cube Exp $
d10 1
a10 1
MESA_SRC_MODULES=	main math vbo tnl shader swrast slang
@


1.1
log
@Build a helper library containing all the code from MesaLib that DRI
modules need to function.  Note that the list of -D differs slightly in
libOSMesa, which compiles a few of the same files.
@
text
@d1 1
a1 1
#	$NetBSD$
d5 4
a8 3
LIB=		mesa
LIBISPRIVATE=	yes
NOSTATICLIB=	# defined
d12 9
d29 3
@


1.1.4.1
log
@Sync with HEAD.

Second commit. See http://mail-index.netbsd.org/source-changes/2009/05/13/msg221222.html
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.2 2009/02/15 19:00:22 mrg Exp $
d5 3
a7 4
LIB=		mesa_dri
LIBISMODULE=	yes

SHLIB_MAJOR=	0
a10 9
CPPFLAGS+=	-I${X11SRCDIR.MesaLib}/src/mesa/main \
		-I${X11SRCDIR.MesaLib}/src/mesa/glapi \
		-I${X11SRCDIR.MesaLib}/src/mesa/shader \
		-I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/common \
		-I${X11SRCDIR.MesaLib}/src/mesa \
		-I${X11SRCDIR.MesaLib}/include \
		-I${DESTDIR}${X11INCDIR}/X11/drm \
		-I${DESTDIR}${X11INCDIR}/X11

a18 3

LIBDIR=		${X11USRLIBDIR}/modules/dri

@


1.1.2.1
log
@file Makefile was added on branch netbsd-5 on 2008-12-01 00:38:35 +0000
@
text
@d1 19
@


1.1.2.2
log
@Pull up following revision(s) (requested by cube in ticket #151):
	external/mit/xorg/lib/dri/libmesa/Makefile: revision 1.1
Build a helper library containing all the code from MesaLib that DRI
modules need to function.  Note that the list of -D differs slightly in
libOSMesa, which compiles a few of the same files.
@
text
@a0 19
#	$NetBSD$

.include <bsd.own.mk>

LIB=		mesa
LIBISPRIVATE=	yes
NOSTATICLIB=	# defined

MESA_SRC_MODULES=	main math vbo tnl shader swrast slang

CPPFLAGS+=	${X11FLAGS.THREADLIB} \
		-DPTHREADS -D_NETBSD_SOURCE -DUSE_EXTERNAL_DXTN_LIB=1 \
		-DHAVE_ALIAS
CFLAGS+=	-pthread

.include "../../libOSMesa/libmesa.mk"

.include <bsd.x11.mk>
.include <bsd.lib.mk>
@


1.1.2.3
log
@Pull up following revision(s) (requested by mrg in ticket #470):
	distrib/sets/lists/xserver/md.amd64: revision 1.46
	distrib/sets/lists/xserver/md.i386: revision 1.61
	distrib/sets/lists/xserver/md.macppc: revision 1.45
	distrib/sets/lists/xserver/md.sparc64: revision 1.31
	external/mit/xorg/lib/Makefile: revision 1.9
	external/mit/xorg/lib/dri/dri.mk: revision 1.5
	external/mit/xorg/lib/dri/libmesa/Makefile: revision 1.2
from yorick hardy:
 - build mesa_dri.so, saving ~1.8MB per module (yay, the size of the
   xserver set goes down massively now)
 - use the right includes so that dri * mesa use the same headers
 - correct LIBDPLIBS for libdri
tested by jmcneill, and builds fine for me.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.1.2.2 2008/12/01 00:38:35 snj Exp $
d5 3
a7 4
LIB=		mesa_dri
LIBISMODULE=	yes

SHLIB_MAJOR=	0
a10 9
CPPFLAGS+=	-I${X11SRCDIR.MesaLib}/src/mesa/main \
		-I${X11SRCDIR.MesaLib}/src/mesa/glapi \
		-I${X11SRCDIR.MesaLib}/src/mesa/shader \
		-I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/common \
		-I${X11SRCDIR.MesaLib}/src/mesa \
		-I${X11SRCDIR.MesaLib}/include \
		-I${DESTDIR}${X11INCDIR}/X11/drm \
		-I${DESTDIR}${X11INCDIR}/X11

a18 3

LIBDIR=		${X11USRLIBDIR}/modules/dri

@


1.1.2.3.4.1
log
@sync to netbsd-5
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.1.2.6 2010/04/08 23:14:27 snj Exp $
d10 1
a10 1
MESA_SRC_MODULES=	glapi main math vbo tnl shader swrast slang ss
d18 1
a18 1
		-I${DESTDIR}${X11INCDIR}/drm \
@


1.1.2.4
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.3 2009/06/16 05:16:12 mrg Exp $
d10 1
a10 1
MESA_SRC_MODULES=	main math vbo tnl shader swrast slang ss
@


1.1.2.5
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,v 1.1.2.4 2009/09/17 04:24:30 snj Exp $
d18 1
a18 1
		-I${DESTDIR}${X11INCDIR}/drm \
@


1.1.2.6
log
@Pull up following revision(s) (requested by yhardy in ticket #1364):
	external/mit/xorg/lib/dri/libmesa/Makefile: revision 1.5
i915 and i965 dri modules need glapi.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.1.2.5 2009/10/10 19:53:22 sborrill Exp $
d10 1
a10 1
MESA_SRC_MODULES=	glapi main math vbo tnl shader swrast slang ss
@


