Thu Apr 17 20:20:25 2014 UTC ()
Limit heap check call to libstdc++.


(joerg)
diff -r1.41 -r1.42 pkgsrc/graphics/blender/distinfo
diff -r0 -r1.1 pkgsrc/graphics/blender/patches/patch-extern_carve_include_carve_mesh__ops.hpp
cvs diff -r1.41 -r1.42 pkgsrc/graphics/blender/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/blender/distinfo 2014/04/07 12:21:25 1.41
+++ pkgsrc/graphics/blender/distinfo 2014/04/17 20:20:25 1.42
@@ -1,15 +1,16 @@ @@ -1,15 +1,16 @@
1$NetBSD: distinfo,v 1.41 2014/04/07 12:21:25 ryoon Exp $ 1$NetBSD: distinfo,v 1.42 2014/04/17 20:20:25 joerg Exp $
2 2
3SHA1 (blender-2.70.tar.gz) = 294d89855e4bd2226bfbd4311f835709379ec309 3SHA1 (blender-2.70.tar.gz) = 294d89855e4bd2226bfbd4311f835709379ec309
4RMD160 (blender-2.70.tar.gz) = 83a44e77d1143cc01932ec18b55a7b7f12bc21b0 4RMD160 (blender-2.70.tar.gz) = 83a44e77d1143cc01932ec18b55a7b7f12bc21b0
5Size (blender-2.70.tar.gz) = 55298021 bytes 5Size (blender-2.70.tar.gz) = 55298021 bytes
6SHA1 (patch-build__files_scons_config_linux-config.py) = 863ff0b2839fa96a4b579cb52d7c4475aa4c571c 6SHA1 (patch-build__files_scons_config_linux-config.py) = 863ff0b2839fa96a4b579cb52d7c4475aa4c571c
7SHA1 (patch-build__files_scons_config_netbsd6-config.py) = f7224f0cd7baacdf26e47348c3ee45caf9e31a32 7SHA1 (patch-build__files_scons_config_netbsd6-config.py) = f7224f0cd7baacdf26e47348c3ee45caf9e31a32
8SHA1 (patch-build__files_scons_tools_btools.py) = 09fe67666091daafcf586aa70dc19fa6964b2098 8SHA1 (patch-build__files_scons_tools_btools.py) = 09fe67666091daafcf586aa70dc19fa6964b2098
 9SHA1 (patch-extern_carve_include_carve_mesh__ops.hpp) = 65b077d5c523475ec515b7b7ec7ae066d0afe244
9SHA1 (patch-extern_libmv_third__party_glog_src_config.h) = d889d56d47167222ab54fad1c8f87c7ddb02852a 10SHA1 (patch-extern_libmv_third__party_glog_src_config.h) = d889d56d47167222ab54fad1c8f87c7ddb02852a
10SHA1 (patch-extern_libmv_third__party_glog_src_config__netbsd.h) = 423dda12bb5871f810938666c0267ac73b3f856e 11SHA1 (patch-extern_libmv_third__party_glog_src_config__netbsd.h) = 423dda12bb5871f810938666c0267ac73b3f856e
11SHA1 (patch-extern_libmv_third__party_glog_src_utilities.h) = 32fea10d935621ef0529fe56b3e857685fbc5d1f 12SHA1 (patch-extern_libmv_third__party_glog_src_utilities.h) = 32fea10d935621ef0529fe56b3e857685fbc5d1f
12SHA1 (patch-extern_rangetree_range__tree.hh) = 976881b9caad67a2cfb24039652e887867fa6cc0 13SHA1 (patch-extern_rangetree_range__tree.hh) = 976881b9caad67a2cfb24039652e887867fa6cc0
13SHA1 (patch-intern_cycles_util_util__types.h) = 37944c6b0a970468e6791ec4a5beef1ec0ddf190 14SHA1 (patch-intern_cycles_util_util__types.h) = 37944c6b0a970468e6791ec4a5beef1ec0ddf190
14SHA1 (patch-intern_ghost_SConscript) = 84dad76663e6dfc3bd6636fe8924921fe04caa2f 15SHA1 (patch-intern_ghost_SConscript) = 84dad76663e6dfc3bd6636fe8924921fe04caa2f
15SHA1 (patch-intern_guardedalloc_intern_mallocn__intern.h) = 6d92a0c0a19c04cbb5e34de360c9e3303e2d8ceb 16SHA1 (patch-intern_guardedalloc_intern_mallocn__intern.h) = 6d92a0c0a19c04cbb5e34de360c9e3303e2d8ceb
File Added: pkgsrc/graphics/blender/patches/Attic/patch-extern_carve_include_carve_mesh__ops.hpp
$NetBSD: patch-extern_carve_include_carve_mesh__ops.hpp,v 1.1 2014/04/17 20:20:25 joerg Exp $

--- extern/carve/include/carve/mesh_ops.hpp.orig	2014-04-17 15:04:25.000000000 +0000
+++ extern/carve/include/carve/mesh_ops.hpp
@@ -580,7 +580,7 @@ namespace carve {
           std::vector<VertexInfo *> queue;
 
           void checkheap() {
-#ifdef __GNUC__
+#ifdef __GLIBCXX__
             CARVE_ASSERT(std::__is_heap(queue.begin(), queue.end(), order_by_score()));
 #endif
           }