head 1.2; access; symbols netbsd-7-2-RELEASE:1.1.1.5.2.1 netbsd-7-1-2-RELEASE:1.1.1.5.2.1 netbsd-7-1-1-RELEASE:1.1.1.5.2.1 netbsd-7-1:1.1.1.5.2.1.0.4 netbsd-7-1-RELEASE:1.1.1.5.2.1 netbsd-7-1-RC2:1.1.1.5.2.1 netbsd-7-1-RC1:1.1.1.5.2.1 netbsd-7-0-2-RELEASE:1.1.1.5.2.1 netbsd-7-0-1-RELEASE:1.1.1.5.2.1 netbsd-7-0:1.1.1.5.2.1.0.2 netbsd-7-0-RELEASE:1.1.1.5.2.1 netbsd-7-0-RC3:1.1.1.5.2.1 netbsd-7-0-RC2:1.1.1.5.2.1 netbsd-7-0-RC1:1.1.1.5.2.1 netbsd-5-2-3-RELEASE:1.1.1.1.2.1 netbsd-5-1-5-RELEASE:1.1.1.1.2.1 netbsd-6-0-6-RELEASE:1.1.1.4 netbsd-6-1-5-RELEASE:1.1.1.4 netbsd-7:1.1.1.5.0.2 netbsd-7-base:1.1.1.5 MesaLib-7-11-2:1.1.1.5 netbsd-6-1-4-RELEASE:1.1.1.4 netbsd-6-0-5-RELEASE:1.1.1.4 riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.1.1.4 riastradh-drm2:1.1.1.4.0.8 riastradh-drm2-base:1.1.1.4 netbsd-6-1-3-RELEASE:1.1.1.4 netbsd-6-0-4-RELEASE:1.1.1.4 netbsd-5-2-2-RELEASE:1.1.1.1.2.1 netbsd-5-1-4-RELEASE:1.1.1.1.2.1 netbsd-6-1-2-RELEASE:1.1.1.4 netbsd-6-0-3-RELEASE:1.1.1.4 netbsd-5-2-1-RELEASE:1.1.1.1.2.1 netbsd-5-1-3-RELEASE:1.1.1.1.2.1 netbsd-6-1-1-RELEASE:1.1.1.4 netbsd-6-1:1.1.1.4.0.6 netbsd-6-0-2-RELEASE:1.1.1.4 netbsd-6-1-RELEASE:1.1.1.4 netbsd-6-1-RC4:1.1.1.4 netbsd-6-1-RC3:1.1.1.4 netbsd-6-1-RC2:1.1.1.4 netbsd-6-1-RC1:1.1.1.4 netbsd-5-2:1.1.1.1.2.1.0.4 netbsd-6-0-1-RELEASE:1.1.1.4 netbsd-5-2-RELEASE:1.1.1.1.2.1 netbsd-5-2-RC1:1.1.1.1.2.1 netbsd-6-0:1.1.1.4.0.4 netbsd-6-0-RELEASE:1.1.1.4 netbsd-6-0-RC2:1.1.1.4 netbsd-6-0-RC1:1.1.1.4 netbsd-6:1.1.1.4.0.2 netbsd-6-base:1.1.1.4 netbsd-5-1-2-RELEASE:1.1.1.1.2.1 netbsd-5-1-1-RELEASE:1.1.1.1.2.1 netbsd-5-1:1.1.1.1.2.1.0.2 netbsd-5-1-RELEASE:1.1.1.1.2.1 netbsd-5-1-RC4:1.1.1.1.2.1 MesaLib-7-8-2:1.1.1.4 netbsd-5-1-RC3:1.1.1.1.2.1 MesaLib-7-7-1:1.1.1.3 netbsd-5-1-RC2:1.1.1.1.2.1 netbsd-5-1-RC1:1.1.1.1.2.1 netbsd-5-0-2-RELEASE:1.1.1.1 MesaLib-7-4-4:1.1.1.2 netbsd-5-0-1-RELEASE:1.1.1.1 MesaLib-7-4-2:1.1.1.2 netbsd-5-0:1.1.1.1.0.4 netbsd-5-0-RELEASE:1.1.1.1 netbsd-5-0-RC4:1.1.1.1 netbsd-5-0-RC3:1.1.1.1 netbsd-5-0-RC2:1.1.1.1 netbsd-5-0-RC1:1.1.1.1 netbsd-5:1.1.1.1.0.2 netbsd-5-base:1.1.1.1 MesaLib-7-0-3: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 2008.07.29.05.08.16; author mrg; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2008.07.29.05.08.16; author mrg; state Exp; branches 1.1.1.1.2.1; next 1.1.1.2; 1.1.1.2 date 2009.06.11.00.50.15; author mrg; state Exp; branches; next 1.1.1.3; 1.1.1.3 date 2010.05.23.21.22.15; author mrg; state Exp; branches; next 1.1.1.4; 1.1.1.4 date 2010.07.19.05.31.51; author mrg; state Exp; branches; next 1.1.1.5; 1.1.1.5 date 2014.07.09.19.38.34; author riastradh; state Exp; branches 1.1.1.5.2.1; next ; commitid h96CLViPL8qdRJHx; 1.1.1.1.2.1 date 2009.09.17.03.32.03; author snj; state Exp; branches; next ; 1.1.1.5.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 freebsd-dri: FreeBSD DRI hardware drivers include $(TOP)/configs/freebsd CONFIG_NAME = freebsd-dri # Compiler and flags CC = gcc CXX = g++ WARN_FLAGS = -Wall OPT_FLAGS = -O EXPAT_INCLUDES = -I/usr/local/include X11_INCLUDES = -I/usr/X11R6/include DEFINES = -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \ -DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \ -DHAVE_ALIAS CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) -Wmissing-prototypes -std=c99 -Wundef -ffast-math \ $(ASM_FLAGS) $(X11_INCLUDES) $(DEFINES) CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) -Wall -ansi -pedantic $(ASM_FLAGS) $(X11_INCLUDES) # Work around aliasing bugs - developers should comment this out CFLAGS += -fno-strict-aliasing CXXFLAGS += -fno-strict-aliasing ASM_SOURCES = # Library/program dependencies LIBDRM_CFLAGS = `pkg-config --cflags libdrm` LIBDRM_LIB = `pkg-config --libs libdrm` DRI_LIB_DEPS = -L/usr/local/lib -lm -pthread -lexpat $(LIBDRM_LIB) GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \ -lm -pthread $(LIBDRM_LIB) GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/X11R6/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/X11R6/lib -lGL -lXt -lX11 # Directories SRC_DIRS = glx/x11 mesa glu glut/glx glw DRIVER_DIRS = dri PROGRAM_DIRS = WINDOW_SYSTEM=dri DRM_SOURCE_PATH=$(TOP)/../drm # ffb and gamma are missing because they have not been converted to use the new # interface. DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon tdfx \ unichrome savage sis @ 1.1 log @Initial revision @ text @@ 1.1.1.1 log @initial import of MesaLib-7.0.3 @ text @@ 1.1.1.1.2.1 log @Apply patch (requested by mrg in ticket #958): Bring over X.Org updates from HEAD. @ text @d12 1 a12 1 OPT_FLAGS = -O -g d15 1 a15 1 X11_INCLUDES = -I/usr/local/include d35 1 a35 1 GL_LIB_DEPS = -L/usr/local/lib -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \ d38 2 a39 2 GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/local/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/local/lib -lGL -lXt -lX11 @ 1.1.1.2 log @initial import of MesaLib-7.4.2 @ text @d12 1 a12 1 OPT_FLAGS = -O -g d15 1 a15 1 X11_INCLUDES = -I/usr/local/include d35 1 a35 1 GL_LIB_DEPS = -L/usr/local/lib -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \ d38 2 a39 2 GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/local/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/local/lib -lGL -lXt -lX11 @ 1.1.1.3 log @initial import of MesaLib-7.7.1 @ text @a29 1 MESA_ASM_SOURCES = d43 1 a43 1 SRC_DIRS = glx/x11 gallium mesa glu glut/glx glew glw @ 1.1.1.4 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 @d44 1 a44 1 SRC_DIRS = glx gallium mesa glu glut/glx glew glw d51 2 @ 1.1.1.5 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 for details. @ text @a32 2 MESA_MODULES = $(TOP)/src/mesa/libmesa.a d35 1 a35 1 DRI_LIB_DEPS = $(MESA_MODULES) -L/usr/local/lib -lm -pthread -lexpat $(LIBDRM_LIB) d44 1 a44 1 SRC_DIRS = glx gallium mesa glu glut/glx glw d46 2 @ 1.1.1.5.2.1 log @File removals that accidently did not happen during pullup of the new MesaLib for ticket #381 @ text @@