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

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

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

1.1.1.3
date	2004.03.05.14.24.00;	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/mga/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 MesaDrvMgaBuildDir
#define MesaDrvMgaBuildDir /**/
#endif
MESADRVMGABUILDDIR = MesaDrvMgaBuildDir

#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)/mga \
		-I$(GLXLIBSRC)/dri/drm
#endif

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

      MGASRCS = $(MESADRVMGABUILDDIR)mgabuffers.c \
		$(MESADRVMGABUILDDIR)mgadd.c \
		$(MESADRVMGABUILDDIR)mgaeltpath.c \
		$(MESADRVMGABUILDDIR)mgafastpath.c \
		$(MESADRVMGABUILDDIR)mgaioctl.c \
		$(MESADRVMGABUILDDIR)mgapipeline.c \
		$(MESADRVMGABUILDDIR)mgaspan.c \
		$(MESADRVMGABUILDDIR)mgastate.c \
		$(MESADRVMGABUILDDIR)mgatex.c \
		$(MESADRVMGABUILDDIR)mgatexcnv.c \
		$(MESADRVMGABUILDDIR)mgatexmem.c \
		$(MESADRVMGABUILDDIR)mgatris.c \
		$(MESADRVMGABUILDDIR)mgavb.c \
		$(MESADRVMGABUILDDIR)mga_xmesa.c \

      MGAOBJS = $(MESADRVMGABUILDDIR)mgabuffers.o \
		$(MESADRVMGABUILDDIR)mgadd.o \
		$(MESADRVMGABUILDDIR)mgaeltpath.o \
		$(MESADRVMGABUILDDIR)mgafastpath.o \
		$(MESADRVMGABUILDDIR)mgaioctl.o \
		$(MESADRVMGABUILDDIR)mgapipeline.o \
		$(MESADRVMGABUILDDIR)mgaspan.o \
		$(MESADRVMGABUILDDIR)mgastate.o \
		$(MESADRVMGABUILDDIR)mgatex.o \
		$(MESADRVMGABUILDDIR)mgatexcnv.o \
		$(MESADRVMGABUILDDIR)mgatexmem.o \
		$(MESADRVMGABUILDDIR)mgatris.o \
		$(MESADRVMGABUILDDIR)mgavb.o \
		$(MESADRVMGABUILDDIR)mga_xmesa.o

      MGAUOBJS = $(MESADRVMGABUILDDIR)unshared/mgabuffers.o \
		$(MESADRVMGABUILDDIR)unshared/mgadd.o \
		$(MESADRVMGABUILDDIR)unshared/mgaeltpath.o \
		$(MESADRVMGABUILDDIR)unshared/mgafastpath.o \
		$(MESADRVMGABUILDDIR)unshared/mgaioctl.o \
		$(MESADRVMGABUILDDIR)unshared/mgapipeline.o \
		$(MESADRVMGABUILDDIR)unshared/mgaspan.o \
		$(MESADRVMGABUILDDIR)unshared/mgastate.o \
		$(MESADRVMGABUILDDIR)unshared/mgatex.o \
		$(MESADRVMGABUILDDIR)unshared/mgatexcnv.o \
		$(MESADRVMGABUILDDIR)unshared/mgatexmem.o \
		$(MESADRVMGABUILDDIR)unshared/mgatris.o \
		$(MESADRVMGABUILDDIR)unshared/mgavb.o \
		$(MESADRVMGABUILDDIR)unshared/mga_xmesa.o

      MGADOBJS = $(MESADRVMGABUILDDIR)debugger/mgabuffers.o \
		$(MESADRVMGABUILDDIR)debugger/mgadd.o \
		$(MESADRVMGABUILDDIR)debugger/mgaeltpath.o \
		$(MESADRVMGABUILDDIR)debugger/mgafastpath.o \
		$(MESADRVMGABUILDDIR)debugger/mgaioctl.o \
		$(MESADRVMGABUILDDIR)debugger/mgapipeline.o \
		$(MESADRVMGABUILDDIR)debugger/mgaspan.o \
		$(MESADRVMGABUILDDIR)debugger/mgastate.o \
		$(MESADRVMGABUILDDIR)debugger/mgatex.o \
		$(MESADRVMGABUILDDIR)debugger/mgatexcnv.o \
		$(MESADRVMGABUILDDIR)debugger/mgatexmem.o \
		$(MESADRVMGABUILDDIR)debugger/mgatris.o \
		$(MESADRVMGABUILDDIR)debugger/mgavb.o \
		$(MESADRVMGABUILDDIR)debugger/mga_xmesa.o

      MGAPOBJS = $(MESADRVMGABUILDDIR)profiled/mgabuffers.o \
		$(MESADRVMGABUILDDIR)profiled/mgadd.o \
		$(MESADRVMGABUILDDIR)profiled/mgaeltpath.o \
		$(MESADRVMGABUILDDIR)profiled/mgafastpath.o \
		$(MESADRVMGABUILDDIR)profiled/mgaioctl.o \
		$(MESADRVMGABUILDDIR)profiled/mgapipeline.o \
		$(MESADRVMGABUILDDIR)profiled/mgaspan.o \
		$(MESADRVMGABUILDDIR)profiled/mgastate.o \
		$(MESADRVMGABUILDDIR)profiled/mgatex.o \
		$(MESADRVMGABUILDDIR)profiled/mgatexcnv.o \
		$(MESADRVMGABUILDDIR)profiled/mgatexmem.o \
		$(MESADRVMGABUILDDIR)profiled/mgatris.o \
		$(MESADRVMGABUILDDIR)profiled/mgavb.o \
		$(MESADRVMGABUILDDIR)profiled/mga_xmesa.o

