head	1.2;
access;
symbols
	netbsd-5-2-3-RELEASE:1.2
	netbsd-5-1-5-RELEASE:1.2
	riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.2
	riastradh-drm2-base:1.2
	netbsd-5-2-2-RELEASE:1.2
	netbsd-5-1-4-RELEASE:1.2
	netbsd-5-2-1-RELEASE:1.2
	netbsd-5-1-3-RELEASE:1.2
	netbsd-5-2:1.2.0.8
	netbsd-5-2-RELEASE:1.2
	netbsd-5-2-RC1:1.2
	netbsd-5-1-2-RELEASE:1.2
	netbsd-5-1-1-RELEASE:1.2
	netbsd-5-1:1.2.0.6
	netbsd-5-1-RELEASE:1.2
	netbsd-5-1-RC4:1.2
	netbsd-5-1-RC3:1.2
	netbsd-5-1-RC2:1.2
	netbsd-5-1-RC1:1.2
	netbsd-5-0-2-RELEASE:1.2
	netbsd-5-0-1-RELEASE:1.2
	netbsd-5-0:1.2.0.4
	netbsd-5-0-RELEASE:1.2
	netbsd-5-0-RC4:1.2
	netbsd-5-0-RC3:1.2
	netbsd-5-0-RC2:1.2
	netbsd-5-0-RC1:1.2
	netbsd-5:1.2.0.2
	netbsd-5-base:1.2
	netbsd-3-1-1-RELEASE:1.1.1.3.6.1
	netbsd-3-1:1.1.1.3.6.1.0.2
	netbsd-3-1-RELEASE:1.1.1.3.6.1
	netbsd-3-1-RC4:1.1.1.3.6.1
	netbsd-3-1-RC3:1.1.1.3.6.1
	netbsd-3-1-RC2:1.1.1.3.6.1
	netbsd-3-1-RC1:1.1.1.3.6.1
	netbsd-3-0-RC4:1.1.1.3.6.1
	netbsd-2-0-3-RELEASE:1.1.1.3
	netbsd-2-1:1.1.1.3.0.8
	netbsd-2-1-RELEASE:1.1.1.3
	netbsd-2-1-RC6:1.1.1.3
	netbsd-2-1-RC5:1.1.1.3
	netbsd-2-1-RC4:1.1.1.3
	netbsd-2-1-RC3:1.1.1.3
	netbsd-2-1-RC2:1.1.1.3
	netbsd-2-1-RC1:1.1.1.3
	netbsd-2-0-2-RELEASE:1.1.1.3
	v4-5-0_beforeimport:1.1.1.3
	netbsd-3:1.1.1.3.0.6
	netbsd-3-base:1.1.1.3
	netbsd-2-0-1-RELEASE:1.1.1.3
	netbsd-2:1.1.1.3.0.4
	netbsd-2-base:1.1.1.3
	netbsd-2-0-RELEASE:1.1.1.3
	netbsd-2-0-RC5:1.1.1.3
	netbsd-2-0-RC4:1.1.1.3
	netbsd-2-0-RC3:1.1.1.3
	netbsd-2-0-RC2:1.1.1.3
	netbsd-2-0-RC1:1.1.1.3
	netbsd-2-0:1.1.1.3.0.2
	netbsd-2-0-base:1.1.1.3
	v4-4-0:1.1.1.3
	v4-4-0_beforeimport:1.1.1.2
	netbsd-1-6-PATCH002-RELEASE:1.1.1.2
	netbsd-1-6-PATCH002:1.1.1.2
	netbsd-1-6-PATCH002-RC4:1.1.1.2
	v4-3-0-2003-12-19:1.1.1.2
	netbsd-1-6-PATCH002-RC3:1.1.1.2
	netbsd-1-6-PATCH002-RC2:1.1.1.2
	netbsd-1-6-PATCH002-RC1:1.1.1.2
	netbsd-1-6:1.1.1.2.0.2
	netbsd-1-6-base:1.1.1.2
	v4-3-0:1.1.1.2
	v4-3-0_beforeimport:1.1.1.1
	netbsd-1-6-PATCH001:1.1.1.1
	netbsd-1-6-RELEASE:1.1.1.1
	v4-2-1:1.1.1.1
	v4-2-1_beforeimport:1.1.1.1
	netbsd-1-5-PATCH003:1.1.1.1
	v4-2-0:1.1.1.1
	netbsd-1-5-PATCH002:1.1.1.1
	v4-1-0:1.1.1.1
	XF86:1.1.1;
