From c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Feb 2021 21:41:11 +0000 Subject: gentoo (valentine's day) resync : 14.02.2021 --- media-gfx/prusaslicer/Manifest | 9 +-- .../files/prusaslicer-2.2.0-atomic.patch | 10 --- .../files/prusaslicer-2.2.0-boost-1.73.patch | 60 --------------- .../files/prusaslicer-2.3.0-miniz-zip-header.patch | 9 +++ media-gfx/prusaslicer/metadata.xml | 2 + media-gfx/prusaslicer/prusaslicer-2.2.0-r1.ebuild | 79 -------------------- media-gfx/prusaslicer/prusaslicer-2.3.0.ebuild | 86 ++++++++++++++++++++++ 7 files changed, 101 insertions(+), 154 deletions(-) delete mode 100644 media-gfx/prusaslicer/files/prusaslicer-2.2.0-atomic.patch delete mode 100644 media-gfx/prusaslicer/files/prusaslicer-2.2.0-boost-1.73.patch create mode 100644 media-gfx/prusaslicer/files/prusaslicer-2.3.0-miniz-zip-header.patch delete mode 100644 media-gfx/prusaslicer/prusaslicer-2.2.0-r1.ebuild create mode 100644 media-gfx/prusaslicer/prusaslicer-2.3.0.ebuild (limited to 'media-gfx/prusaslicer') diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest index 5da6f08f1257..6ac7ca1e061d 100644 --- a/media-gfx/prusaslicer/Manifest +++ b/media-gfx/prusaslicer/Manifest @@ -1,7 +1,6 @@ AUX PrusaGcodeviewer.desktop 208 BLAKE2B e7d041508b4dfb155748319d3c166ed1ff891cc3cf05d748d5d4ef03e90100dbb4c48a5c8daa3c5e04ad98e578e34e433caa9a1b2a85000feb16d9804832a531 SHA512 6f69d47a0f6adf3912de2ce8766c74d7654d3f8442cd269b098769d186a2345cdc6da310f10f4568d2de5ea1633bab22ac05203488617fa2e906d6c25b539964 AUX PrusaSlicer.desktop 401 BLAKE2B 1c9bded4dd9e5e0be33c1bfb66bf8b54adc7898595fb6064d81f30dab9de7b9d6fd406ee48d45cb0ba665b1a03d02035c164d82d5b7cf13ec088b02176989777 SHA512 0777e5eda98d9931f5b289187a144f217f1279af498d8563414fa1485a24eb466a1b801498ec9af652355206543ae4b41012ed8ad8a22577680b088c6c39cc5a -AUX prusaslicer-2.2.0-atomic.patch 200 BLAKE2B c8a4f2e3ce1974dbc3a1aba5805910796f533e85040e9886b8e6c395ba95578ddf1910f0ae35f5625a73b2c063a58cfb33409489169231983a1dea5f10edbde5 SHA512 8da19e19b7027e4f77d19c10a40796e2a9bd4776820cf1adb134dc53a487edbe8a297ba6ebc92c04a419ff5d69d14a2e6fb74b2c2a05e7066a0346015a14582c -AUX prusaslicer-2.2.0-boost-1.73.patch 2383 BLAKE2B f8d96296c7802747ccfcd80adf9e2c954a33add590bb6fff7ef3e2e7c5334970009c63cab7d84adb7e9e0cc3b07a04200f3ea4c2c5dd9a1e1ebb5fe33ceebdde SHA512 36c325ce60c682ce1f5aeef02fc0b457a1e3ce60a2bfcc09e9ce78fddc6ee3452d100ac2a13e1d7454bfd7484d1f1c8d24a95feaa845ca784081dfefd15b2cdc -DIST prusaslicer-2.2.0.tar.gz 30811929 BLAKE2B cde004add53ee025728d566cb7331cb7b1eac5412e9ad3bee037d13277c24dcdc6024c91f09bb9ef0653a12a3ee7c5cb5cec21e2a00825d185472ea7036e08f5 SHA512 5c8dc5b581e04208a1ae53771ef2607da189ee85aadf501ce1480008f5a6ddb10bb528ddc2608d3f04acd26c583ff895ad4148d6a1397f002292e20098971e1d -EBUILD prusaslicer-2.2.0-r1.ebuild 1553 BLAKE2B 0ef5f8d6f486980b3c3ac48e06c517bdf393efdcbe9621c6e1b36a89a985f9ec2fe4ea4891455672fffb8ae5f4c8ccef5afddf86fa90cff10945fcfdc6338a70 SHA512 f166da2aa6b6b7a8c8f2bbcad4f35d514961e957892b644ab4da41745b77781e3c0fb3465de5e0fcdf55bf87cdf26f9f8f7bfcfe4908dbecca757b17c9b6a46b -MISC metadata.xml 830 BLAKE2B b0c07af4dcc135e6ce2a67137ff2373ca4f842ac1e2efdff44dad399c487b2d2c7e71bf9932a544d30bc5f0a1e5ccd64830645be647137dda0bb23d00c62575a SHA512 9441df6291bfc1f7c6c85479e8bbe14389e091a43f0bc2ac22eee68544f6868ebd0eb342c7b79316809d0bde1b15684c9ea59cd57252b59643bb735e0b87422c +AUX prusaslicer-2.3.0-miniz-zip-header.patch 284 BLAKE2B f73db5727dd6bffc39c658a291602ee6d86609244e9cd55a9eeb92a376cc4a579a94ef9f423e3072dbd01295b173c9291d615a56d5fb512cdccc93b205f665d0 SHA512 36e3c1e5d35f6cda26d8f74db3862cc5206478f7f79f35b28b3b3749291150764d1d907a3ccb67b4dcd1872fa5d0ac612791653dc67f3a56aeb98b68dc873f27 +DIST prusaslicer-2.3.0.tar.gz 34785471 BLAKE2B 89691baf30ac2be901ebee594262a82e2c922ddae75b055561707fe152c392175766082844ad1ae2cb2fefb29a9d3abe03c0302ad84c347e94d127756429d0a7 SHA512 2bd3e7d384ba1c59007744f4aba89de9ca9864e4bdc7b6faa9a56f514212878d1d2e7d70fc0f08e39310af76c365d1a3f8f1df263e8656249483a5b33cab417d +EBUILD prusaslicer-2.3.0.ebuild 1812 BLAKE2B 1d34a7cd0dd5fcb40dce9d8fcab86d8b643722a8ebe4810ce0b83172304d2a8aaaea76ed8a6077ed30dab134152294ff42b54476b401b5482691beb41bc8aeb8 SHA512 df62be529a5b69d88e44ac219e6a5e9a51738509f4946397aa7771a29a544aeb9bca84213525c5f6540de3649f5742ce759d2d5303783b2e9f7a70e7f6921997 +MISC metadata.xml 964 BLAKE2B fd4b95e2725a37291f9d7f39aaf75d34068789960c27d6180e809c33b9624507dc5abdb16d125eee88acffbdb424bb949751a86da6475747ef658913b0f6dc44 SHA512 27a581c15d36f0514183f663a645198feed74856c8a9eef7dc8d7c7f460bbaa89f5a5e7c4b8884d400346baffcde66b8f9552d4204f17b7ac905e9f06100b762 diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.2.0-atomic.patch b/media-gfx/prusaslicer/files/prusaslicer-2.2.0-atomic.patch deleted file mode 100644 index 4319ad0f1463..000000000000 --- a/media-gfx/prusaslicer/files/prusaslicer-2.2.0-atomic.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/slic3r/GUI/Mouse3DController.hpp -+++ b/src/slic3r/GUI/Mouse3DController.hpp -@@ -8,6 +8,7 @@ - - #include "hidapi.h" - -+#include - #include - #include - #include diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.2.0-boost-1.73.patch b/media-gfx/prusaslicer/files/prusaslicer-2.2.0-boost-1.73.patch deleted file mode 100644 index 50abea11b328..000000000000 --- a/media-gfx/prusaslicer/files/prusaslicer-2.2.0-boost-1.73.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- a/src/admesh/stlinit.cpp -+++ b/src/admesh/stlinit.cpp -@@ -28,7 +28,6 @@ - - #include - #include --#include - - #include "stl.h" - -@@ -36,9 +35,9 @@ - #error "SEEK_SET not defined" - #endif - --#ifndef BOOST_LITTLE_ENDIAN -+#if __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__ - extern void stl_internal_reverse_quads(char *buf, size_t cnt); --#endif /* BOOST_LITTLE_ENDIAN */ -+#endif /* __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__ */ - - static FILE* stl_open_count_facets(stl_file *stl, const char *file) - { -@@ -89,10 +88,10 @@ - // Read the int following the header. This should contain # of facets. - uint32_t header_num_facets; - bool header_num_faces_read = fread(&header_num_facets, sizeof(uint32_t), 1, fp) != 0; --#ifndef BOOST_LITTLE_ENDIAN -+#if __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__ - // Convert from little endian to big endian. - stl_internal_reverse_quads((char*)&header_num_facets, 4); --#endif /* BOOST_LITTLE_ENDIAN */ -+#endif /* __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__ */ - if (! header_num_faces_read || num_facets != header_num_facets) - BOOST_LOG_TRIVIAL(info) << "stl_open_count_facets: Warning: File size doesn't match number of facets in the header: " << file; - } -@@ -158,10 +157,10 @@ - // Read a single facet from a binary .STL file. We assume little-endian architecture! - if (fread(&facet, 1, SIZEOF_STL_FACET, fp) != SIZEOF_STL_FACET) - return false; --#ifndef BOOST_LITTLE_ENDIAN -+#if __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__ - // Convert the loaded little endian data to big endian. - stl_internal_reverse_quads((char*)&facet, 48); --#endif /* BOOST_LITTLE_ENDIAN */ -+#endif /* __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__ */ - } else { - // Read a single facet from an ASCII .STL file - // skip solid/endsolid - ---- a/CMakeLists.txt (revision 3b2c51fd5ab04a72592bfdba1cd39cd6298b66c2) -+++ b/CMakeLists.txt (date 1607811414000) -@@ -260,7 +260,7 @@ - # set(Boost_COMPILER "-mgw81") - if(NOT WIN32) - # boost::process was introduced first in version 1.64.0 -- set(MINIMUM_BOOST_VERSION "1.64.0") -+ set(MINIMUM_BOOST_VERSION "1.72.0") - endif() - set(_boost_components "system;filesystem;thread;log;locale;regex;chrono;atomic;date_time") - find_package(Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS ${_boost_components}) diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.3.0-miniz-zip-header.patch b/media-gfx/prusaslicer/files/prusaslicer-2.3.0-miniz-zip-header.patch new file mode 100644 index 000000000000..8fd587d3d481 --- /dev/null +++ b/media-gfx/prusaslicer/files/prusaslicer-2.3.0-miniz-zip-header.patch @@ -0,0 +1,9 @@ +https://bugs.gentoo.org/761541 +--- a/src/libslic3r/miniz_extension.hpp 2021-01-11 08:01:51.000000000 -0500 ++++ b/src/libslic3r/miniz_extension.hpp 2021-01-12 01:16:10.503404521 -0500 +@@ -4,4 +4,5 @@ + #include + #include ++#include + + namespace Slic3r { diff --git a/media-gfx/prusaslicer/metadata.xml b/media-gfx/prusaslicer/metadata.xml index 0d7a4d353499..dd17dbe10ea6 100644 --- a/media-gfx/prusaslicer/metadata.xml +++ b/media-gfx/prusaslicer/metadata.xml @@ -14,6 +14,8 @@ PrusaSlicer is based on Slic3r by Alessandro Ranellucci and the RepRap community. + https://github.com/prusa3d/PrusaSlicer/issues + https://help.prusa3d.com/en/article/general-info_1910 prusa3d/PrusaSlicer diff --git a/media-gfx/prusaslicer/prusaslicer-2.2.0-r1.ebuild b/media-gfx/prusaslicer/prusaslicer-2.2.0-r1.ebuild deleted file mode 100644 index f7714afa61d0..000000000000 --- a/media-gfx/prusaslicer/prusaslicer-2.2.0-r1.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -WX_GTK_VER="3.0-gtk3" - -inherit cmake desktop wxwidgets xdg-utils - -MY_PN="PrusaSlicer" - -DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)" -HOMEPAGE="https://www.prusa3d.com/prusaslicer/" -SRC_URI="https://github.com/prusa3d/${MY_PN}/archive/version_${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="AGPL-3 CC-BY-3.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="gui test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-cpp/eigen:3 - dev-cpp/tbb - >=dev-libs/boost-1.73.0:=[threads] - dev-libs/cereal - dev-libs/expat - dev-libs/miniz - media-libs/glew:0= - media-libs/qhull - >=media-gfx/openvdb-5.0.0 - net-misc/curl - >=sci-mathematics/cgal-5.0 - sci-libs/libigl - sci-libs/nlopt - sys-libs/zlib - x11-libs/wxGTK:${WX_GTK_VER}[X] - " -DEPEND="${RDEPEND}" - -S="${WORKDIR}/PrusaSlicer-version_${PV}" -PATCHES=( - "${FILESDIR}/${P}-atomic.patch" - "${FILESDIR}/${P}-boost-1.73.patch" -) - -src_prepare() { - setup-wxwidgets - cmake_src_prepare -} - -src_configure() { - CMAKE_BUILD_TYPE=Release - - local mycmakeargs=( - -DSLIC3R_BUILD_TESTS=$(usex test) - -DSLIC3R_FHS=1 - -DSLIC3R_GUI=$(usex gui) - -DSLIC3R_PCH=0 - -SLIC3R_STATIC=0 - -DSLIC3R_WX_STABLE=1 - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install - - doicon resources/icons/PrusaSlicer.png || die - domenu "${FILESDIR}/PrusaGcodeviewer.desktop" || die - domenu "${FILESDIR}/PrusaSlicer.desktop" || die -} - -pkg_postinst() { - xdg_mimeinfo_database_update - xdg_desktop_database_update -} diff --git a/media-gfx/prusaslicer/prusaslicer-2.3.0.ebuild b/media-gfx/prusaslicer/prusaslicer-2.3.0.ebuild new file mode 100644 index 000000000000..de0016701b26 --- /dev/null +++ b/media-gfx/prusaslicer/prusaslicer-2.3.0.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +WX_GTK_VER="3.0-gtk3" + +inherit xdg cmake desktop wxwidgets + +MY_PN="PrusaSlicer" + +DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)" +HOMEPAGE="https://www.prusa3d.com/prusaslicer/" +SRC_URI="https://github.com/prusa3d/${MY_PN}/archive/version_${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="gui test" + +# tests fail to link with USE=-gui, bug #760096 +REQUIRED_USE="test? ( gui )" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-cpp/eigen:3 + dev-cpp/tbb + >=dev-libs/boost-1.73.0:=[nls,threads] + dev-libs/cereal + dev-libs/expat + dev-libs/gmp:= + >=dev-libs/miniz-2.1.0-r2 + dev-libs/mpfr:= + >=media-gfx/openvdb-5.0.0 + media-libs/ilmbase:= + media-libs/libpng:0= + media-libs/qhull:= + sci-libs/libigl + sci-libs/nlopt + >=sci-mathematics/cgal-5.0:= + sys-apps/dbus + sys-libs/zlib:= + gui? ( + dev-libs/glib:2 + media-libs/glew:0= + net-misc/curl + virtual/glu + virtual/opengl + x11-libs/gtk+:3 + x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] + ) +" +DEPEND="${RDEPEND} + media-libs/qhull[static-libs] +" + +S="${WORKDIR}/${MY_PN}-version_${PV}" + +PATCHES=( + "${FILESDIR}/${P}-miniz-zip-header.patch" +) + +src_configure() { + use gui && setup-wxwidgets + + local mycmakeargs=( + -DSLIC3R_BUILD_TESTS=$(usex test) + -DSLIC3R_FHS=ON + -DSLIC3R_GTK=3 + -DSLIC3R_GUI=$(usex gui) + -DSLIC3R_PCH=OFF + -DSLIC3R_WX_STABLE=ON + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + if use gui; then + newicon -s 128 resources/icons/PrusaSlicer_128px.png PrusaSlicer.png + newicon -s 128 resources/icons/PrusaSlicer-gcodeviewer_128px.png PrusaSlicer-gcodeviewer.png + domenu src/platform/unix/Prusa{Slicer,Gcodeviewer}.desktop + fi +} -- cgit v1.2.3