head	1.2;
access;
symbols
	netbsd-7-2-RELEASE:1.1.1.3.2.1
	netbsd-7-1-2-RELEASE:1.1.1.3.2.1
	netbsd-7-1-1-RELEASE:1.1.1.3.2.1
	netbsd-7-1:1.1.1.3.2.1.0.4
	netbsd-7-1-RELEASE:1.1.1.3.2.1
	netbsd-7-1-RC2:1.1.1.3.2.1
	netbsd-7-1-RC1:1.1.1.3.2.1
	netbsd-7-0-2-RELEASE:1.1.1.3.2.1
	netbsd-7-0-1-RELEASE:1.1.1.3.2.1
	netbsd-7-0:1.1.1.3.2.1.0.2
	netbsd-7-0-RELEASE:1.1.1.3.2.1
	netbsd-7-0-RC3:1.1.1.3.2.1
	netbsd-7-0-RC2:1.1.1.3.2.1
	netbsd-7-0-RC1:1.1.1.3.2.1
	netbsd-6-0-6-RELEASE:1.1.1.2
	netbsd-6-1-5-RELEASE:1.1.1.2
	netbsd-7:1.1.1.3.0.2
	netbsd-7-base:1.1.1.3
	MesaLib-7-11-2:1.1.1.3
	netbsd-6-1-4-RELEASE:1.1.1.2
	netbsd-6-0-5-RELEASE:1.1.1.2
	riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.1.1.2
	riastradh-drm2:1.1.1.2.0.8
	riastradh-drm2-base:1.1.1.2
	netbsd-6-1-3-RELEASE:1.1.1.2
	netbsd-6-0-4-RELEASE:1.1.1.2
	netbsd-6-1-2-RELEASE:1.1.1.2
	netbsd-6-0-3-RELEASE:1.1.1.2
	netbsd-6-1-1-RELEASE:1.1.1.2
	netbsd-6-1:1.1.1.2.0.6
	netbsd-6-0-2-RELEASE:1.1.1.2
	netbsd-6-1-RELEASE:1.1.1.2
	netbsd-6-1-RC4:1.1.1.2
	netbsd-6-1-RC3:1.1.1.2
	netbsd-6-1-RC2:1.1.1.2
	netbsd-6-1-RC1:1.1.1.2
	netbsd-6-0-1-RELEASE:1.1.1.2
	netbsd-6-0:1.1.1.2.0.4
	netbsd-6-0-RELEASE:1.1.1.2
	netbsd-6-0-RC2:1.1.1.2
	netbsd-6-0-RC1:1.1.1.2
	netbsd-6:1.1.1.2.0.2
	netbsd-6-base:1.1.1.2
	MesaLib-7-8-2:1.1.1.2
	MesaLib-7-7-1:1.1.1.1
	xorg:1.1.1;
locks; strict;
comment	@# @;


1.2
date	2014.12.18.06.11.29;	author mrg;	state dead;
branches;
next	1.1;
commitid	Ae59RsLlS9l0cu2y;

1.1
date	2010.05.23.21.22.15;	author mrg;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2010.05.23.21.22.15;	author mrg;	state Exp;
branches;
next	1.1.1.2;

1.1.1.2
date	2010.07.19.05.31.51;	author mrg;	state Exp;
branches;
next	1.1.1.3;

1.1.1.3
date	2014.07.09.19.38.34;	author riastradh;	state Exp;
branches
	1.1.1.3.2.1;
next	;
commitid	h96CLViPL8qdRJHx;

1.1.1.3.2.1
date	2015.01.06.09.26.19;	author martin;	state dead;
branches;
next	;
commitid	2BxXkbQgg8gLEW4y;


desc
@@


1.2
log
@merge Mesa 10.3.5.
@
text
@# -*-makefile-*-
# Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others

include $(TOP)/configs/default

CONFIG_NAME = linux-dri

# Compiler and flags
CC = gcc
CXX = g++

#MKDEP = /usr/X11R6/bin/makedepend
#MKDEP = gcc -M
#MKDEP_OPTIONS = -MF depend

OPT_FLAGS  = -O -g
PIC_FLAGS  = -fPIC

# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
ARCH_FLAGS ?=

DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
	-D_BSD_SOURCE -D_GNU_SOURCE \
	-DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
	-DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \
	-DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN

X11_INCLUDES = -I/usr/X11R6/include

CFLAGS = -Wall -Wmissing-prototypes -std=c99 -ffast-math \
	$(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)

CXXFLAGS = -Wall $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)


MESA_ASM_SOURCES = 

# Library/program dependencies
EXTRA_LIB_PATH=-L/usr/X11R6/lib

LIBDRM_CFLAGS = $(shell pkg-config --cflags libdrm)
LIBDRM_LIB = $(shell pkg-config --libs libdrm)
DRI_LIB_DEPS  = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
		-lm -lpthread -ldl \
                $(LIBDRM_LIB)


# This is now 0 by default since it seems to confuse the hell out of people
# and generate a lot of extra noise on bugzilla.  If you need to build with
# EGL, do 'make linux-dri USING_EGL=1'

USING_EGL=0

# Directories
SRC_DIRS = gallium mesa gallium/winsys glu egl
PROGRAM_DIRS = egl

DRIVER_DIRS = dri
WINDOW_SYSTEM = dri
GALLIUM_WINSYS_DIRS = egl_drm

# gamma are missing because they have not been converted to use the new
# interface.
DRI_DIRS = intel 
@


1.1
log
@Initial revision
@
text
@@


1.1.1.1
log
@initial import of MesaLib-7.7.1
@
text
@@


1.1.1.2
log
@import Mesa 7.8.2, lib part.  major changes since 7.7.1:
- several new extensions for various drivers
- many i965, i915 driver fixes
- many glsl fixes
@
text
@d49 6
d63 2
@


1.1.1.3
log
@import MesaLib 7.11.2

Brings in support for Intel Sandy Bridge and Ivy Bridge hardware, a
new shader language compiler, and various other improvements too
numerous to list here; see <http://www.mesa3d.org/relnotes.html> for
details.
@
text
@a40 2
MESA_MODULES  = $(TOP)/src/mesa/libmesa.a

d43 1
a43 1
DRI_LIB_DEPS  = $(MESA_MODULES) $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
d50 2
a51 1
SRC_DIRS = gallium mesa gallium/winsys gallium/targets glu egl
d54 1
a55 1
GALLIUM_TARGET_DIRS =
@


1.1.1.3.2.1
log
@File removals that accidently did not happen during pullup of the new
MesaLib for ticket #381
@
text
@@