Date: Saturday, April 24, 2021 @ 18:56:10 Author: arojas Revision: 923709
Update to 2.3.1, openexr 3.0 rebuild Added: prusa-slicer/trunk/prusa-slicer-openexr3.patch Modified: prusa-slicer/trunk/PKGBUILD -----------------------------+ PKGBUILD | 12 ++++-- prusa-slicer-openexr3.patch | 77 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-04-24 18:31:00 UTC (rev 923708) +++ PKGBUILD 2021-04-24 18:56:10 UTC (rev 923709) @@ -1,7 +1,7 @@ # Maintainer: Bruno Pagani <archa...@archlinux.org> pkgname=prusa-slicer -pkgver=2.3.0 +pkgver=2.3.1 pkgrel=1 pkgdesc="G-code generator for 3D printers (Prusa fork of Slic3r)" arch=(x86_64) @@ -10,9 +10,15 @@ depends=(boost-libs curl glew intel-tbb nlopt wxgtk3 qhull openvdb cgal) makedepends=(cmake boost cereal eigen expat gtest libpng systemd) replaces=(slic3r-prusa3d) -source=(${url}/archive/version_${pkgver}/${pkgname}-${pkgver}.tar.gz) -sha256sums=('cd3bac5e29b5441fc4690f28cd7b1064e97dc00207bbdc88f7bd7832308d6ca5') +source=(${url}/archive/version_${pkgver}/${pkgname}-${pkgver}.tar.gz + prusa-slicer-openexr3.patch) +sha256sums=('c1315826d07f428dfe4b9aa6325727beb1257aa6f711d1659a2760f8e213cd51' + '1ef7c22f641b7c18de212202c21f14f6533834a36d7fe0c2b322bc9a13804c6b') +prepare() { + patch -d PrusaSlicer-version_${pkgver} -p1 < prusa-slicer-openexr3.patch # Fix build with openEXR 3 +} + build() { cmake -B build -S PrusaSlicer-version_${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ Added: prusa-slicer-openexr3.patch =================================================================== --- prusa-slicer-openexr3.patch (rev 0) +++ prusa-slicer-openexr3.patch 2021-04-24 18:56:10 UTC (rev 923709) @@ -0,0 +1,77 @@ +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) + 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()