[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/files/

[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/files/

[Dennis Lamm]

commit:     693ba9dd842bcf2a2dfdc6d7c8663b90e39974d3
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Feb 14 09:49:12 2021 +0000
Commit:     Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
CommitDate: Sun Feb 14 11:17:12 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=693ba9dd

media-gfx/prusaslicer: remove unused files

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/19459
Signed-off-by: Dennis Lamm <expeditioneer <AT> gentoo.org>

 media-gfx/prusaslicer/files/PrusaGcodeviewer.desktop |  9 ---------
 media-gfx/prusaslicer/files/PrusaSlicer.desktop      | 12 ------------
 2 files changed, 21 deletions(-)

diff --git a/media-gfx/prusaslicer/files/PrusaGcodeviewer.desktop b/media-gfx/prusaslicer/files/PrusaGcodeviewer.desktop
deleted file mode 100644
index 4b73cc905c6..00000000000
--- a/media-gfx/prusaslicer/files/PrusaGcodeviewer.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Prusa GCode viewer
-Exec=prusa-slicer --gcodeviewer %F
-Icon=PrusaSlicer
-Terminal=false
-Type=Application
-MimeType=text/x.gcode;
-Categories=Graphics;3DGraphics;
-Keywords=3D;Printing;Slicer;

diff --git a/media-gfx/prusaslicer/files/PrusaSlicer.desktop b/media-gfx/prusaslicer/files/PrusaSlicer.desktop
deleted file mode 100644
index dae507b54ab..00000000000
--- a/media-gfx/prusaslicer/files/PrusaSlicer.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Name=PrusaSlicer
-GenericName=3D Printing Software
-Icon=PrusaSlicer
-Exec=prusa-slicer %F
-Terminal=false
-Type=Application
-MimeType=model/stl;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;application/x-amf;
-Categories=Graphics;3DGraphics;Engineering;
-Keywords=3D;Printing;Slicer;slice;3D;printer;convert;gcode;stl;obj;amf;SLA
-StartupNotify=false
-StartupWMClass=prusa-slicer
\ No newline at end of file

[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/files/

[Dennis Lamm]

commit:     4dae505a753f59b813c02d7a35a1a7492e4dfbeb
Author:     Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 31 15:25:34 2021 +0000
Commit:     Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
CommitDate: Mon Nov  1 10:00:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dae505a

media-gfx/prusaslicer: removed unused file

dropped upstream merged patch

Signed-off-by: Dennis Lamm <expeditioneer <AT> gentoo.org>
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Dennis Lamm <expeditioneer <AT> gentoo.org>

 .../prusaslicer-2.3.1-gcc11-missing-include.patch  | 24 ----------------------
 1 file changed, 24 deletions(-)

diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.3.1-gcc11-missing-include.patch b/media-gfx/prusaslicer/files/prusaslicer-2.3.1-gcc11-missing-include.patch
deleted file mode 100644
index 6480277bde6..00000000000
--- a/media-gfx/prusaslicer/files/prusaslicer-2.3.1-gcc11-missing-include.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://github.com/prusa3d/PrusaSlicer/commit/62592ca
-https://bugs.gentoo.org/788196
-
-From 62592cab48cfb6a20d84041b1992aecc6a2b659c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hejl?= <hejl.lukas@gmail.com>
-Date: Sat, 1 May 2021 22:33:59 +0200
-Subject: [PATCH] Added missing include (GCC 11.1)
-
----
- src/libslic3r/Optimize/Optimizer.hpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/libslic3r/Optimize/Optimizer.hpp b/src/libslic3r/Optimize/Optimizer.hpp
-index 05191eba26..8ae55c61c5 100644
---- a/src/libslic3r/Optimize/Optimizer.hpp
-+++ b/src/libslic3r/Optimize/Optimizer.hpp
-@@ -8,6 +8,7 @@
- #include <functional>
- #include <limits>
- #include <cassert>
-+#include <optional>
- 
- namespace Slic3r { namespace opt {
- 

[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/files/

[Conrad Kostecki]

commit:     16eed5e9bebcc5bc18b50fec839c9ae14f70a013
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Feb 17 06:58:16 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Feb 17 17:36:06 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16eed5e9

media-gfx/prusaslicer: remove unused patch(es)

Closes: https://github.com/gentoo/gentoo/pull/24229
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../files/prusaslicer-2.4.0-openexr-3.patch        | 76 ----------------------
 1 file changed, 76 deletions(-)

diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.4.0-openexr-3.patch b/media-gfx/prusaslicer/files/prusaslicer-2.4.0-openexr-3.patch
deleted file mode 100644
index cf22b66c7d69..000000000000
--- a/media-gfx/prusaslicer/files/prusaslicer-2.4.0-openexr-3.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-https://src.fedoraproject.org/rpms/prusa-slicer/raw/rawhide/f/prusa-slicer-openexr3.patch
---- a/cmake/modules/FindOpenVDB.cmake
-+++ b/cmake/modules/FindOpenVDB.cmake
-@@ -326,28 +326,10 @@ macro(just_fail msg)
-   return()
- endmacro()
- 
--find_package(IlmBase QUIET COMPONENTS Half)
--if(NOT IlmBase_FOUND)
--  pkg_check_modules(IlmBase QUIET IlmBase)
--endif()
--if (IlmBase_FOUND AND NOT TARGET IlmBase::Half)
--  message(STATUS "Falling back to IlmBase found by pkg-config...")
--
--  find_library(IlmHalf_LIBRARY NAMES Half)
--  if(IlmHalf_LIBRARY-NOTFOUND OR NOT IlmBase_INCLUDE_DIRS)
--    just_fail("IlmBase::Half can not be found!")
--  endif()
--  
--  add_library(IlmBase::Half UNKNOWN IMPORTED)
--  set_target_properties(IlmBase::Half PROPERTIES
--    IMPORTED_LOCATION "${IlmHalf_LIBRARY}"
--    INTERFACE_INCLUDE_DIRECTORIES "${IlmBase_INCLUDE_DIRS}")
--elseif(NOT IlmBase_FOUND)
--  just_fail("IlmBase::Half can not be found!")
--endif()
- find_package(TBB ${_quiet} ${_required} COMPONENTS tbb)
- find_package(ZLIB ${_quiet} ${_required})
- find_package(Boost ${_quiet} ${_required} COMPONENTS iostreams system )
-+find_package(Imath CONFIG)
- 
- # Use GetPrerequisites to see which libraries this OpenVDB lib has linked to
- # which we can query for optional deps. This basically runs ldd/otoll/objdump
-@@ -398,7 +380,7 @@ foreach(PREREQUISITE ${_OPENVDB_PREREQUISITE_LIST})
-     set(OpenVDB_USES_LOG4CPLUS ON)
-   endif()
- 
--  string(FIND ${PREREQUISITE} "IlmImf" _HAS_DEP)
-+  string(FIND ${PREREQUISITE} "OpenEXR" _HAS_DEP)
-   if(NOT ${_HAS_DEP} EQUAL -1)
-     set(OpenVDB_USES_ILM ON)
-   endif()
-@@ -429,11 +411,7 @@ if(OpenVDB_USES_LOG4CPLUS)
-   find_package(Log4cplus ${_quiet} ${_required})
- endif()
- 
--if(OpenVDB_USES_ILM)
--  find_package(IlmBase ${_quiet} ${_required})
--endif()
--
--if(OpenVDB_USES_EXR)
-+if(OpenVDB_USES_ILM OR OpenVDB_USES_EXR)
-   find_package(OpenEXR ${_quiet} ${_required})
- endif()
- 
-@@ -450,7 +428,7 @@ endif()
- set(_OPENVDB_VISIBLE_DEPENDENCIES
-   Boost::iostreams
-   Boost::system
--  IlmBase::Half
-+  Imath::Imath
- )
- 
- set(_OPENVDB_DEFINITIONS)
-@@ -460,10 +438,7 @@ endif()
- 
- if(OpenVDB_USES_EXR)
-   list(APPEND _OPENVDB_VISIBLE_DEPENDENCIES
--    IlmBase::IlmThread
--    IlmBase::Iex
--    IlmBase::Imath
--    OpenEXR::IlmImf
-+    OpenEXR::OpenEXR
-   )
-   list(APPEND _OPENVDB_DEFINITIONS "-DOPENVDB_TOOLS_RAYTRACER_USE_EXR")
- endif()

[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/files/

[Dennis Lamm]

commit:     5c5e7975edee5370b7bab429e495c69fe5fbb222
Author:     Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 30 05:38:05 2022 +0000
Commit:     Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
CommitDate: Wed Aug 31 18:26:46 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c5e7975

media-gfx/prusaslicer: fixed for cereal <1.3.1

Signed-off-by: Dennis Lamm <expeditioneer <AT> gentoo.org>
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Dennis Lamm <expeditioneer <AT> gentoo.org>

 .../files/prusaslicer-2.5.0_rc1-cereal-1.3.1.patch | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-cereal-1.3.1.patch b/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-cereal-1.3.1.patch
index 29e01422b41f..056c6150a7b0 100644
--- a/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-cereal-1.3.1.patch
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-cereal-1.3.1.patch
@@ -1,38 +1,38 @@
---- a/src/CMakeLists.txt	(revision 6690d49beacd48f74bdc75633cb1e7a2280bbcfd)
-+++ b/src/CMakeLists.txt	(date 1661704655632)
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
 @@ -127,7 +127,7 @@
      set_target_properties(PrusaSlicer PROPERTIES OUTPUT_NAME "prusa-slicer")
  endif ()
 
 -target_link_libraries(PrusaSlicer libslic3r cereal)
-+target_link_libraries(PrusaSlicer libslic3r cereal::cereal)
++target_link_libraries(PrusaSlicer libslic3r libcereal)
 
  if (APPLE)
  #    add_compile_options(-stdlib=libc++)
---- a/src/slic3r/CMakeLists.txt	(revision 6690d49beacd48f74bdc75633cb1e7a2280bbcfd)
-+++ b/src/slic3r/CMakeLists.txt	(date 1661704724566)
+--- a/src/slic3r/CMakeLists.txt
++++ b/src/slic3r/CMakeLists.txt
 @@ -260,7 +260,7 @@
 
  encoding_check(libslic3r_gui)
 
 -target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
-+target_link_libraries(libslic3r_gui libslic3r avrdude cereal::cereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
++target_link_libraries(libslic3r_gui libslic3r avrdude libcereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
 
  if (MSVC)
      target_link_libraries(libslic3r_gui Setupapi.lib)
---- a/src/libslic3r/CMakeLists.txt	(revision 6690d49beacd48f74bdc75633cb1e7a2280bbcfd)
-+++ b/src/libslic3r/CMakeLists.txt	(date 1661704699199)
+--- a/src/libslic3r/CMakeLists.txt
++++ b/src/libslic3r/CMakeLists.txt
 @@ -395,7 +395,7 @@
  target_link_libraries(libslic3r
      libnest2d
      admesh
 -    cereal
-+    cereal::cereal
++    libcereal
      libigl
      miniz
      boost_libs
---- a/CMakeLists.txt	(revision 6690d49beacd48f74bdc75633cb1e7a2280bbcfd)
-+++ b/CMakeLists.txt	(date 1661704556468)
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
 @@ -446,6 +446,12 @@
 
  # Find the Cereal serialization library

[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/files/

[Alfredo Tupone]

commit:     5b93b811ad529bf91091e94bfe160cbad5a779a7
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Feb  8 16:54:43 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Thu Feb 23 21:03:30 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b93b811

media-gfx/prusaslicer: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/29494
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 ...aslicer-2.4.0-fix-build-with-cereal-1.3.1.patch | 47 ----------------------
 1 file changed, 47 deletions(-)

diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.4.0-fix-build-with-cereal-1.3.1.patch b/media-gfx/prusaslicer/files/prusaslicer-2.4.0-fix-build-with-cereal-1.3.1.patch
deleted file mode 100644
index d57eb8a31728..000000000000
--- a/media-gfx/prusaslicer/files/prusaslicer-2.4.0-fix-build-with-cereal-1.3.1.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-https://bugs.gentoo.org/834005
-https://github.com/prusa3d/PrusaSlicer/commit/0ffcfd8393457fd035576436752267c9a1e6bbcc
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -506,6 +506,9 @@ endif ()
- 
- # Find the Cereal serialization library
- find_package(cereal REQUIRED)
-+if (NOT TARGET cereal::cereal)
-+    add_library(cereal::cereal ALIAS cereal)
-+endif ()
- 
- # l10n
- set(L10N_DIR "${SLIC3R_RESOURCES_DIR}/localization")
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -126,7 +126,7 @@ if (NOT WIN32 AND NOT APPLE)
-     set_target_properties(PrusaSlicer PROPERTIES OUTPUT_NAME "prusa-slicer")
- endif ()
- 
--target_link_libraries(PrusaSlicer libslic3r cereal)
-+target_link_libraries(PrusaSlicer libslic3r cereal::cereal)
- if (APPLE)
- #    add_compile_options(-stdlib=libc++)
- #    add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE)
---- a/src/libslic3r/CMakeLists.txt
-+++ b/src/libslic3r/CMakeLists.txt
-@@ -358,7 +358,7 @@ find_package(JPEG REQUIRED)
- target_link_libraries(libslic3r
-     libnest2d
-     admesh
--    cereal
-+    cereal::cereal
-     libigl
-     miniz
-     boost_libs
---- a/src/slic3r/CMakeLists.txt
-+++ b/src/slic3r/CMakeLists.txt
-@@ -270,7 +270,7 @@ endforeach()
- 
- encoding_check(libslic3r_gui)
- 
--target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
-+target_link_libraries(libslic3r_gui libslic3r avrdude cereal::cereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
- 
- if (MSVC)
-     target_link_libraries(libslic3r_gui Setupapi.lib)

[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/files/

[Miroslav Šulc]

commit:     ab7b5b95175622e75943b3b8892337a597ad8a46
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 22 09:44:06 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Jun 22 09:44:27 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab7b5b95

media-gfx/prusaslicer: added more missing includes

Bug: https://bugs.gentoo.org/934358
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../files/prusaslicer-2.8.0-missing-includes.patch        | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.8.0-missing-includes.patch b/media-gfx/prusaslicer/files/prusaslicer-2.8.0-missing-includes.patch
index 997ad9ab8a0f..f92813b6b335 100644
--- a/media-gfx/prusaslicer/files/prusaslicer-2.8.0-missing-includes.patch
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.8.0-missing-includes.patch
@@ -8,6 +8,21 @@
  #include <boost/nowide/fstream.hpp>
  
  #include "libslic3r/libslic3r.h"
+--- a/src/slic3r/GUI/RulerForDoubleSlider.cpp
++++ b/src/slic3r/GUI/RulerForDoubleSlider.cpp
+@@ -4,6 +4,12 @@
+ ///|/
+ #include "RulerForDoubleSlider.hpp"
+ #include "libslic3r/CustomGCode.hpp"
++#include "../../libslic3r/libslic3r.h"
++
++#include <algorithm>
++#include <cmath>
++#include <numeric>
++#include <iterator>
+ 
+ using namespace Slic3r;
+ using namespace CustomGCode;
 --- a/src/slic3r/GUI/UserAccountCommunication.cpp
 +++ b/src/slic3r/GUI/UserAccountCommunication.cpp
 @@ -9,6 +9,7 @@

[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/files/

[Miroslav Šulc]

commit:     6a9be4fcabb498522b8e5c5be5b964eac099d4bf
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 25 12:40:12 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Jun 25 12:40:26 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a9be4fc

media-gfx/prusaslicer: updated live ebuild patch

Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../files/prusaslicer-2.8.0-missing-includes.patch | 23 ++++------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.8.0-missing-includes.patch b/media-gfx/prusaslicer/files/prusaslicer-2.8.0-missing-includes.patch
index f92813b6b335..9d13876b607b 100644
--- a/media-gfx/prusaslicer/files/prusaslicer-2.8.0-missing-includes.patch
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.8.0-missing-includes.patch
@@ -8,27 +8,12 @@
  #include <boost/nowide/fstream.hpp>
  
  #include "libslic3r/libslic3r.h"
---- a/src/slic3r/GUI/RulerForDoubleSlider.cpp
-+++ b/src/slic3r/GUI/RulerForDoubleSlider.cpp
-@@ -4,6 +4,12 @@
- ///|/
- #include "RulerForDoubleSlider.hpp"
- #include "libslic3r/CustomGCode.hpp"
-+#include "../../libslic3r/libslic3r.h"
-+
-+#include <algorithm>
-+#include <cmath>
-+#include <numeric>
-+#include <iterator>
- 
- using namespace Slic3r;
- using namespace CustomGCode;
 --- a/src/slic3r/GUI/UserAccountCommunication.cpp
 +++ b/src/slic3r/GUI/UserAccountCommunication.cpp
-@@ -9,6 +9,7 @@
- #include <boost/log/trivial.hpp>
- #include <boost/beast/core/detail/base64.hpp>
- #include <boost/algorithm/string.hpp>
+@@ -13,6 +13,7 @@
+ #include <boost/filesystem.hpp>
+ #include <boost/nowide/cstdio.hpp>
+ #include <boost/nowide/fstream.hpp>
 +#include <boost/nowide/convert.hpp>
  #include <curl/curl.h>
  #include <string>