[arch-commits] Commit in prusa-slicer/repos (3 files)
Sven-Hendrik Haase
svenstaro at gemini.archlinux.org
Sat Nov 6 02:12:08 UTC 2021
Date: Saturday, November 6, 2021 @ 02:12:08
Author: svenstaro
Revision: 1037392
archrelease: copy trunk to community-staging-x86_64
Added:
prusa-slicer/repos/community-staging-x86_64/
prusa-slicer/repos/community-staging-x86_64/PKGBUILD
(from rev 1037391, prusa-slicer/trunk/PKGBUILD)
prusa-slicer/repos/community-staging-x86_64/prusa-slicer-openexr3.patch
(from rev 1037391, prusa-slicer/trunk/prusa-slicer-openexr3.patch)
-----------------------------+
PKGBUILD | 52 ++++++++++++++++++++++++++++
prusa-slicer-openexr3.patch | 77 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 129 insertions(+)
Copied: prusa-slicer/repos/community-staging-x86_64/PKGBUILD (from rev 1037391, prusa-slicer/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2021-11-06 02:12:08 UTC (rev 1037392)
@@ -0,0 +1,52 @@
+# Maintainer: Bruno Pagani <archange at archlinux.org>
+
+pkgname=prusa-slicer
+pkgver=2.3.3
+pkgrel=2
+pkgdesc="G-code generator for 3D printers (Prusa fork of Slic3r)"
+arch=(x86_64)
+url="https://github.com/prusa3d/PrusaSlicer"
+license=(AGPL3)
+depends=(boost-libs curl glew intel-tbb nlopt wxgtk3 qhull openvdb cgal imath)
+makedepends=(cmake boost cereal eigen expat gtest libpng systemd)
+replaces=(slic3r-prusa3d)
+source=(${url}/archive/version_${pkgver}/${pkgname}-${pkgver}.tar.gz
+ prusa-slicer-openexr3.patch)
+sha256sums=('deda209505f740ac3d6f59cb2a960f4df908269ee09bd30cd4edb9fc472d29ac'
+ '1ef7c22f641b7c18de212202c21f14f6533834a36d7fe0c2b322bc9a13804c6b')
+
+prepare() {
+ cd PrusaSlicer-version_${pkgver}
+ patch -p1 < ../prusa-slicer-openexr3.patch # Fix build with openEXR 3
+}
+
+build() {
+ cmake -B build -S PrusaSlicer-version_${pkgver} \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DSLIC3R_FHS=ON \
+ -DSLIC3R_PCH=OFF \
+ -DSLIC3R_WX_STABLE=ON \
+ -DSLIC3R_GTK=3 \
+ -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3
+ make -C build
+}
+
+check() {
+ cd build
+ ctest -v
+}
+
+package() {
+ make -C build DESTDIR="${pkgdir}" install
+
+ # Desktop files
+ mv "${pkgdir}"/usr/share/{PrusaSlicer/,}applications
+
+ # Desktop icons
+ for i in 32 128 192 ; do
+ mkdir -p "${pkgdir}"/usr/share/icons/hicolor/${i}x${i}/apps/
+ ln -s /usr/share/PrusaSlicer/icons/PrusaSlicer_${i}px.png "${pkgdir}"/usr/share/icons/hicolor/${i}x${i}/apps/PrusaSlicer.png
+ ln -s /usr/share/PrusaSlicer/icons/PrusaSlicer-gcodeviewer_${i}px.png "${pkgdir}"/usr/share/icons/hicolor/${i}x${i}/apps/PrusaSlicer-gcodeviewer.png
+ done
+}
Copied: prusa-slicer/repos/community-staging-x86_64/prusa-slicer-openexr3.patch (from rev 1037391, prusa-slicer/trunk/prusa-slicer-openexr3.patch)
===================================================================
--- community-staging-x86_64/prusa-slicer-openexr3.patch (rev 0)
+++ community-staging-x86_64/prusa-slicer-openexr3.patch 2021-11-06 02:12:08 UTC (rev 1037392)
@@ -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()
More information about the arch-commits
mailing list