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

1.1.1.1
date	2001.06.09.14.53.23;	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.58;	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/gamma/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 MesaDrvGammaBuildDir
#define MesaDrvGammaBuildDir /**/
#endif
MESADRVGAMMABUILDDIR = MesaDrvGammaBuildDir

#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$(XF86DRIVERSRC)/glint \
		-I$(XF86OSSRC)
#endif

MESA_INCLUDES = -I$(MESASRCDIR)/src -I$(MESADRVSRCDIR)/gamma
   X_INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC)


    GAMMASRCS = $(MESADRVGAMMABUILDDIR)gamma_gl.c \
		$(MESADRVGAMMABUILDDIR)gamma_xmesa.c \
		$(MESADRVGAMMABUILDDIR)gamma_init.c \
		$(MESADRVGAMMABUILDDIR)gamma_matrix.c \
		$(MESADRVGAMMABUILDDIR)gamma_inithw.c \
		$(MESADRVGAMMABUILDDIR)gamma_texture.c \
		$(MESADRVGAMMABUILDDIR)gamma_dlist.c

    GAMMAOBJS = $(MESADRVGAMMABUILDDIR)gamma_gl.o \
		$(MESADRVGAMMABUILDDIR)gamma_xmesa.o \
		$(MESADRVGAMMABUILDDIR)gamma_init.o \
		$(MESADRVGAMMABUILDDIR)gamma_matrix.o \
		$(MESADRVGAMMABUILDDIR)gamma_inithw.o \
		$(MESADRVGAMMABUILDDIR)gamma_texture.o \
		$(MESADRVGAMMABUILDDIR)gamma_dlist.o

    GAMMAUOBJS = $(MESADRVGAMMABUILDDIR)unshared/gamma_gl.o \
		$(MESADRVGAMMABUILDDIR)unshared/gamma_xmesa.o \
		$(MESADRVGAMMABUILDDIR)unshared/gamma_init.o \
		$(MESADRVGAMMABUILDDIR)unshared/gamma_matrix.o \
		$(MESADRVGAMMABUILDDIR)unshared/gamma_inithw.o \
		$(MESADRVGAMMABUILDDIR)unshared/gamma_texture.o \
		$(MESADRVGAMMABUILDDIR)unshared/gamma_dlist.o

    GAMMADOBJS = $(MESADRVGAMMABUILDDIR)debugger/gamma_gl.o \
		$(MESADRVGAMMABUILDDIR)debugger/gamma_xmesa.o \
		$(MESADRVGAMMABUILDDIR)debugger/gamma_init.o \
		$(MESADRVGAMMABUILDDIR)debugger/gamma_matrix.o \
		$(MESADRVGAMMABUILDDIR)debugger/gamma_inithw.o \
		$(MESADRVGAMMABUILDDIR)debugger/gamma_texture.o \
		$(MESADRVGAMMABUILDDIR)debugger/gamma_dlist.o

    GAMMAPOBJS = $(MESADRVGAMMABUILDDIR)profiled/gamma_gl.o \
		$(MESADRVGAMMABUILDDIR)profiled/gamma_xmesa.o \
		$(MESADRVGAMMABUILDDIR)profiled/gamma_init.o \
		$(MESADRVGAMMABUILDDIR)profiled/gamma_matrix.o \
		$(MESADRVGAMMABUILDDIR)profiled/gamma_inithw.o \
		$(MESADRVGAMMABUILDDIR)profiled/gamma_texture.o \
		$(MESADRVGAMMABUILDDIR)profiled/gamma_dlist.o

#ifdef NeedToLinkMesaSrc
LinkSourceFile(gamma_gl.c, $(MESADRVSRCDIR)/gamma)
LinkSourceFile(gamma_xmesa.c, $(MESADRVSRCDIR)/gamma)
LinkSourceFile(gamma_init.c, $(MESADRVSRCDIR)/gamma)
LinkSourceFile(gamma_matrix.c, $(MESADRVSRCDIR)/gamma)
LinkSourceFile(gamma_inithw.c, $(MESADRVSRCDIR)/gamma)
LinkSourceFile(gamma_texture.c, $(MESADRVSRCDIR)/gamma)
LinkSourceFile(gamma_dlist.c, $(MESADRVSRCDIR)/gamma)
#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/gamma/Imakefile.inc,v 1.3 2002/02/22 21:33:00 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 \
a23 1
		-I$(XF86OSSRC) \
d25 1
a25 3
		-I$(XF86COMSRC) \
		-I$(GLXLIBSRC)/dri/drm \
		-I$(GLXLIBSRC)/include
d28 1
a28 3
MESA_INCLUDES = -I$(MESASRCDIR)/src \
		-I$(MESADRVSRCDIR)/common \
		-I$(MESADRVSRCDIR)/gamma
d32 4
a35 2
    GAMMASRCS = $(MESADRVGAMMABUILDDIR)gamma_context.c \
		$(MESADRVGAMMABUILDDIR)gamma_dd.c \
