summaryrefslogtreecommitdiff
path: root/graphics/MesaLib/files
diff options
context:
space:
mode:
authorbjs <bjs@pkgsrc.org>2008-07-27 00:03:42 +0000
committerbjs <bjs@pkgsrc.org>2008-07-27 00:03:42 +0000
commit03aa255c8fb825c98193093706b2b492977a73e5 (patch)
tree7c65f0da0b8da23c4951cf9c284a77a1e0666911 /graphics/MesaLib/files
parent99833e8c267bd82699c5bee6c48c005e0c8615a4 (diff)
downloadpkgsrc-03aa255c8fb825c98193093706b2b492977a73e5.tar.gz
Update to Mesa-7.0.4 (the head of the 7.0 branch in GIT). Basically,
lots of bug fixes; the intent of my update was mostly to fix problems with i915 and r300 dri drivers and to provide the best environment possible for the xorg server update to the 1.4 branch. Morever, many of our patches from pkgsrc, i.e. those removed in this commit, are now included upstream. Additionally, MesaDemos now builds. NOTES: - MesaLib now requires xf86driproto 2.0.4, as earlier versions install dri_interface.h, which is not correct. - glu now exports its symbols via libtool's -export-symfile. The symfile is generated pre-build--see glu/Makefile. - glxinfo/glxgears do not seem to need to be linked to libpthread, and this seems to cause problems on NetBSD with the new drm code. If I am wrong about this, please let me know. The only program that seems to need libpthread is glthreads in MesaDemos.
Diffstat (limited to 'graphics/MesaLib/files')
-rw-r--r--graphics/MesaLib/files/configs/default6
-rw-r--r--graphics/MesaLib/files/configs/pkgsrc8
2 files changed, 5 insertions, 9 deletions
diff --git a/graphics/MesaLib/files/configs/default b/graphics/MesaLib/files/configs/default
index 6921e7a53a5..45d364ea3ea 100644
--- a/graphics/MesaLib/files/configs/default
+++ b/graphics/MesaLib/files/configs/default
@@ -1,4 +1,4 @@
-# $NetBSD: default,v 1.1 2008/04/24 07:40:24 bjs Exp $
+# $NetBSD: default,v 1.2 2008/07/27 00:03:42 bjs Exp $
CONFIG_NAME = default
@@ -10,8 +10,8 @@ MESA_TINY= 3
GLU_CFLAGS= # defined
MKLIB_OPTIONS=
-MKDEP= makedepend
-MKDEP_OPTIONS= -fdepend
+MKDEP?= makedepend
+MKDEP_OPTIONS?= -fdepend
INSTALL?= $(TOP)/bin/minstall
# Python and flags (generally only needed by the developers)
diff --git a/graphics/MesaLib/files/configs/pkgsrc b/graphics/MesaLib/files/configs/pkgsrc
index ed2f6c699b7..17ad444db68 100644
--- a/graphics/MesaLib/files/configs/pkgsrc
+++ b/graphics/MesaLib/files/configs/pkgsrc
@@ -1,4 +1,4 @@
-# $NetBSD: pkgsrc,v 1.1 2008/04/24 07:40:24 bjs Exp $
+# $NetBSD: pkgsrc,v 1.2 2008/07/27 00:03:42 bjs Exp $
include $(TOP)/configs/default
@@ -30,11 +30,7 @@ GLUT_LIB_DEPS=\
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
+APP_LIB_DEPS= -lGL -lGLU -lglut -lXext -lXmu -lXi -lX11 -lm
SRC_DIRS= mesa glw glu glut/glx
DRIVER_DIRS= x11 osmesa