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
	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	2002.01.19.14.54.26;	author tron;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2002.01.19.14.54.26;	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/i830/Imakefile.inc,v 1.1 2001/10/04 18:28:21 alanh Exp $

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

MESADRVSRCDIR = MesaDrvSrcDir

#ifndef MesaDrvI830BuildDir
#define MesaDrvI830BuildDir /**/
#endif
MESADRVI830BUILDDIR = MesaDrvI830BuildDir

#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)/i830
   X_INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC)

      I830SRCS = $(MESADRVI830BUILDDIR)i830_xmesa.c \
		$(MESADRVI830BUILDDIR)i830_dd.c \
		$(MESADRVI830BUILDDIR)i830_pipeline.c \
		$(MESADRVI830BUILDDIR)i830_span.c \
		$(MESADRVI830BUILDDIR)i830_state.c \
		$(MESADRVI830BUILDDIR)i830_tex.c \
		$(MESADRVI830BUILDDIR)i830_tris.c \
		$(MESADRVI830BUILDDIR)i830_vb.c \
		$(MESADRVI830BUILDDIR)i830_fastpath.c \
		$(MESADRVI830BUILDDIR)i830_ioctl.c

      I830OBJS = $(MESADRVI830BUILDDIR)i830_xmesa.o \
		$(MESADRVI830BUILDDIR)i830_dd.o \
		$(MESADRVI830BUILDDIR)i830_pipeline.o \
		$(MESADRVI830BUILDDIR)i830_span.o \
		$(MESADRVI830BUILDDIR)i830_state.o \
		$(MESADRVI830BUILDDIR)i830_tex.o \
		$(MESADRVI830BUILDDIR)i830_tris.o \
		$(MESADRVI830BUILDDIR)i830_vb.o \
		$(MESADRVI830BUILDDIR)i830_fastpath.o \
		$(MESADRVI830BUILDDIR)i830_ioctl.o

     I830UOBJS = $(MESADRVI830BUILDDIR)unshared/i830_xmesa.o \
		$(MESADRVI830BUILDDIR)unshared/i830_dd.o \
		$(MESADRVI830BUILDDIR)unshared/i830_pipeline.o \
		$(MESADRVI830BUILDDIR)unshared/i830_span.o \
		$(MESADRVI830BUILDDIR)unshared/i830_state.o \
		$(MESADRVI830BUILDDIR)unshared/i830_tex.o \
		$(MESADRVI830BUILDDIR)unshared/i830_tris.o \
		$(MESADRVI830BUILDDIR)unshared/i830_vb.o \
		$(MESADRVI830BUILDDIR)unshared/i830_fastpath.o \
		$(MESADRVI830BUILDDIR)unshared/i830_ioctl.o

     I830DOBJS = $(MESADRVI830BUILDDIR)unshared/i830_xmesa.o \
		$(MESADRVI830BUILDDIR)unshared/i830_dd.o \
		$(MESADRVI830BUILDDIR)unshared/i830_pipeline.o \
		$(MESADRVI830BUILDDIR)unshared/i830_span.o \
		$(MESADRVI830BUILDDIR)unshared/i830_state.o \
		$(MESADRVI830BUILDDIR)unshared/i830_tex.o \
		$(MESADRVI830BUILDDIR)unshared/i830_tris.o \
		$(MESADRVI830BUILDDIR)unshared/i830_vb.o \
		$(MESADRVI830BUILDDIR)unshared/i830_fastpath.o \
		$(MESADRVI830BUILDDIR)unshared/i830_ioctl.o

     I830POBJS = $(MESADRVI830BUILDDIR)unshared/i830_xmesa.o \
		$(MESADRVI830BUILDDIR)unshared/i830_dd.o \
		$(MESADRVI830BUILDDIR)unshared/i830_pipeline.o \
		$(MESADRVI830BUILDDIR)unshared/i830_span.o \
		$(MESADRVI830BUILDDIR)unshared/i830_state.o \
		$(MESADRVI830BUILDDIR)unshared/i830_tex.o \
		$(MESADRVI830BUILDDIR)unshared/i830_tris.o \
		$(MESADRVI830BUILDDIR)unshared/i830_vb.o \
		$(MESADRVI830BUILDDIR)unshared/i830_fastpath.o \
		$(MESADRVI830BUILDDIR)unshared/i830_ioctl.o

#ifdef NeedToLinkMesaSrc
LinkSourceFile(i830_xmesa.c, $(MESADRVSRCDIR)/i830)
LinkSourceFile(i830_dd.c, $(MESADRVSRCDIR)/i830)
LinkSourceFile(i830_pipeline.c, $(MESADRVSRCDIR)/i830)
LinkSourceFile(i830_span.c, $(MESADRVSRCDIR)/i830)
LinkSourceFile(i830_state.c, $(MESADRVSRCDIR)/i830)
LinkSourceFile(i830_tex.c, $(MESADRVSRCDIR)/i830)
LinkSourceFile(i830_tris.c, $(MESADRVSRCDIR)/i830)
LinkSourceFile(i830_vb.c, $(MESADRVSRCDIR)/i830)
LinkSourceFile(i830_fastpath.c, $(MESADRVSRCDIR)/i830)
LinkSourceFile(i830_ioctl.c, $(MESADRVSRCDIR)/i830)
#endif

