2.4.0
This commit is contained in:
Tom spot Callaway
parent
200ca08428
commit
465b852a28
|
|
@ -1,12 +1,11 @@
|
|||
diff --git a/cmake/modules/FindOpenVDB.cmake b/cmake/modules/FindOpenVDB.cmake
|
||||
index 02420fed8..4b93111ab 100644
|
||||
--- a/cmake/modules/FindOpenVDB.cmake
|
||||
+++ b/cmake/modules/FindOpenVDB.cmake
|
||||
@@ -326,28 +326,10 @@ macro(just_fail msg)
|
||||
diff -up PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake.openexr3 PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake
|
||||
--- PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake.openexr3 2021-12-21 15:57:35.000000000 +0000
|
||||
+++ PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake 2022-02-11 19:27:12.105404186 +0000
|
||||
@@ -347,28 +347,10 @@ macro(just_fail msg)
|
||||
return()
|
||||
endmacro()
|
||||
|
||||
-find_package(IlmBase QUIET COMPONENTS Half)
|
||||
-find_package(IlmBase QUIET)
|
||||
-if(NOT IlmBase_FOUND)
|
||||
- pkg_check_modules(IlmBase QUIET IlmBase)
|
||||
-endif()
|
||||
|
|
@ -32,7 +31,7 @@ index 02420fed8..4b93111ab 100644
|
|||
|
||||
# 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})
|
||||
@@ -419,7 +401,7 @@ foreach(PREREQUISITE ${_OPENVDB_PREREQUI
|
||||
set(OpenVDB_USES_LOG4CPLUS ON)
|
||||
endif()
|
||||
|
||||
|
|
@ -41,7 +40,7 @@ index 02420fed8..4b93111ab 100644
|
|||
if(NOT ${_HAS_DEP} EQUAL -1)
|
||||
set(OpenVDB_USES_ILM ON)
|
||||
endif()
|
||||
@@ -429,11 +411,7 @@ if(OpenVDB_USES_LOG4CPLUS)
|
||||
@@ -450,11 +432,7 @@ if(OpenVDB_USES_LOG4CPLUS)
|
||||
find_package(Log4cplus ${_quiet} ${_required})
|
||||
endif()
|
||||
|
||||
|
|
@ -54,7 +53,7 @@ index 02420fed8..4b93111ab 100644
|
|||
find_package(OpenEXR ${_quiet} ${_required})
|
||||
endif()
|
||||
|
||||
@@ -450,7 +428,7 @@ endif()
|
||||
@@ -471,7 +449,7 @@ endif()
|
||||
set(_OPENVDB_VISIBLE_DEPENDENCIES
|
||||
Boost::iostreams
|
||||
Boost::system
|
||||
|
|
@ -63,7 +62,7 @@ index 02420fed8..4b93111ab 100644
|
|||
)
|
||||
|
||||
set(_OPENVDB_DEFINITIONS)
|
||||
@@ -460,10 +438,7 @@ endif()
|
||||
@@ -481,10 +459,7 @@ endif()
|
||||
|
||||
if(OpenVDB_USES_EXR)
|
||||
list(APPEND _OPENVDB_VISIBLE_DEPENDENCIES
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@
|
|||
%endif
|
||||
|
||||
Name: prusa-slicer
|
||||
Version: 2.3.3
|
||||
Release: 5%{?dist}
|
||||
Version: 2.4.0
|
||||
Release: 1%{?dist}
|
||||
Summary: 3D printing slicer optimized for Prusa printers
|
||||
|
||||
# The main PrusaSlicer code and resources are AGPLv3, with small parts as
|
||||
|
|
@ -25,10 +25,7 @@ Source0: https://github.com/prusa3d/PrusaSlicer/archive/version_%version.
|
|||
Source1: %name.desktop
|
||||
Source2: %name.appdata.xml
|
||||
|
||||
# Fix build error with non-const MINSIGSTKSZ
|
||||
# https://github.com/prusa3d/PrusaSlicer/pull/6518
|
||||
Patch1: 0001-Fix-build-error-with-non-const-MINSIGSTKSZ.patch
|
||||
|
||||
Patch1: prusa-slicer-no-cereal-lib.patch
|
||||
|
||||
# Beware!
|
||||
# Patches >= 340 are only applied on Fedora 34+
|
||||
|
|
@ -63,7 +60,8 @@ BuildRequires: gtest-devel
|
|||
BuildRequires: ilmbase-devel
|
||||
BuildRequires: ImageMagick
|
||||
BuildRequires: libgudev
|
||||
BuildRequires: miniz-devel
|
||||
# Upstream miniz is no longer compatible, gotta use the fork.
|
||||
# BuildRequires: miniz-devel
|
||||
BuildRequires: NLopt-devel
|
||||
BuildRequires: openvdb
|
||||
BuildRequires: openvdb-devel
|
||||
|
|
@ -72,9 +70,6 @@ BuildRequires: tbb-devel
|
|||
BuildRequires: wxBase3-devel
|
||||
BuildRequires: wxGTK3-devel
|
||||
|
||||
# Upstream says this is obsolete, but still needed to compile
|
||||
BuildRequires: poly2tri-devel
|
||||
|
||||
# Things we wish we could unbundle
|
||||
#BuildRequires: admesh-devel >= 0.98.1
|
||||
#BuildRequires: polyclipping-devel >= 6.2.0
|
||||
|
|
@ -157,6 +152,10 @@ Provides: bundled(imgui) = 1.66
|
|||
# License: MIT
|
||||
Provides: bundled(mesa-libGLU)
|
||||
|
||||
# PrusaResearch added functions to the upstream miniz. Yay.
|
||||
# License: MIT
|
||||
Provides: bundled(miniz) = 2.1.0prusa
|
||||
|
||||
# A header-only library, developed by one of the authors of PrusaSlicer. Not
|
||||
# packaged in Fedora, but could be (for little benefit).
|
||||
# None of the source files carry licensing information, but a file LICENSE.txt
|
||||
|
|
@ -264,11 +263,6 @@ unbundle () {
|
|||
unbundle eigen
|
||||
unbundle expat
|
||||
unbundle glew
|
||||
unbundle miniz
|
||||
|
||||
# Upstream says this is obsolete, but it's still needed for compilation.
|
||||
# The Fedora version appears to work fine for that purpose so we'll use it.
|
||||
unbundle poly2tri
|
||||
|
||||
# These tests were fixed but the fixes were undone upsteam with commit ac6969c
|
||||
# https://github.com/prusa3d/PrusaSlicer/issues/2288
|
||||
|
|
@ -395,6 +389,9 @@ rm -rf %buildroot%_datadir/PrusaSlicer/data/
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Mon Feb 14 2022 Tom Callaway <spot@fedoraproject.org> - 2.4.0-1
|
||||
- update to 2.4.0
|
||||
|
||||
* Thu Feb 10 2022 Orion Poplawski <orion@nwra.com> - 2.3.3-5
|
||||
- Rebuild for glew 2.2
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (version_2.3.3.tar.gz) = 1f6b97e135202ad9de8f0bb212239ce2497de4205ea32f860b483473fb1f1783451d539a67cd97ef31f512a797b29c1067a1eff4134ea4a29b6218e5757657e2
|
||||
SHA512 (version_2.4.0.tar.gz) = e923e4e6273dbcfc3e2bc0e28f9eb8cda8530747c0a834f48aea715d75ba1d02be9cfee043689efccdaee40de00114f7964e43accad245b9acd801b997868e3c
|
||||
|
|
|
|||
Loading…
Reference in New Issue