[93271] trunk/dports/x11/mesa

[jeremyhu at macports.org]

Revision: 93271
          https://trac.macports.org/changeset/93271
Author:   jeremyhu at macports.org
Date:     2012-05-18 11:50:23 -0700 (Fri, 18 May 2012)
Log Message:
-----------
mesa: Address build failure on Tiger and Leopard (#34499)

Revbumped because mesa's build system ignored the build error and
installed anyways.

<https://trac.macports.org/ticket/34499>

Modified Paths:
--------------
    trunk/dports/x11/mesa/Portfile

Added Paths:
-----------
    trunk/dports/x11/mesa/files/1001-darwin-Address-a-build-failure-on-Leopard-and-earlie.patch

Modified: trunk/dports/x11/mesa/Portfile
===================================================================
--- trunk/dports/x11/mesa/Portfile	2012-05-18 18:34:28 UTC (rev 93270)
+++ trunk/dports/x11/mesa/Portfile	2012-05-18 18:50:23 UTC (rev 93271)
@@ -6,7 +6,7 @@
 name                mesa
 epoch               1
 version             8.0.2
-revision            3
+revision            4
 categories          x11 graphics
 maintainers         jeremyhu openmaintainer
 license             MIT
@@ -41,7 +41,8 @@
     0013-darwin-Make-reported-errors-more-user-friendly.patch \
     0014-darwin-Use-ASL-for-logging.patch \
     0023-darwin-Unlock-our-mutex-before-destroying-it.patch \
-    0024-darwin-Eliminate-a-possible-race-condition-while-des.patch
+    0024-darwin-Eliminate-a-possible-race-condition-while-des.patch \
+    1001-darwin-Address-a-build-failure-on-Leopard-and-earlie.patch
 
 use_configure  no
 use_parallel_build yes

Added: trunk/dports/x11/mesa/files/1001-darwin-Address-a-build-failure-on-Leopard-and-earlie.patch
===================================================================
--- trunk/dports/x11/mesa/files/1001-darwin-Address-a-build-failure-on-Leopard-and-earlie.patch	                        (rev 0)
+++ trunk/dports/x11/mesa/files/1001-darwin-Address-a-build-failure-on-Leopard-and-earlie.patch	2012-05-18 18:50:23 UTC (rev 93271)
@@ -0,0 +1,40 @@
+From e69758260b0403d47ec61692e1fc18bcbb14865e Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu at apple.com>
+Date: Fri, 18 May 2012 11:31:24 -0700
+Subject: [PATCH] darwin: Address a build failure on Leopard and earlier OS
+ versions
+
+<https://trac.macports.org/ticket/34499>
+
+Regression-from: 51691f0767f6a75a1f549cd979a878a0ad12a228
+Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
+(cherry picked from commit 27b821bc95ea01cc4292ada9c7c65211580d1f98)
+---
+ src/glx/apple/apple_glx_log.c |   10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/src/glx/apple/apple_glx_log.c b/src/glx/apple/apple_glx_log.c
+index 9ebf666..5b9a865 100644
+--- a/src/glx/apple/apple_glx_log.c
++++ b/src/glx/apple/apple_glx_log.c
+@@ -76,7 +76,17 @@ void _apple_glx_vlog(int level, const char *file, const char *function,
+     uint64_t thread = 0;
+ 
+     if (pthread_is_threaded_np()) {
++#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
++        thread = (uint64_t)(uintptr_t)pthread_self();
++#elif MAC_OS_X_VERSION_MIN_REQUIRED < 1060
++        if (&pthread_threadid_np) {
++            pthread_threadid_np(NULL, &thread);
++        } else {
++            thread = (uint64_t)(uintptr_t)pthread_self();
++        }
++#else
+         pthread_threadid_np(NULL, &thread);
++#endif
+     }
+ 
+     if (diagnostic) {
+-- 
+1.7.10.1
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120518/aee123bb/attachment.html>