Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package PrusaSlicer for openSUSE:Factory checked in at 2021-08-31 19:55:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/PrusaSlicer (Old) and /work/SRC/openSUSE:Factory/.PrusaSlicer.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "PrusaSlicer" Tue Aug 31 19:55:10 2021 rev:12 rq:915019 version:2.3.3 Changes: -------- --- /work/SRC/openSUSE:Factory/PrusaSlicer/PrusaSlicer.changes 2021-07-16 22:13:39.518441632 +0200 +++ /work/SRC/openSUSE:Factory/.PrusaSlicer.new.1899/PrusaSlicer.changes 2021-08-31 19:56:08.973996349 +0200 @@ -1,0 +2,8 @@ +Mon Aug 30 11:37:03 UTC 2021 - Ben Greiner <c...@bnavigator.de> + +- Add PrusaSlicer-issue6681-openvdb.patch + * gh#prusa3d/PrusaSlicer#6681 + * ilmbase-devel is now provided by openexr-devel + * OpenVDB's FindOpenVDB.cmake requires blosc-devel + +------------------------------------------------------------------- New: ---- PrusaSlicer-issue6681-openvdb.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ PrusaSlicer.spec ++++++ --- /var/tmp/diff_new_pack.XRV6d6/_old 2021-08-31 19:56:09.537997055 +0200 +++ /var/tmp/diff_new_pack.XRV6d6/_new 2021-08-31 19:56:09.545997065 +0200 @@ -24,6 +24,9 @@ Group: Hardware/Printing URL: https://www.prusa3d.com/prusaslicer/ Source0: https://github.com/prusa3d/PrusaSlicer/archive/version_%{version}.tar.gz#/%{name}-%{version}.tar.gz +# PATCH-FIX-UPSTREAM PrusaSlicer-issue6681-openvdb.patch -- gh#prusa3d/PrusaSlicer#6681 +Patch0: https://github.com/prusa3d/PrusaSlicer/commit/e6507594fb6893156056c2123822a2b37f7f179d.patch#/PrusaSlicer-issue6681-openvdb.patch +BuildRequires: blosc-devel BuildRequires: cereal-devel BuildRequires: cgal-devel >= 4.13.2 BuildRequires: cmake @@ -34,7 +37,6 @@ # For now, use bundled GLEW because of gh#prusa3d/PrusaSlicer#6396 #!BuildIgnore: glew-devel BuildRequires: gtest >= 1.7 -BuildRequires: ilmbase-devel BuildRequires: libboost_atomic-devel BuildRequires: libboost_filesystem-devel BuildRequires: libboost_iostreams-devel @@ -47,6 +49,7 @@ BuildRequires: libexpat-devel BuildRequires: memory-constraints BuildRequires: nlopt-devel +BuildRequires: openexr-devel BuildRequires: openvdb-devel >= 5 BuildRequires: openvdb-tools BuildRequires: tbb-devel @@ -82,8 +85,10 @@ export CFLAGS="%optflags -mfpmath=sse -msse2" export CXXFLAGS="$CFLAGS" %endif -%cmake -DSLIC3R_FHS=1 \ - -DSLIC3R_GTK=3 +%cmake \ + -DSLIC3R_FHS=1 \ + -DSLIC3R_GTK=3 \ + -DOPENVDB_FIND_MODULE_PATH=%{_libdir}/cmake/OpenVDB %cmake_build %install ++++++ PrusaSlicer-issue6681-openvdb.patch ++++++ >From e6507594fb6893156056c2123822a2b37f7f179d Mon Sep 17 00:00:00 2001 From: tamasmeszaros <meszaro...@gmail.com> Date: Wed, 14 Jul 2021 16:26:44 +0200 Subject: [PATCH] Search for a better openvdb find module if available Solves #6681, alternative path for openvdb installation can be specified via cache variable --- CMakeLists.txt | 12 +++++++++--- cmake/modules/FindOpenVDB.cmake | 21 +++++++++++++++++++++ 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b6fe88e48f..b8b9add60f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,6 +33,8 @@ option(SLIC3R_MSVC_PDB "Generate PDB files on MSVC in Release mode" 1) option(SLIC3R_PERL_XS "Compile XS Perl module and enable Perl unit and integration tests" 0) option(SLIC3R_ASAN "Enable ASan on Clang and GCC" 0) +set(OPENVDB_FIND_MODULE_PATH "" CACHE PATH "Path to OpenVDB installation's find modules.") + set(SLIC3R_GTK "2" CACHE STRING "GTK version to use with wxWidgets on Linux") set(IS_CROSS_COMPILE FALSE) @@ -492,13 +494,17 @@ find_package(NLopt 1.4 REQUIRED) if(SLIC3R_STATIC) set(OPENVDB_USE_STATIC_LIBS ON) set(USE_BLOSC TRUE) -endif() +endif () -find_package(OpenVDB 5.0 REQUIRED COMPONENTS openvdb) +find_package(OpenVDB 5.0 COMPONENTS openvdb) if(OpenVDB_FOUND) slic3r_remap_configs(IlmBase::Half RelWithDebInfo Release) slic3r_remap_configs(Blosc::blosc RelWithDebInfo Release) -endif() +else () + message(FATAL_ERROR "OpenVDB could not be found with the bundled find module. " + "You can try to specify the find module location of your " + "OpenVDB installation with the OPENVDB_FIND_MODULE_PATH cache variable.") +endif () set(TOP_LEVEL_PROJECT_DIR ${PROJECT_SOURCE_DIR}) function(prusaslicer_copy_dlls target) diff --git a/cmake/modules/FindOpenVDB.cmake b/cmake/modules/FindOpenVDB.cmake index 02420fed8e..3b60ac9d36 100644 --- a/cmake/modules/FindOpenVDB.cmake +++ b/cmake/modules/FindOpenVDB.cmake @@ -102,6 +102,27 @@ may be provided to tell this module where to look. #]=======================================================================] +# If an explicit openvdb module path was specified, that will be used +if (OPENVDB_FIND_MODULE_PATH) + set(_module_path_bak ${CMAKE_MODULE_PATH}) + set(CMAKE_MODULE_PATH ${OPENVDB_FIND_MODULE_PATH}) + find_package( + OpenVDB ${OpenVDB_FIND_VERSION} QUIET + COMPONENTS + ${OpenVDB_FIND_COMPONENTS} + ) + + set(CMAKE_MODULE_PATH ${_module_path_bak}) + if (OpenVDB_FOUND) + return() + endif () + + if (NOT OpenVDB_FIND_QUIETLY) + message(STATUS "Using bundled find module for OpenVDB") + endif () +endif () +# ########################################################################### + cmake_minimum_required(VERSION 3.3) # Monitoring <PackageName>_ROOT variables if(POLICY CMP0074)
