Gentoo Archives: gentoo-commits

From: Dennis Lamm <expeditioneer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/, media-gfx/prusaslicer/files/
Date: Sun, 07 Feb 2021 21:30:54
Message-Id: 1612733444.8957d845a5aa219acf1a63a1b6bfb0743423836f.expeditioneer@gentoo
1 commit: 8957d845a5aa219acf1a63a1b6bfb0743423836f
2 Author: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 7 19:13:00 2021 +0000
4 Commit: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 7 21:30:44 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8957d845
7
8 media-gfx/prusaslicer: drop old
9
10 Signed-off-by: Dennis Lamm <expeditioneer <AT> gentoo.org>
11
12 media-gfx/prusaslicer/Manifest | 1 -
13 .../files/prusaslicer-2.2.0-atomic.patch | 10 ---
14 .../files/prusaslicer-2.2.0-boost-1.73.patch | 60 ----------------
15 media-gfx/prusaslicer/prusaslicer-2.2.0-r1.ebuild | 79 ----------------------
16 4 files changed, 150 deletions(-)
17
18 diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
19 index 4dcbadca21f..33a0f438d35 100644
20 --- a/media-gfx/prusaslicer/Manifest
21 +++ b/media-gfx/prusaslicer/Manifest
22 @@ -1,2 +1 @@
23 -DIST prusaslicer-2.2.0.tar.gz 30811929 BLAKE2B cde004add53ee025728d566cb7331cb7b1eac5412e9ad3bee037d13277c24dcdc6024c91f09bb9ef0653a12a3ee7c5cb5cec21e2a00825d185472ea7036e08f5 SHA512 5c8dc5b581e04208a1ae53771ef2607da189ee85aadf501ce1480008f5a6ddb10bb528ddc2608d3f04acd26c583ff895ad4148d6a1397f002292e20098971e1d
24 DIST prusaslicer-2.3.0.tar.gz 34785471 BLAKE2B 89691baf30ac2be901ebee594262a82e2c922ddae75b055561707fe152c392175766082844ad1ae2cb2fefb29a9d3abe03c0302ad84c347e94d127756429d0a7 SHA512 2bd3e7d384ba1c59007744f4aba89de9ca9864e4bdc7b6faa9a56f514212878d1d2e7d70fc0f08e39310af76c365d1a3f8f1df263e8656249483a5b33cab417d
25
26 diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.2.0-atomic.patch b/media-gfx/prusaslicer/files/prusaslicer-2.2.0-atomic.patch
27 deleted file mode 100644
28 index 4319ad0f146..00000000000
29 --- a/media-gfx/prusaslicer/files/prusaslicer-2.2.0-atomic.patch
30 +++ /dev/null
31 @@ -1,10 +0,0 @@
32 ---- a/src/slic3r/GUI/Mouse3DController.hpp
33 -+++ b/src/slic3r/GUI/Mouse3DController.hpp
34 -@@ -8,6 +8,7 @@
35 -
36 - #include "hidapi.h"
37 -
38 -+#include <atomic>
39 - #include <queue>
40 - #include <thread>
41 - #include <vector>
42
43 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
44 deleted file mode 100644
45 index 50abea11b32..00000000000
46 --- a/media-gfx/prusaslicer/files/prusaslicer-2.2.0-boost-1.73.patch
47 +++ /dev/null
48 @@ -1,60 +0,0 @@
49 ---- a/src/admesh/stlinit.cpp
50 -+++ b/src/admesh/stlinit.cpp
51 -@@ -28,7 +28,6 @@
52 -
53 - #include <boost/log/trivial.hpp>
54 - #include <boost/nowide/cstdio.hpp>
55 --#include <boost/detail/endian.hpp>
56 -
57 - #include "stl.h"
58 -
59 -@@ -36,9 +35,9 @@
60 - #error "SEEK_SET not defined"
61 - #endif
62 -
63 --#ifndef BOOST_LITTLE_ENDIAN
64 -+#if __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__
65 - extern void stl_internal_reverse_quads(char *buf, size_t cnt);
66 --#endif /* BOOST_LITTLE_ENDIAN */
67 -+#endif /* __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__ */
68 -
69 - static FILE* stl_open_count_facets(stl_file *stl, const char *file)
70 - {
71 -@@ -89,10 +88,10 @@
72 - // Read the int following the header. This should contain # of facets.
73 - uint32_t header_num_facets;
74 - bool header_num_faces_read = fread(&header_num_facets, sizeof(uint32_t), 1, fp) != 0;
75 --#ifndef BOOST_LITTLE_ENDIAN
76 -+#if __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__
77 - // Convert from little endian to big endian.
78 - stl_internal_reverse_quads((char*)&header_num_facets, 4);
79 --#endif /* BOOST_LITTLE_ENDIAN */
80 -+#endif /* __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__ */
81 - if (! header_num_faces_read || num_facets != header_num_facets)
82 - BOOST_LOG_TRIVIAL(info) << "stl_open_count_facets: Warning: File size doesn't match number of facets in the header: " << file;
83 - }
84 -@@ -158,10 +157,10 @@
85 - // Read a single facet from a binary .STL file. We assume little-endian architecture!
86 - if (fread(&facet, 1, SIZEOF_STL_FACET, fp) != SIZEOF_STL_FACET)
87 - return false;
88 --#ifndef BOOST_LITTLE_ENDIAN
89 -+#if __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__
90 - // Convert the loaded little endian data to big endian.
91 - stl_internal_reverse_quads((char*)&facet, 48);
92 --#endif /* BOOST_LITTLE_ENDIAN */
93 -+#endif /* __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__ */
94 - } else {
95 - // Read a single facet from an ASCII .STL file
96 - // skip solid/endsolid
97 -
98 ---- a/CMakeLists.txt (revision 3b2c51fd5ab04a72592bfdba1cd39cd6298b66c2)
99 -+++ b/CMakeLists.txt (date 1607811414000)
100 -@@ -260,7 +260,7 @@
101 - # set(Boost_COMPILER "-mgw81")
102 - if(NOT WIN32)
103 - # boost::process was introduced first in version 1.64.0
104 -- set(MINIMUM_BOOST_VERSION "1.64.0")
105 -+ set(MINIMUM_BOOST_VERSION "1.72.0")
106 - endif()
107 - set(_boost_components "system;filesystem;thread;log;locale;regex;chrono;atomic;date_time")
108 - find_package(Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS ${_boost_components})
109
110 diff --git a/media-gfx/prusaslicer/prusaslicer-2.2.0-r1.ebuild b/media-gfx/prusaslicer/prusaslicer-2.2.0-r1.ebuild
111 deleted file mode 100644
112 index f7714afa61d..00000000000
113 --- a/media-gfx/prusaslicer/prusaslicer-2.2.0-r1.ebuild
114 +++ /dev/null
115 @@ -1,79 +0,0 @@
116 -# Copyright 1999-2020 Gentoo Authors
117 -# Distributed under the terms of the GNU General Public License v2
118 -
119 -EAPI=7
120 -
121 -WX_GTK_VER="3.0-gtk3"
122 -
123 -inherit cmake desktop wxwidgets xdg-utils
124 -
125 -MY_PN="PrusaSlicer"
126 -
127 -DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
128 -HOMEPAGE="https://www.prusa3d.com/prusaslicer/"
129 -SRC_URI="https://github.com/prusa3d/${MY_PN}/archive/version_${PV}.tar.gz -> ${P}.tar.gz"
130 -
131 -LICENSE="AGPL-3 CC-BY-3.0"
132 -SLOT="0"
133 -KEYWORDS="~amd64 ~x86"
134 -
135 -IUSE="gui test"
136 -RESTRICT="!test? ( test )"
137 -
138 -RDEPEND="
139 - dev-cpp/eigen:3
140 - dev-cpp/tbb
141 - >=dev-libs/boost-1.73.0:=[threads]
142 - dev-libs/cereal
143 - dev-libs/expat
144 - dev-libs/miniz
145 - media-libs/glew:0=
146 - media-libs/qhull
147 - >=media-gfx/openvdb-5.0.0
148 - net-misc/curl
149 - >=sci-mathematics/cgal-5.0
150 - sci-libs/libigl
151 - sci-libs/nlopt
152 - sys-libs/zlib
153 - x11-libs/wxGTK:${WX_GTK_VER}[X]
154 - "
155 -DEPEND="${RDEPEND}"
156 -
157 -S="${WORKDIR}/PrusaSlicer-version_${PV}"
158 -PATCHES=(
159 - "${FILESDIR}/${P}-atomic.patch"
160 - "${FILESDIR}/${P}-boost-1.73.patch"
161 -)
162 -
163 -src_prepare() {
164 - setup-wxwidgets
165 - cmake_src_prepare
166 -}
167 -
168 -src_configure() {
169 - CMAKE_BUILD_TYPE=Release
170 -
171 - local mycmakeargs=(
172 - -DSLIC3R_BUILD_TESTS=$(usex test)
173 - -DSLIC3R_FHS=1
174 - -DSLIC3R_GUI=$(usex gui)
175 - -DSLIC3R_PCH=0
176 - -SLIC3R_STATIC=0
177 - -DSLIC3R_WX_STABLE=1
178 - )
179 -
180 - cmake_src_configure
181 -}
182 -
183 -src_install() {
184 - cmake_src_install
185 -
186 - doicon resources/icons/PrusaSlicer.png || die
187 - domenu "${FILESDIR}/PrusaGcodeviewer.desktop" || die
188 - domenu "${FILESDIR}/PrusaSlicer.desktop" || die
189 -}
190 -
191 -pkg_postinst() {
192 - xdg_mimeinfo_database_update
193 - xdg_desktop_database_update
194 -}