1 |
commit: 63a246e7653f2940e57e4c8a2cfb7394aca6269a |
2 |
Author: Amy Liffey <amynka <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Aug 11 12:41:07 2017 +0000 |
4 |
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Aug 11 12:45:23 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63a246e7 |
7 |
|
8 |
media-gfx/meshlab: EAPI 6 bump ,fix bug #614776 |
9 |
|
10 |
- Add patch structuresynth build failure |
11 |
Submitted-by: CaptainBlood <luc_pierard_de_maujouy <AT> yahoo.fr> |
12 |
|
13 |
- Fix slot glew |
14 |
|
15 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
16 |
|
17 |
media-gfx/meshlab/files/1.3.3/gcc-4.7.patch | 4 +-- |
18 |
media-gfx/meshlab/files/1.3.3/lapack.patch | 4 +-- |
19 |
media-gfx/meshlab/files/1.3.3/meshrender.patch | 4 +-- |
20 |
media-gfx/meshlab/files/1.3.3/mpir.patch | 4 +-- |
21 |
media-gfx/meshlab/files/1.3.3/pluginmanager.patch | 4 +-- |
22 |
media-gfx/meshlab/files/1.3.3/qt-4.8.patch | 4 +-- |
23 |
media-gfx/meshlab/files/1.3.3/rfx.patch | 4 +-- |
24 |
media-gfx/meshlab/files/1.3.3/rmmeshrender.patch | 4 +-- |
25 |
media-gfx/meshlab/files/1.3.3/rpath.patch | 8 +++--- |
26 |
media-gfx/meshlab/files/1.3.3/structuresynth.patch | 11 ++++++++ |
27 |
media-gfx/meshlab/meshlab-1.3.2.ebuild | 4 +-- |
28 |
...eshlab-1.3.3.ebuild => meshlab-1.3.3-r1.ebuild} | 31 ++++++++++++---------- |
29 |
12 files changed, 50 insertions(+), 36 deletions(-) |
30 |
|
31 |
diff --git a/media-gfx/meshlab/files/1.3.3/gcc-4.7.patch b/media-gfx/meshlab/files/1.3.3/gcc-4.7.patch |
32 |
index b918ca52ec4..6329f23e794 100644 |
33 |
--- a/media-gfx/meshlab/files/1.3.3/gcc-4.7.patch |
34 |
+++ b/media-gfx/meshlab/files/1.3.3/gcc-4.7.patch |
35 |
@@ -1,7 +1,7 @@ |
36 |
diff --git vcglib/wrap/ply/plystuff.h vcglib/wrap/ply/plystuff.h |
37 |
index 3e41e63..4af9508 100644 |
38 |
---- vcglib/wrap/ply/plystuff.h |
39 |
-+++ vcglib/wrap/ply/plystuff.h |
40 |
+--- a/vcglib/wrap/ply/plystuff.h |
41 |
++++ b/vcglib/wrap/ply/plystuff.h |
42 |
@@ -75,6 +75,7 @@ using namespace vcg; |
43 |
#define pb_close _close |
44 |
#define DIR_SEP "\\" |
45 |
|
46 |
diff --git a/media-gfx/meshlab/files/1.3.3/lapack.patch b/media-gfx/meshlab/files/1.3.3/lapack.patch |
47 |
index 81c09463405..e2742eb9999 100644 |
48 |
--- a/media-gfx/meshlab/files/1.3.3/lapack.patch |
49 |
+++ b/media-gfx/meshlab/files/1.3.3/lapack.patch |
50 |
@@ -1,6 +1,6 @@ |
51 |
diff -Nur meshlab.orig/src/external/levmar-2.3/lm.h meshlab/src/external/levmar-2.3/lm.h |
52 |
---- meshlab.orig/src/external/levmar-2.3/lm.h 2010-04-28 17:30:47.000000000 +1000 |
53 |
-+++ meshlab/src/external/levmar-2.3/lm.h 2010-05-13 20:17:35.488505907 +1000 |
54 |
+--- a/meshlab/src/external/levmar-2.3/lm.h 2010-04-28 17:30:47.000000000 +1000 |
55 |
++++ b/meshlab/src/external/levmar-2.3/lm.h 2010-05-13 20:17:35.488505907 +1000 |
56 |
@@ -27,7 +27,6 @@ |
57 |
|
58 |
/* specify whether to use LAPACK or not. The first option is strongly recommended */ |
59 |
|
60 |
diff --git a/media-gfx/meshlab/files/1.3.3/meshrender.patch b/media-gfx/meshlab/files/1.3.3/meshrender.patch |
61 |
index 382e21ca2f0..33eb1cbf703 100644 |
62 |
--- a/media-gfx/meshlab/files/1.3.3/meshrender.patch |
63 |
+++ b/media-gfx/meshlab/files/1.3.3/meshrender.patch |
64 |
@@ -1,5 +1,5 @@ |
65 |
---- meshlab/src/meshlabplugins/render_gdp/meshrender.cpp 2014-02-07 10:38:28.000000000 +0100 |
66 |
-+++ meshlab/src/meshlabplugins/render_gdb/meshrender.cpp 2015-11-15 22:17:39.848179962 +0100 |
67 |
+--- a/meshlab/src/meshlabplugins/render_gdp/meshrender.cpp 2014-02-07 10:38:28.000000000 +0100 |
68 |
++++ b/meshlab/src/meshlabplugins/render_gdb/meshrender.cpp 2015-11-15 22:17:39.848179962 +0100 |
69 |
@@ -36,8 +36,11 @@ |
70 |
/*QAction * qaNone = new QAction("None", this); |
71 |
qaNone->setCheckable(false); |
72 |
|
73 |
diff --git a/media-gfx/meshlab/files/1.3.3/mpir.patch b/media-gfx/meshlab/files/1.3.3/mpir.patch |
74 |
index a3f8d051d89..fae203e18a1 100644 |
75 |
--- a/media-gfx/meshlab/files/1.3.3/mpir.patch |
76 |
+++ b/media-gfx/meshlab/files/1.3.3/mpir.patch |
77 |
@@ -1,6 +1,6 @@ |
78 |
diff -Nur meshlab.orig/src/meshlabplugins/filter_csg/filter_csg.pro meshlab/src/meshlabplugins/filter_csg/filter_csg.pro |
79 |
---- meshlab.orig/src/meshlabplugins/filter_csg/filter_csg.pro 2014-04-02 02:59:31.000000000 +1100 |
80 |
-+++ meshlab/src/meshlabplugins/filter_csg/filter_csg.pro 2014-06-01 21:10:24.521095356 +1000 |
81 |
+--- a/meshlab/src/meshlabplugins/filter_csg/filter_csg.pro 2014-04-02 02:59:31.000000000 +1100 |
82 |
++++ b/meshlab/src/meshlabplugins/filter_csg/filter_csg.pro 2014-06-01 21:10:24.521095356 +1000 |
83 |
@@ -18,6 +18,4 @@ |
84 |
win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/mpirxx.lib ../../external/lib/win32-msvc2008/mpir.lib |
85 |
win32-msvc2010:LIBS += ../../external/lib/win32-msvc2008/mpirxx.lib ../../external/lib/win32-msvc2008/mpir.lib |
86 |
|
87 |
diff --git a/media-gfx/meshlab/files/1.3.3/pluginmanager.patch b/media-gfx/meshlab/files/1.3.3/pluginmanager.patch |
88 |
index 00f3ba8c182..853015da4d0 100644 |
89 |
--- a/media-gfx/meshlab/files/1.3.3/pluginmanager.patch |
90 |
+++ b/media-gfx/meshlab/files/1.3.3/pluginmanager.patch |
91 |
@@ -1,5 +1,5 @@ |
92 |
---- meshlab/src/common/pluginmanager.cpp~ 2014-04-01 17:07:40.000000000 +0200 |
93 |
-+++ meshlab/src/common/pluginmanager.cpp 2015-11-15 20:58:53.708227793 +0100 |
94 |
+--- a/meshlab/src/common/pluginmanager.cpp 2014-04-01 17:07:40.000000000 +0200 |
95 |
++++ b/meshlab/src/common/pluginmanager.cpp 2015-11-15 20:58:53.708227793 +0100 |
96 |
@@ -178,7 +178,11 @@ |
97 |
|
98 |
QString PluginManager::getBaseDirPath() |
99 |
|
100 |
diff --git a/media-gfx/meshlab/files/1.3.3/qt-4.8.patch b/media-gfx/meshlab/files/1.3.3/qt-4.8.patch |
101 |
index e820aceb5bb..bb1113a5c61 100644 |
102 |
--- a/media-gfx/meshlab/files/1.3.3/qt-4.8.patch |
103 |
+++ b/media-gfx/meshlab/files/1.3.3/qt-4.8.patch |
104 |
@@ -1,6 +1,6 @@ |
105 |
diff -Nur meshlab.orig/src/meshlab/meshlab.pro meshlab/src/meshlab/meshlab.pro |
106 |
---- meshlab.orig/src/meshlab/meshlab.pro 2011-02-15 20:39:47.000000000 +1100 |
107 |
-+++ meshlab/src/meshlab/meshlab.pro 2012-01-07 11:57:18.055586086 +1100 |
108 |
+--- a/meshlab/src/meshlab/meshlab.pro 2011-02-15 20:39:47.000000000 +1100 |
109 |
++++ b/meshlab/src/meshlab/meshlab.pro 2012-01-07 11:57:18.055586086 +1100 |
110 |
@@ -85,6 +85,7 @@ |
111 |
QT += xmlpatterns |
112 |
QT += network |
113 |
|
114 |
diff --git a/media-gfx/meshlab/files/1.3.3/rfx.patch b/media-gfx/meshlab/files/1.3.3/rfx.patch |
115 |
index 9cac5595991..0d7d03d3f09 100644 |
116 |
--- a/media-gfx/meshlab/files/1.3.3/rfx.patch |
117 |
+++ b/media-gfx/meshlab/files/1.3.3/rfx.patch |
118 |
@@ -1,5 +1,5 @@ |
119 |
---- meshlab/src/meshlabplugins/render_rfx/render_rfx.cpp~ 2014-02-07 10:38:29.000000000 +0100 |
120 |
-+++ meshlab/src/meshlabplugins/render_rfx/render_rfx.cpp 2015-11-16 00:07:34.868113218 +0100 |
121 |
+--- a/meshlab/src/meshlabplugins/render_rfx/render_rfx.cpp 2014-02-07 10:38:29.000000000 +0100 |
122 |
++++ b/meshlab/src/meshlabplugins/render_rfx/render_rfx.cpp 2015-11-16 00:07:34.868113218 +0100 |
123 |
@@ -55,7 +55,11 @@ |
124 |
|
125 |
void RenderRFX::initActionList() |
126 |
|
127 |
diff --git a/media-gfx/meshlab/files/1.3.3/rmmeshrender.patch b/media-gfx/meshlab/files/1.3.3/rmmeshrender.patch |
128 |
index 59f3333a731..1fbf686980b 100644 |
129 |
--- a/media-gfx/meshlab/files/1.3.3/rmmeshrender.patch |
130 |
+++ b/media-gfx/meshlab/files/1.3.3/rmmeshrender.patch |
131 |
@@ -1,5 +1,5 @@ |
132 |
---- meshlab/src/plugins_unsupported/render_rm/rmmeshrender.cpp~ 2013-05-22 17:08:53.000000000 +0200 |
133 |
-+++ meshlab/src/plugins_unsupported/render_rm/rmmeshrender.cpp 2015-11-15 23:18:04.678143277 +0100 |
134 |
+--- a/meshlab/src/plugins_unsupported/render_rm/rmmeshrender.cpp 2013-05-22 17:08:53.000000000 +0200 |
135 |
++++ b/meshlab/src/plugins_unsupported/render_rm/rmmeshrender.cpp 2015-11-15 23:18:04.678143277 +0100 |
136 |
@@ -63,7 +63,12 @@ |
137 |
|
138 |
void RmMeshShaderRenderPlugin::initActionList() { |
139 |
|
140 |
diff --git a/media-gfx/meshlab/files/1.3.3/rpath.patch b/media-gfx/meshlab/files/1.3.3/rpath.patch |
141 |
index 31ed26b0344..473d2a8fa48 100644 |
142 |
--- a/media-gfx/meshlab/files/1.3.3/rpath.patch |
143 |
+++ b/media-gfx/meshlab/files/1.3.3/rpath.patch |
144 |
@@ -1,6 +1,6 @@ |
145 |
diff -Nur meshlab.orig/src/meshlab/meshlab.pro meshlab/src/meshlab/meshlab.pro |
146 |
---- meshlab.orig/src/meshlab/meshlab.pro 2012-05-31 00:32:44.000000000 +1000 |
147 |
-+++ meshlab/src/meshlab/meshlab.pro 2012-08-06 21:26:01.405784190 +1000 |
148 |
+--- a/meshlab/src/meshlab/meshlab.pro 2012-05-31 00:32:44.000000000 +1000 |
149 |
++++ b/meshlab/src/meshlab/meshlab.pro 2012-08-06 21:26:01.405784190 +1000 |
150 |
@@ -130,11 +130,11 @@ |
151 |
#} |
152 |
|
153 |
@@ -20,8 +20,8 @@ diff -Nur meshlab.orig/src/meshlab/meshlab.pro meshlab/src/meshlab/meshlab.pro |
154 |
# uncomment in your local copy only in emergency cases. |
155 |
# We should never be too permissive |
156 |
diff -Nur meshlab.orig/src/meshlabserver/meshlabserver.pro meshlab/src/meshlabserver/meshlabserver.pro |
157 |
---- meshlab.orig/src/meshlabserver/meshlabserver.pro 2011-10-15 03:34:48.000000000 +1100 |
158 |
-+++ meshlab/src/meshlabserver/meshlabserver.pro 2012-08-06 21:26:34.609557938 +1000 |
159 |
+--- a/meshlab/src/meshlabserver/meshlabserver.pro 2011-10-15 03:34:48.000000000 +1100 |
160 |
++++ b/meshlab/src/meshlabserver/meshlabserver.pro 2012-08-06 21:26:34.609557938 +1000 |
161 |
@@ -26,11 +26,11 @@ |
162 |
win32-msvc2010: LIBS += -L../distrib -lcommon |
163 |
win32-g++: LIBS += -L../distrib -lcommon |
164 |
|
165 |
diff --git a/media-gfx/meshlab/files/1.3.3/structuresynth.patch b/media-gfx/meshlab/files/1.3.3/structuresynth.patch |
166 |
new file mode 100644 |
167 |
index 00000000000..e5d6d2baea9 |
168 |
--- /dev/null |
169 |
+++ b/media-gfx/meshlab/files/1.3.3/structuresynth.patch |
170 |
@@ -0,0 +1,11 @@ |
171 |
+--- a/meshlab/src/external/structuresynth-1.5/ssynth/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp 2014-02-07 12:38:23.000000000 +0300 |
172 |
++++ b/meshlab/src/external/structuresynth-1.5/ssynth/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp 2017-08-10 21:00:02.819783756 +0300 |
173 |
+@@ -122,7 +122,7 @@ |
174 |
+ currentT = p; |
175 |
+ |
176 |
+ // We do not intersect grid. |
177 |
+- if (!found) return false; |
178 |
++ if (!found) return NULL; |
179 |
+ } |
180 |
+ |
181 |
+ stepX = (dir.x() > 0) ? 1 : -1; |
182 |
|
183 |
diff --git a/media-gfx/meshlab/meshlab-1.3.2.ebuild b/media-gfx/meshlab/meshlab-1.3.2.ebuild |
184 |
index f2f3eb354eb..587c5dbe263 100644 |
185 |
--- a/media-gfx/meshlab/meshlab-1.3.2.ebuild |
186 |
+++ b/media-gfx/meshlab/meshlab-1.3.2.ebuild |
187 |
@@ -1,4 +1,4 @@ |
188 |
-# Copyright 1999-2014 Gentoo Foundation |
189 |
+# Copyright 1999-2017 Gentoo Foundation |
190 |
# Distributed under the terms of the GNU General Public License v2 |
191 |
|
192 |
EAPI=5 |
193 |
@@ -18,7 +18,7 @@ DEPEND="dev-cpp/eigen:3 |
194 |
dev-cpp/muParser |
195 |
dev-qt/qtcore:4 |
196 |
dev-qt/qtopengl:4 |
197 |
- media-libs/glew |
198 |
+ media-libs/glew:0= |
199 |
media-libs/qhull |
200 |
=media-libs/lib3ds-1* |
201 |
media-libs/openctm |
202 |
|
203 |
diff --git a/media-gfx/meshlab/meshlab-1.3.3.ebuild b/media-gfx/meshlab/meshlab-1.3.3-r1.ebuild |
204 |
similarity index 70% |
205 |
rename from media-gfx/meshlab/meshlab-1.3.3.ebuild |
206 |
rename to media-gfx/meshlab/meshlab-1.3.3-r1.ebuild |
207 |
index 8c1c340e1fe..8cfb26c0df4 100644 |
208 |
--- a/media-gfx/meshlab/meshlab-1.3.3.ebuild |
209 |
+++ b/media-gfx/meshlab/meshlab-1.3.3-r1.ebuild |
210 |
@@ -1,9 +1,9 @@ |
211 |
-# Copyright 1999-2016 Gentoo Foundation |
212 |
+# Copyright 1999-2017 Gentoo Foundation |
213 |
# Distributed under the terms of the GNU General Public License v2 |
214 |
|
215 |
-EAPI=5 |
216 |
+EAPI=6 |
217 |
|
218 |
-inherit eutils versionator multilib |
219 |
+inherit eutils versionator |
220 |
|
221 |
DESCRIPTION="A mesh processing system" |
222 |
HOMEPAGE="http://meshlab.sourceforge.net/" |
223 |
@@ -19,7 +19,7 @@ DEPEND="dev-cpp/eigen:3 |
224 |
dev-qt/qtcore:4 |
225 |
dev-qt/qtopengl:4 |
226 |
dev-qt/qtxmlpatterns:4 |
227 |
- media-libs/glew |
228 |
+ media-libs/glew:0= |
229 |
media-libs/qhull |
230 |
=media-libs/lib3ds-1* |
231 |
media-libs/openctm |
232 |
@@ -30,17 +30,20 @@ RDEPEND="${DEPEND}" |
233 |
|
234 |
S="${WORKDIR}/meshlab/src" |
235 |
|
236 |
+PATCHES=( "${FILESDIR}/${PV}/gcc-4.7.patch" |
237 |
+ "${FILESDIR}/${PV}/lapack.patch" |
238 |
+ "${FILESDIR}/${PV}/mpir.patch" |
239 |
+ "${FILESDIR}/${PV}/qt-4.8.patch" |
240 |
+ "${FILESDIR}/${PV}/rpath.patch" |
241 |
+ "${FILESDIR}/${PV}/pluginmanager.patch" |
242 |
+ "${FILESDIR}/${PV}/meshrender.patch" |
243 |
+ "${FILESDIR}/${PV}/rmmeshrender.patch" |
244 |
+ "${FILESDIR}/${PV}/rfx.patch" |
245 |
+ "${FILESDIR}/${PV}/structuresynth.patch" ) |
246 |
+ |
247 |
src_prepare() { |
248 |
- cd "${WORKDIR}" |
249 |
- epatch "${FILESDIR}/${PV}"/gcc-4.7.patch \ |
250 |
- "${FILESDIR}/${PV}"/lapack.patch \ |
251 |
- "${FILESDIR}/${PV}"/mpir.patch \ |
252 |
- "${FILESDIR}/${PV}"/qt-4.8.patch \ |
253 |
- "${FILESDIR}/${PV}"/rpath.patch \ |
254 |
- "${FILESDIR}/${PV}"/pluginmanager.patch \ |
255 |
- "${FILESDIR}/${PV}"/meshrender.patch \ |
256 |
- "${FILESDIR}/${PV}"/rmmeshrender.patch \ |
257 |
- "${FILESDIR}/${PV}"/rfx.patch |
258 |
+ cd "${WORKDIR}" || die |
259 |
+ default |
260 |
} |
261 |
|
262 |
src_configure() { |