| 1 |
commit: 5c5e7975edee5370b7bab429e495c69fe5fbb222 |
| 2 |
Author: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 30 05:38:05 2022 +0000 |
| 4 |
Commit: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 31 18:26:46 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c5e7975 |
| 7 |
|
| 8 |
media-gfx/prusaslicer: fixed for cereal <1.3.1 |
| 9 |
|
| 10 |
Signed-off-by: Dennis Lamm <expeditioneer <AT> gentoo.org> |
| 11 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
| 12 |
Signed-off-by: Dennis Lamm <expeditioneer <AT> gentoo.org> |
| 13 |
|
| 14 |
.../files/prusaslicer-2.5.0_rc1-cereal-1.3.1.patch | 22 +++++++++++----------- |
| 15 |
1 file changed, 11 insertions(+), 11 deletions(-) |
| 16 |
|
| 17 |
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 |
| 18 |
index 29e01422b41f..056c6150a7b0 100644 |
| 19 |
--- a/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-cereal-1.3.1.patch |
| 20 |
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-cereal-1.3.1.patch |
| 21 |
@@ -1,38 +1,38 @@ |
| 22 |
---- a/src/CMakeLists.txt (revision 6690d49beacd48f74bdc75633cb1e7a2280bbcfd) |
| 23 |
-+++ b/src/CMakeLists.txt (date 1661704655632) |
| 24 |
+--- a/src/CMakeLists.txt |
| 25 |
++++ b/src/CMakeLists.txt |
| 26 |
@@ -127,7 +127,7 @@ |
| 27 |
set_target_properties(PrusaSlicer PROPERTIES OUTPUT_NAME "prusa-slicer") |
| 28 |
endif () |
| 29 |
|
| 30 |
-target_link_libraries(PrusaSlicer libslic3r cereal) |
| 31 |
-+target_link_libraries(PrusaSlicer libslic3r cereal::cereal) |
| 32 |
++target_link_libraries(PrusaSlicer libslic3r libcereal) |
| 33 |
|
| 34 |
if (APPLE) |
| 35 |
# add_compile_options(-stdlib=libc++) |
| 36 |
---- a/src/slic3r/CMakeLists.txt (revision 6690d49beacd48f74bdc75633cb1e7a2280bbcfd) |
| 37 |
-+++ b/src/slic3r/CMakeLists.txt (date 1661704724566) |
| 38 |
+--- a/src/slic3r/CMakeLists.txt |
| 39 |
++++ b/src/slic3r/CMakeLists.txt |
| 40 |
@@ -260,7 +260,7 @@ |
| 41 |
|
| 42 |
encoding_check(libslic3r_gui) |
| 43 |
|
| 44 |
-target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES}) |
| 45 |
-+target_link_libraries(libslic3r_gui libslic3r avrdude cereal::cereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES}) |
| 46 |
++target_link_libraries(libslic3r_gui libslic3r avrdude libcereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES}) |
| 47 |
|
| 48 |
if (MSVC) |
| 49 |
target_link_libraries(libslic3r_gui Setupapi.lib) |
| 50 |
---- a/src/libslic3r/CMakeLists.txt (revision 6690d49beacd48f74bdc75633cb1e7a2280bbcfd) |
| 51 |
-+++ b/src/libslic3r/CMakeLists.txt (date 1661704699199) |
| 52 |
+--- a/src/libslic3r/CMakeLists.txt |
| 53 |
++++ b/src/libslic3r/CMakeLists.txt |
| 54 |
@@ -395,7 +395,7 @@ |
| 55 |
target_link_libraries(libslic3r |
| 56 |
libnest2d |
| 57 |
admesh |
| 58 |
- cereal |
| 59 |
-+ cereal::cereal |
| 60 |
++ libcereal |
| 61 |
libigl |
| 62 |
miniz |
| 63 |
boost_libs |
| 64 |
---- a/CMakeLists.txt (revision 6690d49beacd48f74bdc75633cb1e7a2280bbcfd) |
| 65 |
-+++ b/CMakeLists.txt (date 1661704556468) |
| 66 |
+--- a/CMakeLists.txt |
| 67 |
++++ b/CMakeLists.txt |
| 68 |
@@ -446,6 +446,12 @@ |
| 69 |
|
| 70 |
# Find the Cereal serialization library |
Archives