summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkristerw <kristerw@pkgsrc.org>2005-07-12 21:40:35 +0000
committerkristerw <kristerw@pkgsrc.org>2005-07-12 21:40:35 +0000
commit0110f098fb2ead7490ea7731ef28c2ee7bd69132 (patch)
treeb358222e6429355155107bbd07f504c288acf78b
parentf6cb7f35dfb36aaa128a1f000a6f8b7179424d30 (diff)
downloadpkgsrc-0110f098fb2ead7490ea7731ef28c2ee7bd69132.tar.gz
Make this pkg compile on DragonFly by applying a patch sent to
tech-pkg by Joerg Sonnenberger.
-rw-r--r--graphics/MesaLib/distinfo4
-rw-r--r--graphics/MesaLib/patches/patch-ah13
2 files changed, 13 insertions, 4 deletions
diff --git a/graphics/MesaLib/distinfo b/graphics/MesaLib/distinfo
index c108513c811..9e4b5371bf9 100644
--- a/graphics/MesaLib/distinfo
+++ b/graphics/MesaLib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.29 2005/06/17 15:54:06 jlam Exp $
+$NetBSD: distinfo,v 1.30 2005/07/12 21:40:35 kristerw Exp $
SHA1 (Mesa-6.2.1/MesaLib-6.2.1.tar.bz2) = 7c4fb46ae17b066e85e90592ace496ac6b36c189
RMD160 (Mesa-6.2.1/MesaLib-6.2.1.tar.bz2) = cfc5e8db61289c017ff20dd6b4c6db5c7b66855b
@@ -13,4 +13,4 @@ SHA1 (patch-ad) = 000d115933e3f75ca096effa47e8d19c900fe95c
SHA1 (patch-ae) = a92133c77b1b958dcfe9b37ddc317d6ff31157d0
SHA1 (patch-af) = 8f77d0a0e7c63de6bcc44a653767ccd04107c98c
SHA1 (patch-ag) = 3d05125b389c26b04884775f3f631247faa8a716
-SHA1 (patch-ah) = 8ccfd1734accf9ed3920d42e9208eef5a9d233cf
+SHA1 (patch-ah) = 0c0a4d18531d2bc9ea1be83e89f373be5609f0e7
diff --git a/graphics/MesaLib/patches/patch-ah b/graphics/MesaLib/patches/patch-ah
index 3f00083d244..fadc6584af4 100644
--- a/graphics/MesaLib/patches/patch-ah
+++ b/graphics/MesaLib/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.1 2004/10/26 13:55:56 adam Exp $
+$NetBSD: patch-ah,v 1.2 2005/07/12 21:40:35 kristerw Exp $
--- configs/default.orig 2004-10-25 17:21:49.000000000 +0000
+++ configs/default
-@@ -14,10 +14,6 @@ MESA_TINY=0
+@@ -14,10 +14,6 @@ MESA_TINY=1
DRM_SOURCE_PATH=$(TOP)/../drm
# Compiler and flags
@@ -22,3 +22,12 @@ $NetBSD: patch-ah,v 1.1 2004/10/26 13:55:56 adam Exp $
SRC_DIRS = mesa glu glut/glx glw
GLU_DIRS = sgi
DRIVER_DIRS = x11 osmesa
+@@ -60,7 +56,7 @@ PROGRAM_DIRS = demos redbook samples xde
+
+
+ # Library/program dependencies
+-GL_LIB_DEPS = -lX11 -lXext -lm -lpthread
++GL_LIB_DEPS = -lX11 -lXext -lm ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
+ OSMESA_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB)
+ GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm
+ GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXt -lXi -lm