wip/PrusaSlicer: Switch to wip version of upgraded nlopt.

[Paul Ripke <stix%stix.id.au@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Paul Ripke <stix%stix.id.au@localhost>
Pushed By:	stix
Date:		Tue Oct 20 13:47:14 2020 +1100
Changeset:	93be4183603ada1bc3bf814f75ccf4ae16b5f0b0

Modified Files:
	PrusaSlicer/Makefile
	PrusaSlicer/TODO

Log Message:
wip/PrusaSlicer: Switch to wip version of upgraded nlopt.

- wip/nlopt has the patch to avoid rbtree symbol collisions.
- Remove TODO for nlopt.
- Remove crash stacks from TODO, these were fixed in
  wip/threadingbuildingblocks commit.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=93be4183603ada1bc3bf814f75ccf4ae16b5f0b0

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 PrusaSlicer/Makefile |  2 +-
 PrusaSlicer/TODO     | 47 -----------------------------------------------
 2 files changed, 1 insertion(+), 48 deletions(-)

diffs:
diff --git a/PrusaSlicer/Makefile b/PrusaSlicer/Makefile
index 1c68825c3a..c78b8c0a96 100644
--- a/PrusaSlicer/Makefile
+++ b/PrusaSlicer/Makefile
@@ -35,9 +35,9 @@ CMAKE_ARGS+=	-DSLIC3R_WX_STABLE=1
 .include "../../graphics/png/buildlink3.mk"
 .include "../../math/cgal/buildlink3.mk"
 .include "../../math/eigen3/buildlink3.mk"
-.include "../../math/nlopt/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../wip/cereal/buildlink3.mk"
+.include "../../wip/nlopt/buildlink3.mk"
 .include "../../wip/openvdb/buildlink3.mk"
 .include "../../wip/threadingbuildingblocks/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
diff --git a/PrusaSlicer/TODO b/PrusaSlicer/TODO
index c6d21aab20..f410e5cb4b 100644
--- a/PrusaSlicer/TODO
+++ b/PrusaSlicer/TODO
@@ -1,50 +1,3 @@
 In addition to wip/ versions of packages, this package needs:
 
-- patch to math/nlopt to avoid symbol collisions with libc.
 - patch to math/cgal to remove WRKDIR from installed cmake files.
-
-Seeing frequent crashes on first slice run in TBB, if it survives the
-first slice, it appears stable from that point on. Trace like:
-
-#0  tbb::internal::generic_scheduler::allocate_task (this=this@entry=0x799632fe7e80, number_of_bytes=number_of_bytes@entry=8,
-    parent=parent@entry=0x0, context=context@entry=0x79966ba4ab40 <tbb::internal::the_dummy_context>)
-    at ../../src/tbb/scheduler.cpp:352
-#1  0x000079966b830848 in tbb::internal::generic_scheduler::generic_scheduler (this=this@entry=0x799632fe7e80, m=...,
-    genuine=genuine@entry=true) at ../../src/tbb/scheduler.cpp:99
-#2  0x000079966b83696e in tbb::internal::custom_scheduler<tbb::internal::IntelSchedulerTraits>::custom_scheduler (genuine=true,
-    m=..., this=0x799632fe7e80) at ../../src/tbb/custom_scheduler.h:55
-#3  tbb::internal::custom_scheduler<tbb::internal::IntelSchedulerTraits>::allocate_scheduler (m=..., genuine=<optimized out>)
-    at ../../src/tbb/custom_scheduler.h:140
-#4  0x000079966b830a23 in tbb::internal::allocate_scheduler (genuine=true, m=...) at ../../src/tbb/scheduler.cpp:38
-#5  tbb::internal::generic_scheduler::create_master (a=a@entry=0x0) at ../../src/tbb/scheduler.cpp:1289
-#6  0x000079966b82c62c in tbb::internal::governor::init_scheduler_weak () at ../../src/tbb/governor.cpp:167
-#7  0x000079966b82b235 in tbb::internal::governor::local_scheduler_weak () at ../../src/tbb/governor.h:136
-#8  tbb::internal::allocate_root_with_context_proxy::allocate (this=0x799641dfe728, size=104) at ../../src/tbb/task.cpp:61
-#9  0x00000000005c09c2 in Slic3r::TriangleMeshSlicer::slice(std::vector<float, std::allocator<float> > const&, Slic3r::SlicingMode, std::vector<std::vector<Slic3r::Polygon, std::allocator<Slic3r::Polygon> >, std::allocator<std::vector<Slic3r::Polygon, std::allocator<Slic3r::Polygon> > > >*, std::function<void ()>) const ()
-#10 0x00000000005c0e6a in Slic3r::TriangleMeshSlicer::slice(std::vector<float, std::allocator<float> > const&, Slic3r::SlicingMode, float, std::vector<std::vector<Slic3r::ExPolygon, std::allocator<Slic3r::ExPolygon> >, std::allocator<std::vector<Slic3r::ExPolygon, std::allocator<Slic3r::ExPolygon> > > >*, std::function<void ()>) const ()
-#11 0x0000000000558513 in Slic3r::PrintObject::slice_volumes(std::vector<float, std::allocator<float> > const&, Slic3r::SlicingMode, std::vector<Slic3r::ModelVolume const*, std::allocator<Slic3r::ModelVolume const*> > const&) const ()
-#12 0x0000000000559450 in Slic3r::PrintObject::slice_region(unsigned long, std::vector<float, std::allocator<float> > const&, Slic3r::SlicingMode) const ()
-#13 0x0000000000562eaa in Slic3r::PrintObject::_slice(std::vector<double, std::allocator<double> > const&) ()
-#14 0x0000000000564658 in Slic3r::PrintObject::slice() ()
-#15 0x00000000005649ab in Slic3r::PrintObject::make_perimeters() ()
-#16 0x000000000052fb8a in Slic3r::Print::process() ()
-#17 0x000000000081adb9 in Slic3r::BackgroundSlicingProcess::process_fff() ()
-#18 0x000000000081c1ce in Slic3r::BackgroundSlicingProcess::thread_proc() ()
-#19 0x000000000081c9ea in Slic3r::BackgroundSlicingProcess::thread_proc_safe() ()
-#20 0x000079966ea07f16 in thread_proxy () from /usr/pkg/lib/libboost_thread.so.1.73.0
-#21 0x000079966b40c072 in ?? () from /usr/lib/libpthread.so.1
-#22 0x0000799666887b70 in ?? () from /usr/lib/libc.so.12
-#23 0x0000000000200000 in ?? ()
-#24 0x0000000000000000 in ?? ()
-
-or, less frequently:
-
-#0  0x00007bd432031e5e in tbb::internal::generic_scheduler::reload_tasks (this=this@entry=0x7bd408ac3e80,
-    offloaded_tasks=@0x7bd408ac3fd0: 0x7bd408ac3ff8, offloaded_task_list_link=@0x7bd408ac3fd8: 0x0,
-    top_priority=top_priority@entry=1, isolation=isolation@entry=0) at ../../src/tbb/scheduler.cpp:879
-#1  0x00007bd432032501 in tbb::internal::generic_scheduler::reload_tasks (this=this@entry=0x7bd408ac3e80, isolation=isolation@entry=0)
-    at ../../src/tbb/scheduler.cpp:936
-#2  0x00007bd432036c44 in tbb::internal::custom_scheduler<tbb::internal::IntelSchedulerTraits>::receive_or_steal_task (                    this=0x7bd408ac3e80, completion_ref_count=<optimized out>, isolation=0) at ../../src/tbb/custom_scheduler.h:263                    #3  0x00007bd43202e61c in tbb::internal::arena::process (this=0x7bd408ad3480, s=...) at ../../src/tbb/arena.cpp:191
-#4  0x00007bd43202d1cc in tbb::internal::market::process (this=0x7bd408ae3580, j=...) at ../../src/tbb/market.cpp:667                  #5  0x00007bd43202a537 in tbb::internal::rml::private_worker::run (this=0x7bd407306080) at ../../src/tbb/private_server.cpp:266        #6  0x00007bd43202a675 in tbb::internal::rml::private_worker::thread_routine (arg=<optimized out>)
-    at ../../src/tbb/private_server.cpp:219                                                                                            #7  0x00007bd431c0c072 in ?? () from /usr/lib/libpthread.so.1
-#8  0x00007bd42d087b70 in ?? () from /usr/lib/libc.so.12                                                                               Backtrace stopped: Cannot access memory at address 0x7bd407000000