[120370] trunk/dports/x11/mesa
jeremyhu at macports.org
jeremyhu at macports.org
Sat May 24 14:35:25 PDT 2014
Revision: 120370
https://trac.macports.org/changeset/120370
Author: jeremyhu at macports.org
Date: 2014-05-24 14:35:25 -0700 (Sat, 24 May 2014)
Log Message:
-----------
mesa: Fix a memory leak and improve error reporting
Modified Paths:
--------------
trunk/dports/x11/mesa/Portfile
Added Paths:
-----------
trunk/dports/x11/mesa/files/1001-darwin-Fix-a-pixel-format-memory-leak.patch
trunk/dports/x11/mesa/files/1002-appleglx-Improve-error-reporting-if-CGLChoosePixelFo.patch
trunk/dports/x11/mesa/files/1003-Write-errors-in-choosing-the-pixel-format-to-the-cra.patch
Modified: trunk/dports/x11/mesa/Portfile
===================================================================
--- trunk/dports/x11/mesa/Portfile 2014-05-24 21:08:04 UTC (rev 120369)
+++ trunk/dports/x11/mesa/Portfile 2014-05-24 21:35:25 UTC (rev 120370)
@@ -6,6 +6,7 @@
name mesa
epoch 1
version 8.0.5
+revision 1
categories x11 graphics
maintainers jeremyhu openmaintainer
license MIT
@@ -40,7 +41,10 @@
0009-mesa-test-for-GL_EXT_framebuffer_sRGB-in-glPopAttrib.patch \
0011-Apple-glFlush-is-not-needed-with-CGLFlushDrawable.patch \
0012-glapi-Avoid-heap-corruption-in-_glapi_table.patch \
- 0013-darwin-Fix-test-for-kCGLPFAOpenGLProfile-support-at-.patch
+ 0013-darwin-Fix-test-for-kCGLPFAOpenGLProfile-support-at-.patch \
+ 1001-darwin-Fix-a-pixel-format-memory-leak.patch \
+ 1002-appleglx-Improve-error-reporting-if-CGLChoosePixelFo.patch \
+ 1003-Write-errors-in-choosing-the-pixel-format-to-the-cra.patch
patch.pre_args -p1
use_configure no
Added: trunk/dports/x11/mesa/files/1001-darwin-Fix-a-pixel-format-memory-leak.patch
===================================================================
--- trunk/dports/x11/mesa/files/1001-darwin-Fix-a-pixel-format-memory-leak.patch (rev 0)
+++ trunk/dports/x11/mesa/files/1001-darwin-Fix-a-pixel-format-memory-leak.patch 2014-05-24 21:35:25 UTC (rev 120370)
@@ -0,0 +1,26 @@
+From fc42fe8d28e7f5b886db8241ab5a2bfdf40a1adb Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 24 May 2014 14:08:16 -0700
+Subject: [PATCH 1001/1003] darwin: Fix a pixel format memory leak
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+(cherry picked from commit 131d80fc36c1f027c4f3153fe5c861c07c2fe567)
+---
+ src/glx/apple/apple_visual.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/glx/apple/apple_visual.c b/src/glx/apple/apple_visual.c
+index 238c248..ea0fdd0 100644
+--- a/src/glx/apple/apple_visual.c
++++ b/src/glx/apple/apple_visual.c
+@@ -80,6 +80,7 @@ apple_visual_create_pfobj(CGLPixelFormatObj * pfobj, const struct glx_config * m
+ /* Test for kCGLPFAOpenGLProfile support at runtime and roll it out if not supported */
+ attr[numattr] = 0;
+ error = apple_cgl.choose_pixel_format(attr, pfobj, &vsref);
++ apple_cgl.destroy_pixel_format(pfobj);
+ if (error == kCGLBadAttribute)
+ numattr -= 2;
+
+--
+1.9.3
+
Added: trunk/dports/x11/mesa/files/1002-appleglx-Improve-error-reporting-if-CGLChoosePixelFo.patch
===================================================================
--- trunk/dports/x11/mesa/files/1002-appleglx-Improve-error-reporting-if-CGLChoosePixelFo.patch (rev 0)
+++ trunk/dports/x11/mesa/files/1002-appleglx-Improve-error-reporting-if-CGLChoosePixelFo.patch 2014-05-24 21:35:25 UTC (rev 120370)
@@ -0,0 +1,30 @@
+From 6de6bdcacc6ba0af908480b3115dd24431d12ea8 Mon Sep 17 00:00:00 2001
+From: Jon TURNEY <jon.turney at dronecode.org.uk>
+Date: Mon, 12 May 2014 15:38:26 +0100
+Subject: [PATCH 1002/1003] appleglx: Improve error reporting if
+ CGLChoosePixelFormat() didn't find any matching pixel formats.
+
+Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
+Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+(cherry picked from commit 002a3a74273b81dfb226e1c3f0a8c18525ed0af4)
+---
+ src/glx/apple/apple_visual.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/glx/apple/apple_visual.c b/src/glx/apple/apple_visual.c
+index ea0fdd0..677dfca 100644
+--- a/src/glx/apple/apple_visual.c
++++ b/src/glx/apple/apple_visual.c
+@@ -168,4 +168,9 @@ apple_visual_create_pfobj(CGLPixelFormatObj * pfobj, const struct glx_config * m
+ fprintf(stderr, "error: %s\n", apple_cgl.error_string(error));
+ abort();
+ }
++
++ if (!*pfobj) {
++ fprintf(stderr, "No matching pixelformats found, perhaps try using LIBGL_ALLOW_SOFTWARE\n");
++ abort();
++ }
+ }
+--
+1.9.3
+
Added: trunk/dports/x11/mesa/files/1003-Write-errors-in-choosing-the-pixel-format-to-the-cra.patch
===================================================================
--- trunk/dports/x11/mesa/files/1003-Write-errors-in-choosing-the-pixel-format-to-the-cra.patch (rev 0)
+++ trunk/dports/x11/mesa/files/1003-Write-errors-in-choosing-the-pixel-format-to-the-cra.patch 2014-05-24 21:35:25 UTC (rev 120370)
@@ -0,0 +1,55 @@
+From 88aaacec6cfa336a4bbfb747aafb7e77fb44c519 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 24 May 2014 14:13:33 -0700
+Subject: [PATCH 1003/1003] Write errors in choosing the pixel format to the
+ crash log
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+(cherry picked from commit 177bff9dd5564384232f17ccade57df50adbcf0e)
+---
+ src/glx/apple/apple_visual.c | 18 ++++++++++++++++--
+ 1 file changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/src/glx/apple/apple_visual.c b/src/glx/apple/apple_visual.c
+index 677dfca..1905fb0 100644
+--- a/src/glx/apple/apple_visual.c
++++ b/src/glx/apple/apple_visual.c
+@@ -63,6 +63,16 @@ enum
+ MAX_ATTR = 60
+ };
+
++static char __crashreporter_info_buff__[4096] = { 0 };
++static const char *__crashreporter_info__ __attribute__((__used__)) =
++ &__crashreporter_info_buff__[0];
++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
++// This is actually a toolchain requirement, but I'm not sure the correct check,
++// but it should be fine to just only include it for Leopard and later. This line
++// just tells the linker to never strip this symbol (such as for space optimization)
++__asm__ (".desc ___crashreporter_info__, 0x10");
++#endif
++
+ void
+ apple_visual_create_pfobj(CGLPixelFormatObj * pfobj, const struct glx_config * mode,
+ bool * double_buffered, bool * uses_stereo,
+@@ -165,12 +175,16 @@ apple_visual_create_pfobj(CGLPixelFormatObj * pfobj, const struct glx_config * m
+ error = apple_cgl.choose_pixel_format(attr, pfobj, &vsref);
+
+ if (error) {
+- fprintf(stderr, "error: %s\n", apple_cgl.error_string(error));
++ snprintf(__crashreporter_info_buff__, sizeof(__crashreporter_info_buff__),
++ "CGLChoosePixelFormat error: %s\n", apple_cgl.error_string(error));
++ fprintf(stderr, "%s", __crashreporter_info_buff__);
+ abort();
+ }
+
+ if (!*pfobj) {
+- fprintf(stderr, "No matching pixelformats found, perhaps try using LIBGL_ALLOW_SOFTWARE\n");
++ snprintf(__crashreporter_info_buff__, sizeof(__crashreporter_info_buff__),
++ "No matching pixelformats found, perhaps try using LIBGL_ALLOW_SOFTWARE\n");
++ fprintf(stderr, "%s", __crashreporter_info_buff__);
+ abort();
+ }
+ }
+--
+1.9.3
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140524/2b6e083f/attachment.html>
More information about the macports-changes
mailing list