diff options
| author | ryoon <ryoon> | 2014-01-24 23:00:15 +0000 |
|---|---|---|
| committer | ryoon <ryoon> | 2014-01-24 23:00:15 +0000 |
| commit | 17bde7b8cdbbe02978c147b76585a3e169c54371 (patch) | |
| tree | dd1ea5482bcd7f33fd07e298924e86864780914a | |
| parent | 0720493801668eb35df7c4df66c18ff0bfc54151 (diff) | |
| download | pkgsrc-17bde7b8cdbbe02978c147b76585a3e169c54371.tar.gz | |
Bump PKGREVISION
* Fix exit time segfault of qt5 applications
| -rw-r--r-- | graphics/MesaLib/Makefile | 4 | ||||
| -rw-r--r-- | graphics/MesaLib/distinfo | 3 | ||||
| -rw-r--r-- | graphics/MesaLib/patches/patch-src_glsl_ralloc.c | 16 |
3 files changed, 20 insertions, 3 deletions
diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile index 8926e213f4f..7cbb08db6f6 100644 --- a/graphics/MesaLib/Makefile +++ b/graphics/MesaLib/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.95 2013/12/12 14:44:10 is Exp $ +# $NetBSD: Makefile,v 1.96 2014/01/24 23:00:15 ryoon Exp $ PKGNAME= MesaLib-${MESA_PKGVERSION} -PKGREVISION= 3 +PKGREVISION= 4 COMMENT= Graphics library similar to SGI's OpenGL CONFLICTS+= xf86driproto<2.0.4 diff --git a/graphics/MesaLib/distinfo b/graphics/MesaLib/distinfo index 37fd397ba4c..23566a9765e 100644 --- a/graphics/MesaLib/distinfo +++ b/graphics/MesaLib/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.84 2014/01/10 07:21:16 pho Exp $ +$NetBSD: distinfo,v 1.85 2014/01/24 23:00:15 ryoon Exp $ SHA1 (Mesa-7.11.2/MesaGLUT-7.11.2.tar.bz2) = 2e6e730204800a0748b301a5f58b86332699788b RMD160 (Mesa-7.11.2/MesaGLUT-7.11.2.tar.bz2) = bb2b140375aa13df79fcdb60a7ad0a63622dc531 @@ -13,6 +13,7 @@ SHA1 (patch-include_GL_gl.h) = a97ab309556c78d818d0b8bd867b5f2412c141b0 SHA1 (patch-src_gallium_auxiliary_util_u__atomic.h) = 68ba9694aca506add2aa96a6892a7227481c2c11 SHA1 (patch-src_gallium_include_pipe_p__config.h) = 934e2505fe299e1a25da6def2f971fa1302840c0 SHA1 (patch-src_glsl_ir__constant__expression.cpp) = 281e281f51afed244b1a29b92942d572fc095124 +SHA1 (patch-src_glsl_ralloc.c) = 94fac7a8115d85bc3ee3daeb8ea308c766dc45c1 SHA1 (patch-src_glu_sgi_glu.exports) = 66609d2ea59b02fc46b41311b0042fe4a2da517f SHA1 (patch-src_glx_XF86dri.c) = b69b7cf5e0d617eca129f0d7f0b06c7603d00db0 SHA1 (patch-src_mesa_drivers_dri_common_dri__util.h) = 53e63dcc6243b1872f4e4816b46e92910cf97edc diff --git a/graphics/MesaLib/patches/patch-src_glsl_ralloc.c b/graphics/MesaLib/patches/patch-src_glsl_ralloc.c new file mode 100644 index 00000000000..3537f16de61 --- /dev/null +++ b/graphics/MesaLib/patches/patch-src_glsl_ralloc.c @@ -0,0 +1,16 @@ +$NetBSD: patch-src_glsl_ralloc.c,v 1.1 2014/01/24 23:00:15 ryoon Exp $ + +* Fix exit time segfault of qt5 application with modular xorg + +--- src/glsl/ralloc.c.orig 2011-10-15 00:43:58.000000000 +0000 ++++ src/glsl/ralloc.c +@@ -283,7 +283,8 @@ ralloc_autofree_context(void) + { + if (unlikely(autofree_context == NULL)) { + autofree_context = ralloc_context(NULL); +- atexit(autofree); ++ extern __attribute__((visibility("hidden"))) void *__dso_handle; ++ __cxa_atexit(autofree, NULL, __dso_handle); + } + return autofree_context; + } |