aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Martinez <danielmartinez@cock.li>2024-02-21 18:06:53 +0000
committerAndrea Brancaleoni <miwaxe@gmail.com>2024-02-28 16:31:30 +0000
commit8262a4acdfa1dd46caba77c4c061d499a41d44ba (patch)
treeacf6dbb11481f08d1d094181286445dcd1c5f3b4
parent54e6237a65beb6116bad61c05bc0aa8926170b1c (diff)
downloadvoid-packages-8262a4acdfa1dd46caba77c4c061d499a41d44ba.tar
void-packages-8262a4acdfa1dd46caba77c4c061d499a41d44ba.tar.gz
void-packages-8262a4acdfa1dd46caba77c4c061d499a41d44ba.tar.bz2
void-packages-8262a4acdfa1dd46caba77c4c061d499a41d44ba.tar.lz
void-packages-8262a4acdfa1dd46caba77c4c061d499a41d44ba.tar.xz
void-packages-8262a4acdfa1dd46caba77c4c061d499a41d44ba.tar.zst
void-packages-8262a4acdfa1dd46caba77c4c061d499a41d44ba.zip
PrusaSlicer: rebuild for tbb, fix build.
-rw-r--r--srcpkgs/PrusaSlicer/patches/ambiguous-overloads.patch28
-rw-r--r--srcpkgs/PrusaSlicer/patches/cstdint.patch85
-rw-r--r--srcpkgs/PrusaSlicer/template2
3 files changed, 114 insertions, 1 deletions
diff --git a/srcpkgs/PrusaSlicer/patches/ambiguous-overloads.patch b/srcpkgs/PrusaSlicer/patches/ambiguous-overloads.patch
new file mode 100644
index 00000000000..eb8cd200a0b
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/ambiguous-overloads.patch
@@ -0,0 +1,28 @@
+diff --git a/src/slic3r/GUI/PhysicalPrinterDialog.cpp b/src/slic3r/GUI/PhysicalPrinterDialog.cpp
+index 2364c5624..c977bee4c 100644
+--- a/src/slic3r/GUI/PhysicalPrinterDialog.cpp
++++ b/src/slic3r/GUI/PhysicalPrinterDialog.cpp
+@@ -467,7 +467,8 @@ void PhysicalPrinterDialog::build_printhost_settings(ConfigOptionsGroup* m_optgr
+ // Always fill in the "printhost_port" combo box from the config and select it.
+ {
+ Choice* choice = dynamic_cast<Choice*>(m_optgroup->get_field("printhost_port"));
+- choice->set_values({ m_config->opt_string("printhost_port") });
++ const wxArrayString printhost_port = wxArrayString{ m_config->opt_string("printhost_port") };
++ choice->set_values(printhost_port);
+ choice->set_selection();
+ }
+
+diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp
+index 2d00674c0..011ef7cfd 100644
+--- a/src/slic3r/GUI/Plater.cpp
++++ b/src/slic3r/GUI/Plater.cpp
+@@ -5425,7 +5425,8 @@ void Plater::load_project(const wxString& filename)
+
+ p->reset();
+
+- if (! load_files({ into_path(filename) }).empty()) {
++ boost::filesystem::path full_path = into_path(filename);
++ if (! load_files({ full_path }, true, true).empty()) {
+ // At least one file was loaded.
+ p->set_project_filename(filename);
+ // Save the names of active presets and project specific config into ProjectDirtyStateManager.
diff --git a/srcpkgs/PrusaSlicer/patches/cstdint.patch b/srcpkgs/PrusaSlicer/patches/cstdint.patch
new file mode 100644
index 00000000000..3b74f98a578
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/cstdint.patch
@@ -0,0 +1,85 @@
+From 4846f8c211515546d441d3305a50138614987b72 Mon Sep 17 00:00:00 2001
+From: Robert Schiele <rschiele@gmail.com>
+Date: Fri, 5 May 2023 20:39:46 +0200
+Subject: [PATCH] add missing includes of <cstdint> (PR #10499)
+
+---
+ deps/OpenEXR/OpenEXR.cmake | 3 ++-
+ deps/OpenEXR/OpenEXR.patch | 36 +++++++++++++++++++++++++++++++++
+ src/libslic3r/PNGReadWrite.hpp | 1 +
+ 4 files changed, 40 insertions(+), 1 deletion(-)
+ create mode 100644 deps/OpenEXR/OpenEXR.patch
+
+diff --git a/deps/OpenEXR/OpenEXR.cmake b/deps/OpenEXR/OpenEXR.cmake
+index 046223fed9e..094965d0421 100644
+--- a/deps/OpenEXR/OpenEXR.cmake
++++ b/deps/OpenEXR/OpenEXR.cmake
+@@ -4,6 +4,7 @@ prusaslicer_add_cmake_project(OpenEXR
+ URL_HASH SHA256=0307a3d7e1fa1e77e9d84d7e9a8694583fbbbfd50bdc6884e2c96b8ef6b902de
+ DEPENDS ${ZLIB_PKG}
+ GIT_TAG v2.5.5
++ PATCH_COMMAND patch -p1 < ${CMAKE_CURRENT_LIST_DIR}/OpenEXR.patch
+ CMAKE_ARGS
+ -DCMAKE_POSITION_INDEPENDENT_CODE=ON
+ -DBUILD_TESTING=OFF
+@@ -14,4 +15,4 @@ prusaslicer_add_cmake_project(OpenEXR
+
+ if (MSVC)
+ add_debug_dep(dep_OpenEXR)
+-endif ()
+\ No newline at end of file
++endif ()
+diff --git a/deps/OpenEXR/OpenEXR.patch b/deps/OpenEXR/OpenEXR.patch
+new file mode 100644
+index 00000000000..22adbd27784
+--- /dev/null
++++ b/deps/OpenEXR/OpenEXR.patch
+@@ -0,0 +1,36 @@
++diff --git a/OpenEXR/IlmImf/ImfDwaCompressor.cpp b/OpenEXR/IlmImf/ImfDwaCompressor.cpp
++index 59d1d5d1..585a3e65 100644
++--- a/OpenEXR/IlmImf/ImfDwaCompressor.cpp
+++++ b/OpenEXR/IlmImf/ImfDwaCompressor.cpp
++@@ -159,6 +159,7 @@
++ #include <limits>
++
++ #include <cstddef>
+++#include <cstdint>
++
++
++ // Windows specific addition to prevent the indirect import of the redefined min/max macros
++diff --git a/OpenEXR/IlmImf/ImfHuf.cpp b/OpenEXR/IlmImf/ImfHuf.cpp
++index 271849b7..165fac58 100644
++--- a/OpenEXR/IlmImf/ImfHuf.cpp
+++++ b/OpenEXR/IlmImf/ImfHuf.cpp
++@@ -53,6 +53,7 @@
++ #include <cstring>
++ #include <cassert>
++ #include <algorithm>
+++#include <cstdint>
++
++
++ using namespace std;
++diff --git a/OpenEXR/IlmImf/ImfMisc.cpp b/OpenEXR/IlmImf/ImfMisc.cpp
++index d2c84787..4b487940 100644
++--- a/OpenEXR/IlmImf/ImfMisc.cpp
+++++ b/OpenEXR/IlmImf/ImfMisc.cpp
++@@ -40,6 +40,7 @@
++ //
++ //-----------------------------------------------------------------------------
++
+++#include <cstdint>
++ #include <ImfMisc.h>
++ #include <ImfHeader.h>
++ #include <ImfAttribute.h>
+diff --git a/src/libslic3r/PNGReadWrite.hpp b/src/libslic3r/PNGReadWrite.hpp
+index 01e1f474500..399c6224382 100644
+--- a/src/libslic3r/PNGReadWrite.hpp
++++ b/src/libslic3r/PNGReadWrite.hpp
+@@ -4,6 +4,7 @@
+ #include <vector>
+ #include <string>
+ #include <istream>
++#include <cstdint>
+
+ namespace Slic3r { namespace png {
+
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index c28c2d707c2..04d1e74a353 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
# Template file for 'PrusaSlicer'
pkgname=PrusaSlicer
version=2.5.2
-revision=3
+revision=4
build_style=cmake
build_helper="qemu cmake-wxWidgets-gtk3"
# Pre-Compiled Headers seems to be slower