--LQksG6bCIzRHxTLp
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Fri, Jun 17, 2005 at 03:54:07PM +0000, Johnny C. Lam wrote:
> 
> Module Name:	pkgsrc
> Committed By:	jlam
> Date:		Fri Jun 17 15:54:07 UTC 2005
> 
> Modified Files:
> 	pkgsrc/graphics/MesaLib: Makefile builtin.mk distinfo
> 	pkgsrc/graphics/MesaLib/patches: patch-ab
> 
> Log Message:
> Enable the pthread-based thread-safety code in pkgsrc MesaLib.
> Bump the PKGREVISION to 2.  This fixes PR pkg/30537.

This broke the build on DragonFly. Is the attached patch OK?

Joerg

--LQksG6bCIzRHxTLp
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="MesaLib.diff"

? MesaLib.diff
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/MesaLib/distinfo,v
retrieving revision 1.29
diff -u -r1.29 distinfo
--- distinfo	17 Jun 2005 15:54:06 -0000	1.29
+++ distinfo	7 Jul 2005 14:03:22 -0000
@@ -13,4 +13,4 @@
 SHA1 (patch-ae) = a92133c77b1b958dcfe9b37ddc317d6ff31157d0
 SHA1 (patch-af) = 8f77d0a0e7c63de6bcc44a653767ccd04107c98c
 SHA1 (patch-ag) = 3d05125b389c26b04884775f3f631247faa8a716
-SHA1 (patch-ah) = 8ccfd1734accf9ed3920d42e9208eef5a9d233cf
+SHA1 (patch-ah) = 0c0a4d18531d2bc9ea1be83e89f373be5609f0e7
Index: patches/patch-ah
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/MesaLib/patches/patch-ah,v
retrieving revision 1.1
diff -u -r1.1 patch-ah
--- patches/patch-ah	26 Oct 2004 13:55:56 -0000	1.1
+++ patches/patch-ah	7 Jul 2005 14:03:22 -0000
@@ -2,7 +2,7 @@
 
 --- 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 @@
  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

--LQksG6bCIzRHxTLp--