locks; strict;
comment	@# @;


1.2
date	2005.03.18.14.55.02;	author tron;	state dead;
branches;
next	1.1;

1.1
date	2001.06.09.14.53.29;	author tron;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2001.06.09.14.53.29;	author tron;	state Exp;
branches;
next	1.1.1.2;

1.1.1.2
date	2003.02.28.13.18.43;	author tron;	state Exp;
branches;
next	1.1.1.3;

1.1.1.3
date	2004.03.05.14.23.59;	author tron;	state Exp;
branches
	1.1.1.3.6.1;
next	;

1.1.1.3.6.1
date	2005.04.06.20.00.14;	author tron;	state dead;
branches;
next	;


desc
@@


1.2
log
@Resolve conflicts from import of XFree86 4.5.0.
@
text
@XCOMM $XFree86: xc/lib/GL/mesa/src/drv/i810/Imakefile.inc,v 1.2 2001/05/02 15:06:03 dawes Exp $

#ifndef MesaDrvSrcDir
#define MesaDrvSrcDir $(GLXLIBSRC)/mesa/src/drv
#endif

MESADRVSRCDIR = MesaDrvSrcDir

#ifndef MesaDrvI810BuildDir
#define MesaDrvI810BuildDir /**/
#endif
MESADRVI810BUILDDIR = MesaDrvI810BuildDir

#if Malloc0ReturnsNull
ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
#endif

#if BuildXF86DRI
  DRI_DEFINES = GlxDefines
 DRI_INCLUDES = -I$(GLXLIBSRC)/dri -I$(GLXLIBSRC)/glx \
		-I$(INCLUDESRC) -I$(INCLUDESRC)/GL \
		-I$(GLXLIBSRC)/mesa/dri \
		-I$(SERVERSRC)/GL/dri \
		-I$(XF86OSSRC) \
		-I$(XF86DRIVERSRC)/i810 \
		-I$(GLXLIBSRC)/dri/drm
#endif