@


1.1
log
@Initial revision
@
text
@@


1.1.1.1
log
@Import of XFree86 4.2.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/i830/Imakefile.inc,v 1.2 2002/09/09 19:18:47 dawes Exp $
d20 3
a22 5
 DRI_INCLUDES = -I$(GLXLIBSRC)/dri \
		-I$(GLXLIBSRC)/glx \
		-I$(INCLUDESRC) \
		-I$(INCLUDESRC)/GL \
		-I$(GLXLIBSRC)/dri \
d26 1
a26 2
		-I$(GLXLIBSRC)/dri/drm \
		-I$(GLXLIBSRC)/include
d33 3
a35 5
     I830SRCS = $(MESADRVI830BUILDDIR)i830_context.c \
		$(MESADRVI830BUILDDIR)i830_debug.c \
		$(MESADRVI830BUILDDIR)i830_ioctl.c \
		$(MESADRVI830BUILDDIR)i830_render.c \
		$(MESADRVI830BUILDDIR)i830_screen.c \
a38 2
		$(MESADRVI830BUILDDIR)i830_texmem.c \
		$(MESADRVI830BUILDDIR)i830_texstate.c \
d40 7
a46 7
		$(MESADRVI830BUILDDIR)i830_vb.c

     I830OBJS = $(MESADRVI830BUILDDIR)i830_context.o \
		$(MESADRVI830BUILDDIR)i830_debug.o \
		$(MESADRVI830BUILDDIR)i830_ioctl.o \
		$(MESADRVI830BUILDDIR)i830_render.o \
		$(MESADRVI830BUILDDIR)i830_screen.o \
a49 2
		$(MESADRVI830BUILDDIR)i830_texmem.o \
		$(MESADRVI830BUILDDIR)i830_texstate.o \
d51 29
a79 7
		$(MESADRVI830BUILDDIR)i830_vb.o

    I830UOBJS = $(MESADRVI830BUILDDIR)unshared/i830_context.o \
		$(MESADRVI830BUILDDIR)unshared/i830_debug.o \
		$(MESADRVI830BUILDDIR)unshared/i830_ioctl.o \
		$(MESADRVI830BUILDDIR)unshared/i830_render.o \
		$(MESADRVI830BUILDDIR)unshared/i830_screen.o \
a82 2
		$(MESADRVI830BUILDDIR)unshared/i830_texmem.o \
		$(MESADRVI830BUILDDIR)unshared/i830_texstate.o \
d84 3
a86 27
		$(MESADRVI830BUILDDIR)unshared/i830_vb.o

    I830DOBJS = $(MESADRVI830BUILDDIR)debugger/i830_context.o \
		$(MESADRVI830BUILDDIR)debugger/i830_debug.o \
		$(MESADRVI830BUILDDIR)debugger/i830_ioctl.o \
		$(MESADRVI830BUILDDIR)debugger/i830_render.o \
		$(MESADRVI830BUILDDIR)debugger/i830_screen.o \
		$(MESADRVI830BUILDDIR)debugger/i830_span.o \
		$(MESADRVI830BUILDDIR)debugger/i830_state.o \
		$(MESADRVI830BUILDDIR)debugger/i830_tex.o \
		$(MESADRVI830BUILDDIR)debugger/i830_texmem.o \
		$(MESADRVI830BUILDDIR)debugger/i830_texstate.o \
		$(MESADRVI830BUILDDIR)debugger/i830_tris.o \
		$(MESADRVI830BUILDDIR)debugger/i830_vb.o

    I830POBJS = $(MESADRVI830BUILDDIR)profiled/i830_context.o \
		$(MESADRVI830BUILDDIR)profiled/i830_debug.o \
		$(MESADRVI830BUILDDIR)profiled/i830_ioctl.o \
		$(MESADRVI830BUILDDIR)profiled/i830_render.o \
		$(MESADRVI830BUILDDIR)profiled/i830_screen.o \
		$(MESADRVI830BUILDDIR)profiled/i830_span.o \
		$(MESADRVI830BUILDDIR)profiled/i830_state.o \
		$(MESADRVI830BUILDDIR)profiled/i830_tex.o \
		$(MESADRVI830BUILDDIR)profiled/i830_texmem.o \
		$(MESADRVI830BUILDDIR)profiled/i830_texstate.o \
		$(MESADRVI830BUILDDIR)profiled/i830_tris.o \
		$(MESADRVI830BUILDDIR)profiled/i830_vb.o
d89 3
a91 5
LinkSourceFile(i830_context.c, $(MESADRVSRCDIR)/i830)
LinkSourceFile(i830_debug.c, $(MESADRVSRCDIR)/i830)
LinkSourceFile(i830_ioctl.c, $(MESADRVSRCDIR)/i830)
LinkSourceFile(i830_render.c, $(MESADRVSRCDIR)/i830)
LinkSourceFile(i830_screen.c, $(MESADRVSRCDIR)/i830)
a94 2
LinkSourceFile(i830_texmem.c, $(MESADRVSRCDIR)/i830)
LinkSourceFile(i830_texstate.c, $(MESADRVSRCDIR)/i830)
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/i830/Imakefile.inc,v 1.3 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
@@