#ifdef NeedToLinkMesaSrc
LinkSourceFile(mgabuffers.c, $(MESADRVSRCDIR)/mga)
LinkSourceFile(mgadd.c, $(MESADRVSRCDIR)/mga)
LinkSourceFile(mgaeltpath.c, $(MESADRVSRCDIR)/mga)
LinkSourceFile(mgafastpath.c, $(MESADRVSRCDIR)/mga)
LinkSourceFile(mgaioctl.c, $(MESADRVSRCDIR)/mga)
LinkSourceFile(mgapipeline.c, $(MESADRVSRCDIR)/mga)
LinkSourceFile(mgaspan.c, $(MESADRVSRCDIR)/mga)
LinkSourceFile(mgastate.c, $(MESADRVSRCDIR)/mga)
LinkSourceFile(mgatex.c, $(MESADRVSRCDIR)/mga)
LinkSourceFile(mgatexcnv.c, $(MESADRVSRCDIR)/mga)
LinkSourceFile(mgatexmem.c, $(MESADRVSRCDIR)/mga)
LinkSourceFile(mgatris.c, $(MESADRVSRCDIR)/mga)
LinkSourceFile(mgavb.c, $(MESADRVSRCDIR)/mga)
LinkSourceFile(mga_xmesa.c, $(MESADRVSRCDIR)/mga)
#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/mga/Imakefile.inc,v 1.3 2002/02/22 21:33:05 dawes Exp $
d19 1
a19 1
  DRI_DEFINES = GlxDefines -DX_BYTE_ORDER=ByteOrder
d24 1
d28 1
a28 3
		-I$(XF86COMSRC) \
		-I$(GLXLIBSRC)/dri/drm \
		-I$(GLXLIBSRC)/include
d38 2
a39 1
		$(MESADRVMGABUILDDIR)mgarender.c \
d41 1
a41 1
		$(MESADRVMGABUILDDIR)mgapixel.c \
d53 2
a54 1
		$(MESADRVMGABUILDDIR)mgarender.o \
d56 1
a56 1
		$(MESADRVMGABUILDDIR)mgapixel.o \
d68 2
a69 1
		$(MESADRVMGABUILDDIR)unshared/mgarender.o \
d71 1
a71 1
		$(MESADRVMGABUILDDIR)unshared/mgapixel.o \
d83 2
a84 1
		$(MESADRVMGABUILDDIR)debugger/mgarender.o \
d86 1
a86 1
		$(MESADRVMGABUILDDIR)debugger/mgapixel.o \
d98 2
a99 1
		$(MESADRVMGABUILDDIR)profiled/mgarender.o \
d101 1
a101 1
		$(MESADRVMGABUILDDIR)profiled/mgapixel.o \
d114 2
a115 1
LinkSourceFile(mgarender.c, $(MESADRVSRCDIR)/mga)
d117 1
a117 1
LinkSourceFile(mgapixel.c, $(MESADRVSRCDIR)/mga)
@


1.1.1.3
log
@Import of XFree86 4.4.0.
@
text
@d1 1
a1 1
XCOMM $XFree86: xc/lib/GL/mesa/src/drv/mga/Imakefile.inc,v 1.5 2003/09/28 20:15:16 alanh Exp $
d19 1
a19 1
  DRI_DEFINES = GlxDefines -DX_BYTE_ORDER=$(X_BYTE_ORDER)
d37 2
a38 1
      MGASRCS = $(MESADRVMGABUILDDIR)mgadd.c \
d45 1
a46 2
		$(MESADRVMGABUILDDIR)mga_texstate.c \
		$(MESADRVMGABUILDDIR)mga_texcombine.c \
d51 2
a52 1
      MGAOBJS = $(MESADRVMGABUILDDIR)mgadd.o \
d59 1
a60 2
		$(MESADRVMGABUILDDIR)mga_texstate.o \
		$(MESADRVMGABUILDDIR)mga_texcombine.o \
d65 2
a66 1
      MGAUOBJS = $(MESADRVMGABUILDDIR)unshared/mgadd.o \
d73 1
a74 2
		$(MESADRVMGABUILDDIR)unshared/mga_texstate.o \
		$(MESADRVMGABUILDDIR)unshared/mga_texcombine.o \
d79 2
a80 1
      MGADOBJS = $(MESADRVMGABUILDDIR)debugger/mgadd.o \
d87 1
a88 2
		$(MESADRVMGABUILDDIR)debugger/mga_texstate.o \
		$(MESADRVMGABUILDDIR)debugger/mga_texcombine.o \
d93 2
a94 1
      MGAPOBJS = $(MESADRVMGABUILDDIR)profiled/mgadd.o \
d101 1
a102 2
		$(MESADRVMGABUILDDIR)profiled/mga_texstate.o \
		$(MESADRVMGABUILDDIR)profiled/mga_texcombine.o \
d108 1
d116 1
a117 2
LinkSourceFile(mga_texstate.c, $(MESADRVSRCDIR)/mga)
LinkSourceFile(mga_texcombine.c, $(MESADRVSRCDIR)/mga)
@


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