1 |
commit: 072bdaec28a442f05020560afd050ffa578ce441 |
2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jan 28 16:14:13 2018 +0000 |
4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 28 16:14:13 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=072bdaec |
7 |
|
8 |
media-gfx/aqsis: remove last rited package |
9 |
|
10 |
media-gfx/aqsis/Manifest | 1 - |
11 |
media-gfx/aqsis/aqsis-1.8.2.ebuild | 61 --- |
12 |
.../aqsis/files/aqsis-1.8.2-boost-join-moc.patch | 568 --------------------- |
13 |
media-gfx/aqsis/files/aqsis-1.8.2-gcc6.patch | 23 - |
14 |
.../aqsis/files/aqsis-1.8.2-openexr-compat.patch | 15 - |
15 |
.../aqsis/files/aqsis-1.8.2-pfto-boost-1.59.patch | 41 -- |
16 |
.../aqsis/files/aqsis-1.8.2-unbundle-tinyxml.patch | 57 --- |
17 |
media-gfx/aqsis/metadata.xml | 11 - |
18 |
8 files changed, 777 deletions(-) |
19 |
|
20 |
diff --git a/media-gfx/aqsis/Manifest b/media-gfx/aqsis/Manifest |
21 |
deleted file mode 100644 |
22 |
index e5ea2ee1a3d..00000000000 |
23 |
--- a/media-gfx/aqsis/Manifest |
24 |
+++ /dev/null |
25 |
@@ -1 +0,0 @@ |
26 |
-DIST aqsis-1.8.2.tar.gz 5669285 BLAKE2B 1ac1ad7837812f8484634d39545df413e9b0916fb5cf8e0ef8506ec9a10395d8cf6ff303b5735634c161db9bf147785a2a087f10a63789886b58f982d36629bf SHA512 b571f9cfa46c0f1e659b054835698fe90f4d9bf43bea54caea257ac0b9d1d65fca68a0ea874772d18c98194630e13528acefb0e852ef398f353b1d1bb545cecc |
27 |
|
28 |
diff --git a/media-gfx/aqsis/aqsis-1.8.2.ebuild b/media-gfx/aqsis/aqsis-1.8.2.ebuild |
29 |
deleted file mode 100644 |
30 |
index 18ee7fcbed1..00000000000 |
31 |
--- a/media-gfx/aqsis/aqsis-1.8.2.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,61 +0,0 @@ |
34 |
-# Copyright 1999-2017 Gentoo Foundation |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=5 |
38 |
- |
39 |
-inherit cmake-utils multilib |
40 |
- |
41 |
-DESCRIPTION="Open source RenderMan-compliant 3D rendering solution" |
42 |
-HOMEPAGE="http://www.aqsis.org" |
43 |
-SRC_URI="mirror://sourceforge/aqsis/${P}.tar.gz" |
44 |
- |
45 |
-LICENSE="GPL-2" |
46 |
-SLOT="0" |
47 |
-KEYWORDS="~amd64 ~ppc ~x86" |
48 |
-IUSE="png qt4" |
49 |
- |
50 |
-# OpenEXR currently can not be optional dependency, despite build system options |
51 |
-RDEPEND=" |
52 |
- dev-libs/boost:= |
53 |
- dev-libs/tinyxml |
54 |
- media-libs/tiff:0 |
55 |
- sys-libs/zlib |
56 |
- media-libs/openexr:= |
57 |
- png? ( media-libs/libpng:0= ) |
58 |
- qt4? ( dev-qt/qtgui:4 ) |
59 |
-" |
60 |
- |
61 |
-DEPEND="${RDEPEND} |
62 |
- dev-libs/libxslt |
63 |
- sys-devel/bison |
64 |
- sys-devel/flex |
65 |
-" |
66 |
- |
67 |
-DOCS=( AUTHORS INSTALL README ) |
68 |
- |
69 |
-PATCHES=( |
70 |
- "${FILESDIR}/${P}-openexr-compat.patch" |
71 |
- "${FILESDIR}/${P}-unbundle-tinyxml.patch" |
72 |
- "${FILESDIR}/${P}-pfto-boost-1.59.patch" |
73 |
- "${FILESDIR}/${P}-boost-join-moc.patch" |
74 |
- "${FILESDIR}/${P}-gcc6.patch" |
75 |
-) |
76 |
- |
77 |
-src_configure() { |
78 |
- local mycmakeargs=( |
79 |
- $(cmake-utils_use png AQSIS_USE_PNG) |
80 |
- $(cmake-utils_use qt4 AQSIS_USE_QT) |
81 |
- -DAQSIS_ENABLE_DOCS=OFF |
82 |
- -DAQSIS_USE_EXTERNAL_TINYXML=ON |
83 |
- -DAQSIS_USE_OPENEXR=ON |
84 |
- -DAQSIS_USE_RPATH=OFF |
85 |
- -DLIBDIR="$(get_libdir)" |
86 |
- -DSYSCONFDIR="/etc" |
87 |
- ) |
88 |
- cmake-utils_src_configure |
89 |
-} |
90 |
- |
91 |
-src_install() { |
92 |
- newdoc "release-notes/1.8/summary-1.8.0.txt" ReleaseNotes |
93 |
- cmake-utils_src_install |
94 |
-} |
95 |
|
96 |
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 |
97 |
deleted file mode 100644 |
98 |
index ce579d12242..00000000000 |
99 |
--- a/media-gfx/aqsis/files/aqsis-1.8.2-boost-join-moc.patch |
100 |
+++ /dev/null |
101 |
@@ -1,568 +0,0 @@ |
102 |
-Add include guards to all boost includes, as qt's moc trips |
103 |
-over nested BOOST_JOIN macros: |
104 |
-* /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 |
105 |
-* /usr/include/boost/type_traits/detail/has_binary_operator.hp:50: Parse error at "BOOST_JOIN" |
106 |
-See also: https://bugs.gentoo.org/show_bug.cgi?id=574560 |
107 |
- |
108 |
---- aqsis-1.8.2/tools/piqsl/piqsl_ui.cpp |
109 |
-+++ aqsis-1.8.2/tools/piqsl/piqsl_ui.cpp |
110 |
-@@ -42,7 +42,9 @@ |
111 |
- #include <QtGui/QPainter> |
112 |
- #include <QtGui/QImage> |
113 |
- |
114 |
-+#ifndef Q_MOC_RUN |
115 |
- #include <boost/thread.hpp> |
116 |
-+#endif |
117 |
- |
118 |
- #include <aqsis/version.h> |
119 |
- #include <aqsis/math/math.h> |
120 |
---- aqsis-1.8.2/tools/piqsl/piqsl_ui.h |
121 |
-+++ aqsis-1.8.2/tools/piqsl/piqsl_ui.h |
122 |
-@@ -37,7 +37,9 @@ |
123 |
- |
124 |
- #include <QtGui/QStyledItemDelegate> |
125 |
- |
126 |
-+#ifndef Q_MOC_RUN |
127 |
- #include <boost/shared_ptr.hpp> |
128 |
-+#endif |
129 |
- |
130 |
- #include "image.h" |
131 |
- |
132 |
---- aqsis-1.8.2/tools/piqsl/displayserverimage.cpp |
133 |
-+++ aqsis-1.8.2/tools/piqsl/displayserverimage.cpp |
134 |
-@@ -39,11 +39,13 @@ |
135 |
- #include <map> |
136 |
- #include <algorithm> |
137 |
- |
138 |
-+#ifndef Q_MOC_RUN |
139 |
- #include <boost/archive/iterators/base64_from_binary.hpp> |
140 |
- #include <boost/archive/iterators/transform_width.hpp> |
141 |
- #include <boost/archive/iterators/insert_linebreaks.hpp> |
142 |
- #include <boost/format.hpp> |
143 |
- #include <boost/filesystem.hpp> |
144 |
-+#endif |
145 |
- |
146 |
- #include "displayserverimage.h" |
147 |
- |
148 |
---- aqsis-1.8.2/tools/piqsl/image.cpp |
149 |
-+++ aqsis-1.8.2/tools/piqsl/image.cpp |
150 |
-@@ -38,7 +38,9 @@ |
151 |
- |
152 |
- #include <float.h> |
153 |
- |
154 |
-+#ifndef Q_MOC_RUN |
155 |
- #include <boost/format.hpp> |
156 |
-+#endif |
157 |
- |
158 |
- #include <aqsis/version.h> |
159 |
- #include <aqsis/util/logging.h> |
160 |
---- aqsis-1.8.2/tools/piqsl/image.h |
161 |
-+++ aqsis-1.8.2/tools/piqsl/image.h |
162 |
-@@ -46,10 +46,12 @@ |
163 |
- #include <QtCore/QObject> |
164 |
- #include <QtGui/QImage> |
165 |
- |
166 |
-+#ifndef Q_MOC_RUN |
167 |
- #include <boost/shared_ptr.hpp> |
168 |
- #include <boost/shared_array.hpp> |
169 |
- #include <boost/filesystem/path.hpp> |
170 |
- #include <boost/thread/mutex.hpp> |
171 |
-+#endif |
172 |
- |
173 |
- #include "tinyxml.h" |
174 |
- |
175 |
---- aqsis-1.8.2/tools/piqsl/imagelistmodel.cpp |
176 |
-+++ aqsis-1.8.2/tools/piqsl/imagelistmodel.cpp |
177 |
-@@ -37,11 +37,13 @@ |
178 |
- #include <QtCore/QSocketNotifier> |
179 |
- #include <QtGui/QMessageBox> |
180 |
- |
181 |
-+#ifndef Q_MOC_RUN |
182 |
- #include <boost/thread/mutex.hpp> |
183 |
- #include <boost/archive/iterators/binary_from_base64.hpp> |
184 |
- #include <boost/archive/iterators/transform_width.hpp> |
185 |
- #include <boost/archive/iterators/remove_whitespace.hpp> |
186 |
- #include <boost/version.hpp> |
187 |
-+#endif |
188 |
- |
189 |
- |
190 |
- #include "displayserverimage.h" |
191 |
---- aqsis-1.8.2/tools/piqsl/imagelistmodel.h |
192 |
-+++ aqsis-1.8.2/tools/piqsl/imagelistmodel.h |
193 |
-@@ -33,8 +33,10 @@ |
194 |
- |
195 |
- #include <QtCore/QAbstractListModel> |
196 |
- |
197 |
-+#ifndef Q_MOC_RUN |
198 |
- #include <boost/shared_ptr.hpp> |
199 |
- #include <boost/thread/thread.hpp> |
200 |
-+#endif |
201 |
- |
202 |
- #include <aqsis/util/socket.h> |
203 |
- #include "image.h" |
204 |
---- aqsis-1.8.2/include/aqsis/core/interfacefwd.h |
205 |
-+++ aqsis-1.8.2/include/aqsis/core/interfacefwd.h |
206 |
-@@ -13,7 +13,9 @@ |
207 |
- #ifndef ___interfacefwd_Loaded___ |
208 |
- #define ___interfacefwd_Loaded___ |
209 |
- |
210 |
-+#ifndef Q_MOC_RUN |
211 |
- #include <boost/shared_ptr.hpp> |
212 |
-+#endif |
213 |
- |
214 |
- namespace Aqsis { |
215 |
- |
216 |
---- aqsis-1.8.2/include/aqsis/core/ioptions.h |
217 |
-+++ aqsis-1.8.2/include/aqsis/core/ioptions.h |
218 |
-@@ -29,7 +29,9 @@ |
219 |
- |
220 |
- #include <aqsis/aqsis.h> |
221 |
- |
222 |
-+#ifndef Q_MOC_RUN |
223 |
- #include <boost/filesystem/path.hpp> |
224 |
-+#endif |
225 |
- |
226 |
- #include <aqsis/riutil/primvartype.h> |
227 |
- #include <aqsis/ri/ritypes.h> |
228 |
---- aqsis-1.8.2/include/aqsis/core/irenderer.h |
229 |
-+++ aqsis-1.8.2/include/aqsis/core/irenderer.h |
230 |
-@@ -14,7 +14,9 @@ |
231 |
- #include <iosfwd> |
232 |
- #include <string> |
233 |
- |
234 |
-+#ifndef Q_MOC_RUN |
235 |
- #include <boost/function.hpp> |
236 |
-+#endif |
237 |
- |
238 |
- #include <aqsis/math/matrix.h> |
239 |
- #include <aqsis/core/itransform.h> |
240 |
---- aqsis-1.8.2/include/aqsis/core/isurface.h |
241 |
-+++ aqsis-1.8.2/include/aqsis/core/isurface.h |
242 |
-@@ -12,7 +12,10 @@ |
243 |
- #define ___isurface_Loaded___ |
244 |
- |
245 |
- #include <vector> |
246 |
-+ |
247 |
-+#ifndef Q_MOC_RUN |
248 |
- #include <boost/shared_ptr.hpp> |
249 |
-+#endif |
250 |
- |
251 |
- #include <aqsis/aqsis.h> |
252 |
- #include <aqsis/math/matrix.h> |
253 |
---- aqsis-1.8.2/include/aqsis/core/itransform.h |
254 |
-+++ aqsis-1.8.2/include/aqsis/core/itransform.h |
255 |
-@@ -12,7 +12,10 @@ |
256 |
- #define ___itransform_Loaded___ |
257 |
- |
258 |
- #include <aqsis/aqsis.h> |
259 |
-+ |
260 |
-+#ifndef Q_MOC_RUN |
261 |
- #include <boost/shared_ptr.hpp> |
262 |
-+#endif |
263 |
- |
264 |
- namespace Aqsis { |
265 |
- |
266 |
---- aqsis-1.8.2/include/aqsis/math/math.h |
267 |
-+++ aqsis-1.8.2/include/aqsis/math/math.h |
268 |
-@@ -30,8 +30,10 @@ |
269 |
- #include <cmath> |
270 |
- #include <limits> |
271 |
- |
272 |
-+#ifndef Q_MOC_RUN |
273 |
- #include <boost/utility/enable_if.hpp> |
274 |
- #include <boost/type_traits/arithmetic_traits.hpp> |
275 |
-+#endif |
276 |
- |
277 |
- namespace Aqsis { |
278 |
- // These inline functions are intended to eventually replace all the old macros |
279 |
---- aqsis-1.8.2/include/aqsis/riutil/ricxxutil.h |
280 |
-+++ aqsis-1.8.2/include/aqsis/riutil/ricxxutil.h |
281 |
-@@ -48,7 +48,9 @@ |
282 |
- #include <aqsis/riutil/interpclasscounts.h> |
283 |
- #include <aqsis/util/exception.h> |
284 |
- |
285 |
-+#ifndef Q_MOC_RUN |
286 |
- #include <boost/function.hpp> |
287 |
-+#endif |
288 |
- |
289 |
- namespace Aqsis { |
290 |
- |
291 |
---- aqsis-1.8.2/include/aqsis/shadervm/ishaderexecenv.h |
292 |
-+++ aqsis-1.8.2/include/aqsis/shadervm/ishaderexecenv.h |
293 |
-@@ -28,7 +28,9 @@ |
294 |
- |
295 |
- #include <aqsis/aqsis.h> |
296 |
- |
297 |
-+#ifndef Q_MOC_RUN |
298 |
- #include <boost/shared_ptr.hpp> |
299 |
-+#endif |
300 |
- |
301 |
- #include <aqsis/shadervm/ishaderdata.h> |
302 |
- #include <aqsis/math/vector3d.h> |
303 |
---- aqsis-1.8.2/include/aqsis/shadervm/ishader.h |
304 |
-+++ aqsis-1.8.2/include/aqsis/shadervm/ishader.h |
305 |
-@@ -19,7 +19,9 @@ |
306 |
- #include <vector> |
307 |
- #include <iosfwd> |
308 |
- |
309 |
-+#ifndef Q_MOC_RUN |
310 |
- #include <boost/shared_ptr.hpp> |
311 |
-+#endif |
312 |
- |
313 |
- #include <aqsis/core/interfacefwd.h> |
314 |
- #include <aqsis/riutil/primvartype.h> |
315 |
---- aqsis-1.8.2/include/aqsis/tex/buffers/channellist.h |
316 |
-+++ aqsis-1.8.2/include/aqsis/tex/buffers/channellist.h |
317 |
-@@ -43,7 +43,9 @@ |
318 |
- #include <iosfwd> |
319 |
- #include <vector> |
320 |
- |
321 |
-+#ifndef Q_MOC_RUN |
322 |
- #include <boost/format.hpp> |
323 |
-+#endif |
324 |
- |
325 |
- #include <aqsis/tex/buffers/channelinfo.h> |
326 |
- #include <aqsis/tex/texexception.h> |
327 |
---- aqsis-1.8.2/include/aqsis/tex/buffers/mixedimagebuffer.h |
328 |
-+++ aqsis-1.8.2/include/aqsis/tex/buffers/mixedimagebuffer.h |
329 |
-@@ -45,9 +45,11 @@ |
330 |
- #include <string> |
331 |
- #include <vector> |
332 |
- |
333 |
-+#ifndef Q_MOC_RUN |
334 |
- #include <boost/shared_array.hpp> |
335 |
- #include <boost/shared_ptr.hpp> |
336 |
- #include <boost/utility.hpp> |
337 |
-+#endif |
338 |
- |
339 |
- #include <aqsis/math/math.h> |
340 |
- #include <aqsis/tex/buffers/channellist.h> |
341 |
---- aqsis-1.8.2/include/aqsis/tex/buffers/texturebuffer.h |
342 |
-+++ aqsis-1.8.2/include/aqsis/tex/buffers/texturebuffer.h |
343 |
-@@ -42,7 +42,9 @@ |
344 |
- |
345 |
- #include <aqsis/aqsis.h> |
346 |
- |
347 |
-+#ifndef Q_MOC_RUN |
348 |
- #include <boost/shared_array.hpp> |
349 |
-+#endif |
350 |
- |
351 |
- #include <aqsis/tex/buffers/channellist.h> |
352 |
- #include <aqsis/tex/buffers/samplevector.h> |
353 |
---- aqsis-1.8.2/include/aqsis/tex/buffers/tilearray.h |
354 |
-+++ aqsis-1.8.2/include/aqsis/tex/buffers/tilearray.h |
355 |
-@@ -43,10 +43,12 @@ |
356 |
- |
357 |
- #include <vector> |
358 |
- |
359 |
-+#ifndef Q_MOC_RUN |
360 |
- #include <boost/intrusive_ptr.hpp> |
361 |
- #include <boost/scoped_ptr.hpp> |
362 |
- #include <boost/scoped_array.hpp> |
363 |
- #include <boost/noncopyable.hpp> |
364 |
-+#endif |
365 |
- |
366 |
- //#include <aqsis/util/memorysentry.h> |
367 |
- #include <aqsis/tex/io/itiledtexinputfile.h> |
368 |
---- aqsis-1.8.2/include/aqsis/tex/filtering/ienvironmentsampler.h |
369 |
-+++ aqsis-1.8.2/include/aqsis/tex/filtering/ienvironmentsampler.h |
370 |
-@@ -40,7 +40,9 @@ |
371 |
- |
372 |
- #include <aqsis/aqsis.h> |
373 |
- |
374 |
-+#ifndef Q_MOC_RUN |
375 |
- #include <boost/shared_ptr.hpp> |
376 |
-+#endif |
377 |
- |
378 |
- #include <aqsis/tex/filtering/samplequad.h> |
379 |
- #include <aqsis/tex/filtering/texturesampleoptions.h> |
380 |
---- aqsis-1.8.2/include/aqsis/tex/filtering/iocclusionsampler.h |
381 |
-+++ aqsis-1.8.2/include/aqsis/tex/filtering/iocclusionsampler.h |
382 |
-@@ -40,7 +40,9 @@ |
383 |
- |
384 |
- #include <aqsis/aqsis.h> |
385 |
- |
386 |
-+#ifndef Q_MOC_RUN |
387 |
- #include <boost/shared_ptr.hpp> |
388 |
-+#endif |
389 |
- |
390 |
- #include <aqsis/math/matrix.h> |
391 |
- #include <aqsis/tex/filtering/samplequad.h> |
392 |
---- aqsis-1.8.2/include/aqsis/tex/filtering/ishadowsampler.h |
393 |
-+++ aqsis-1.8.2/include/aqsis/tex/filtering/ishadowsampler.h |
394 |
-@@ -40,7 +40,9 @@ |
395 |
- |
396 |
- #include <aqsis/aqsis.h> |
397 |
- |
398 |
-+#ifndef Q_MOC_RUN |
399 |
- #include <boost/shared_ptr.hpp> |
400 |
-+#endif |
401 |
- |
402 |
- #include <aqsis/math/matrix.h> |
403 |
- #include <aqsis/tex/filtering/samplequad.h> |
404 |
---- aqsis-1.8.2/include/aqsis/tex/filtering/itexturecache.h |
405 |
-+++ aqsis-1.8.2/include/aqsis/tex/filtering/itexturecache.h |
406 |
-@@ -40,8 +40,10 @@ |
407 |
- |
408 |
- #include <aqsis/aqsis.h> |
409 |
- |
410 |
-+#ifndef Q_MOC_RUN |
411 |
- #include <boost/function.hpp> |
412 |
- #include <boost/shared_ptr.hpp> |
413 |
-+#endif |
414 |
- |
415 |
- namespace Aqsis { |
416 |
- |
417 |
---- aqsis-1.8.2/include/aqsis/tex/filtering/itexturesampler.h |
418 |
-+++ aqsis-1.8.2/include/aqsis/tex/filtering/itexturesampler.h |
419 |
-@@ -40,7 +40,9 @@ |
420 |
- |
421 |
- #include <aqsis/aqsis.h> |
422 |
- |
423 |
-+#ifndef Q_MOC_RUN |
424 |
- #include <boost/shared_ptr.hpp> |
425 |
-+#endif |
426 |
- |
427 |
- #include <aqsis/tex/filtering/samplequad.h> |
428 |
- #include <aqsis/tex/filtering/texturesampleoptions.h> |
429 |
---- aqsis-1.8.2/include/aqsis/tex/io/itiledtexinputfile.h |
430 |
-+++ aqsis-1.8.2/include/aqsis/tex/io/itiledtexinputfile.h |
431 |
-@@ -40,7 +40,9 @@ |
432 |
- |
433 |
- #include <aqsis/aqsis.h> |
434 |
- |
435 |
-+#ifndef Q_MOC_RUN |
436 |
- #include <boost/shared_ptr.hpp> |
437 |
-+#endif |
438 |
- |
439 |
- #include <aqsis/util/file.h> |
440 |
- #include <aqsis/tex/io/imagefiletype.h> |
441 |
---- aqsis-1.8.2/include/aqsis/tex/io/texfileheader.h |
442 |
-+++ aqsis-1.8.2/include/aqsis/tex/io/texfileheader.h |
443 |
-@@ -44,8 +44,10 @@ |
444 |
- #include <iostream> |
445 |
- #include <map> |
446 |
- |
447 |
-+#ifndef Q_MOC_RUN |
448 |
- #include <boost/any.hpp> |
449 |
- #include <boost/shared_ptr.hpp> |
450 |
-+#endif |
451 |
- |
452 |
- #include <aqsis/tex/io/texfileattributes.h> |
453 |
- |
454 |
---- aqsis-1.8.2/include/aqsis/util/autobuffer.h |
455 |
-+++ aqsis-1.8.2/include/aqsis/util/autobuffer.h |
456 |
-@@ -41,7 +41,9 @@ |
457 |
- |
458 |
- #include <aqsis/aqsis.h> |
459 |
- |
460 |
-+#ifndef Q_MOC_RUN |
461 |
- #include <boost/scoped_array.hpp> |
462 |
-+#endif |
463 |
- |
464 |
- namespace Aqsis { |
465 |
- |
466 |
---- aqsis-1.8.2/include/aqsis/util/enum.h |
467 |
-+++ aqsis-1.8.2/include/aqsis/util/enum.h |
468 |
-@@ -122,7 +122,9 @@ |
469 |
- #include <string> |
470 |
- #include <vector> |
471 |
- |
472 |
-+#ifndef Q_MOC_RUN |
473 |
- #include <boost/static_assert.hpp> |
474 |
-+#endif |
475 |
- |
476 |
- #include <aqsis/util/sstring.h> // for CqString::hash() |
477 |
- |
478 |
---- aqsis-1.8.2/include/aqsis/util/execute.h |
479 |
-+++ aqsis-1.8.2/include/aqsis/util/execute.h |
480 |
-@@ -30,7 +30,9 @@ |
481 |
- |
482 |
- #include <aqsis/aqsis.h> |
483 |
- |
484 |
-+#ifndef Q_MOC_RUN |
485 |
- #include <boost/function.hpp> |
486 |
-+#endif |
487 |
- |
488 |
- #include <string> |
489 |
- #include <vector> |
490 |
---- aqsis-1.8.2/include/aqsis/util/file.h |
491 |
-+++ aqsis-1.8.2/include/aqsis/util/file.h |
492 |
-@@ -32,8 +32,10 @@ |
493 |
- |
494 |
- #include <string> |
495 |
- |
496 |
-+#ifndef Q_MOC_RUN |
497 |
- #include <boost/filesystem/path.hpp> |
498 |
- #include <boost/tokenizer.hpp> |
499 |
-+#endif |
500 |
- |
501 |
- namespace Aqsis { |
502 |
- |
503 |
---- aqsis-1.8.2/include/aqsis/util/popen.h |
504 |
-+++ aqsis-1.8.2/include/aqsis/util/popen.h |
505 |
-@@ -41,9 +41,11 @@ |
506 |
- #include <string> |
507 |
- #include <vector> |
508 |
- |
509 |
-+#ifndef Q_MOC_RUN |
510 |
- #include <boost/iostreams/concepts.hpp> |
511 |
- #include <boost/iostreams/stream.hpp> |
512 |
- #include <boost/shared_ptr.hpp> |
513 |
-+#endif |
514 |
- |
515 |
- #ifndef AQSIS_POPEN_H_INCLUDED |
516 |
- #define AQSIS_POPEN_H_INCLUDED |
517 |
---- aqsis-1.8.2/include/aqsis/util/socket.h |
518 |
-+++ aqsis-1.8.2/include/aqsis/util/socket.h |
519 |
-@@ -32,7 +32,9 @@ |
520 |
- |
521 |
- #include <sstream> |
522 |
- |
523 |
-+#ifndef Q_MOC_RUN |
524 |
- #include <boost/utility.hpp> |
525 |
-+#endif |
526 |
- |
527 |
- #ifdef AQSIS_SYSTEM_WIN32 |
528 |
- # include <winsock2.h> |
529 |
---- aqsis-1.8.2/include/aqsis/util/timer.h |
530 |
-+++ aqsis-1.8.2/include/aqsis/util/timer.h |
531 |
-@@ -39,8 +39,10 @@ |
532 |
- #include <ctime> |
533 |
- #include <vector> |
534 |
- |
535 |
-+#ifndef Q_MOC_RUN |
536 |
- #include <boost/shared_ptr.hpp> |
537 |
- #include <boost/timer.hpp> |
538 |
-+#endif |
539 |
- |
540 |
- namespace Aqsis { |
541 |
- |
542 |
---- aqsis-1.8.2/tools/aqsl/aqsl.cpp |
543 |
-+++ aqsis-1.8.2/tools/aqsl/aqsl.cpp |
544 |
-@@ -36,7 +36,10 @@ |
545 |
- #include <cstring> |
546 |
- #include <string> |
547 |
- #include <vector> |
548 |
-+ |
549 |
-+#ifndef Q_MOC_RUN |
550 |
- #include <boost/scoped_ptr.hpp> |
551 |
-+#endif |
552 |
- |
553 |
- #ifdef AQSIS_SYSTEM_WIN32 |
554 |
- #include "io.h" |
555 |
---- aqsis-1.8.2/tools/displays/exr/d_exr.cpp |
556 |
-+++ aqsis-1.8.2/tools/displays/exr/d_exr.cpp |
557 |
-@@ -98,7 +98,9 @@ |
558 |
- |
559 |
- #include <assert.h> |
560 |
- |
561 |
-+#ifndef Q_MOC_RUN |
562 |
- #include <boost/shared_ptr.hpp> |
563 |
-+#endif |
564 |
- |
565 |
- // Lower the warning level to eliminate unavoidable warnings from the OpenEXR headers. |
566 |
- #if AQSIS_SYSTEM_WIN32 && (defined(AQSIS_COMPILER_MSVC6) || defined(AQSIS_COMPILER_MSVC7)) |
567 |
---- aqsis-1.8.2/tools/displays/piqsl/piqsldisplay.cpp |
568 |
-+++ aqsis-1.8.2/tools/displays/piqsl/piqsldisplay.cpp |
569 |
-@@ -33,10 +33,12 @@ |
570 |
- #include <map> |
571 |
- #include <vector> |
572 |
- |
573 |
-+#ifndef Q_MOC_RUN |
574 |
- #include <boost/archive/iterators/base64_from_binary.hpp> |
575 |
- #include <boost/archive/iterators/transform_width.hpp> |
576 |
- #include <boost/archive/iterators/insert_linebreaks.hpp> |
577 |
- #include <boost/shared_ptr.hpp> |
578 |
-+#endif |
579 |
- |
580 |
- #ifdef AQSIS_SYSTEM_WIN32 |
581 |
- #include <winsock2.h> |
582 |
---- aqsis-1.8.2/tools/eqsl/eqsl.cpp |
583 |
-+++ aqsis-1.8.2/tools/eqsl/eqsl.cpp |
584 |
-@@ -55,9 +55,11 @@ |
585 |
- #include <QtGui/QStatusBar> |
586 |
- #include <QtGui/QTabWidget> |
587 |
- |
588 |
-+#ifndef Q_MOC_RUN |
589 |
- #include <boost/thread.hpp> |
590 |
- #include <boost/regex.hpp> |
591 |
- #include <boost/lexical_cast.hpp> |
592 |
-+#endif |
593 |
- |
594 |
- #include <aqsis/version.h> |
595 |
- #include <aqsis/util/execute.h> |
596 |
---- aqsis-1.8.2/tools/miqser/miqser.cpp |
597 |
-+++ aqsis-1.8.2/tools/miqser/miqser.cpp |
598 |
-@@ -44,7 +44,9 @@ |
599 |
- #include <cstring> |
600 |
- #include <cstdlib> |
601 |
- |
602 |
-+#ifndef Q_MOC_RUN |
603 |
- #include <boost/shared_ptr.hpp> |
604 |
-+#endif |
605 |
- |
606 |
- #include <aqsis/util/argparse.h> |
607 |
- #include <aqsis/util/exception.h> |
608 |
---- aqsis-1.8.2/tools/procedurals/hairgen/hair.cpp |
609 |
-+++ aqsis-1.8.2/tools/procedurals/hairgen/hair.cpp |
610 |
-@@ -37,8 +37,10 @@ |
611 |
- #include <aqsis/math/math.h> |
612 |
- #include <aqsis/math/matrix.h> |
613 |
- |
614 |
-+#ifndef Q_MOC_RUN |
615 |
- #include <boost/tokenizer.hpp> |
616 |
- #include <boost/algorithm/string/trim.hpp> |
617 |
-+#endif |
618 |
- |
619 |
- // project includes |
620 |
- #include "primvar.h" |
621 |
---- aqsis-1.8.2/tools/procedurals/hairgen/parenthairs.h |
622 |
-+++ aqsis-1.8.2/tools/procedurals/hairgen/parenthairs.h |
623 |
-@@ -35,7 +35,9 @@ |
624 |
- #include <vector> |
625 |
- #include <iosfwd> |
626 |
- |
627 |
-+#ifndef Q_MOC_RUN |
628 |
- #include <boost/scoped_ptr.hpp> |
629 |
-+#endif |
630 |
- |
631 |
- #include "kdtree/kdtree2.hpp" |
632 |
- #include "primvar.h" |
633 |
---- aqsis-1.8.2/tools/procedurals/hairgen/primvar.h |
634 |
-+++ aqsis-1.8.2/tools/procedurals/hairgen/primvar.h |
635 |
-@@ -37,7 +37,9 @@ |
636 |
- #include <vector> |
637 |
- #include <stdexcept> |
638 |
- |
639 |
-+#ifndef Q_MOC_RUN |
640 |
- #include <boost/shared_ptr.hpp> |
641 |
-+#endif |
642 |
- |
643 |
- #include <aqsis/riutil/primvartoken.h> |
644 |
- #include <aqsis/ri/ri.h> |
645 |
---- aqsis-1.8.2/tools/ptview/ptview.cpp |
646 |
-+++ aqsis-1.8.2/tools/ptview/ptview.cpp |
647 |
-@@ -38,7 +38,9 @@ |
648 |
- #include <QtGui/QFileDialog> |
649 |
- #include <QtGui/QColorDialog> |
650 |
- |
651 |
-+#ifndef Q_MOC_RUN |
652 |
- #include <boost/program_options.hpp> |
653 |
-+#endif |
654 |
- |
655 |
- #define NOMINMAX |
656 |
- #include <OpenEXR/ImathVec.h> |
657 |
---- aqsis-1.8.2/tools/ptview/ptview.h |
658 |
-+++ aqsis-1.8.2/tools/ptview/ptview.h |
659 |
-@@ -33,8 +33,10 @@ |
660 |
- #include <cmath> |
661 |
- #include <vector> |
662 |
- |
663 |
-+#ifndef Q_MOC_RUN |
664 |
- #include <boost/shared_ptr.hpp> |
665 |
- #include <boost/shared_array.hpp> |
666 |
-+#endif |
667 |
- |
668 |
- #include <QtGui/QMainWindow> |
669 |
- #include <QtOpenGL/QGLWidget> |
670 |
|
671 |
diff --git a/media-gfx/aqsis/files/aqsis-1.8.2-gcc6.patch b/media-gfx/aqsis/files/aqsis-1.8.2-gcc6.patch |
672 |
deleted file mode 100644 |
673 |
index c51f669c09b..00000000000 |
674 |
--- a/media-gfx/aqsis/files/aqsis-1.8.2-gcc6.patch |
675 |
+++ /dev/null |
676 |
@@ -1,23 +0,0 @@ |
677 |
-From d450f4aac8c107f82b18df7789afb52b502eaba0 Mon Sep 17 00:00:00 2001 |
678 |
-From: Hodorgasm <nsane457@×××××.com> |
679 |
-Date: Mon, 19 Sep 2016 22:58:44 -0400 |
680 |
-Subject: [PATCH] Use "!file.fail()" instead of "file != NULL" |
681 |
- |
682 |
-Pre-C++11 defined an implicit cast from ifstream to "void *" and post C++11 replaced it with an explicit cast of ifstream to "bool". Testing an ifstream with "!ifstream.fail()" should work regardless of the C++ dialect. |
683 |
---- |
684 |
- libs/core/texturing_old/shadowmap_old.cpp | 2 +- |
685 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
686 |
- |
687 |
-diff --git a/libs/core/texturing_old/shadowmap_old.cpp b/libs/core/texturing_old/shadowmap_old.cpp |
688 |
-index 1a22491..fbcac59 100644 |
689 |
---- a/libs/core/texturing_old/shadowmap_old.cpp |
690 |
-+++ b/libs/core/texturing_old/shadowmap_old.cpp |
691 |
-@@ -176,7 +176,7 @@ void CqShadowMapOld::LoadZFile() |
692 |
- { |
693 |
- std::ifstream file( m_strName.c_str(), std::ios::in | std::ios::binary ); |
694 |
- |
695 |
-- if ( file != NULL ) |
696 |
-+ if ( !file.fail() ) |
697 |
- { |
698 |
- // Save a file type and version marker |
699 |
- TqPchar origHeader = tokenCast(ZFILE_HEADER); |
700 |
|
701 |
diff --git a/media-gfx/aqsis/files/aqsis-1.8.2-openexr-compat.patch b/media-gfx/aqsis/files/aqsis-1.8.2-openexr-compat.patch |
702 |
deleted file mode 100644 |
703 |
index 155c93ebb29..00000000000 |
704 |
--- a/media-gfx/aqsis/files/aqsis-1.8.2-openexr-compat.patch |
705 |
+++ /dev/null |
706 |
@@ -1,15 +0,0 @@ |
707 |
---- libs/tex/io/exrinputfile.h.orig 2012-08-24 16:26:50.000000000 +0400 |
708 |
-+++ libs/tex/io/exrinputfile.h 2014-02-14 16:26:47.293497092 +0400 |
709 |
-@@ -48,10 +48,9 @@ |
710 |
- |
711 |
- #include <aqsis/tex/io/itexinputfile.h> |
712 |
- |
713 |
-+#include <OpenEXR/ImfInputFile.h> |
714 |
-+ |
715 |
- //------------------------------------------------------------------------------ |
716 |
--namespace Imf { |
717 |
-- class InputFile; |
718 |
--} |
719 |
- |
720 |
- namespace Aqsis { |
721 |
- |
722 |
|
723 |
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 |
724 |
deleted file mode 100644 |
725 |
index 621853e245e..00000000000 |
726 |
--- a/media-gfx/aqsis/files/aqsis-1.8.2-pfto-boost-1.59.patch |
727 |
+++ /dev/null |
728 |
@@ -1,41 +0,0 @@ |
729 |
-Remove BOOST_MAKE_PFTO_WRAPPER macros, which were long deprecated |
730 |
-and finally removed with boost-1.59. |
731 |
- |
732 |
-diff -aur package.pristine/tools/displays/piqsl/piqsldisplay.cpp package.new/tools/displays/piqsl/piqsldisplay.cpp |
733 |
---- package.pristine/tools/displays/piqsl/piqsldisplay.cpp 2015-12-12 12:52:50.455773602 +0100 |
734 |
-+++ package.new/tools/displays/piqsl/piqsldisplay.cpp 2015-12-12 12:54:31.291661954 +0100 |
735 |
-@@ -450,8 +450,8 @@ |
736 |
- |
737 |
- TiXmlElement* bucketDataXML = new TiXmlElement("BucketData"); |
738 |
- std::stringstream base64Data; |
739 |
-- std::copy( base64_text(BOOST_MAKE_PFTO_WRAPPER(data)), |
740 |
-- base64_text(BOOST_MAKE_PFTO_WRAPPER(data + bufferlength)), |
741 |
-+ std::copy( base64_text(data), |
742 |
-+ base64_text(data + bufferlength), |
743 |
- std::ostream_iterator<char>(base64Data)); |
744 |
- TiXmlText* dataTextXML = new TiXmlText(base64Data.str()); |
745 |
- dataTextXML->SetCDATA(true); |
746 |
-diff -aur package.pristine/tools/piqsl/imagelistmodel.cpp package.new/tools/piqsl/imagelistmodel.cpp |
747 |
---- package.pristine/tools/piqsl/imagelistmodel.cpp 2015-12-12 12:52:50.465773524 +0100 |
748 |
-+++ package.new/tools/piqsl/imagelistmodel.cpp 2015-12-12 12:53:26.088831765 +0100 |
749 |
-@@ -42,11 +42,6 @@ |
750 |
- #include <boost/archive/iterators/transform_width.hpp> |
751 |
- #include <boost/archive/iterators/remove_whitespace.hpp> |
752 |
- #include <boost/version.hpp> |
753 |
--#if BOOST_VERSION < 103700 |
754 |
--# include <boost/pfto.hpp> |
755 |
--#else |
756 |
--# include <boost/serialization/pfto.hpp> |
757 |
--#endif |
758 |
- |
759 |
- |
760 |
- #include "displayserverimage.h" |
761 |
-@@ -286,7 +281,7 @@ |
762 |
- std::string data = dataText->Value(); |
763 |
- std::vector<unsigned char> binaryData; |
764 |
- binaryData.reserve(count); |
765 |
-- base64_binary ti_begin = base64_binary(BOOST_MAKE_PFTO_WRAPPER(data.begin())); |
766 |
-+ base64_binary ti_begin = base64_binary(data.begin()); |
767 |
- std::size_t padding = 2 - count % 3; |
768 |
- while(--count > 0) |
769 |
- { |
770 |
|
771 |
diff --git a/media-gfx/aqsis/files/aqsis-1.8.2-unbundle-tinyxml.patch b/media-gfx/aqsis/files/aqsis-1.8.2-unbundle-tinyxml.patch |
772 |
deleted file mode 100644 |
773 |
index 158c96aeabc..00000000000 |
774 |
--- a/media-gfx/aqsis/files/aqsis-1.8.2-unbundle-tinyxml.patch |
775 |
+++ /dev/null |
776 |
@@ -1,57 +0,0 @@ |
777 |
---- CMakeLists.txt.orig 2014-02-14 16:55:38.894647998 +0400 |
778 |
-+++ CMakeLists.txt 2014-02-14 16:56:14.017651059 +0400 |
779 |
-@@ -134,15 +134,15 @@ |
780 |
- endif() |
781 |
- endif() |
782 |
- |
783 |
--## find tinyxml. If not found we use the version distributed with the aqsis |
784 |
--## source. |
785 |
--#if(AQSIS_USE_EXTERNAL_TINYXML) |
786 |
--# find_package(TinyXML) |
787 |
--# if(NOT TINYXML_FOUND) |
788 |
--# message("** Cannot find external tinyxml library - using version included with the aqsis source.") |
789 |
--# set(AQSIS_USE_EXTERNAL_TINYXML OFF) |
790 |
--# endif() |
791 |
--#endif() |
792 |
-+# find tinyxml. If not found we use the version distributed with the aqsis |
793 |
-+# source. |
794 |
-+if(AQSIS_USE_EXTERNAL_TINYXML) |
795 |
-+ find_package(TinyXML) |
796 |
-+ if(NOT AQSIS_TINYXML_FOUND) |
797 |
-+ message("** Cannot find external tinyxml library - using version included with the aqsis source.") |
798 |
-+ set(AQSIS_USE_EXTERNAL_TINYXML OFF) |
799 |
-+ endif() |
800 |
-+endif() |
801 |
- |
802 |
- |
803 |
- #------------------------------------------------------------------------------- |
804 |
-@@ -274,7 +274,9 @@ |
805 |
- ) |
806 |
- |
807 |
- # Thirdparty libs |
808 |
--declare_subproject(thirdparty/tinyxml) |
809 |
-+if(NOT AQSIS_USE_EXTERNAL_TINYXML) |
810 |
-+ declare_subproject(thirdparty/tinyxml) |
811 |
-+endif() |
812 |
- declare_subproject(thirdparty/partio) |
813 |
- declare_subproject(libs/pointrender) |
814 |
- if(AQSIS_USE_PDIFF) |
815 |
---- tools/piqsl/CMakeLists.txt.orig 2014-02-16 11:18:43.308699170 +0400 |
816 |
-+++ tools/piqsl/CMakeLists.txt 2014-02-16 11:18:52.620699981 +0400 |
817 |
-@@ -5,8 +5,6 @@ |
818 |
- message(FATAL_ERROR "Piqsl requires boost thread and Qt4 to build") |
819 |
- endif() |
820 |
- |
821 |
--include_subproject(tinyxml) |
822 |
-- |
823 |
- set(piqsl_hdrs |
824 |
- displayserverimage.h |
825 |
- image.h |
826 |
---- tools/displays/piqsl/CMakeLists.txt.orig 2014-02-16 11:21:25.820713332 +0400 |
827 |
-+++ tools/displays/piqsl/CMakeLists.txt 2014-02-16 11:21:34.676714104 +0400 |
828 |
-@@ -1,5 +1,4 @@ |
829 |
- include_subproject(dspyutil) |
830 |
--include_subproject(tinyxml) |
831 |
- |
832 |
- aqsis_add_display(piqsl piqsldisplay.cpp ${dspyutil_srcs} |
833 |
- ${tinyxml_srcs} ${tinyxml_hdrs} |
834 |
|
835 |
diff --git a/media-gfx/aqsis/metadata.xml b/media-gfx/aqsis/metadata.xml |
836 |
deleted file mode 100644 |
837 |
index db7d814b78a..00000000000 |
838 |
--- a/media-gfx/aqsis/metadata.xml |
839 |
+++ /dev/null |
840 |
@@ -1,11 +0,0 @@ |
841 |
-<?xml version="1.0" encoding="UTF-8"?> |
842 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
843 |
-<pkgmetadata> |
844 |
- <maintainer type="project"> |
845 |
- <email>graphics@g.o</email> |
846 |
- <name>Gentoo Graphics Project</name> |
847 |
- </maintainer> |
848 |
- <upstream> |
849 |
- <remote-id type="sourceforge">aqsis</remote-id> |
850 |
- </upstream> |
851 |
-</pkgmetadata> |