d37 2
a38 11
		$(MESADRVGAMMABUILDDIR)gamma_lock.c \
		$(MESADRVGAMMABUILDDIR)gamma_render.c \
		$(MESADRVGAMMABUILDDIR)gamma_screen.c \
		$(MESADRVGAMMABUILDDIR)gamma_span.c \
		$(MESADRVGAMMABUILDDIR)gamma_state.c \
		$(MESADRVGAMMABUILDDIR)gamma_tex.c \
		$(MESADRVGAMMABUILDDIR)gamma_texmem.c \
		$(MESADRVGAMMABUILDDIR)gamma_texstate.c \
		$(MESADRVGAMMABUILDDIR)gamma_tris.c \
		$(MESADRVGAMMABUILDDIR)gamma_vb.c \
		$(MESADRVGAMMABUILDDIR)gamma_xmesa.c
d40 4
a43 2
    GAMMAOBJS = $(MESADRVGAMMABUILDDIR)gamma_context.o \
		$(MESADRVGAMMABUILDDIR)gamma_dd.o \
d45 2
a46 11
		$(MESADRVGAMMABUILDDIR)gamma_lock.o \
		$(MESADRVGAMMABUILDDIR)gamma_render.o \
		$(MESADRVGAMMABUILDDIR)gamma_screen.o \
		$(MESADRVGAMMABUILDDIR)gamma_span.o \
		$(MESADRVGAMMABUILDDIR)gamma_state.o \
		$(MESADRVGAMMABUILDDIR)gamma_tex.o \
		$(MESADRVGAMMABUILDDIR)gamma_texmem.o \
		$(MESADRVGAMMABUILDDIR)gamma_texstate.o \
		$(MESADRVGAMMABUILDDIR)gamma_tris.o \
		$(MESADRVGAMMABUILDDIR)gamma_vb.o \
		$(MESADRVGAMMABUILDDIR)gamma_xmesa.o
d48 4
a51 2
    GAMMAUOBJS = $(MESADRVGAMMABUILDDIR)unshared/gamma_context.o \
		$(MESADRVGAMMABUILDDIR)unshared/gamma_dd.o \
d53 2
a54 11
		$(MESADRVGAMMABUILDDIR)unshared/gamma_lock.o \
		$(MESADRVGAMMABUILDDIR)unshared/gamma_render.o \
		$(MESADRVGAMMABUILDDIR)unshared/gamma_screen.o \
		$(MESADRVGAMMABUILDDIR)unshared/gamma_span.o \
		$(MESADRVGAMMABUILDDIR)unshared/gamma_state.o \
		$(MESADRVGAMMABUILDDIR)unshared/gamma_tex.o \
		$(MESADRVGAMMABUILDDIR)unshared/gamma_texmem.o \
		$(MESADRVGAMMABUILDDIR)unshared/gamma_texstate.o \
		$(MESADRVGAMMABUILDDIR)unshared/gamma_tris.o \
		$(MESADRVGAMMABUILDDIR)unshared/gamma_vb.o \
		$(MESADRVGAMMABUILDDIR)unshared/gamma_xmesa.o
d56 4
a59 2
    GAMMADOBJS = $(MESADRVGAMMABUILDDIR)debugger/gamma_context.o \
		$(MESADRVGAMMABUILDDIR)debugger/gamma_dd.o \
d61 2
a62 11
		$(MESADRVGAMMABUILDDIR)debugger/gamma_lock.o \
		$(MESADRVGAMMABUILDDIR)debugger/gamma_render.o \
		$(MESADRVGAMMABUILDDIR)debugger/gamma_screen.o \
		$(MESADRVGAMMABUILDDIR)debugger/gamma_span.o \
		$(MESADRVGAMMABUILDDIR)debugger/gamma_state.o \
		$(MESADRVGAMMABUILDDIR)debugger/gamma_tex.o \
		$(MESADRVGAMMABUILDDIR)debugger/gamma_texmem.o \
		$(MESADRVGAMMABUILDDIR)debugger/gamma_texstate.o \
		$(MESADRVGAMMABUILDDIR)debugger/gamma_tris.o \
		$(MESADRVGAMMABUILDDIR)debugger/gamma_vb.o \
		$(MESADRVGAMMABUILDDIR)debugger/gamma_xmesa.o
d64 4
a67 2
    GAMMAPOBJS = $(MESADRVGAMMABUILDDIR)profiled/gamma_context.o \
		$(MESADRVGAMMABUILDDIR)profiled/gamma_dd.o \
d69 2
a70 11
		$(MESADRVGAMMABUILDDIR)profiled/gamma_lock.o \
		$(MESADRVGAMMABUILDDIR)profiled/gamma_render.o \
		$(MESADRVGAMMABUILDDIR)profiled/gamma_screen.o \
		$(MESADRVGAMMABUILDDIR)profiled/gamma_span.o \
		$(MESADRVGAMMABUILDDIR)profiled/gamma_state.o \
		$(MESADRVGAMMABUILDDIR)profiled/gamma_tex.o \
		$(MESADRVGAMMABUILDDIR)profiled/gamma_texmem.o \
		$(MESADRVGAMMABUILDDIR)profiled/gamma_texstate.o \
		$(MESADRVGAMMABUILDDIR)profiled/gamma_tris.o \
		$(MESADRVGAMMABUILDDIR)profiled/gamma_vb.o \
		$(MESADRVGAMMABUILDDIR)profiled/gamma_xmesa.o
@


1.1.1.3
log
@Import of XFree86 4.4.0.
@
text
@d1 1
a1 1
XCOMM $XFree86: xc/lib/GL/mesa/src/drv/gamma/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
@@