* [PR PATCH] New package: SuperSlicer-2.4.58.5
@ 2022-09-29 0:37 enderger
2022-09-29 21:09 ` enderger
` (7 more replies)
0 siblings, 8 replies; 9+ messages in thread
From: enderger @ 2022-09-29 0:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1089 bytes --]
There is a new pull request by enderger against master on the void-packages repository
https://github.com/enderger/void-packages SuperSlicer
https://github.com/void-linux/void-packages/pull/39520
New package: SuperSlicer-2.4.58.5
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: briefly
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
A patch file from https://github.com/void-linux/void-packages/pull/39520.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-SuperSlicer-39520.patch --]
[-- Type: text/x-diff, Size: 10428 bytes --]
From fb7446f4283f295340b92d67542d74fc9f6fe676 Mon Sep 17 00:00:00 2001
From: Hutzdog <endergeryt@gmail.com>
Date: Wed, 28 Sep 2022 10:10:58 -0700
Subject: [PATCH] New package: SuperSlicer-2.4.58.5
---
srcpkgs/SuperSlicer/files/SuperSlicer.desktop | 11 +++++
...-sys-unistd.h-with-unistd.h-for-musl.patch | 25 ++++++++++
...ace-get_current_thread_name-for-musl.patch | 30 ++++++++++++
.../patches/cmake-is-very-good.patch | 25 ++++++++++
srcpkgs/SuperSlicer/patches/fstream.patch | 10 ++++
srcpkgs/SuperSlicer/patches/string_file.patch | 6 +++
srcpkgs/SuperSlicer/patches/tdd-gcode.patch | 36 ++++++++++++++
srcpkgs/SuperSlicer/template | 47 +++++++++++++++++++
8 files changed, 190 insertions(+)
create mode 100644 srcpkgs/SuperSlicer/files/SuperSlicer.desktop
create mode 100644 srcpkgs/SuperSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch
create mode 100644 srcpkgs/SuperSlicer/patches/0002-Replace-get_current_thread_name-for-musl.patch
create mode 100644 srcpkgs/SuperSlicer/patches/cmake-is-very-good.patch
create mode 100644 srcpkgs/SuperSlicer/patches/fstream.patch
create mode 100644 srcpkgs/SuperSlicer/patches/string_file.patch
create mode 100644 srcpkgs/SuperSlicer/patches/tdd-gcode.patch
create mode 100644 srcpkgs/SuperSlicer/template
diff --git a/srcpkgs/SuperSlicer/files/SuperSlicer.desktop b/srcpkgs/SuperSlicer/files/SuperSlicer.desktop
new file mode 100644
index 000000000000..66a0b0f9318c
--- /dev/null
+++ b/srcpkgs/SuperSlicer/files/SuperSlicer.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=SuperSlicer
+Exec=/usr/bin/
+Icon=SuperSlicer
+Terminal=false
+Type=Application
+StartupNotify=false
+MimeType=model/stl;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;application/x-amf;
+Icon=/usr/share/SuperSlicer/icons/SuperSlicer_192px.png
+Categories=Graphics;3DGraphics;
+Keywords=3D;Printing;Slicer;
diff --git a/srcpkgs/SuperSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch b/srcpkgs/SuperSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch
new file mode 100644
index 000000000000..c759e84879aa
--- /dev/null
+++ b/srcpkgs/SuperSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch
@@ -0,0 +1,25 @@
+From 7cdeb3dfbe01fc681c35e89e3f509c8e7ac9522e Mon Sep 17 00:00:00 2001
+From: Jasper Chan <jasperchan515@gmail.com>
+Date: Mon, 27 May 2019 18:54:59 -0700
+Subject: [PATCH] Replace sys/unistd.h with unistd.h for musl
+
+---
+ src/slic3r/Utils/Serial.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git src/slic3r/Utils/Serial.cpp src/slic3r/Utils/Serial.cpp
+index 601719b50..43dab2390 100644
+--- a/src/slic3r/Utils/Serial.cpp
++++ b/src/slic3r/Utils/Serial.cpp
+@@ -42,7 +42,7 @@
+ #ifndef _WIN32
+ #include <sys/ioctl.h>
+ #include <sys/time.h>
+- #include <sys/unistd.h>
++ #include <unistd.h>
+ #include <sys/select.h>
+ #endif
+
+--
+2.21.0
+
diff --git a/srcpkgs/SuperSlicer/patches/0002-Replace-get_current_thread_name-for-musl.patch b/srcpkgs/SuperSlicer/patches/0002-Replace-get_current_thread_name-for-musl.patch
new file mode 100644
index 000000000000..1dca187b2bae
--- /dev/null
+++ b/srcpkgs/SuperSlicer/patches/0002-Replace-get_current_thread_name-for-musl.patch
@@ -0,0 +1,30 @@
+--- a/src/libslic3r/Thread.cpp 2021-01-24 13:50:00.469444149 +0100
++++ b/src/libslic3r/Thread.cpp 2021-01-24 13:51:17.109443201 +0100
+@@ -171,16 +171,27 @@ bool set_thread_name(boost::thread &thre
+ return true;
+ }
+
++#ifndef __GLIBC__
++thread_local char current_thread_name[16] = { 0 };
++#endif
++
+ bool set_current_thread_name(const char *thread_name)
+ {
++#ifndef __GLIBC__
++ strncpy(current_thread_name, thread_name, 15);
++#endif
+ pthread_setname_np(pthread_self(), thread_name);
+ return true;
+ }
+
+ std::optional<std::string> get_current_thread_name()
+ {
++#ifdef __GLIBC__
+ char buf[16];
+ return std::string(pthread_getname_np(pthread_self(), buf, 16) == 0 ? buf : "");
++#else
++ return std::string(current_thread_name);
++#endif
+ }
+
+ #endif
diff --git a/srcpkgs/SuperSlicer/patches/cmake-is-very-good.patch b/srcpkgs/SuperSlicer/patches/cmake-is-very-good.patch
new file mode 100644
index 000000000000..f2ca8e0c1f76
--- /dev/null
+++ b/srcpkgs/SuperSlicer/patches/cmake-is-very-good.patch
@@ -0,0 +1,25 @@
+get_prerequisites will go straight to run ldd on the libraries.
+
+get_prerequisites supports objdump, but only on Windows
+--- a/cmake/modules/FindOpenVDB.cmake
++++ b/cmake/modules/FindOpenVDB.cmake
+@@ -381,19 +381,6 @@ set(_EXCLUDE_SYSTEM_PREREQUISITES 1)
+ set(_RECURSE_PREREQUISITES 0)
+ set(_OPENVDB_PREREQUISITE_LIST)
+
+-if(NOT OPENVDB_USE_STATIC_LIBS)
+-get_prerequisites(${OpenVDB_openvdb_LIBRARY}
+- _OPENVDB_PREREQUISITE_LIST
+- ${_EXCLUDE_SYSTEM_PREREQUISITES}
+- ${_RECURSE_PREREQUISITES}
+- ""
+- "${SYSTEM_LIBRARY_PATHS}"
+-)
+-endif()
+-
+-unset(_EXCLUDE_SYSTEM_PREREQUISITES)
+-unset(_RECURSE_PREREQUISITES)
+-
+ # As the way we resolve optional libraries relies on library file names, use
+ # the configuration options from the main CMakeLists.txt to allow users
+ # to manually identify the requirements of OpenVDB builds if they know them.
diff --git a/srcpkgs/SuperSlicer/patches/fstream.patch b/srcpkgs/SuperSlicer/patches/fstream.patch
new file mode 100644
index 000000000000..936593209c53
--- /dev/null
+++ b/srcpkgs/SuperSlicer/patches/fstream.patch
@@ -0,0 +1,10 @@
+--- a/src/hints/HintsToPot.cpp
++++ b/src/hints/HintsToPot.cpp
+@@ -2,6 +2,7 @@
+ #include <vector>
+ #include <string>
+ #include <boost/filesystem.hpp>
++#include <boost/filesystem/fstream.hpp>
+ #include <boost/dll.hpp>
+ #include <boost/property_tree/ini_parser.hpp>
+ #include <boost/nowide/fstream.hpp>
diff --git a/srcpkgs/SuperSlicer/patches/string_file.patch b/srcpkgs/SuperSlicer/patches/string_file.patch
new file mode 100644
index 000000000000..76040869f404
--- /dev/null
+++ b/srcpkgs/SuperSlicer/patches/string_file.patch
@@ -0,0 +1,6 @@
+--- a/src/slic3r/GUI/ScriptExecutor.cpp
++++ b/src/slic3r/GUI/ScriptExecutor.cpp
+@@ -7,2 +7,3 @@
+ #include <string>
++#include <boost/filesystem/string_file.hpp>
+
diff --git a/srcpkgs/SuperSlicer/patches/tdd-gcode.patch b/srcpkgs/SuperSlicer/patches/tdd-gcode.patch
new file mode 100644
index 000000000000..3d9ed1f79260
--- /dev/null
+++ b/srcpkgs/SuperSlicer/patches/tdd-gcode.patch
@@ -0,0 +1,36 @@
+--- a/src/libslic3r/GCode.cpp
++++ b/src/libslic3r/GCode.cpp
+@@ -2073,13 +2073,13 @@
+
+ // The pipeline elements are joined using const references, thus no copying is performed.
+ output_stream.find_replace_supress();
+- tbb::filter<void, GCode::LayerResult> pipeline_to_layerresult = generator;
++ auto pipeline_to_layerresult = generator;
+ if (m_spiral_vase)
+ pipeline_to_layerresult = pipeline_to_layerresult & spiral_vase;
+- tbb::filter<void, std::string> pipeline_to_string = pipeline_to_layerresult & cooling & fan_mover;
++ auto pipeline_to_string = pipeline_to_layerresult & cooling & fan_mover;
+ if (m_find_replace)
+ pipeline_to_string = pipeline_to_string & find_replace;
+- tbb::filter<void, void> full_pipeline = pipeline_to_string & output;
++ auto full_pipeline = pipeline_to_string & output;
+ tbb::parallel_pipeline(12, full_pipeline);
+ output_stream.find_replace_enable();
+ }
+@@ -2147,13 +2147,13 @@
+
+ // The pipeline elements are joined using const references, thus no copying is performed.
+ output_stream.find_replace_supress();
+- tbb::filter<void, GCode::LayerResult> pipeline_to_layerresult = generator;
++ auto pipeline_to_layerresult = generator;
+ if (m_spiral_vase)
+ pipeline_to_layerresult = pipeline_to_layerresult & spiral_vase;
+- tbb::filter<void, std::string> pipeline_to_string = pipeline_to_layerresult & cooling & fan_mover;
++ auto pipeline_to_string = pipeline_to_layerresult & cooling & fan_mover;
+ if (m_find_replace)
+ pipeline_to_string = pipeline_to_string & find_replace;
+- tbb::filter<void, void> full_pipeline = pipeline_to_string & output;
++ auto full_pipeline = pipeline_to_string & output;
+ tbb::parallel_pipeline(12, full_pipeline);
+ output_stream.find_replace_enable();
+ }
diff --git a/srcpkgs/SuperSlicer/template b/srcpkgs/SuperSlicer/template
new file mode 100644
index 000000000000..65100eddda99
--- /dev/null
+++ b/srcpkgs/SuperSlicer/template
@@ -0,0 +1,47 @@
+# Template file for 'SuperSlicer'
+pkgname=SuperSlicer
+version=2.4.58.5
+revision=1
+wrksrc="SuperSlicer-${version}"
+build_style=cmake
+build_helper="qemu cmake-wxWidgets-gtk3"
+configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=ON -DSLIC3R_GTK=3
+ -DSLIC3R_ENC_CHECK=0 -DUSE_BLOSC=ON -DUSE_EXR=ON -DSLIC3R_ALPHA=OFF
+ -DCMAKE_BUILD_TYPE=Release"
+hostmakedepends="pkg-config"
+makedepends="boost-devel cereal cgal-devel dbus-devel eigen glew-devel
+ glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
+ libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel
+ c-blosc-devel ilmbase-devel libopenexr-devel wxWidgets-gtk3-devel"
+short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
+maintainer="Danielle Hutzley <endergeryt@gmail.com>"
+license="AGPL-3.0-or-later"
+homepage="https://github.com/supermerill/SuperSlicer"
+distfiles="https://github.com/supermerill/SuperSlicer/archive/refs/tags/${version}.tar.gz
+ https://github.com/slic3r/slic3r-profiles/archive/refs/heads/main.tar.gz"
+checksum="6bfb4198ff009cf1c5109ceb994fc2a701c6add35b5237abb2aec8b561214821
+ a1fb0ce0133346f22e71b38072506642d0c3205fc19b9365d4a39876dee15a33"
+
+post_extract() {
+ # Move profiles to resources
+ mv ../slic3r-profiles-*/* resources/profiles/
+
+ # Mark tests that fail on certain targets
+ case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ vsed -i tests/libslic3r/test_mutable_priority_queue.cpp \
+ -e 's/\(TEST_CASE("Mutable priority queue - first pop", "\[MutableSkipHeapPriorityQueue\]\)\(")\)/\1[!mayfail]\2/'
+ ;;
+ i686*)
+ vsed -i tests/libslic3r/test_voronoi.cpp \
+ -e 's/\(TEST_CASE("Voronoi offset 2", "\[VoronoiOffset\]\)\(")\)/\1[!mayfail]\2/'
+ vsed -i tests/fff_print/test_trianglemesh.cpp \
+ -e 's/\(SCENARIO( "make_xxx functions produce meshes."\)\()\)/\1, "[!mayfail]"\2/'
+ ;;
+ esac
+}
+
+post_install() {
+ vinstall ${FILESDIR}/SuperSlicer.desktop 644 usr/share/applications
+ vlicense LICENSE
+}
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: New package: SuperSlicer-2.4.58.5
2022-09-29 0:37 [PR PATCH] New package: SuperSlicer-2.4.58.5 enderger
@ 2022-09-29 21:09 ` enderger
2022-09-30 0:27 ` [PR PATCH] [Updated] " enderger
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: enderger @ 2022-09-29 21:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 167 bytes --]
New comment by enderger on void-packages repository
https://github.com/void-linux/void-packages/pull/39520#issuecomment-1262818266
Comment:
Might need to run the CI
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] New package: SuperSlicer-2.4.58.5
2022-09-29 0:37 [PR PATCH] New package: SuperSlicer-2.4.58.5 enderger
2022-09-29 21:09 ` enderger
@ 2022-09-30 0:27 ` enderger
2022-09-30 0:28 ` enderger
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: enderger @ 2022-09-30 0:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1113 bytes --]
There is an updated pull request by enderger against master on the void-packages repository
https://github.com/enderger/void-packages SuperSlicer
https://github.com/void-linux/void-packages/pull/39520
New package: SuperSlicer-2.4.58.5
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: briefly
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl|
Closes #39486
A patch file from https://github.com/void-linux/void-packages/pull/39520.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-SuperSlicer-39520.patch --]
[-- Type: text/x-diff, Size: 10396 bytes --]
From 533066e735bb99cad1721f9371f3bc4d2aaec9f5 Mon Sep 17 00:00:00 2001
From: Hutzdog <endergeryt@gmail.com>
Date: Wed, 28 Sep 2022 10:10:58 -0700
Subject: [PATCH] New package: SuperSlicer-2.4.58.5
---
srcpkgs/SuperSlicer/files/SuperSlicer.desktop | 11 +++++
...-sys-unistd.h-with-unistd.h-for-musl.patch | 25 ++++++++++
...ace-get_current_thread_name-for-musl.patch | 30 ++++++++++++
.../patches/cmake-is-very-good.patch | 25 ++++++++++
srcpkgs/SuperSlicer/patches/fstream.patch | 10 ++++
srcpkgs/SuperSlicer/patches/string_file.patch | 6 +++
srcpkgs/SuperSlicer/patches/tdd-gcode.patch | 36 +++++++++++++++
srcpkgs/SuperSlicer/template | 46 +++++++++++++++++++
8 files changed, 189 insertions(+)
create mode 100644 srcpkgs/SuperSlicer/files/SuperSlicer.desktop
create mode 100644 srcpkgs/SuperSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch
create mode 100644 srcpkgs/SuperSlicer/patches/0002-Replace-get_current_thread_name-for-musl.patch
create mode 100644 srcpkgs/SuperSlicer/patches/cmake-is-very-good.patch
create mode 100644 srcpkgs/SuperSlicer/patches/fstream.patch
create mode 100644 srcpkgs/SuperSlicer/patches/string_file.patch
create mode 100644 srcpkgs/SuperSlicer/patches/tdd-gcode.patch
create mode 100644 srcpkgs/SuperSlicer/template
diff --git a/srcpkgs/SuperSlicer/files/SuperSlicer.desktop b/srcpkgs/SuperSlicer/files/SuperSlicer.desktop
new file mode 100644
index 000000000000..66a0b0f9318c
--- /dev/null
+++ b/srcpkgs/SuperSlicer/files/SuperSlicer.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=SuperSlicer
+Exec=/usr/bin/
+Icon=SuperSlicer
+Terminal=false
+Type=Application
+StartupNotify=false
+MimeType=model/stl;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;application/x-amf;
+Icon=/usr/share/SuperSlicer/icons/SuperSlicer_192px.png
+Categories=Graphics;3DGraphics;
+Keywords=3D;Printing;Slicer;
diff --git a/srcpkgs/SuperSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch b/srcpkgs/SuperSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch
new file mode 100644
index 000000000000..c759e84879aa
--- /dev/null
+++ b/srcpkgs/SuperSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch
@@ -0,0 +1,25 @@
+From 7cdeb3dfbe01fc681c35e89e3f509c8e7ac9522e Mon Sep 17 00:00:00 2001
+From: Jasper Chan <jasperchan515@gmail.com>
+Date: Mon, 27 May 2019 18:54:59 -0700
+Subject: [PATCH] Replace sys/unistd.h with unistd.h for musl
+
+---
+ src/slic3r/Utils/Serial.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git src/slic3r/Utils/Serial.cpp src/slic3r/Utils/Serial.cpp
+index 601719b50..43dab2390 100644
+--- a/src/slic3r/Utils/Serial.cpp
++++ b/src/slic3r/Utils/Serial.cpp
+@@ -42,7 +42,7 @@
+ #ifndef _WIN32
+ #include <sys/ioctl.h>
+ #include <sys/time.h>
+- #include <sys/unistd.h>
++ #include <unistd.h>
+ #include <sys/select.h>
+ #endif
+
+--
+2.21.0
+
diff --git a/srcpkgs/SuperSlicer/patches/0002-Replace-get_current_thread_name-for-musl.patch b/srcpkgs/SuperSlicer/patches/0002-Replace-get_current_thread_name-for-musl.patch
new file mode 100644
index 000000000000..1dca187b2bae
--- /dev/null
+++ b/srcpkgs/SuperSlicer/patches/0002-Replace-get_current_thread_name-for-musl.patch
@@ -0,0 +1,30 @@
+--- a/src/libslic3r/Thread.cpp 2021-01-24 13:50:00.469444149 +0100
++++ b/src/libslic3r/Thread.cpp 2021-01-24 13:51:17.109443201 +0100
+@@ -171,16 +171,27 @@ bool set_thread_name(boost::thread &thre
+ return true;
+ }
+
++#ifndef __GLIBC__
++thread_local char current_thread_name[16] = { 0 };
++#endif
++
+ bool set_current_thread_name(const char *thread_name)
+ {
++#ifndef __GLIBC__
++ strncpy(current_thread_name, thread_name, 15);
++#endif
+ pthread_setname_np(pthread_self(), thread_name);
+ return true;
+ }
+
+ std::optional<std::string> get_current_thread_name()
+ {
++#ifdef __GLIBC__
+ char buf[16];
+ return std::string(pthread_getname_np(pthread_self(), buf, 16) == 0 ? buf : "");
++#else
++ return std::string(current_thread_name);
++#endif
+ }
+
+ #endif
diff --git a/srcpkgs/SuperSlicer/patches/cmake-is-very-good.patch b/srcpkgs/SuperSlicer/patches/cmake-is-very-good.patch
new file mode 100644
index 000000000000..f2ca8e0c1f76
--- /dev/null
+++ b/srcpkgs/SuperSlicer/patches/cmake-is-very-good.patch
@@ -0,0 +1,25 @@
+get_prerequisites will go straight to run ldd on the libraries.
+
+get_prerequisites supports objdump, but only on Windows
+--- a/cmake/modules/FindOpenVDB.cmake
++++ b/cmake/modules/FindOpenVDB.cmake
+@@ -381,19 +381,6 @@ set(_EXCLUDE_SYSTEM_PREREQUISITES 1)
+ set(_RECURSE_PREREQUISITES 0)
+ set(_OPENVDB_PREREQUISITE_LIST)
+
+-if(NOT OPENVDB_USE_STATIC_LIBS)
+-get_prerequisites(${OpenVDB_openvdb_LIBRARY}
+- _OPENVDB_PREREQUISITE_LIST
+- ${_EXCLUDE_SYSTEM_PREREQUISITES}
+- ${_RECURSE_PREREQUISITES}
+- ""
+- "${SYSTEM_LIBRARY_PATHS}"
+-)
+-endif()
+-
+-unset(_EXCLUDE_SYSTEM_PREREQUISITES)
+-unset(_RECURSE_PREREQUISITES)
+-
+ # As the way we resolve optional libraries relies on library file names, use
+ # the configuration options from the main CMakeLists.txt to allow users
+ # to manually identify the requirements of OpenVDB builds if they know them.
diff --git a/srcpkgs/SuperSlicer/patches/fstream.patch b/srcpkgs/SuperSlicer/patches/fstream.patch
new file mode 100644
index 000000000000..936593209c53
--- /dev/null
+++ b/srcpkgs/SuperSlicer/patches/fstream.patch
@@ -0,0 +1,10 @@
+--- a/src/hints/HintsToPot.cpp
++++ b/src/hints/HintsToPot.cpp
+@@ -2,6 +2,7 @@
+ #include <vector>
+ #include <string>
+ #include <boost/filesystem.hpp>
++#include <boost/filesystem/fstream.hpp>
+ #include <boost/dll.hpp>
+ #include <boost/property_tree/ini_parser.hpp>
+ #include <boost/nowide/fstream.hpp>
diff --git a/srcpkgs/SuperSlicer/patches/string_file.patch b/srcpkgs/SuperSlicer/patches/string_file.patch
new file mode 100644
index 000000000000..76040869f404
--- /dev/null
+++ b/srcpkgs/SuperSlicer/patches/string_file.patch
@@ -0,0 +1,6 @@
+--- a/src/slic3r/GUI/ScriptExecutor.cpp
++++ b/src/slic3r/GUI/ScriptExecutor.cpp
+@@ -7,2 +7,3 @@
+ #include <string>
++#include <boost/filesystem/string_file.hpp>
+
diff --git a/srcpkgs/SuperSlicer/patches/tdd-gcode.patch b/srcpkgs/SuperSlicer/patches/tdd-gcode.patch
new file mode 100644
index 000000000000..3d9ed1f79260
--- /dev/null
+++ b/srcpkgs/SuperSlicer/patches/tdd-gcode.patch
@@ -0,0 +1,36 @@
+--- a/src/libslic3r/GCode.cpp
++++ b/src/libslic3r/GCode.cpp
+@@ -2073,13 +2073,13 @@
+
+ // The pipeline elements are joined using const references, thus no copying is performed.
+ output_stream.find_replace_supress();
+- tbb::filter<void, GCode::LayerResult> pipeline_to_layerresult = generator;
++ auto pipeline_to_layerresult = generator;
+ if (m_spiral_vase)
+ pipeline_to_layerresult = pipeline_to_layerresult & spiral_vase;
+- tbb::filter<void, std::string> pipeline_to_string = pipeline_to_layerresult & cooling & fan_mover;
++ auto pipeline_to_string = pipeline_to_layerresult & cooling & fan_mover;
+ if (m_find_replace)
+ pipeline_to_string = pipeline_to_string & find_replace;
+- tbb::filter<void, void> full_pipeline = pipeline_to_string & output;
++ auto full_pipeline = pipeline_to_string & output;
+ tbb::parallel_pipeline(12, full_pipeline);
+ output_stream.find_replace_enable();
+ }
+@@ -2147,13 +2147,13 @@
+
+ // The pipeline elements are joined using const references, thus no copying is performed.
+ output_stream.find_replace_supress();
+- tbb::filter<void, GCode::LayerResult> pipeline_to_layerresult = generator;
++ auto pipeline_to_layerresult = generator;
+ if (m_spiral_vase)
+ pipeline_to_layerresult = pipeline_to_layerresult & spiral_vase;
+- tbb::filter<void, std::string> pipeline_to_string = pipeline_to_layerresult & cooling & fan_mover;
++ auto pipeline_to_string = pipeline_to_layerresult & cooling & fan_mover;
+ if (m_find_replace)
+ pipeline_to_string = pipeline_to_string & find_replace;
+- tbb::filter<void, void> full_pipeline = pipeline_to_string & output;
++ auto full_pipeline = pipeline_to_string & output;
+ tbb::parallel_pipeline(12, full_pipeline);
+ output_stream.find_replace_enable();
+ }
diff --git a/srcpkgs/SuperSlicer/template b/srcpkgs/SuperSlicer/template
new file mode 100644
index 000000000000..b3ef82af9ca1
--- /dev/null
+++ b/srcpkgs/SuperSlicer/template
@@ -0,0 +1,46 @@
+# Template file for 'SuperSlicer'
+pkgname=SuperSlicer
+version=2.4.58.5
+revision=1
+build_style=cmake
+build_helper="qemu cmake-wxWidgets-gtk3"
+configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=ON -DSLIC3R_GTK=3
+ -DSLIC3R_ENC_CHECK=0 -DUSE_BLOSC=ON -DUSE_EXR=ON -DSLIC3R_ALPHA=OFF
+ -DCMAKE_BUILD_TYPE=Release"
+hostmakedepends="pkg-config"
+makedepends="boost-devel cereal cgal-devel dbus-devel eigen glew-devel
+ glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
+ libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel
+ c-blosc-devel ilmbase-devel libopenexr-devel wxWidgets-gtk3-devel"
+short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
+maintainer="Danielle Hutzley <endergeryt@gmail.com>"
+license="AGPL-3.0-or-later"
+homepage="https://github.com/supermerill/SuperSlicer"
+distfiles="https://github.com/supermerill/SuperSlicer/archive/refs/tags/${version}.tar.gz
+ https://github.com/slic3r/slic3r-profiles/archive/refs/heads/main.tar.gz"
+checksum="6bfb4198ff009cf1c5109ceb994fc2a701c6add35b5237abb2aec8b561214821
+ a1fb0ce0133346f22e71b38072506642d0c3205fc19b9365d4a39876dee15a33"
+
+post_extract() {
+ # Move profiles to resources
+ mv ../slic3r-profiles-*/* resources/profiles/
+
+ # Mark tests that fail on certain targets
+ case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ vsed -i tests/libslic3r/test_mutable_priority_queue.cpp \
+ -e 's/\(TEST_CASE("Mutable priority queue - first pop", "\[MutableSkipHeapPriorityQueue\]\)\(")\)/\1[!mayfail]\2/'
+ ;;
+ i686*)
+ vsed -i tests/libslic3r/test_voronoi.cpp \
+ -e 's/\(TEST_CASE("Voronoi offset 2", "\[VoronoiOffset\]\)\(")\)/\1[!mayfail]\2/'
+ vsed -i tests/fff_print/test_trianglemesh.cpp \
+ -e 's/\(SCENARIO( "make_xxx functions produce meshes."\)\()\)/\1, "[!mayfail]"\2/'
+ ;;
+ esac
+}
+
+post_install() {
+ vinstall ${FILESDIR}/SuperSlicer.desktop 644 usr/share/applications
+ vlicense LICENSE
+}
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: New package: SuperSlicer-2.4.58.5
2022-09-29 0:37 [PR PATCH] New package: SuperSlicer-2.4.58.5 enderger
2022-09-29 21:09 ` enderger
2022-09-30 0:27 ` [PR PATCH] [Updated] " enderger
@ 2022-09-30 0:28 ` enderger
2022-09-30 0:38 ` enderger
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: enderger @ 2022-09-30 0:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 291 bytes --]
New comment by enderger on void-packages repository
https://github.com/void-linux/void-packages/pull/39520#issuecomment-1262966062
Comment:
Alright, think I fixed the lint. The build failure appears to be a flakey test, as it is failing to download xlocate rather than anything in the PR.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: New package: SuperSlicer-2.4.58.5
2022-09-29 0:37 [PR PATCH] New package: SuperSlicer-2.4.58.5 enderger
` (2 preceding siblings ...)
2022-09-30 0:28 ` enderger
@ 2022-09-30 0:38 ` enderger
2022-09-30 16:13 ` enderger
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: enderger @ 2022-09-30 0:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 320 bytes --]
New comment by enderger on void-packages repository
https://github.com/void-linux/void-packages/pull/39520#issuecomment-1262966062
Comment:
Alright, think I fixed the lint. The build failure appears to be a flakey test, as it is failing to download xlocate rather than anything in the PR. Should be ready to rerun CI.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: New package: SuperSlicer-2.4.58.5
2022-09-29 0:37 [PR PATCH] New package: SuperSlicer-2.4.58.5 enderger
` (3 preceding siblings ...)
2022-09-30 0:38 ` enderger
@ 2022-09-30 16:13 ` enderger
2022-10-23 9:47 ` hvraven
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: enderger @ 2022-09-30 16:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 316 bytes --]
New comment by enderger on void-packages repository
https://github.com/void-linux/void-packages/pull/39520#issuecomment-1263764909
Comment:
Alright, no idea why CI is failing. Xlocate appears to be a part of the packaging system itself, so unless I'm doing something wrong the test might just not be working here.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: New package: SuperSlicer-2.4.58.5
2022-09-29 0:37 [PR PATCH] New package: SuperSlicer-2.4.58.5 enderger
` (4 preceding siblings ...)
2022-09-30 16:13 ` enderger
@ 2022-10-23 9:47 ` hvraven
2023-01-22 2:00 ` github-actions
2023-02-05 2:03 ` [PR PATCH] [Closed]: " github-actions
7 siblings, 0 replies; 9+ messages in thread
From: hvraven @ 2022-10-23 9:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 222 bytes --]
New comment by hvraven on void-packages repository
https://github.com/void-linux/void-packages/pull/39520#issuecomment-1288068589
Comment:
built and used it successfully on my machine for x86_64. Thanks for the package.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: New package: SuperSlicer-2.4.58.5
2022-09-29 0:37 [PR PATCH] New package: SuperSlicer-2.4.58.5 enderger
` (5 preceding siblings ...)
2022-10-23 9:47 ` hvraven
@ 2023-01-22 2:00 ` github-actions
2023-02-05 2:03 ` [PR PATCH] [Closed]: " github-actions
7 siblings, 0 replies; 9+ messages in thread
From: github-actions @ 2023-01-22 2:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/39520#issuecomment-1399384011
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Closed]: New package: SuperSlicer-2.4.58.5
2022-09-29 0:37 [PR PATCH] New package: SuperSlicer-2.4.58.5 enderger
` (6 preceding siblings ...)
2023-01-22 2:00 ` github-actions
@ 2023-02-05 2:03 ` github-actions
7 siblings, 0 replies; 9+ messages in thread
From: github-actions @ 2023-02-05 2:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 951 bytes --]
There's a closed pull request on the void-packages repository
New package: SuperSlicer-2.4.58.5
https://github.com/void-linux/void-packages/pull/39520
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: briefly
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl|
Closes #39486
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2023-02-05 2:03 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-29 0:37 [PR PATCH] New package: SuperSlicer-2.4.58.5 enderger
2022-09-29 21:09 ` enderger
2022-09-30 0:27 ` [PR PATCH] [Updated] " enderger
2022-09-30 0:28 ` enderger
2022-09-30 0:38 ` enderger
2022-09-30 16:13 ` enderger
2022-10-23 9:47 ` hvraven
2023-01-22 2:00 ` github-actions
2023-02-05 2:03 ` [PR PATCH] [Closed]: " github-actions
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).