MESA_INCLUDES = -I$(MESASRCDIR)/src -I$(MESADRVSRCDIR)/common \
		-I$(MESADRVSRCDIR)/i810
   X_INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC)

     I810SRCS = $(MESADRVI810BUILDDIR)i810_xmesa.c \
		$(MESADRVI810BUILDDIR)i810dd.c \
		$(MESADRVI810BUILDDIR)i810pipeline.c \
		$(MESADRVI810BUILDDIR)i810span.c \
		$(MESADRVI810BUILDDIR)i810state.c \
		$(MESADRVI810BUILDDIR)i810tex.c \
		$(MESADRVI810BUILDDIR)i810tris.c \
		$(MESADRVI810BUILDDIR)i810vb.c \
		$(MESADRVI810BUILDDIR)i810fastpath.c \
		$(MESADRVI810BUILDDIR)i810ioctl.c

     I810OBJS = $(MESADRVI810BUILDDIR)i810_xmesa.o \
		$(MESADRVI810BUILDDIR)i810dd.o \
		$(MESADRVI810BUILDDIR)i810pipeline.o \
		$(MESADRVI810BUILDDIR)i810span.o \
		$(MESADRVI810BUILDDIR)i810state.o \
		$(MESADRVI810BUILDDIR)i810tex.o \
		$(MESADRVI810BUILDDIR)i810tris.o \
		$(MESADRVI810BUILDDIR)i810vb.o \
		$(MESADRVI810BUILDDIR)i810fastpath.o \
		$(MESADRVI810BUILDDIR)i810ioctl.o

     I810UOBJS = $(MESADRVI810BUILDDIR)unshared/i810_xmesa.o \
		$(MESADRVI810BUILDDIR)unshared/i810dd.o \
		$(MESADRVI810BUILDDIR)unshared/i810pipeline.o \
		$(MESADRVI810BUILDDIR)unshared/i810span.o \
		$(MESADRVI810BUILDDIR)unshared/i810state.o \
		$(MESADRVI810BUILDDIR)unshared/i810tex.o \
		$(MESADRVI810BUILDDIR)unshared/i810tris.o \
		$(MESADRVI810BUILDDIR)unshared/i810vb.o \
		$(MESADRVI810BUILDDIR)unshared/i810fastpath.o \
		$(MESADRVI810BUILDDIR)unshared/i810ioctl.o

     I810DOBJS = $(MESADRVI810BUILDDIR)debugger/i810_xmesa.o \
		$(MESADRVI810BUILDDIR)debugger/i810dd.o \
		$(MESADRVI810BUILDDIR)debugger/i810pipeline.o \
		$(MESADRVI810BUILDDIR)debugger/i810span.o \
		$(MESADRVI810BUILDDIR)debugger/i810state.o \
		$(MESADRVI810BUILDDIR)debugger/i810tex.o \
		$(MESADRVI810BUILDDIR)debugger/i810tris.o \
		$(MESADRVI810BUILDDIR)debugger/i810vb.o \
		$(MESADRVI810BUILDDIR)debugger/i810fastpath.o \
		$(MESADRVI810BUILDDIR)debugger/i810ioctl.o

     I810POBJS = $(MESADRVI810BUILDDIR)profiled/i810_xmesa.o \
		$(MESADRVI810BUILDDIR)profiled/i810dd.o \
		$(MESADRVI810BUILDDIR)profiled/i810pipeline.o \
		$(MESADRVI810BUILDDIR)profiled/i810span.o \
		$(MESADRVI810BUILDDIR)profiled/i810state.o \
		$(MESADRVI810BUILDDIR)profiled/i810tex.o \
		$(MESADRVI810BUILDDIR)profiled/i810tris.o \
		$(MESADRVI810BUILDDIR)profiled/i810vb.o \
		$(MESADRVI810BUILDDIR)profiled/i810fastpath.o \
		$(MESADRVI810BUILDDIR)profiled/i810ioctl.o

#ifdef NeedToLinkMesaSrc
LinkSourceFile(i810_xmesa.c, $(MESADRVSRCDIR)/i810)
LinkSourceFile(i810dd.c, $(MESADRVSRCDIR)/i810)
LinkSourceFile(i810pipeline.c, $(MESADRVSRCDIR)/i810)
LinkSourceFile(i810span.c, $(MESADRVSRCDIR)/i810)
LinkSourceFile(i810state.c, $(MESADRVSRCDIR)/i810)
LinkSourceFile(i810tex.c, $(MESADRVSRCDIR)/i810)
LinkSourceFile(i810tris.c, $(MESADRVSRCDIR)/i810)
LinkSourceFile(i810vb.c, $(MESADRVSRCDIR)/i810)
LinkSourceFile(i810fastpath.c, $(MESADRVSRCDIR)/i810)
LinkSourceFile(i810ioctl.c, $(MESADRVSRCDIR)/i810)
#endif

@


1.1
log
@Initial revision
@
text
@@


1.1.1.1
log
@Import of XFree86 4.1.0.
@
text
@@


1.1.1.2
log
@Import of XFree86 4.3.0.
@
text
@d1 1
a1 1
XCOMM $XFree86: xc/lib/GL/mesa/src/drv/i810/Imakefile.inc,v 1.3 2002/02/22 21:33:03 dawes Exp $
d19 4
a22 5
  DRI_DEFINES = GlxDefines -DX_BYTE_ORDER=ByteOrder
 DRI_INCLUDES = -I$(GLXLIBSRC)/dri \
		-I$(GLXLIBSRC)/glx \
		-I$(INCLUDESRC) \
		-I$(INCLUDESRC)/GL \
d26 1
a26 3
		-I$(XF86COMSRC) \
		-I$(GLXLIBSRC)/dri/drm \
		-I$(GLXLIBSRC)/include
