summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorwiz <wiz>2017-01-15 00:13:44 +0000
committerwiz <wiz>2017-01-15 00:13:44 +0000
commiteac38fd8b45346a4c7f0bb1d9495776fb15bd63e (patch)
tree7f0137b27626f9a5bec1d6065e136b8bafe42c51 /graphics
parent01a5545c62e06f5268cb52ed1060c93ce5a25614 (diff)
downloadpkgsrc-eac38fd8b45346a4c7f0bb1d9495776fb15bd63e.tar.gz
Avoid double-free. Bump PKGREVISION.
Diffstat (limited to 'graphics')
-rw-r--r--graphics/MesaLib/Makefile6
-rw-r--r--graphics/MesaLib/distinfo3
-rw-r--r--graphics/MesaLib/patches/patch-src_compiler_glsl_builtin__functions.cpp12
3 files changed, 19 insertions, 2 deletions
diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile
index 0e73c83e46f..4de502b0eb5 100644
--- a/graphics/MesaLib/Makefile
+++ b/graphics/MesaLib/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.130 2017/01/01 14:43:41 wiz Exp $
+# $NetBSD: Makefile,v 1.131 2017/01/15 00:13:44 wiz Exp $
DISTNAME= mesa-11.2.2
PKGNAME= ${DISTNAME:S/mesa/MesaLib/}
+PKGREVISION= 1
CATEGORIES= graphics x11
MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/${PKGVERSION_NOREV}/
EXTRACT_SUFX= .tar.xz
@@ -16,6 +17,9 @@ USE_TOOLS+= bison pkg-config gmake flex
USE_LANGUAGES= c99 c++
USE_LIBTOOL= yes
+#CFLAGS+= -g -O0
+#CXXFLAGS+= -g -O0
+
GCC_REQD+= 4.2
PKGCONFIG_OVERRIDE+= src/egl/main/egl.pc.in
diff --git a/graphics/MesaLib/distinfo b/graphics/MesaLib/distinfo
index 47866d2c977..634fa9bfcc6 100644
--- a/graphics/MesaLib/distinfo
+++ b/graphics/MesaLib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.117 2016/05/18 12:55:28 wiz Exp $
+$NetBSD: distinfo,v 1.118 2017/01/15 00:13:44 wiz Exp $
SHA1 (mesa-11.2.2.tar.xz) = c3805020be6fef77d3b96a5ddf4ddc256dee16ff
RMD160 (mesa-11.2.2.tar.xz) = 14bca7cc76015e53db2fafcebb8540f451be5aab
@@ -6,6 +6,7 @@ SHA512 (mesa-11.2.2.tar.xz) = fd1fcb1bc97e52784a4b3dedfd8c8ba95bc1b03a62b132d2e1
Size (mesa-11.2.2.tar.xz) = 7860932 bytes
SHA1 (patch-configure) = 87f0f2e60f342c91b3aecab02d3a4d8940eadf0a
SHA1 (patch-include_GL_glxext.h) = 830902f2d38a8395cda682c059fc5223e1b0e89e
+SHA1 (patch-src_compiler_glsl_builtin__functions.cpp) = 44ee467dda7c5be318d93109c72e25f74285e689
SHA1 (patch-src_compiler_glsl_glsl__parser__extras.cpp) = c5046ce848d0b1ea428e29611b6822d4f4ab970d
SHA1 (patch-src_egl_drivers_dri2_platform__drm.c) = 99b6dd6739c29551ae2c885eabd7babd159fc3e5
SHA1 (patch-src_egl_drivers_dri2_platform__x11.c) = 04b6ef8e755f226fbe3e6f2bea6c9e2a56a783ca
diff --git a/graphics/MesaLib/patches/patch-src_compiler_glsl_builtin__functions.cpp b/graphics/MesaLib/patches/patch-src_compiler_glsl_builtin__functions.cpp
new file mode 100644
index 00000000000..62909e45e00
--- /dev/null
+++ b/graphics/MesaLib/patches/patch-src_compiler_glsl_builtin__functions.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_compiler_glsl_builtin__functions.cpp,v 1.1 2017/01/15 00:13:44 wiz Exp $
+
+--- src/compiler/glsl/builtin_functions.cpp.orig 2016-05-09 12:51:42.000000000 +0000
++++ src/compiler/glsl/builtin_functions.cpp
+@@ -853,6 +853,7 @@ builtin_builder::builtin_builder()
+ builtin_builder::~builtin_builder()
+ {
+ ralloc_free(mem_ctx);
++ mem_ctx = NULL;
+ }
+
+ ir_function_signature *