summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2005-06-17 15:54:06 +0000
committerjlam <jlam@pkgsrc.org>2005-06-17 15:54:06 +0000
commitacf0616090d51494b12135d23858cec5f2e471d4 (patch)
treeb5fe2df71389fb3d8bacf40b11d3171c00bd587a /graphics
parente1702af298085246d1f23378ab7130866e7aee55 (diff)
downloadpkgsrc-acf0616090d51494b12135d23858cec5f2e471d4.tar.gz
Enable the pthread-based thread-safety code in pkgsrc MesaLib.
Bump the PKGREVISION to 2. This fixes PR pkg/30537.
Diffstat (limited to 'graphics')
-rw-r--r--graphics/MesaLib/Makefile6
-rw-r--r--graphics/MesaLib/builtin.mk8
-rw-r--r--graphics/MesaLib/distinfo4
-rw-r--r--graphics/MesaLib/patches/patch-ab4
4 files changed, 14 insertions, 8 deletions
diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile
index 34cca3e510e..c0f0facb125 100644
--- a/graphics/MesaLib/Makefile
+++ b/graphics/MesaLib/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2005/06/05 15:39:06 minskim Exp $
+# $NetBSD: Makefile,v 1.40 2005/06/17 15:54:06 jlam Exp $
PKGNAME= MesaLib-${MESA_VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
COMMENT= Graphics library similar to SGI's OpenGL
.include "../Mesa/Makefile.common"
@@ -19,6 +19,8 @@ CONFIGURE_ARGS+= --disable-sparc
BUILDLINK_TRANSFORM+= rm:-O[23]
.endif
+.include "../../mk/pthread.buildlink3.mk"
+
pre-build:
cd ${WRKSRC} && ${RM} -fr src/glu src/glut progs
diff --git a/graphics/MesaLib/builtin.mk b/graphics/MesaLib/builtin.mk
index b9f9bfd30f1..5b75f92a560 100644
--- a/graphics/MesaLib/builtin.mk
+++ b/graphics/MesaLib/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.9 2005/06/03 19:12:49 jlam Exp $
+# $NetBSD: builtin.mk,v 1.10 2005/06/17 15:54:06 jlam Exp $
BUILTIN_PKG:= MesaLib
@@ -68,7 +68,11 @@ CHECK_BUILTIN.MesaLib?= no
.if !empty(CHECK_BUILTIN.MesaLib:M[nN][oO])
. if !empty(USE_BUILTIN.MesaLib:M[nN][oO])
-BUILDLINK_DEPENDS.MesaLib+= MesaLib>=6.0
+BUILDLINK_DEPENDS.MesaLib+= MesaLib>=6.2.1nb2
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+. include "../../mk/pthread.buildlink3.mk"
+. include "../../mk/pthread.builtin.mk"
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
. endif
. if !empty(USE_BUILTIN.MesaLib:M[yY][eE][sS])
diff --git a/graphics/MesaLib/distinfo b/graphics/MesaLib/distinfo
index 99895b905dd..c108513c811 100644
--- a/graphics/MesaLib/distinfo
+++ b/graphics/MesaLib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.28 2005/06/07 14:31:48 minskim Exp $
+$NetBSD: distinfo,v 1.29 2005/06/17 15:54:06 jlam 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
@@ -7,7 +7,7 @@ SHA1 (Mesa-6.2.1/MesaDemos-6.2.1.tar.bz2) = f8da791e365eec633a70c4b5a76d96d27838
RMD160 (Mesa-6.2.1/MesaDemos-6.2.1.tar.bz2) = 62b3ebc47e822c4704b69c9888e74bae12a1391b
Size (Mesa-6.2.1/MesaDemos-6.2.1.tar.bz2) = 1004511 bytes
SHA1 (patch-aa) = 90457ea124a42150e3a37b48e1e0691597668606
-SHA1 (patch-ab) = 8de78b793e384578d8821a4ef487bb2b39ebfcb6
+SHA1 (patch-ab) = c257a57d4570576f160e9a4c029384718402c1bd
SHA1 (patch-ac) = 9a0717105fef41e84b5faebaa8bd91d1c0964b86
SHA1 (patch-ad) = 000d115933e3f75ca096effa47e8d19c900fe95c
SHA1 (patch-ae) = a92133c77b1b958dcfe9b37ddc317d6ff31157d0
diff --git a/graphics/MesaLib/patches/patch-ab b/graphics/MesaLib/patches/patch-ab
index 5c353306d62..85cb8d57ce9 100644
--- a/graphics/MesaLib/patches/patch-ab
+++ b/graphics/MesaLib/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.13 2004/10/27 19:20:33 drochner Exp $
+$NetBSD: patch-ab,v 1.14 2005/06/17 15:54:07 jlam Exp $
--- /dev/null 2004-10-25 16:57:21.000000000 +0000
+++ configs/pkgsrc
@@ -10,6 +10,6 @@ $NetBSD: patch-ab,v 1.13 2004/10/27 19:20:33 drochner Exp $
+CONFIG_NAME = pkgsrc
+
+# Compiler and flags
-+CFLAGS+= -DUSE_XSHM
++CFLAGS+= -DUSE_XSHM -DPTHREADS
+APP_LIB_DEPS = -L$(LIB_DIR) -L${PREFIX}/lib -L${X11PREFIX}/lib -lXext -lXmu -lXi -lX11 -lm
+