d29 1
a29 2
MESA_INCLUDES = -I$(MESASRCDIR)/src \
		-I$(MESADRVSRCDIR)/common \
d33 3
a35 4
     I810SRCS = $(MESADRVI810BUILDDIR)i810context.c \
		$(MESADRVI810BUILDDIR)i810ioctl.c \
		$(MESADRVI810BUILDDIR)i810render.c \
		$(MESADRVI810BUILDDIR)i810screen.c \
a38 2
		$(MESADRVI810BUILDDIR)i810texmem.c \
		$(MESADRVI810BUILDDIR)i810texstate.c \
d40 7
a46 6
		$(MESADRVI810BUILDDIR)i810vb.c

     I810OBJS = $(MESADRVI810BUILDDIR)i810context.o \
		$(MESADRVI810BUILDDIR)i810ioctl.o \
		$(MESADRVI810BUILDDIR)i810render.o \
		$(MESADRVI810BUILDDIR)i810screen.o \
a49 2
		$(MESADRVI810BUILDDIR)i810texmem.o \
		$(MESADRVI810BUILDDIR)i810texstate.o \
d51 7
a57 6
		$(MESADRVI810BUILDDIR)i810vb.o

     I810UOBJS = $(MESADRVI810BUILDDIR)unshared/i810context.o \
		$(MESADRVI810BUILDDIR)unshared/i810ioctl.o \
		$(MESADRVI810BUILDDIR)unshared/i810render.o \
		$(MESADRVI810BUILDDIR)unshared/i810screen.o \
a60 2
		$(MESADRVI810BUILDDIR)unshared/i810texmem.o \
		$(MESADRVI810BUILDDIR)unshared/i810texstate.o \
d62 7
a68 6
		$(MESADRVI810BUILDDIR)unshared/i810vb.o

     I810DOBJS = $(MESADRVI810BUILDDIR)debugger/i810context.o \
		$(MESADRVI810BUILDDIR)debugger/i810ioctl.o \
		$(MESADRVI810BUILDDIR)debugger/i810render.o \
		$(MESADRVI810BUILDDIR)debugger/i810screen.o \
a71 2
		$(MESADRVI810BUILDDIR)debugger/i810texmem.o \
		$(MESADRVI810BUILDDIR)debugger/i810texstate.o \
d73 7
a79 6
		$(MESADRVI810BUILDDIR)debugger/i810vb.o

     I810POBJS = $(MESADRVI810BUILDDIR)profiled/i810context.o \
		$(MESADRVI810BUILDDIR)profiled/i810ioctl.o \
		$(MESADRVI810BUILDDIR)profiled/i810render.o \
		$(MESADRVI810BUILDDIR)profiled/i810screen.o \
a82 2
		$(MESADRVI810BUILDDIR)profiled/i810texmem.o \
		$(MESADRVI810BUILDDIR)profiled/i810texstate.o \
d84 3
a86 1
		$(MESADRVI810BUILDDIR)profiled/i810vb.o
d89 3
a91 4
LinkSourceFile(i810context.c, $(MESADRVSRCDIR)/i810)
LinkSourceFile(i810ioctl.c, $(MESADRVSRCDIR)/i810)
LinkSourceFile(i810render.c, $(MESADRVSRCDIR)/i810)
LinkSourceFile(i810screen.c, $(MESADRVSRCDIR)/i810)
a94 2
LinkSourceFile(i810texmem.c, $(MESADRVSRCDIR)/i810)
LinkSourceFile(i810texstate.c, $(MESADRVSRCDIR)/i810)
d97 2
@


1.1.1.3
log
@Import of XFree86 4.4.0.
@
text
@d1 1
a1 1
XCOMM $XFree86: xc/lib/GL/mesa/src/drv/i810/Imakefile.inc,v 1.4 2003/05/27 16:34:33 tsi Exp $
d19 1
a19 1
  DRI_DEFINES = GlxDefines -DX_BYTE_ORDER=$(X_BYTE_ORDER)
@


1.1.1.3.6.1
log
@Apply patch (requested by jmc in ticket #114):
Update XFree86 to version 4.5.0.
@
text
@@