Welcome to Mesa-7.0.3.

Changes from 6.4.2 are (obviously) far too numerous to mention!  This
package brings with it support for the Direct Rendering Infrastructure
(DRI) on NetBSD-current; the kernel DRM was committed approximately
one year ago.  Patches for NetBSD 4.0 are available in the mailing list
archives (I think), but are _not supported_.

Developers and other interested parties are encouraged to read the TODO
file, as well as my remarks in options.mk.  There is still a significant
amount of work to be done.  Users of NetBSD/i386 (-current) shouldn't
have much trouble getting mainstream cards (Intel i915 and Radeon 9600-
R430 are by far the most tested) to work.

I have taken great pains to ensure that this works properly, but inevitably
there will be problems--especially on heretofore untested (read: non-x86)
hardware.  Your questions, comments, problem reports, and of course
bug fixes are welcome.

NOTE: There are currently problems (on NetBSD, at least) linking some
executables, e.g. compiz, due to unresolved symbols for libpthread
functions.  This is due to libX11's thread stubs, which should not
be enabled on NetBSD >= 2.0; see the TODO For more information
and the URL of an interim patch.

10 files changed, 243 insertions, 0 deletions

diff --git a/graphics/MesaLib/files/configs/default b/graphics/MesaLib/files/configs/default
new file mode 100644
index 00000000000..6921e7a53a5
--- /dev/null
+++ b/graphics/MesaLib/files/configs/default
@@ -0,0 +1,61 @@
+# $NetBSD: default,v 1.1 2008/04/24 07:40:24 bjs Exp $
+
+CONFIG_NAME = default
+
+# Version info
+MESA_MAJOR=	7
+MESA_MINOR=	0
+MESA_TINY=	3
+
+GLU_CFLAGS=	# defined
+
+MKLIB_OPTIONS=
+MKDEP=	makedepend
+MKDEP_OPTIONS=	-fdepend
+INSTALL?=	$(TOP)/bin/minstall
+
+# Python and flags (generally only needed by the developers)
+PYTHON2=	$(PYTHONBIN)
+PYTHON_FLAGS=	-t -O -O
+
+GL_LIB=		GL
+GLU_LIB=	GLU
+GLUT_LIB=	glut
+GLW_LIB=	GLw
+OSMESA_LIB=	OSMesa
+
+GL_LIB_NAME?=		lib$(GL_LIB).so
+GLU_LIB_NAME?=		lib$(GLU_LIB).so
+GLUT_LIB_NAME?=		lib$(GLUT_LIB).so
+GLW_LIB_NAME?=		lib$(GLW_LIB).so
+OSMESA_LIB_NAME?=	lib$(OSMESA_LIB).so
+
+ASM_SOURCES?=	# defined
+GLW_SOURCES?=	GLwDrawA.c
+
+LIB_DIR=	lib
+SRC_DIRS=	mesa glu glut/glx glw
+GLU_DIRS=	sgi
+DRIVER_DIRS=	x11 osmesa
+PROGRAM_DIRS=	demos redbook samples glsl xdemos
+
+EXTRA_LIB_PATH?=	# defined
+GL_LIB_DEPS=\
+	$(EXTRA_LIB_PATH) -lX11 -lXext -lm $(PTHREAD_STUBLIB)
+OSMESA_LIB_DEPS=\
+	-L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
+GLU_LIB_DEPS=\
+	-L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
+GLUT_LIB_DEPS=\
+	-L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) \
+	$(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lm
+GLW_LIB_DEPS=\
+	-L$(TOP)/$(LIB_DIR) -l$(GL_LIB)  \
+	 $(EXTRA_LIB_PATH) -lXt -lX11
+APP_LIB_DEPS=\
+	 -lm
+
+INSTALL_DIR?= $(PREFIX)
+DRI_DRIVER_INSTALL_DIR?= $(PREFIX)/lib/dri
+
+DRI_DRIVER_SEARCH_DIR?=  $(LOCALBASE)/lib/dri
diff --git a/graphics/MesaLib/files/configs/interix3 b/graphics/MesaLib/files/configs/interix3
new file mode 100644
index 00000000000..16a4566aad6
--- /dev/null
+++ b/graphics/MesaLib/files/configs/interix3
@@ -0,0 +1,12 @@
+# $NetBSD: interix3,v 1.1 2008/04/24 07:40:24 bjs Exp $
+#
+# Configuration for Interix 3.x
+
+include $(TOP)/configs/default
+
+CONFIG_NAME = pkgsrc
+
+# Compiler and flags
+CFLAGS+= -DUSE_XSHM_HDRONLY -DPTHREADS
+APP_LIB_DEPS = -L$(LIB_DIR) -L${PREFIX}/lib -L${X11PREFIX}/lib -lXext -lXmu -lXi -lX11 -lm
+
diff --git a/graphics/MesaLib/files/configs/pkgsrc b/graphics/MesaLib/files/configs/pkgsrc
new file mode 100644
index 00000000000..ed2f6c699b7
--- /dev/null
+++ b/graphics/MesaLib/files/configs/pkgsrc
@@ -0,0 +1,40 @@
+# $NetBSD: pkgsrc,v 1.1 2008/04/24 07:40:24 bjs Exp $
+
+include $(TOP)/configs/default
+
+ifeq ($(USE_XCB), yes)
+include $(TOP)/configs/xcb-defs
+endif
+
+CONFIG_NAME=	pkgsrc
+
+DEFINES=	-DPTHREADS -DUSE_XSHM -DHZ=$(MESA_HZ) $(XCB_DEFS)
+X11_INCLUDES=	-I$(X11BASE)/include $(XCB_X11_INCLUDES)
+
+CFLAGS+=	$(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) \
+		$(DEFINES) $(X11_INCLUDES)
+CXXFLAGS+=	$(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) \
+		$(DEFINES) $(X11_INCLUDES)
+
+LIBTOOL?=	libtool
+
+GLUT_CFLAGS=	-fexceptions # XXX gcc
+GL_LIB_DEPS=\
+	$(EXTRA_LIB_PATH) -lX11 $(XCB_GL_LIB_DEPS) -lXext -lm $(PTHREAD_STUBLIB)
+OSMESA_LIB_DEPS=\
+	$(TOP)/$(LIB_DIR)/lib$(GL_LIB).la
+GLU_LIB_DEPS=\
+	-lGL -lm
+GLUT_LIB_DEPS=\
+	-lGLU -lGL -lX11 -lXmu -lXt -lXi -lm
+GLW_LIB_DEPS=\
+	$(TOP)/$(LIB_DIR)/lib$(GL_LIB).la -lXt -lX11
+
+# XXX this is wrong, revisit when doing MesaDemos
+APP_LIB_DEPS=	$(TOP)/$(LIB_DIR)/lib$(GLUT_LIB).la \
+		$(TOP)/$(LIB_DIR)/lib$(GLU_LIB).la \
+		$(TOP)/$(LIB_DIR)/lib$(GL_LIB).la \
+		-lXext -lXmu -lXi -lX11 -lm
+
+SRC_DIRS=	mesa glw glu glut/glx
+DRIVER_DIRS=	x11 osmesa
diff --git a/graphics/MesaLib/files/configs/pkgsrc-dri b/graphics/MesaLib/files/configs/pkgsrc-dri
new file mode 100644
index 00000000000..ab3499d00c2
--- /dev/null
+++ b/graphics/MesaLib/files/configs/pkgsrc-dri
@@ -0,0 +1,40 @@
+# $NetBSD: pkgsrc-dri,v 1.1 2008/04/24 07:40:24 bjs Exp $
+
+include $(TOP)/configs/pkgsrc
+
+ifeq ($(USE_XCB), yes)
+include $(TOP)/configs/xcb-defs
+endif
+
+CONFIG_NAME= 	pkgsrc-dri
+
+DEFINES=\
+	-DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
+	-DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING -DHZ=$(MESA_HZ) \
+	-DHAVE_ALIAS -D_REENTRANT $(XCB_DEFS)
+CFLAGS+=\
+	$(WARN_FLAGS) -Wmissing-prototypes -Wall \
+	$(ASM_FLAGS) $(X11_INCLUDES)
+CXXFLAGS+=\
+	$(WARN_FLAGS) $(COPTS) -Wall $(ASM_FLAGS)
+
+ASM_SOURCES?=	# defined
+
+LIBDRM_CFLAGS=	`$(PKG_CONFIG) --cflags libdrm`
+LIBDRM_LIB=	`$(PKG_CONFIG) --libs libdrm`
+#PCIACCESS_CFLAGS=	`$(PKG_CONFIG) --cflags pciaccess`
+#PCIACCESS_LIBS=	`$(PKG_CONFIG) --cflags pciaccess`
+
+DRI_LIB_DEPS?=	-lm -lexpat $(LIBDRM_LIB)
+GL_LIB_DEPS=\
+	-lX11 -lXext -lXxf86vm -lXdamage \
+	-lXfixes -lm $(LIBDRM_LIB) \
+	$(XCB_GL_LIB_DEPS)
+
+SRC_DIRS=	glx/x11 mesa glw
+DRIVER_DIRS=	dri
+PROGRAM_DIRS=	# defined
+WINDOW_SYSTEM=	dri
+
+DRI_DIRS?=	i810 i915 i915tex i965 mach64 mga r128 r200  \
+		r300 radeon tdfx unichrome savage sis
diff --git a/graphics/MesaLib/files/configs/pkgsrc-dri-i386 b/graphics/MesaLib/files/configs/pkgsrc-dri-i386
new file mode 100644
index 00000000000..47f0323ad7b
--- /dev/null
+++ b/graphics/MesaLib/files/configs/pkgsrc-dri-i386
@@ -0,0 +1,9 @@
+# $NetBSD: pkgsrc-dri-i386,v 1.1 2008/04/24 07:40:24 bjs Exp $
+
+include $(TOP)/configs/pkgsrc-dri$(MESA_CONFIG_SUFX)
+
+CONFIG_NAME=	pkgsrc-dri-i386
+
+ASM_FLAGS=	-DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
+ASM_SOURCES=	$(X86_SOURCES)
+ASM_API=	$(X86_API)
diff --git a/graphics/MesaLib/files/configs/pkgsrc-dri-x86_64 b/graphics/MesaLib/files/configs/pkgsrc-dri-x86_64
new file mode 100644
index 00000000000..11d1fa7d1ba
--- /dev/null
+++ b/graphics/MesaLib/files/configs/pkgsrc-dri-x86_64
@@ -0,0 +1,9 @@
+# $NetBSD: pkgsrc-dri-x86_64,v 1.1 2008/04/24 07:40:24 bjs Exp $
+
+include $(TOP)/configs/pkgsrc-dri$(MESA_CONFIG_SUFX)
+
+CONFIG_NAME=	pkgsrc-dri-x86_64
+
+ASM_FLAGS=	-DUSE_X86_64_ASM
+ASM_SOURCES=	$(X86-64_SOURCES)
+ASM_API=	$(X86-64_API)
diff --git a/graphics/MesaLib/files/configs/pkgsrc-i386 b/graphics/MesaLib/files/configs/pkgsrc-i386
new file mode 100644
index 00000000000..8fbe266c6ab
--- /dev/null
+++ b/graphics/MesaLib/files/configs/pkgsrc-i386
@@ -0,0 +1,9 @@
+# $NetBSD: pkgsrc-i386,v 1.1 2008/04/24 07:40:24 bjs Exp $
+
+include $(TOP)/configs/pkgsrc
+
+CONFIG_NAME=	pkgsrc-i386
+
+ASM_FLAGS?=	-DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
+ASM_SOURCES=	$(X86_SOURCES)
+ASM_API=	$(X86_API)
diff --git a/graphics/MesaLib/files/configs/pkgsrc-indirect b/graphics/MesaLib/files/configs/pkgsrc-indirect
new file mode 100644
index 00000000000..fe5f8078a06
--- /dev/null
+++ b/graphics/MesaLib/files/configs/pkgsrc-indirect
@@ -0,0 +1,39 @@
+# $NetBSD: pkgsrc-indirect,v 1.1 2008/04/24 07:40:24 bjs Exp $
+
+include $(TOP)/configs/pkgsrc
+
+ifeq ($(USE_XCB), yes)
+include $(TOP)/configs/xcb-defs
+endif
+
+CONFIG_NAME=	pkgsrc-indirect
+
+DEFINES=\
+	-DPTHREADS -DGLX_INDIRECT_RENDERING -DHAVE_ALIAS -D_REENTRANT \
+	$(XCB_DEFS)
+CFLAGS+=\
+	$(WARN_FLAGS) $(COPTS) -Wmissing-prototypes -Wall \
+	$(ASM_FLAGS) $(X11_INCLUDES) $(XCB_X11_INCLUDES)
+CXXFLAGS+=\
+	$(WARN_FLAGS) $(COPTS) -Wall $(ASM_FLAGS)
+
+ASM_SOURCES?=	# defined
+
+LIBDRM_CFLAGS=	`$(PKG_CONFIG) --cflags libdrm`
+LIBDRM_LIB=	`$(PKG_CONFIG) --libs libdrm`
+#PCIACCESS_CFLAGS=	`$(PKG_CONFIG) --cflags pciaccess`
+#PCIACCESS_LIBS=	`$(PKG_CONFIG) --cflags pciaccess`
+
+DRI_LIB_DEPS?= -lm -lexpat $(LIBDRM_LIB)
+GL_LIB_DEPS=\
+	-lX11 -lXext -lXxf86vm -lXdamage \
+	-lXfixes -lm $(LIBDRM_LIB) \
+	$(XCB_GL_LIB_DEPS)
+
+SRC_DIRS=	glx/x11 mesa glw
+DRIVER_DIRS=	dri
+PROGRAM_DIRS=	# defined
+WINDOW_SYSTEM=	dri
+
+DRI_DIRS?=	i810 i915 i915tex i965 mach64 mga r128 r200  \
+		r300 radeon tdfx unichrome savage sis
diff --git a/graphics/MesaLib/files/configs/pkgsrc-x86_64 b/graphics/MesaLib/files/configs/pkgsrc-x86_64
new file mode 100644
index 00000000000..6340180e14b
--- /dev/null
+++ b/graphics/MesaLib/files/configs/pkgsrc-x86_64
@@ -0,0 +1,9 @@
+# $NetBSD: pkgsrc-x86_64,v 1.1 2008/04/24 07:40:24 bjs Exp $
+
+include $(TOP)/configs/pkgsrc
+
+CONFIG_NAME=	pkgsrc-dri-x86_64
+
+ASM_FLAGS=	-DUSE_X86_64_ASM
+ASM_SOURCES=	$(X86-64_SOURCES)
+ASM_API=	$(X86-64_API)
diff --git a/graphics/MesaLib/files/configs/xcb-defs b/graphics/MesaLib/files/configs/xcb-defs
new file mode 100644
index 00000000000..34b9a8e2dd3
--- /dev/null
+++ b/graphics/MesaLib/files/configs/xcb-defs
@@ -0,0 +1,15 @@
+# $NetBSD: xcb-defs,v 1.1 2008/04/24 07:40:24 bjs Exp $
+
+
+XCB_DEFS=	-DUSE_XCB
+
+XCB_X11_INCLUDES=\
+	`pkg-config --cflags-only-I x11` \
+	`pkg-config --cflags-only-I xcb` \
+	`pkg-config --cflags-only-I x11-xcb` \
+	`pkg-config --cflags-only-I xcb-glx`
+
+XCB_GL_LIB_DEPS=\
+	`pkg-config --libs xcb` \
+	`pkg-config --libs x11-xcb` \
+	`pkg-config --libs xcb-glx`