1 |
commit: 826c6a82ab9ee3b35dc804c62ed97d5bf9dc85ea |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Mar 28 09:29:09 2016 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Mar 28 09:29:22 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=826c6a82 |
7 |
|
8 |
media-gfx/aqsis: Fix BOOST_JOIN with >=dev-libs/boost-1.58.0 |
9 |
|
10 |
Gentoo-Bug: 574560 |
11 |
* Also fix BOOST_MAKE_PFTO_WRAPPER macro that was removed |
12 |
|
13 |
Package-Manager: portage-2.2.28 |
14 |
|
15 |
media-gfx/aqsis/aqsis-1.8.2.ebuild | 4 +- |
16 |
.../aqsis/files/aqsis-1.8.2-boost-join-moc.patch | 568 +++++++++++++++++++++ |
17 |
.../aqsis/files/aqsis-1.8.2-pfto-boost-1.59.patch | 41 ++ |
18 |
3 files changed, 612 insertions(+), 1 deletion(-) |
19 |
|
20 |
diff --git a/media-gfx/aqsis/aqsis-1.8.2.ebuild b/media-gfx/aqsis/aqsis-1.8.2.ebuild |
21 |
index 02ae317..5e62ba2 100644 |
22 |
--- a/media-gfx/aqsis/aqsis-1.8.2.ebuild |
23 |
+++ b/media-gfx/aqsis/aqsis-1.8.2.ebuild |
24 |
@@ -1,4 +1,4 @@ |
25 |
-# Copyright 1999-2014 Gentoo Foundation |
26 |
+# Copyright 1999-2016 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
# $Id$ |
29 |
|
30 |
@@ -36,6 +36,8 @@ DOCS=( AUTHORS INSTALL README ) |
31 |
PATCHES=( |
32 |
"${FILESDIR}/${P}-openexr-compat.patch" |
33 |
"${FILESDIR}/${P}-unbundle-tinyxml.patch" |
34 |
+ "${FILESDIR}/${P}-pfto-boost-1.59.patch" |
35 |
+ "${FILESDIR}/${P}-boost-join-moc.patch" |
36 |
) |
37 |
|
38 |
src_configure() { |
39 |
|
40 |
diff --git a/media-gfx/aqsis/files/aqsis-1.8.2-boost-join-moc.patch b/media-gfx/aqsis/files/aqsis-1.8.2-boost-join-moc.patch |
41 |
new file mode 100644 |
42 |
index 0000000..ce579d1 |
43 |
--- /dev/null |
44 |
+++ b/media-gfx/aqsis/files/aqsis-1.8.2-boost-join-moc.patch |
45 |
@@ -0,0 +1,568 @@ |
46 |
+Add include guards to all boost includes, as qt's moc trips |
47 |
+over nested BOOST_JOIN macros: |
48 |
+* /usr/lib64/qt4/bin/moc @/var/tmp/portage/media-gfx/aqsis-1.8.2/work/aqsis-1.8.2_build/tools/piqsl/moc_piqsl_ui.cxx_parameters |
49 |
+* /usr/include/boost/type_traits/detail/has_binary_operator.hp:50: Parse error at "BOOST_JOIN" |
50 |
+See also: https://bugs.gentoo.org/show_bug.cgi?id=574560 |
51 |
+ |
52 |
+--- aqsis-1.8.2/tools/piqsl/piqsl_ui.cpp |
53 |
++++ aqsis-1.8.2/tools/piqsl/piqsl_ui.cpp |
54 |
+@@ -42,7 +42,9 @@ |
55 |
+ #include <QtGui/QPainter> |
56 |
+ #include <QtGui/QImage> |
57 |
+ |
58 |
++#ifndef Q_MOC_RUN |
59 |
+ #include <boost/thread.hpp> |
60 |
++#endif |
61 |
+ |
62 |
+ #include <aqsis/version.h> |
63 |
+ #include <aqsis/math/math.h> |
64 |
+--- aqsis-1.8.2/tools/piqsl/piqsl_ui.h |
65 |
++++ aqsis-1.8.2/tools/piqsl/piqsl_ui.h |
66 |
+@@ -37,7 +37,9 @@ |
67 |
+ |
68 |
+ #include <QtGui/QStyledItemDelegate> |
69 |
+ |
70 |
++#ifndef Q_MOC_RUN |
71 |
+ #include <boost/shared_ptr.hpp> |
72 |
++#endif |
73 |
+ |
74 |
+ #include "image.h" |
75 |
+ |
76 |
+--- aqsis-1.8.2/tools/piqsl/displayserverimage.cpp |
77 |
++++ aqsis-1.8.2/tools/piqsl/displayserverimage.cpp |
78 |
+@@ -39,11 +39,13 @@ |
79 |
+ #include <map> |
80 |
+ #include <algorithm> |
81 |
+ |
82 |
++#ifndef Q_MOC_RUN |
83 |
+ #include <boost/archive/iterators/base64_from_binary.hpp> |
84 |
+ #include <boost/archive/iterators/transform_width.hpp> |
85 |
+ #include <boost/archive/iterators/insert_linebreaks.hpp> |
86 |
+ #include <boost/format.hpp> |
87 |
+ #include <boost/filesystem.hpp> |
88 |
++#endif |
89 |
+ |
90 |
+ #include "displayserverimage.h" |
91 |
+ |
92 |
+--- aqsis-1.8.2/tools/piqsl/image.cpp |
93 |
++++ aqsis-1.8.2/tools/piqsl/image.cpp |
94 |
+@@ -38,7 +38,9 @@ |
95 |
+ |
96 |
+ #include <float.h> |
97 |
+ |
98 |
++#ifndef Q_MOC_RUN |
99 |
+ #include <boost/format.hpp> |
100 |
++#endif |
101 |
+ |
102 |
+ #include <aqsis/version.h> |
103 |
+ #include <aqsis/util/logging.h> |
104 |
+--- aqsis-1.8.2/tools/piqsl/image.h |
105 |
++++ aqsis-1.8.2/tools/piqsl/image.h |
106 |
+@@ -46,10 +46,12 @@ |
107 |
+ #include <QtCore/QObject> |
108 |
+ #include <QtGui/QImage> |
109 |
+ |
110 |
++#ifndef Q_MOC_RUN |
111 |
+ #include <boost/shared_ptr.hpp> |
112 |
+ #include <boost/shared_array.hpp> |
113 |
+ #include <boost/filesystem/path.hpp> |
114 |
+ #include <boost/thread/mutex.hpp> |
115 |
++#endif |
116 |
+ |
117 |
+ #include "tinyxml.h" |
118 |
+ |
119 |
+--- aqsis-1.8.2/tools/piqsl/imagelistmodel.cpp |
120 |
++++ aqsis-1.8.2/tools/piqsl/imagelistmodel.cpp |
121 |
+@@ -37,11 +37,13 @@ |
122 |
+ #include <QtCore/QSocketNotifier> |
123 |
+ #include <QtGui/QMessageBox> |
124 |
+ |
125 |
++#ifndef Q_MOC_RUN |
126 |
+ #include <boost/thread/mutex.hpp> |
127 |
+ #include <boost/archive/iterators/binary_from_base64.hpp> |
128 |
+ #include <boost/archive/iterators/transform_width.hpp> |
129 |
+ #include <boost/archive/iterators/remove_whitespace.hpp> |
130 |
+ #include <boost/version.hpp> |
131 |
++#endif |
132 |
+ |
133 |
+ |
134 |
+ #include "displayserverimage.h" |
135 |
+--- aqsis-1.8.2/tools/piqsl/imagelistmodel.h |
136 |
++++ aqsis-1.8.2/tools/piqsl/imagelistmodel.h |
137 |
+@@ -33,8 +33,10 @@ |
138 |
+ |
139 |
+ #include <QtCore/QAbstractListModel> |
140 |
+ |
141 |
++#ifndef Q_MOC_RUN |
142 |
+ #include <boost/shared_ptr.hpp> |
143 |
+ #include <boost/thread/thread.hpp> |
144 |
++#endif |
145 |
+ |
146 |
+ #include <aqsis/util/socket.h> |
147 |
+ #include "image.h" |
148 |
+--- aqsis-1.8.2/include/aqsis/core/interfacefwd.h |
149 |
++++ aqsis-1.8.2/include/aqsis/core/interfacefwd.h |
150 |
+@@ -13,7 +13,9 @@ |
151 |
+ #ifndef ___interfacefwd_Loaded___ |
152 |
+ #define ___interfacefwd_Loaded___ |
153 |
+ |
154 |
++#ifndef Q_MOC_RUN |
155 |
+ #include <boost/shared_ptr.hpp> |
156 |
++#endif |
157 |
+ |
158 |
+ namespace Aqsis { |
159 |
+ |
160 |
+--- aqsis-1.8.2/include/aqsis/core/ioptions.h |
161 |
++++ aqsis-1.8.2/include/aqsis/core/ioptions.h |
162 |
+@@ -29,7 +29,9 @@ |
163 |
+ |
164 |
+ #include <aqsis/aqsis.h> |
165 |
+ |
166 |
++#ifndef Q_MOC_RUN |
167 |
+ #include <boost/filesystem/path.hpp> |
168 |
++#endif |
169 |
+ |
170 |
+ #include <aqsis/riutil/primvartype.h> |
171 |
+ #include <aqsis/ri/ritypes.h> |
172 |
+--- aqsis-1.8.2/include/aqsis/core/irenderer.h |
173 |
++++ aqsis-1.8.2/include/aqsis/core/irenderer.h |
174 |
+@@ -14,7 +14,9 @@ |
175 |
+ #include <iosfwd> |
176 |
+ #include <string> |
177 |
+ |
178 |
++#ifndef Q_MOC_RUN |
179 |
+ #include <boost/function.hpp> |
180 |
++#endif |
181 |
+ |
182 |
+ #include <aqsis/math/matrix.h> |
183 |
+ #include <aqsis/core/itransform.h> |
184 |
+--- aqsis-1.8.2/include/aqsis/core/isurface.h |
185 |
++++ aqsis-1.8.2/include/aqsis/core/isurface.h |
186 |
+@@ -12,7 +12,10 @@ |
187 |
+ #define ___isurface_Loaded___ |
188 |
+ |
189 |
+ #include <vector> |
190 |
++ |
191 |
++#ifndef Q_MOC_RUN |
192 |
+ #include <boost/shared_ptr.hpp> |
193 |
++#endif |
194 |
+ |
195 |
+ #include <aqsis/aqsis.h> |
196 |
+ #include <aqsis/math/matrix.h> |
197 |
+--- aqsis-1.8.2/include/aqsis/core/itransform.h |
198 |
++++ aqsis-1.8.2/include/aqsis/core/itransform.h |
199 |
+@@ -12,7 +12,10 @@ |
200 |
+ #define ___itransform_Loaded___ |
201 |
+ |
202 |
+ #include <aqsis/aqsis.h> |
203 |
++ |
204 |
++#ifndef Q_MOC_RUN |
205 |
+ #include <boost/shared_ptr.hpp> |
206 |
++#endif |
207 |
+ |
208 |
+ namespace Aqsis { |
209 |
+ |
210 |
+--- aqsis-1.8.2/include/aqsis/math/math.h |
211 |
++++ aqsis-1.8.2/include/aqsis/math/math.h |
212 |
+@@ -30,8 +30,10 @@ |
213 |
+ #include <cmath> |
214 |
+ #include <limits> |
215 |
+ |
216 |
++#ifndef Q_MOC_RUN |
217 |
+ #include <boost/utility/enable_if.hpp> |
218 |
+ #include <boost/type_traits/arithmetic_traits.hpp> |
219 |
++#endif |
220 |
+ |
221 |
+ namespace Aqsis { |
222 |
+ // These inline functions are intended to eventually replace all the old macros |
223 |
+--- aqsis-1.8.2/include/aqsis/riutil/ricxxutil.h |
224 |
++++ aqsis-1.8.2/include/aqsis/riutil/ricxxutil.h |
225 |
+@@ -48,7 +48,9 @@ |
226 |
+ #include <aqsis/riutil/interpclasscounts.h> |
227 |
+ #include <aqsis/util/exception.h> |
228 |
+ |
229 |
++#ifndef Q_MOC_RUN |
230 |
+ #include <boost/function.hpp> |
231 |
++#endif |
232 |
+ |
233 |
+ namespace Aqsis { |
234 |
+ |
235 |
+--- aqsis-1.8.2/include/aqsis/shadervm/ishaderexecenv.h |
236 |
++++ aqsis-1.8.2/include/aqsis/shadervm/ishaderexecenv.h |
237 |
+@@ -28,7 +28,9 @@ |
238 |
+ |
239 |
+ #include <aqsis/aqsis.h> |
240 |
+ |
241 |
++#ifndef Q_MOC_RUN |
242 |
+ #include <boost/shared_ptr.hpp> |
243 |
++#endif |
244 |
+ |
245 |
+ #include <aqsis/shadervm/ishaderdata.h> |
246 |
+ #include <aqsis/math/vector3d.h> |
247 |
+--- aqsis-1.8.2/include/aqsis/shadervm/ishader.h |
248 |
++++ aqsis-1.8.2/include/aqsis/shadervm/ishader.h |
249 |
+@@ -19,7 +19,9 @@ |
250 |
+ #include <vector> |
251 |
+ #include <iosfwd> |
252 |
+ |
253 |
++#ifndef Q_MOC_RUN |
254 |
+ #include <boost/shared_ptr.hpp> |
255 |
++#endif |
256 |
+ |
257 |
+ #include <aqsis/core/interfacefwd.h> |
258 |
+ #include <aqsis/riutil/primvartype.h> |
259 |
+--- aqsis-1.8.2/include/aqsis/tex/buffers/channellist.h |
260 |
++++ aqsis-1.8.2/include/aqsis/tex/buffers/channellist.h |
261 |
+@@ -43,7 +43,9 @@ |
262 |
+ #include <iosfwd> |
263 |
+ #include <vector> |
264 |
+ |
265 |
++#ifndef Q_MOC_RUN |
266 |
+ #include <boost/format.hpp> |
267 |
++#endif |
268 |
+ |
269 |
+ #include <aqsis/tex/buffers/channelinfo.h> |
270 |
+ #include <aqsis/tex/texexception.h> |
271 |
+--- aqsis-1.8.2/include/aqsis/tex/buffers/mixedimagebuffer.h |
272 |
++++ aqsis-1.8.2/include/aqsis/tex/buffers/mixedimagebuffer.h |
273 |
+@@ -45,9 +45,11 @@ |
274 |
+ #include <string> |
275 |
+ #include <vector> |
276 |
+ |
277 |
++#ifndef Q_MOC_RUN |
278 |
+ #include <boost/shared_array.hpp> |
279 |
+ #include <boost/shared_ptr.hpp> |
280 |
+ #include <boost/utility.hpp> |
281 |
++#endif |
282 |
+ |
283 |
+ #include <aqsis/math/math.h> |
284 |
+ #include <aqsis/tex/buffers/channellist.h> |
285 |
+--- aqsis-1.8.2/include/aqsis/tex/buffers/texturebuffer.h |
286 |
++++ aqsis-1.8.2/include/aqsis/tex/buffers/texturebuffer.h |
287 |
+@@ -42,7 +42,9 @@ |
288 |
+ |
289 |
+ #include <aqsis/aqsis.h> |
290 |
+ |
291 |
++#ifndef Q_MOC_RUN |
292 |
+ #include <boost/shared_array.hpp> |
293 |
++#endif |
294 |
+ |
295 |
+ #include <aqsis/tex/buffers/channellist.h> |
296 |
+ #include <aqsis/tex/buffers/samplevector.h> |
297 |
+--- aqsis-1.8.2/include/aqsis/tex/buffers/tilearray.h |
298 |
++++ aqsis-1.8.2/include/aqsis/tex/buffers/tilearray.h |
299 |
+@@ -43,10 +43,12 @@ |
300 |
+ |
301 |
+ #include <vector> |
302 |
+ |
303 |
++#ifndef Q_MOC_RUN |
304 |
+ #include <boost/intrusive_ptr.hpp> |
305 |
+ #include <boost/scoped_ptr.hpp> |
306 |
+ #include <boost/scoped_array.hpp> |
307 |
+ #include <boost/noncopyable.hpp> |
308 |
++#endif |
309 |
+ |
310 |
+ //#include <aqsis/util/memorysentry.h> |
311 |
+ #include <aqsis/tex/io/itiledtexinputfile.h> |
312 |
+--- aqsis-1.8.2/include/aqsis/tex/filtering/ienvironmentsampler.h |
313 |
++++ aqsis-1.8.2/include/aqsis/tex/filtering/ienvironmentsampler.h |
314 |
+@@ -40,7 +40,9 @@ |
315 |
+ |
316 |
+ #include <aqsis/aqsis.h> |
317 |
+ |
318 |
++#ifndef Q_MOC_RUN |
319 |
+ #include <boost/shared_ptr.hpp> |
320 |
++#endif |
321 |
+ |
322 |
+ #include <aqsis/tex/filtering/samplequad.h> |
323 |
+ #include <aqsis/tex/filtering/texturesampleoptions.h> |
324 |
+--- aqsis-1.8.2/include/aqsis/tex/filtering/iocclusionsampler.h |
325 |
++++ aqsis-1.8.2/include/aqsis/tex/filtering/iocclusionsampler.h |
326 |
+@@ -40,7 +40,9 @@ |
327 |
+ |
328 |
+ #include <aqsis/aqsis.h> |
329 |
+ |
330 |
++#ifndef Q_MOC_RUN |
331 |
+ #include <boost/shared_ptr.hpp> |
332 |
++#endif |
333 |
+ |
334 |
+ #include <aqsis/math/matrix.h> |
335 |
+ #include <aqsis/tex/filtering/samplequad.h> |
336 |
+--- aqsis-1.8.2/include/aqsis/tex/filtering/ishadowsampler.h |
337 |
++++ aqsis-1.8.2/include/aqsis/tex/filtering/ishadowsampler.h |
338 |
+@@ -40,7 +40,9 @@ |
339 |
+ |
340 |
+ #include <aqsis/aqsis.h> |
341 |
+ |
342 |
++#ifndef Q_MOC_RUN |
343 |
+ #include <boost/shared_ptr.hpp> |
344 |
++#endif |
345 |
+ |
346 |
+ #include <aqsis/math/matrix.h> |
347 |
+ #include <aqsis/tex/filtering/samplequad.h> |
348 |
+--- aqsis-1.8.2/include/aqsis/tex/filtering/itexturecache.h |
349 |
++++ aqsis-1.8.2/include/aqsis/tex/filtering/itexturecache.h |
350 |
+@@ -40,8 +40,10 @@ |
351 |
+ |
352 |
+ #include <aqsis/aqsis.h> |
353 |
+ |
354 |
++#ifndef Q_MOC_RUN |
355 |
+ #include <boost/function.hpp> |
356 |
+ #include <boost/shared_ptr.hpp> |
357 |
++#endif |
358 |
+ |
359 |
+ namespace Aqsis { |
360 |
+ |
361 |
+--- aqsis-1.8.2/include/aqsis/tex/filtering/itexturesampler.h |
362 |
++++ aqsis-1.8.2/include/aqsis/tex/filtering/itexturesampler.h |
363 |
+@@ -40,7 +40,9 @@ |
364 |
+ |
365 |
+ #include <aqsis/aqsis.h> |
366 |
+ |
367 |
++#ifndef Q_MOC_RUN |
368 |
+ #include <boost/shared_ptr.hpp> |
369 |
++#endif |
370 |
+ |
371 |
+ #include <aqsis/tex/filtering/samplequad.h> |
372 |
+ #include <aqsis/tex/filtering/texturesampleoptions.h> |
373 |
+--- aqsis-1.8.2/include/aqsis/tex/io/itiledtexinputfile.h |
374 |
++++ aqsis-1.8.2/include/aqsis/tex/io/itiledtexinputfile.h |
375 |
+@@ -40,7 +40,9 @@ |
376 |
+ |
377 |
+ #include <aqsis/aqsis.h> |
378 |
+ |
379 |
++#ifndef Q_MOC_RUN |
380 |
+ #include <boost/shared_ptr.hpp> |
381 |
++#endif |
382 |
+ |
383 |
+ #include <aqsis/util/file.h> |
384 |
+ #include <aqsis/tex/io/imagefiletype.h> |
385 |
+--- aqsis-1.8.2/include/aqsis/tex/io/texfileheader.h |
386 |
++++ aqsis-1.8.2/include/aqsis/tex/io/texfileheader.h |
387 |
+@@ -44,8 +44,10 @@ |
388 |
+ #include <iostream> |
389 |
+ #include <map> |
390 |
+ |
391 |
++#ifndef Q_MOC_RUN |
392 |
+ #include <boost/any.hpp> |
393 |
+ #include <boost/shared_ptr.hpp> |
394 |
++#endif |
395 |
+ |
396 |
+ #include <aqsis/tex/io/texfileattributes.h> |
397 |
+ |
398 |
+--- aqsis-1.8.2/include/aqsis/util/autobuffer.h |
399 |
++++ aqsis-1.8.2/include/aqsis/util/autobuffer.h |
400 |
+@@ -41,7 +41,9 @@ |
401 |
+ |
402 |
+ #include <aqsis/aqsis.h> |
403 |
+ |
404 |
++#ifndef Q_MOC_RUN |
405 |
+ #include <boost/scoped_array.hpp> |
406 |
++#endif |
407 |
+ |
408 |
+ namespace Aqsis { |
409 |
+ |
410 |
+--- aqsis-1.8.2/include/aqsis/util/enum.h |
411 |
++++ aqsis-1.8.2/include/aqsis/util/enum.h |
412 |
+@@ -122,7 +122,9 @@ |
413 |
+ #include <string> |
414 |
+ #include <vector> |
415 |
+ |
416 |
++#ifndef Q_MOC_RUN |
417 |
+ #include <boost/static_assert.hpp> |
418 |
++#endif |
419 |
+ |
420 |
+ #include <aqsis/util/sstring.h> // for CqString::hash() |
421 |
+ |
422 |
+--- aqsis-1.8.2/include/aqsis/util/execute.h |
423 |
++++ aqsis-1.8.2/include/aqsis/util/execute.h |
424 |
+@@ -30,7 +30,9 @@ |
425 |
+ |
426 |
+ #include <aqsis/aqsis.h> |
427 |
+ |
428 |
++#ifndef Q_MOC_RUN |
429 |
+ #include <boost/function.hpp> |
430 |
++#endif |
431 |
+ |
432 |
+ #include <string> |
433 |
+ #include <vector> |
434 |
+--- aqsis-1.8.2/include/aqsis/util/file.h |
435 |
++++ aqsis-1.8.2/include/aqsis/util/file.h |
436 |
+@@ -32,8 +32,10 @@ |
437 |
+ |
438 |
+ #include <string> |
439 |
+ |
440 |
++#ifndef Q_MOC_RUN |
441 |
+ #include <boost/filesystem/path.hpp> |
442 |
+ #include <boost/tokenizer.hpp> |
443 |
++#endif |
444 |
+ |
445 |
+ namespace Aqsis { |
446 |
+ |
447 |
+--- aqsis-1.8.2/include/aqsis/util/popen.h |
448 |
++++ aqsis-1.8.2/include/aqsis/util/popen.h |
449 |
+@@ -41,9 +41,11 @@ |
450 |
+ #include <string> |
451 |
+ #include <vector> |
452 |
+ |
453 |
++#ifndef Q_MOC_RUN |
454 |
+ #include <boost/iostreams/concepts.hpp> |
455 |
+ #include <boost/iostreams/stream.hpp> |
456 |
+ #include <boost/shared_ptr.hpp> |
457 |
++#endif |
458 |
+ |
459 |
+ #ifndef AQSIS_POPEN_H_INCLUDED |
460 |
+ #define AQSIS_POPEN_H_INCLUDED |
461 |
+--- aqsis-1.8.2/include/aqsis/util/socket.h |
462 |
++++ aqsis-1.8.2/include/aqsis/util/socket.h |
463 |
+@@ -32,7 +32,9 @@ |
464 |
+ |
465 |
+ #include <sstream> |
466 |
+ |
467 |
++#ifndef Q_MOC_RUN |
468 |
+ #include <boost/utility.hpp> |
469 |
++#endif |
470 |
+ |
471 |
+ #ifdef AQSIS_SYSTEM_WIN32 |
472 |
+ # include <winsock2.h> |
473 |
+--- aqsis-1.8.2/include/aqsis/util/timer.h |
474 |
++++ aqsis-1.8.2/include/aqsis/util/timer.h |
475 |
+@@ -39,8 +39,10 @@ |
476 |
+ #include <ctime> |
477 |
+ #include <vector> |
478 |
+ |
479 |
++#ifndef Q_MOC_RUN |
480 |
+ #include <boost/shared_ptr.hpp> |
481 |
+ #include <boost/timer.hpp> |
482 |
++#endif |
483 |
+ |
484 |
+ namespace Aqsis { |
485 |
+ |
486 |
+--- aqsis-1.8.2/tools/aqsl/aqsl.cpp |
487 |
++++ aqsis-1.8.2/tools/aqsl/aqsl.cpp |
488 |
+@@ -36,7 +36,10 @@ |
489 |
+ #include <cstring> |
490 |
+ #include <string> |
491 |
+ #include <vector> |
492 |
++ |
493 |
++#ifndef Q_MOC_RUN |
494 |
+ #include <boost/scoped_ptr.hpp> |
495 |
++#endif |
496 |
+ |
497 |
+ #ifdef AQSIS_SYSTEM_WIN32 |
498 |
+ #include "io.h" |
499 |
+--- aqsis-1.8.2/tools/displays/exr/d_exr.cpp |
500 |
++++ aqsis-1.8.2/tools/displays/exr/d_exr.cpp |
501 |
+@@ -98,7 +98,9 @@ |
502 |
+ |
503 |
+ #include <assert.h> |
504 |
+ |
505 |
++#ifndef Q_MOC_RUN |
506 |
+ #include <boost/shared_ptr.hpp> |
507 |
++#endif |
508 |
+ |
509 |
+ // Lower the warning level to eliminate unavoidable warnings from the OpenEXR headers. |
510 |
+ #if AQSIS_SYSTEM_WIN32 && (defined(AQSIS_COMPILER_MSVC6) || defined(AQSIS_COMPILER_MSVC7)) |
511 |
+--- aqsis-1.8.2/tools/displays/piqsl/piqsldisplay.cpp |
512 |
++++ aqsis-1.8.2/tools/displays/piqsl/piqsldisplay.cpp |
513 |
+@@ -33,10 +33,12 @@ |
514 |
+ #include <map> |
515 |
+ #include <vector> |
516 |
+ |
517 |
++#ifndef Q_MOC_RUN |
518 |
+ #include <boost/archive/iterators/base64_from_binary.hpp> |
519 |
+ #include <boost/archive/iterators/transform_width.hpp> |
520 |
+ #include <boost/archive/iterators/insert_linebreaks.hpp> |
521 |
+ #include <boost/shared_ptr.hpp> |
522 |
++#endif |
523 |
+ |
524 |
+ #ifdef AQSIS_SYSTEM_WIN32 |
525 |
+ #include <winsock2.h> |
526 |
+--- aqsis-1.8.2/tools/eqsl/eqsl.cpp |
527 |
++++ aqsis-1.8.2/tools/eqsl/eqsl.cpp |
528 |
+@@ -55,9 +55,11 @@ |
529 |
+ #include <QtGui/QStatusBar> |
530 |
+ #include <QtGui/QTabWidget> |
531 |
+ |
532 |
++#ifndef Q_MOC_RUN |
533 |
+ #include <boost/thread.hpp> |
534 |
+ #include <boost/regex.hpp> |
535 |
+ #include <boost/lexical_cast.hpp> |
536 |
++#endif |
537 |
+ |
538 |
+ #include <aqsis/version.h> |
539 |
+ #include <aqsis/util/execute.h> |
540 |
+--- aqsis-1.8.2/tools/miqser/miqser.cpp |
541 |
++++ aqsis-1.8.2/tools/miqser/miqser.cpp |
542 |
+@@ -44,7 +44,9 @@ |
543 |
+ #include <cstring> |
544 |
+ #include <cstdlib> |
545 |
+ |
546 |
++#ifndef Q_MOC_RUN |
547 |
+ #include <boost/shared_ptr.hpp> |
548 |
++#endif |
549 |
+ |
550 |
+ #include <aqsis/util/argparse.h> |
551 |
+ #include <aqsis/util/exception.h> |
552 |
+--- aqsis-1.8.2/tools/procedurals/hairgen/hair.cpp |
553 |
++++ aqsis-1.8.2/tools/procedurals/hairgen/hair.cpp |
554 |
+@@ -37,8 +37,10 @@ |
555 |
+ #include <aqsis/math/math.h> |
556 |
+ #include <aqsis/math/matrix.h> |
557 |
+ |
558 |
++#ifndef Q_MOC_RUN |
559 |
+ #include <boost/tokenizer.hpp> |
560 |
+ #include <boost/algorithm/string/trim.hpp> |
561 |
++#endif |
562 |
+ |
563 |
+ // project includes |
564 |
+ #include "primvar.h" |
565 |
+--- aqsis-1.8.2/tools/procedurals/hairgen/parenthairs.h |
566 |
++++ aqsis-1.8.2/tools/procedurals/hairgen/parenthairs.h |
567 |
+@@ -35,7 +35,9 @@ |
568 |
+ #include <vector> |
569 |
+ #include <iosfwd> |
570 |
+ |
571 |
++#ifndef Q_MOC_RUN |
572 |
+ #include <boost/scoped_ptr.hpp> |
573 |
++#endif |
574 |
+ |
575 |
+ #include "kdtree/kdtree2.hpp" |
576 |
+ #include "primvar.h" |
577 |
+--- aqsis-1.8.2/tools/procedurals/hairgen/primvar.h |
578 |
++++ aqsis-1.8.2/tools/procedurals/hairgen/primvar.h |
579 |
+@@ -37,7 +37,9 @@ |
580 |
+ #include <vector> |
581 |
+ #include <stdexcept> |
582 |
+ |
583 |
++#ifndef Q_MOC_RUN |
584 |
+ #include <boost/shared_ptr.hpp> |
585 |
++#endif |
586 |
+ |
587 |
+ #include <aqsis/riutil/primvartoken.h> |
588 |
+ #include <aqsis/ri/ri.h> |
589 |
+--- aqsis-1.8.2/tools/ptview/ptview.cpp |
590 |
++++ aqsis-1.8.2/tools/ptview/ptview.cpp |
591 |
+@@ -38,7 +38,9 @@ |
592 |
+ #include <QtGui/QFileDialog> |
593 |
+ #include <QtGui/QColorDialog> |
594 |
+ |
595 |
++#ifndef Q_MOC_RUN |
596 |
+ #include <boost/program_options.hpp> |
597 |
++#endif |
598 |
+ |
599 |
+ #define NOMINMAX |
600 |
+ #include <OpenEXR/ImathVec.h> |
601 |
+--- aqsis-1.8.2/tools/ptview/ptview.h |
602 |
++++ aqsis-1.8.2/tools/ptview/ptview.h |
603 |
+@@ -33,8 +33,10 @@ |
604 |
+ #include <cmath> |
605 |
+ #include <vector> |
606 |
+ |
607 |
++#ifndef Q_MOC_RUN |
608 |
+ #include <boost/shared_ptr.hpp> |
609 |
+ #include <boost/shared_array.hpp> |
610 |
++#endif |
611 |
+ |
612 |
+ #include <QtGui/QMainWindow> |
613 |
+ #include <QtOpenGL/QGLWidget> |
614 |
|
615 |
diff --git a/media-gfx/aqsis/files/aqsis-1.8.2-pfto-boost-1.59.patch b/media-gfx/aqsis/files/aqsis-1.8.2-pfto-boost-1.59.patch |
616 |
new file mode 100644 |
617 |
index 0000000..621853e |
618 |
--- /dev/null |
619 |
+++ b/media-gfx/aqsis/files/aqsis-1.8.2-pfto-boost-1.59.patch |
620 |
@@ -0,0 +1,41 @@ |
621 |
+Remove BOOST_MAKE_PFTO_WRAPPER macros, which were long deprecated |
622 |
+and finally removed with boost-1.59. |
623 |
+ |
624 |
+diff -aur package.pristine/tools/displays/piqsl/piqsldisplay.cpp package.new/tools/displays/piqsl/piqsldisplay.cpp |
625 |
+--- package.pristine/tools/displays/piqsl/piqsldisplay.cpp 2015-12-12 12:52:50.455773602 +0100 |
626 |
++++ package.new/tools/displays/piqsl/piqsldisplay.cpp 2015-12-12 12:54:31.291661954 +0100 |
627 |
+@@ -450,8 +450,8 @@ |
628 |
+ |
629 |
+ TiXmlElement* bucketDataXML = new TiXmlElement("BucketData"); |
630 |
+ std::stringstream base64Data; |
631 |
+- std::copy( base64_text(BOOST_MAKE_PFTO_WRAPPER(data)), |
632 |
+- base64_text(BOOST_MAKE_PFTO_WRAPPER(data + bufferlength)), |
633 |
++ std::copy( base64_text(data), |
634 |
++ base64_text(data + bufferlength), |
635 |
+ std::ostream_iterator<char>(base64Data)); |
636 |
+ TiXmlText* dataTextXML = new TiXmlText(base64Data.str()); |
637 |
+ dataTextXML->SetCDATA(true); |
638 |
+diff -aur package.pristine/tools/piqsl/imagelistmodel.cpp package.new/tools/piqsl/imagelistmodel.cpp |
639 |
+--- package.pristine/tools/piqsl/imagelistmodel.cpp 2015-12-12 12:52:50.465773524 +0100 |
640 |
++++ package.new/tools/piqsl/imagelistmodel.cpp 2015-12-12 12:53:26.088831765 +0100 |
641 |
+@@ -42,11 +42,6 @@ |
642 |
+ #include <boost/archive/iterators/transform_width.hpp> |
643 |
+ #include <boost/archive/iterators/remove_whitespace.hpp> |
644 |
+ #include <boost/version.hpp> |
645 |
+-#if BOOST_VERSION < 103700 |
646 |
+-# include <boost/pfto.hpp> |
647 |
+-#else |
648 |
+-# include <boost/serialization/pfto.hpp> |
649 |
+-#endif |
650 |
+ |
651 |
+ |
652 |
+ #include "displayserverimage.h" |
653 |
+@@ -286,7 +281,7 @@ |
654 |
+ std::string data = dataText->Value(); |
655 |
+ std::vector<unsigned char> binaryData; |
656 |
+ binaryData.reserve(count); |
657 |
+- base64_binary ti_begin = base64_binary(BOOST_MAKE_PFTO_WRAPPER(data.begin())); |
658 |
++ base64_binary ti_begin = base64_binary(data.begin()); |
659 |
+ std::size_t padding = 2 - count % 3; |
660 |
+ while(--count > 0) |
661 |
+ { |