diff --git a/PrusaSlicer-2.4.2.tar.gz b/PrusaSlicer-2.4.2.tar.gz deleted file mode 100644 index 9410f92..0000000 --- a/PrusaSlicer-2.4.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ac3a77212260e8d0baf9df027c29e0ae965bc77f371e59fd27b8fe103ebb1f23 -size 47752224 diff --git a/PrusaSlicer-2.5.0.tar.gz b/PrusaSlicer-2.5.0.tar.gz new file mode 100644 index 0000000..61f0874 --- /dev/null +++ b/PrusaSlicer-2.5.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dbbf3e10c812d1dc7bae4bd6879e60f864d763b2738b099dd34b9636d0e5eb6a +size 48591956 diff --git a/PrusaSlicer-cereal.patch b/PrusaSlicer-cereal.patch index 454499f..9b92ba1 100644 --- a/PrusaSlicer-cereal.patch +++ b/PrusaSlicer-cereal.patch @@ -35,12 +35,12 @@ Index: PrusaSlicer-version_2.4.2/src/CMakeLists.txt @@ -125,7 +125,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 libcereal) + if (APPLE) # add_compile_options(-stdlib=libc++) - # add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE) Index: PrusaSlicer-version_2.4.2/src/libslic3r/CMakeLists.txt =================================================================== --- PrusaSlicer-version_2.4.2.orig/src/libslic3r/CMakeLists.txt diff --git a/PrusaSlicer.changes b/PrusaSlicer.changes index 5447622..3fd1863 100644 --- a/PrusaSlicer.changes +++ b/PrusaSlicer.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Sat Oct 29 11:35:55 UTC 2022 - Ben Greiner + +- Update to version 2.5.0 + * Arachne perimeter generator + * Lightning infill + * Pressure equalizer + * STEP file import + * various smaller features and bugfixes + * Big changelog since v2.4.2, most changes decribed in alpha and + beta release notes: + https://github.com/prusa3d/PrusaSlicer/releases +- Add up-occt-version.patch + ------------------------------------------------------------------- Mon Sep 5 17:17:49 UTC 2022 - Hans-Peter Jansen diff --git a/PrusaSlicer.spec b/PrusaSlicer.spec index c17d846..c0c06e4 100644 --- a/PrusaSlicer.spec +++ b/PrusaSlicer.spec @@ -17,7 +17,7 @@ Name: PrusaSlicer -Version: 2.4.2 +Version: 2.5.0 Release: 0 Summary: G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.) License: AGPL-3.0-only @@ -28,6 +28,8 @@ Source0: https://github.com/prusa3d/PrusaSlicer/archive/version_%{version Patch0: PrusaSlicer-boost1.79.patch # PATCH-FIX-UPSTREAM PrusaSlicer-cereal.patch -- gh#prusa3d/PrusaSlicer#7809 Patch1: PrusaSlicer-cereal.patch +# PATCH-FIX-OPENSUSE up-occt-version.patch mike.chikov@gmail.com -- install wrapper so into libdir, not bindir +Patch2: up-occt-version.patch BuildRequires: blosc-devel BuildRequires: cereal-devel BuildRequires: cgal-devel >= 4.13.2 @@ -56,10 +58,13 @@ BuildRequires: libboost_system-devel BuildRequires: libboost_thread-devel BuildRequires: libcurl-devel BuildRequires: libexpat-devel +BuildRequires: libjpeg-devel BuildRequires: memory-constraints BuildRequires: nlopt-devel +BuildRequires: occt-devel BuildRequires: openexr-devel -BuildRequires: openvdb-devel >= 5 +# See https://github.com/prusa3d/PrusaSlicer/pull/9103 +BuildRequires: openvdb-devel >= 7.1 BuildRequires: openvdb-tools BuildRequires: pkgconfig BuildRequires: tbb-devel @@ -113,7 +118,7 @@ sed -i tests/libslic3r/CMakeLists.txt -e '\@test_voronoi.cpp@d' %install %cmake_install -%suse_update_desktop_file -r PrusaSlicer Graphics 3DGraphics Science Engineering +%suse_update_desktop_file -r PrusaSlicer Graphics 3DGraphics %suse_update_desktop_file -r PrusaGcodeviewer Graphics 3DGraphics #remove stray font file @@ -152,19 +157,15 @@ find %{buildroot}%{_datadir}/%{name}/localization -type d | sed ' %fdupes %{buildroot}%{_datadir} %check -%ctest --timeout 600 +%ctest %files -f lang-files %{_bindir}/prusa-slicer %{_bindir}/prusa-gcodeviewer +%{_libdir}/OCCTWrapper.so %dir %{_datadir}/%{name}/ %{_datadir}/%{name}/{icons,models,profiles,shaders,udev,data,shapes}/ -%{_datadir}/icons/hicolor/32x32/apps/%{name}.png -%{_datadir}/icons/hicolor/128x128/apps/%{name}.png -%{_datadir}/icons/hicolor/192x192/apps/%{name}.png -%{_datadir}/icons/hicolor/32x32/apps/%{name}-gcodeviewer.png -%{_datadir}/icons/hicolor/128x128/apps/%{name}-gcodeviewer.png -%{_datadir}/icons/hicolor/192x192/apps/%{name}-gcodeviewer.png +%{_datadir}/icons/hicolor/*/apps/%{name}*.png %{_datadir}/applications/PrusaSlicer.desktop %{_datadir}/applications/PrusaGcodeviewer.desktop %license LICENSE diff --git a/up-occt-version.patch b/up-occt-version.patch new file mode 100644 index 0000000..77b33cf --- /dev/null +++ b/up-occt-version.patch @@ -0,0 +1,20 @@ +Index: PrusaSlicer-version_2.5.0/src/occt_wrapper/CMakeLists.txt +=================================================================== +--- PrusaSlicer-version_2.5.0.orig/src/occt_wrapper/CMakeLists.txt ++++ PrusaSlicer-version_2.5.0/src/occt_wrapper/CMakeLists.txt +@@ -19,7 +19,7 @@ include(GenerateExportHeader) + + generate_export_header(OCCTWrapper) + +-find_package(OpenCASCADE 7.6.2 REQUIRED) ++find_package(OpenCASCADE 7.6.3 REQUIRED) + + set(OCCT_LIBS + TKXDESTEP +@@ -56,5 +56,5 @@ target_link_libraries(OCCTWrapper ${OCCT + + include(GNUInstallDirs) + +-install(TARGETS OCCTWrapper DESTINATION "${CMAKE_INSTALL_BINDIR}") ++install(TARGETS OCCTWrapper DESTINATION "${CMAKE_INSTALL_LIBDIR}") +