[pkgsrc/trunk]: pkgsrc/graphics/MesaLib Add new round of distribution patches...

[bjs <bjs%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e1bb323db416
branches:  trunk
changeset: 542533:e1bb323db416
user:      bjs <bjs%pkgsrc.org@localhost>
date:      Wed May 21 04:11:37 2008 +0000

description:
Add new round of distribution patches (update code to head of Mesa_7_0_branch).
While here, ensure that all instances of pthread_getspecific are
replaced with __libc_thr_getspecific on NetBSD (fixes linking issues
with compiz, at least).

diffstat:

 graphics/MesaLib/distinfo |   5 ++++-
 graphics/MesaLib/hacks.mk |  18 +++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

diffs (65 lines):

diff -r 7712512fe03b -r e1bb323db416 graphics/MesaLib/distinfo
--- a/graphics/MesaLib/distinfo Tue May 20 21:13:15 2008 +0000
+++ b/graphics/MesaLib/distinfo Wed May 21 04:11:37 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.52 2008/05/01 15:37:13 bjs Exp $
+$NetBSD: distinfo,v 1.53 2008/05/21 04:11:37 bjs Exp $
 
 SHA1 (Mesa-7.0.3/Mesa-7.0.3-001) = 32725fd4632d51495253b06786b3f0e743d11dbd
 RMD160 (Mesa-7.0.3/Mesa-7.0.3-001) = 92b1e1d3eb3932a419c6d1fb9e7b96ef5c32fd1a
@@ -6,6 +6,9 @@
 SHA1 (Mesa-7.0.3/Mesa-7.0.3-002) = 9fcdeb76d4cf44f0aeadff48bf7c48335773a2c0
 RMD160 (Mesa-7.0.3/Mesa-7.0.3-002) = 63b568f9c3f0e09cf53de064aee3350b4f96ee2d
 Size (Mesa-7.0.3/Mesa-7.0.3-002) = 639 bytes
+SHA1 (Mesa-7.0.3/Mesa-7.0.3-003) = d514fc54a8002983e16e38506253caed68470f39
+RMD160 (Mesa-7.0.3/Mesa-7.0.3-003) = 380c8929b520f597d618c69b014efa12a9c11e2f
+Size (Mesa-7.0.3/Mesa-7.0.3-003) = 10876 bytes
 SHA1 (Mesa-7.0.3/MesaDemos-7.0.3.tar.bz2) = c8dfef08f3b3f7abc70d99e16a35b0bbc1af4f8a
 RMD160 (Mesa-7.0.3/MesaDemos-7.0.3.tar.bz2) = 22917fbab3987e1d60d46321e1a77d5cbdd3800c
 Size (Mesa-7.0.3/MesaDemos-7.0.3.tar.bz2) = 1342158 bytes
diff -r 7712512fe03b -r e1bb323db416 graphics/MesaLib/hacks.mk
--- a/graphics/MesaLib/hacks.mk Tue May 20 21:13:15 2008 +0000
+++ b/graphics/MesaLib/hacks.mk Wed May 21 04:11:37 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.6 2008/04/25 20:11:11 bjs Exp $
+# $NetBSD: hacks.mk,v 1.7 2008/05/21 04:11:37 bjs Exp $
 
 .if !defined(MESALIBS_HACKS_MK)
 MESALIBS_HACKS_MK=     # defined
@@ -23,8 +23,8 @@
 .  if !empty(CC_VERSION:Mgcc-[34]*)
 PKG_HACKS+=            no-strict-aliasing
 CFLAGS+=               -fno-strict-aliasing
-PKG_HACKS+=            gcc-fast-math
-CFLAGS+=               -ffast-math
+#PKG_HACKS+=           gcc-fast-math
+#CFLAGS+=              -ffast-math
 .  endif
 
 .  if !empty(CC_VERSION:Mgcc-[4-9]*)
@@ -36,8 +36,10 @@
 .  endif
 ###
 ### XXX this shoddy hack is here to fix the unresolved symbol error that
-###    results due to '.extern pthread_getspecific' in the x86 and x86-64
-###    assembler dispatch routines.  This should be removed ASAP!
+###    results due to '.extern pthread_getspecific' in the x86/x86-64
+###    assembler dispatch routines.  Morever, there are also link-time
+###    issues with certain other applications due to pthread_getspecific()
+###    in glthread.c and glxext.c, so "fix" those also.
 ###
 .  include "../../mk/bsd.fast.prefs.mk"
 
@@ -45,8 +47,10 @@
        empty(PTHREAD_STUBLIB:U:M*pthstub*)
 SUBST_CLASSES+=        asm-hack
 SUBST_FILES.asm-hack=  src/mesa/x86/glapi_x86.S
-SUBST_FILES.asm-jack+= src/mesa/x86/glapi_x86-64.S
-SUBST_MESSAGE.asm-hack+=Teaching x86 assembler code about NetBSD thread stubs
+SUBST_FILES.asm-hack+= src/mesa/x86-64/glapi_x86-64.S
+SUBST_FILES.asm-hack+= src/mesa/glapi/glthread.c
+SUBST_FILES.asm-hack+= src/glx/x11/glxext.c
+SUBST_MESSAGE.asm-hack+=Teaching glapi about NetBSD thread stubs
 SUBST_SED.asm-hack=    -e 's,pthread_getspecific,__libc_thr_getspecific,g'
 SUBST_STAGE.asm-hack=  post-patch
 .  endif