diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /media-gfx/aqsis |
reinit the tree, so we can have metadata
Diffstat (limited to 'media-gfx/aqsis')
-rw-r--r-- | media-gfx/aqsis/Manifest | 10 | ||||
-rw-r--r-- | media-gfx/aqsis/aqsis-1.8.2.ebuild | 61 | ||||
-rw-r--r-- | media-gfx/aqsis/files/aqsis-1.8.2-boost-join-moc.patch | 568 | ||||
-rw-r--r-- | media-gfx/aqsis/files/aqsis-1.8.2-gcc6.patch | 23 | ||||
-rw-r--r-- | media-gfx/aqsis/files/aqsis-1.8.2-openexr-compat.patch | 15 | ||||
-rw-r--r-- | media-gfx/aqsis/files/aqsis-1.8.2-pfto-boost-1.59.patch | 41 | ||||
-rw-r--r-- | media-gfx/aqsis/files/aqsis-1.8.2-unbundle-tinyxml.patch | 57 | ||||
-rw-r--r-- | media-gfx/aqsis/metadata.xml | 11 |
8 files changed, 786 insertions, 0 deletions
diff --git a/media-gfx/aqsis/Manifest b/media-gfx/aqsis/Manifest new file mode 100644 index 000000000000..e38c130ed72a --- /dev/null +++ b/media-gfx/aqsis/Manifest @@ -0,0 +1,10 @@ +AUX aqsis-1.8.2-boost-join-moc.patch 13879 SHA256 82babf014959d3929e17436a36bb1f2c2a9e666c15705cf0e43202e0f07042b9 SHA512 dcc0cd94c7239b210fddf93a4eac52ae87a1f6197e025b08d6e727ad96c1f6d1299edaf411c02c3b0e62d09bca311300282b7bc05725550306764dc7bc8a588a WHIRLPOOL 3a3b60eb3a15c387102d5b7f5eb3cfea827d4caef818162c410baed3def45dbcb3a0da0b2036795b22ac15cdf9d7754ad68b63eb98d9b7738f31f620c1f1dd45 +AUX aqsis-1.8.2-gcc6.patch 1037 SHA256 2227dab638d2f7214447da6d9deec040f5144392d3b835d07669ea58d4d11c94 SHA512 44d0b6c581666cfa904112d28a75abf082d462419b0ed7871d4e82bae4a50e68cb4b470966a50866fdcc606b9e51be0d6640b647222573b1c2dd26b5bea52aba WHIRLPOOL d9f916d095e89042ac5a7cf6ae4bab918061419f1a32d78f7e8f24ae8aff67622c85c7a30fafff1dfd6a94845c36ea03be52124609e12f962b0989c9d8b81668 +AUX aqsis-1.8.2-openexr-compat.patch 384 SHA256 c0dc89b88ad1faed2ecf55dd978210583f5202cf1808f8d39e461a9e11997183 SHA512 43e903cf2e81b1581c1e391b18aabe1aa5538187c2cb54fc5b105bcbad0e44ac51e5b8c50f6f5e8d4b18b96931ec79870e3e68a5970d270b47a93d22cdb8e332 WHIRLPOOL 8c292a0a8ef293ddc7afe910da045b5a63165dabe160083e7997d875c7cb55bf3e9ee447d9611484964ed2d5f0d5e365494b7d2545f3f2d7b8d9425b7bf6d80d +AUX aqsis-1.8.2-pfto-boost-1.59.patch 2024 SHA256 64dc1f7b4cf08faa80f1215c17589d5132dd3687e55a635ab463bf7b838d6faa SHA512 2510fc40b617c8a54603950894a14329be8a3fc6292c1e000331e0e90a664abd2f1895c90a63595b3513ec6b3210912c6b6378f8ee78ee5339af0b38bcf36545 WHIRLPOOL 253cc1cd200539f32bb420f8becba682fd1ffd46aadcbc7346029285278aee87806f4213e89d8e49db5da6a7b65518d2efe893bd8c0ad808a56f55ef1cb5fbac +AUX aqsis-1.8.2-unbundle-tinyxml.patch 1835 SHA256 7952a88118edd3b2356ec149a56c32cca1c044ea880d41bc8963b8c6da6a0a3f SHA512 836b5f19544c04c245d4772f64ba689a6590e90bf510c1aad11560589fb9b6f11821716bfb15f2e366a1439a401de08b13f39398d18f95eeb1b42afaa458bccc WHIRLPOOL 875993ca1b46ecf7fde6cc9a808e136af4e7b1e62a96915ece0754b8ac92d162665f72ceb577279d7b869497c5bf1cd8cfa24d593c391f6f44b29e7917da46f2 +DIST aqsis-1.8.2.tar.gz 5669285 SHA256 25f644eb69dfe6f89c76f95615e897c6d74053fe72cc2069713855f80e791098 SHA512 b571f9cfa46c0f1e659b054835698fe90f4d9bf43bea54caea257ac0b9d1d65fca68a0ea874772d18c98194630e13528acefb0e852ef398f353b1d1bb545cecc WHIRLPOOL 57514e5943f48946db78f1fe88fd884d844318c7dd92a7d260beb0c6302f5c2fa71d0e97b0a58f0f9f16388eec5b0097106e6142906aa503a7b9f5f833377079 +EBUILD aqsis-1.8.2.ebuild 1333 SHA256 9d98abfe0845435dfd4e543249db223cc7e41e2ccdbf99a6c573b631aeb5d4a5 SHA512 af53b6ef5b042e831cf132f79f6dfd8de534c925907990d2b228fc574cc3b2d3af6dee3f5c1129ac50ee5cb2f5995c6a0f86dddb2af95daf90878f0ad35f5f53 WHIRLPOOL d9c337425ce9818227d2a0211b591871611f9d14b560f2942c686dc55423bc93de3807d788c73af8aa38f77d76a84b9939c808f3e1a2539022032d3bb10a5b56 +MISC ChangeLog 2826 SHA256 4f53e13a51c6ff0fba6c2a70a1efbf4162999721f68d91aa7490210e91868adb SHA512 5103d621406bd1ba6958a5b5161a51a9bf5a2d4d1916421b6ad9e12df6e3454eefbf5f7dec61c919ad7694b18d527cae45fbb89a87d21404188284a15b15b18f WHIRLPOOL 88711c2f1f6d9fdb891b8823d0bf3d6d46330c33b2a6ac914e193f5e3ab5702dd4c792e71b9cebf7dc823f55530385e1083a8da392f33b29f84ad09725edea96 +MISC ChangeLog-2015 3964 SHA256 8eed6e036042c96c6410c31fae03fff0078ce7debaa07f47e246c9de8d797789 SHA512 70c180359000ceb3f7dc7802cd01383e2d7976589553a3056b1ac5fc1ec705e91a6f35865be50c39e6989e4643dd3e2f59064dce05546fac443e35c849951c65 WHIRLPOOL 1eda74f8c0a8cf9c801ab5942c30422ed7041a479073b7e07782bb64ea689727985c64b4a383707f234bec53a3c8e88995eeb29d074c0dac6cc1e2a2d7bfa838 +MISC metadata.xml 334 SHA256 7c4bc5470c81bf19458a32bb75054bb6d5bbee6869f773a050ddb480e4e83c11 SHA512 77c45ef76b18a09a1e492cbc1ebf6d3dfbf3183d7c7eccc88ae4ab6233acacd7529cec677352236bc489ee83619c9cbdd0f1896f6887b260a5bebb794a8118c7 WHIRLPOOL 5f8ed6c3b26fb59586dfcc4fba6e74ef1e02828201cbafff04c63ba5be79c1fd503d855fc91c646262f329e7cad7efaa3d64cce03388ff546fcec6b6fcfa9c27 diff --git a/media-gfx/aqsis/aqsis-1.8.2.ebuild b/media-gfx/aqsis/aqsis-1.8.2.ebuild new file mode 100644 index 000000000000..18ee7fcbed1d --- /dev/null +++ b/media-gfx/aqsis/aqsis-1.8.2.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit cmake-utils multilib + +DESCRIPTION="Open source RenderMan-compliant 3D rendering solution" +HOMEPAGE="http://www.aqsis.org" +SRC_URI="mirror://sourceforge/aqsis/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="png qt4" + +# OpenEXR currently can not be optional dependency, despite build system options +RDEPEND=" + dev-libs/boost:= + dev-libs/tinyxml + media-libs/tiff:0 + sys-libs/zlib + media-libs/openexr:= + png? ( media-libs/libpng:0= ) + qt4? ( dev-qt/qtgui:4 ) +" + +DEPEND="${RDEPEND} + dev-libs/libxslt + sys-devel/bison + sys-devel/flex +" + +DOCS=( AUTHORS INSTALL README ) + +PATCHES=( + "${FILESDIR}/${P}-openexr-compat.patch" + "${FILESDIR}/${P}-unbundle-tinyxml.patch" + "${FILESDIR}/${P}-pfto-boost-1.59.patch" + "${FILESDIR}/${P}-boost-join-moc.patch" + "${FILESDIR}/${P}-gcc6.patch" +) + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use png AQSIS_USE_PNG) + $(cmake-utils_use qt4 AQSIS_USE_QT) + -DAQSIS_ENABLE_DOCS=OFF + -DAQSIS_USE_EXTERNAL_TINYXML=ON + -DAQSIS_USE_OPENEXR=ON + -DAQSIS_USE_RPATH=OFF + -DLIBDIR="$(get_libdir)" + -DSYSCONFDIR="/etc" + ) + cmake-utils_src_configure +} + +src_install() { + newdoc "release-notes/1.8/summary-1.8.0.txt" ReleaseNotes + cmake-utils_src_install +} 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 new file mode 100644 index 000000000000..ce579d12242f --- /dev/null +++ b/media-gfx/aqsis/files/aqsis-1.8.2-boost-join-moc.patch @@ -0,0 +1,568 @@ +Add include guards to all boost includes, as qt's moc trips +over nested BOOST_JOIN macros: +* /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 +* /usr/include/boost/type_traits/detail/has_binary_operator.hp:50: Parse error at "BOOST_JOIN" +See also: https://bugs.gentoo.org/show_bug.cgi?id=574560 + +--- aqsis-1.8.2/tools/piqsl/piqsl_ui.cpp ++++ aqsis-1.8.2/tools/piqsl/piqsl_ui.cpp +@@ -42,7 +42,9 @@ + #include <QtGui/QPainter> + #include <QtGui/QImage> + ++#ifndef Q_MOC_RUN + #include <boost/thread.hpp> ++#endif + + #include <aqsis/version.h> + #include <aqsis/math/math.h> +--- aqsis-1.8.2/tools/piqsl/piqsl_ui.h ++++ aqsis-1.8.2/tools/piqsl/piqsl_ui.h +@@ -37,7 +37,9 @@ + + #include <QtGui/QStyledItemDelegate> + ++#ifndef Q_MOC_RUN + #include <boost/shared_ptr.hpp> ++#endif + + #include "image.h" + +--- aqsis-1.8.2/tools/piqsl/displayserverimage.cpp ++++ aqsis-1.8.2/tools/piqsl/displayserverimage.cpp +@@ -39,11 +39,13 @@ + #include <map> + #include <algorithm> + ++#ifndef Q_MOC_RUN + #include <boost/archive/iterators/base64_from_binary.hpp> + #include <boost/archive/iterators/transform_width.hpp> + #include <boost/archive/iterators/insert_linebreaks.hpp> + #include <boost/format.hpp> + #include <boost/filesystem.hpp> ++#endif + + #include "displayserverimage.h" + +--- aqsis-1.8.2/tools/piqsl/image.cpp ++++ aqsis-1.8.2/tools/piqsl/image.cpp +@@ -38,7 +38,9 @@ + + #include <float.h> + ++#ifndef Q_MOC_RUN + #include <boost/format.hpp> ++#endif + + #include <aqsis/version.h> + #include <aqsis/util/logging.h> +--- aqsis-1.8.2/tools/piqsl/image.h ++++ aqsis-1.8.2/tools/piqsl/image.h +@@ -46,10 +46,12 @@ + #include <QtCore/QObject> + #include <QtGui/QImage> + ++#ifndef Q_MOC_RUN + #include <boost/shared_ptr.hpp> + #include <boost/shared_array.hpp> + #include <boost/filesystem/path.hpp> + #include <boost/thread/mutex.hpp> ++#endif + + #include "tinyxml.h" + +--- aqsis-1.8.2/tools/piqsl/imagelistmodel.cpp ++++ aqsis-1.8.2/tools/piqsl/imagelistmodel.cpp +@@ -37,11 +37,13 @@ + #include <QtCore/QSocketNotifier> + #include <QtGui/QMessageBox> + ++#ifndef Q_MOC_RUN + #include <boost/thread/mutex.hpp> + #include <boost/archive/iterators/binary_from_base64.hpp> + #include <boost/archive/iterators/transform_width.hpp> + #include <boost/archive/iterators/remove_whitespace.hpp> + #include <boost/version.hpp> ++#endif + + + #include "displayserverimage.h" +--- aqsis-1.8.2/tools/piqsl/imagelistmodel.h ++++ aqsis-1.8.2/tools/piqsl/imagelistmodel.h +@@ -33,8 +33,10 @@ + + #include <QtCore/QAbstractListModel> + ++#ifndef Q_MOC_RUN + #include <boost/shared_ptr.hpp> + #include <boost/thread/thread.hpp> ++#endif + + #include <aqsis/util/socket.h> + #include "image.h" +--- aqsis-1.8.2/include/aqsis/core/interfacefwd.h ++++ aqsis-1.8.2/include/aqsis/core/interfacefwd.h +@@ -13,7 +13,9 @@ + #ifndef ___interfacefwd_Loaded___ + #define ___interfacefwd_Loaded___ + ++#ifndef Q_MOC_RUN + #include <boost/shared_ptr.hpp> ++#endif + + namespace Aqsis { + +--- aqsis-1.8.2/include/aqsis/core/ioptions.h ++++ aqsis-1.8.2/include/aqsis/core/ioptions.h +@@ -29,7 +29,9 @@ + + #include <aqsis/aqsis.h> + ++#ifndef Q_MOC_RUN + #include <boost/filesystem/path.hpp> ++#endif + + #include <aqsis/riutil/primvartype.h> + #include <aqsis/ri/ritypes.h> +--- aqsis-1.8.2/include/aqsis/core/irenderer.h ++++ aqsis-1.8.2/include/aqsis/core/irenderer.h +@@ -14,7 +14,9 @@ + #include <iosfwd> + #include <string> + ++#ifndef Q_MOC_RUN + #include <boost/function.hpp> ++#endif + + #include <aqsis/math/matrix.h> + #include <aqsis/core/itransform.h> +--- aqsis-1.8.2/include/aqsis/core/isurface.h ++++ aqsis-1.8.2/include/aqsis/core/isurface.h +@@ -12,7 +12,10 @@ + #define ___isurface_Loaded___ + + #include <vector> ++ ++#ifndef Q_MOC_RUN + #include <boost/shared_ptr.hpp> ++#endif + + #include <aqsis/aqsis.h> + #include <aqsis/math/matrix.h> +--- aqsis-1.8.2/include/aqsis/core/itransform.h ++++ aqsis-1.8.2/include/aqsis/core/itransform.h +@@ -12,7 +12,10 @@ + #define ___itransform_Loaded___ + + #include <aqsis/aqsis.h> ++ ++#ifndef Q_MOC_RUN + #include <boost/shared_ptr.hpp> ++#endif + + namespace Aqsis { + +--- aqsis-1.8.2/include/aqsis/math/math.h ++++ aqsis-1.8.2/include/aqsis/math/math.h +@@ -30,8 +30,10 @@ + #include <cmath> + #include <limits> + ++#ifndef Q_MOC_RUN + #include <boost/utility/enable_if.hpp> + #include <boost/type_traits/arithmetic_traits.hpp> ++#endif + + namespace Aqsis { + // These inline functions are intended to eventually replace all the old macros +--- aqsis-1.8.2/include/aqsis/riutil/ricxxutil.h ++++ aqsis-1.8.2/include/aqsis/riutil/ricxxutil.h +@@ -48,7 +48,9 @@ + #include <aqsis/riutil/interpclasscounts.h> + #include <aqsis/util/exception.h> + ++#ifndef Q_MOC_RUN + #include <boost/function.hpp> ++#endif + + namespace Aqsis { + +--- aqsis-1.8.2/include/aqsis/shadervm/ishaderexecenv.h ++++ aqsis-1.8.2/include/aqsis/shadervm/ishaderexecenv.h +@@ -28,7 +28,9 @@ + + #include <aqsis/aqsis.h> + ++#ifndef Q_MOC_RUN + #include <boost/shared_ptr.hpp> ++#endif + + #include <aqsis/shadervm/ishaderdata.h> + #include <aqsis/math/vector3d.h> +--- aqsis-1.8.2/include/aqsis/shadervm/ishader.h ++++ aqsis-1.8.2/include/aqsis/shadervm/ishader.h +@@ -19,7 +19,9 @@ + #include <vector> + #include <iosfwd> + ++#ifndef Q_MOC_RUN + #include <boost/shared_ptr.hpp> ++#endif + + #include <aqsis/core/interfacefwd.h> + #include <aqsis/riutil/primvartype.h> +--- aqsis-1.8.2/include/aqsis/tex/buffers/channellist.h ++++ aqsis-1.8.2/include/aqsis/tex/buffers/channellist.h +@@ -43,7 +43,9 @@ + #include <iosfwd> + #include <vector> + ++#ifndef Q_MOC_RUN + #include <boost/format.hpp> ++#endif + + #include <aqsis/tex/buffers/channelinfo.h> + #include <aqsis/tex/texexception.h> +--- aqsis-1.8.2/include/aqsis/tex/buffers/mixedimagebuffer.h ++++ aqsis-1.8.2/include/aqsis/tex/buffers/mixedimagebuffer.h +@@ -45,9 +45,11 @@ + #include <string> + #include <vector> + ++#ifndef Q_MOC_RUN + #include <boost/shared_array.hpp> + #include <boost/shared_ptr.hpp> + #include <boost/utility.hpp> ++#endif + + #include <aqsis/math/math.h> + #include <aqsis/tex/buffers/channellist.h> +--- aqsis-1.8.2/include/aqsis/tex/buffers/texturebuffer.h ++++ aqsis-1.8.2/include/aqsis/tex/buffers/texturebuffer.h +@@ -42,7 +42,9 @@ + + #include <aqsis/aqsis.h> + ++#ifndef Q_MOC_RUN + #include <boost/shared_array.hpp> ++#endif + + #include <aqsis/tex/buffers/channellist.h> + #include <aqsis/tex/buffers/samplevector.h> +--- aqsis-1.8.2/include/aqsis/tex/buffers/tilearray.h ++++ aqsis-1.8.2/include/aqsis/tex/buffers/tilearray.h +@@ -43,10 +43,12 @@ + + #include <vector> + ++#ifndef Q_MOC_RUN + #include <boost/intrusive_ptr.hpp> + #include <boost/scoped_ptr.hpp> + #include <boost/scoped_array.hpp> + #include <boost/noncopyable.hpp> ++#endif + + //#include <aqsis/util/memorysentry.h> + #include <aqsis/tex/io/itiledtexinputfile.h> +--- aqsis-1.8.2/include/aqsis/tex/filtering/ienvironmentsampler.h ++++ aqsis-1.8.2/include/aqsis/tex/filtering/ienvironmentsampler.h +@@ -40,7 +40,9 @@ + + #include <aqsis/aqsis.h> + ++#ifndef Q_MOC_RUN + #include <boost/shared_ptr.hpp> ++#endif + + #include <aqsis/tex/filtering/samplequad.h> + #include <aqsis/tex/filtering/texturesampleoptions.h> +--- aqsis-1.8.2/include/aqsis/tex/filtering/iocclusionsampler.h ++++ aqsis-1.8.2/include/aqsis/tex/filtering/iocclusionsampler.h +@@ -40,7 +40,9 @@ + + #include <aqsis/aqsis.h> + ++#ifndef Q_MOC_RUN + #include <boost/shared_ptr.hpp> ++#endif + + #include <aqsis/math/matrix.h> + #include <aqsis/tex/filtering/samplequad.h> +--- aqsis-1.8.2/include/aqsis/tex/filtering/ishadowsampler.h ++++ aqsis-1.8.2/include/aqsis/tex/filtering/ishadowsampler.h +@@ -40,7 +40,9 @@ + + #include <aqsis/aqsis.h> + ++#ifndef Q_MOC_RUN + #include <boost/shared_ptr.hpp> ++#endif + + #include <aqsis/math/matrix.h> + #include <aqsis/tex/filtering/samplequad.h> +--- aqsis-1.8.2/include/aqsis/tex/filtering/itexturecache.h ++++ aqsis-1.8.2/include/aqsis/tex/filtering/itexturecache.h +@@ -40,8 +40,10 @@ + + #include <aqsis/aqsis.h> + ++#ifndef Q_MOC_RUN + #include <boost/function.hpp> + #include <boost/shared_ptr.hpp> ++#endif + + namespace Aqsis { + +--- aqsis-1.8.2/include/aqsis/tex/filtering/itexturesampler.h ++++ aqsis-1.8.2/include/aqsis/tex/filtering/itexturesampler.h +@@ -40,7 +40,9 @@ + + #include <aqsis/aqsis.h> + ++#ifndef Q_MOC_RUN + #include <boost/shared_ptr.hpp> ++#endif + + #include <aqsis/tex/filtering/samplequad.h> + #include <aqsis/tex/filtering/texturesampleoptions.h> +--- aqsis-1.8.2/include/aqsis/tex/io/itiledtexinputfile.h ++++ aqsis-1.8.2/include/aqsis/tex/io/itiledtexinputfile.h +@@ -40,7 +40,9 @@ + + #include <aqsis/aqsis.h> + ++#ifndef Q_MOC_RUN + #include <boost/shared_ptr.hpp> ++#endif + + #include <aqsis/util/file.h> + #include <aqsis/tex/io/imagefiletype.h> +--- aqsis-1.8.2/include/aqsis/tex/io/texfileheader.h ++++ aqsis-1.8.2/include/aqsis/tex/io/texfileheader.h +@@ -44,8 +44,10 @@ + #include <iostream> + #include <map> + ++#ifndef Q_MOC_RUN + #include <boost/any.hpp> + #include <boost/shared_ptr.hpp> ++#endif + + #include <aqsis/tex/io/texfileattributes.h> + +--- aqsis-1.8.2/include/aqsis/util/autobuffer.h ++++ aqsis-1.8.2/include/aqsis/util/autobuffer.h +@@ -41,7 +41,9 @@ + + #include <aqsis/aqsis.h> + ++#ifndef Q_MOC_RUN + #include <boost/scoped_array.hpp> ++#endif + + namespace Aqsis { + +--- aqsis-1.8.2/include/aqsis/util/enum.h ++++ aqsis-1.8.2/include/aqsis/util/enum.h +@@ -122,7 +122,9 @@ + #include <string> + #include <vector> + ++#ifndef Q_MOC_RUN + #include <boost/static_assert.hpp> ++#endif + + #include <aqsis/util/sstring.h> // for CqString::hash() + +--- aqsis-1.8.2/include/aqsis/util/execute.h ++++ aqsis-1.8.2/include/aqsis/util/execute.h +@@ -30,7 +30,9 @@ + + #include <aqsis/aqsis.h> + ++#ifndef Q_MOC_RUN + #include <boost/function.hpp> ++#endif + + #include <string> + #include <vector> +--- aqsis-1.8.2/include/aqsis/util/file.h ++++ aqsis-1.8.2/include/aqsis/util/file.h +@@ -32,8 +32,10 @@ + + #include <string> + ++#ifndef Q_MOC_RUN + #include <boost/filesystem/path.hpp> + #include <boost/tokenizer.hpp> ++#endif + + namespace Aqsis { + +--- aqsis-1.8.2/include/aqsis/util/popen.h ++++ aqsis-1.8.2/include/aqsis/util/popen.h +@@ -41,9 +41,11 @@ + #include <string> + #include <vector> + ++#ifndef Q_MOC_RUN + #include <boost/iostreams/concepts.hpp> + #include <boost/iostreams/stream.hpp> + #include <boost/shared_ptr.hpp> ++#endif + + #ifndef AQSIS_POPEN_H_INCLUDED + #define AQSIS_POPEN_H_INCLUDED +--- aqsis-1.8.2/include/aqsis/util/socket.h ++++ aqsis-1.8.2/include/aqsis/util/socket.h +@@ -32,7 +32,9 @@ + + #include <sstream> + ++#ifndef Q_MOC_RUN + #include <boost/utility.hpp> ++#endif + + #ifdef AQSIS_SYSTEM_WIN32 + # include <winsock2.h> +--- aqsis-1.8.2/include/aqsis/util/timer.h ++++ aqsis-1.8.2/include/aqsis/util/timer.h +@@ -39,8 +39,10 @@ + #include <ctime> + #include <vector> + ++#ifndef Q_MOC_RUN + #include <boost/shared_ptr.hpp> + #include <boost/timer.hpp> ++#endif + + namespace Aqsis { + +--- aqsis-1.8.2/tools/aqsl/aqsl.cpp ++++ aqsis-1.8.2/tools/aqsl/aqsl.cpp +@@ -36,7 +36,10 @@ + #include <cstring> + #include <string> + #include <vector> ++ ++#ifndef Q_MOC_RUN + #include <boost/scoped_ptr.hpp> ++#endif + + #ifdef AQSIS_SYSTEM_WIN32 + #include "io.h" +--- aqsis-1.8.2/tools/displays/exr/d_exr.cpp ++++ aqsis-1.8.2/tools/displays/exr/d_exr.cpp +@@ -98,7 +98,9 @@ + + #include <assert.h> + ++#ifndef Q_MOC_RUN + #include <boost/shared_ptr.hpp> ++#endif + + // Lower the warning level to eliminate unavoidable warnings from the OpenEXR headers. + #if AQSIS_SYSTEM_WIN32 && (defined(AQSIS_COMPILER_MSVC6) || defined(AQSIS_COMPILER_MSVC7)) +--- aqsis-1.8.2/tools/displays/piqsl/piqsldisplay.cpp ++++ aqsis-1.8.2/tools/displays/piqsl/piqsldisplay.cpp +@@ -33,10 +33,12 @@ + #include <map> + #include <vector> + ++#ifndef Q_MOC_RUN + #include <boost/archive/iterators/base64_from_binary.hpp> + #include <boost/archive/iterators/transform_width.hpp> + #include <boost/archive/iterators/insert_linebreaks.hpp> + #include <boost/shared_ptr.hpp> ++#endif + + #ifdef AQSIS_SYSTEM_WIN32 + #include <winsock2.h> +--- aqsis-1.8.2/tools/eqsl/eqsl.cpp ++++ aqsis-1.8.2/tools/eqsl/eqsl.cpp +@@ -55,9 +55,11 @@ + #include <QtGui/QStatusBar> + #include <QtGui/QTabWidget> + ++#ifndef Q_MOC_RUN + #include <boost/thread.hpp> + #include <boost/regex.hpp> + #include <boost/lexical_cast.hpp> ++#endif + + #include <aqsis/version.h> + #include <aqsis/util/execute.h> +--- aqsis-1.8.2/tools/miqser/miqser.cpp ++++ aqsis-1.8.2/tools/miqser/miqser.cpp +@@ -44,7 +44,9 @@ + #include <cstring> + #include <cstdlib> + ++#ifndef Q_MOC_RUN + #include <boost/shared_ptr.hpp> ++#endif + + #include <aqsis/util/argparse.h> + #include <aqsis/util/exception.h> +--- aqsis-1.8.2/tools/procedurals/hairgen/hair.cpp ++++ aqsis-1.8.2/tools/procedurals/hairgen/hair.cpp +@@ -37,8 +37,10 @@ + #include <aqsis/math/math.h> + #include <aqsis/math/matrix.h> + ++#ifndef Q_MOC_RUN + #include <boost/tokenizer.hpp> + #include <boost/algorithm/string/trim.hpp> ++#endif + + // project includes + #include "primvar.h" +--- aqsis-1.8.2/tools/procedurals/hairgen/parenthairs.h ++++ aqsis-1.8.2/tools/procedurals/hairgen/parenthairs.h +@@ -35,7 +35,9 @@ + #include <vector> + #include <iosfwd> + ++#ifndef Q_MOC_RUN + #include <boost/scoped_ptr.hpp> ++#endif + + #include "kdtree/kdtree2.hpp" + #include "primvar.h" +--- aqsis-1.8.2/tools/procedurals/hairgen/primvar.h ++++ aqsis-1.8.2/tools/procedurals/hairgen/primvar.h +@@ -37,7 +37,9 @@ + #include <vector> + #include <stdexcept> + ++#ifndef Q_MOC_RUN + #include <boost/shared_ptr.hpp> ++#endif + + #include <aqsis/riutil/primvartoken.h> + #include <aqsis/ri/ri.h> +--- aqsis-1.8.2/tools/ptview/ptview.cpp ++++ aqsis-1.8.2/tools/ptview/ptview.cpp +@@ -38,7 +38,9 @@ + #include <QtGui/QFileDialog> + #include <QtGui/QColorDialog> + ++#ifndef Q_MOC_RUN + #include <boost/program_options.hpp> ++#endif + + #define NOMINMAX + #include <OpenEXR/ImathVec.h> +--- aqsis-1.8.2/tools/ptview/ptview.h ++++ aqsis-1.8.2/tools/ptview/ptview.h +@@ -33,8 +33,10 @@ + #include <cmath> + #include <vector> + ++#ifndef Q_MOC_RUN + #include <boost/shared_ptr.hpp> + #include <boost/shared_array.hpp> ++#endif + + #include <QtGui/QMainWindow> + #include <QtOpenGL/QGLWidget> diff --git a/media-gfx/aqsis/files/aqsis-1.8.2-gcc6.patch b/media-gfx/aqsis/files/aqsis-1.8.2-gcc6.patch new file mode 100644 index 000000000000..c51f669c09b5 --- /dev/null +++ b/media-gfx/aqsis/files/aqsis-1.8.2-gcc6.patch @@ -0,0 +1,23 @@ +From d450f4aac8c107f82b18df7789afb52b502eaba0 Mon Sep 17 00:00:00 2001 +From: Hodorgasm <nsane457@gmail.com> +Date: Mon, 19 Sep 2016 22:58:44 -0400 +Subject: [PATCH] Use "!file.fail()" instead of "file != NULL" + +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. +--- + libs/core/texturing_old/shadowmap_old.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libs/core/texturing_old/shadowmap_old.cpp b/libs/core/texturing_old/shadowmap_old.cpp +index 1a22491..fbcac59 100644 +--- a/libs/core/texturing_old/shadowmap_old.cpp ++++ b/libs/core/texturing_old/shadowmap_old.cpp +@@ -176,7 +176,7 @@ void CqShadowMapOld::LoadZFile() + { + std::ifstream file( m_strName.c_str(), std::ios::in | std::ios::binary ); + +- if ( file != NULL ) ++ if ( !file.fail() ) + { + // Save a file type and version marker + TqPchar origHeader = tokenCast(ZFILE_HEADER); 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 new file mode 100644 index 000000000000..155c93ebb295 --- /dev/null +++ b/media-gfx/aqsis/files/aqsis-1.8.2-openexr-compat.patch @@ -0,0 +1,15 @@ +--- libs/tex/io/exrinputfile.h.orig 2012-08-24 16:26:50.000000000 +0400 ++++ libs/tex/io/exrinputfile.h 2014-02-14 16:26:47.293497092 +0400 +@@ -48,10 +48,9 @@ + + #include <aqsis/tex/io/itexinputfile.h> + ++#include <OpenEXR/ImfInputFile.h> ++ + //------------------------------------------------------------------------------ +-namespace Imf { +- class InputFile; +-} + + namespace Aqsis { + 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 new file mode 100644 index 000000000000..621853e245e5 --- /dev/null +++ b/media-gfx/aqsis/files/aqsis-1.8.2-pfto-boost-1.59.patch @@ -0,0 +1,41 @@ +Remove BOOST_MAKE_PFTO_WRAPPER macros, which were long deprecated +and finally removed with boost-1.59. + +diff -aur package.pristine/tools/displays/piqsl/piqsldisplay.cpp package.new/tools/displays/piqsl/piqsldisplay.cpp +--- package.pristine/tools/displays/piqsl/piqsldisplay.cpp 2015-12-12 12:52:50.455773602 +0100 ++++ package.new/tools/displays/piqsl/piqsldisplay.cpp 2015-12-12 12:54:31.291661954 +0100 +@@ -450,8 +450,8 @@ + + TiXmlElement* bucketDataXML = new TiXmlElement("BucketData"); + std::stringstream base64Data; +- std::copy( base64_text(BOOST_MAKE_PFTO_WRAPPER(data)), +- base64_text(BOOST_MAKE_PFTO_WRAPPER(data + bufferlength)), ++ std::copy( base64_text(data), ++ base64_text(data + bufferlength), + std::ostream_iterator<char>(base64Data)); + TiXmlText* dataTextXML = new TiXmlText(base64Data.str()); + dataTextXML->SetCDATA(true); +diff -aur package.pristine/tools/piqsl/imagelistmodel.cpp package.new/tools/piqsl/imagelistmodel.cpp +--- package.pristine/tools/piqsl/imagelistmodel.cpp 2015-12-12 12:52:50.465773524 +0100 ++++ package.new/tools/piqsl/imagelistmodel.cpp 2015-12-12 12:53:26.088831765 +0100 +@@ -42,11 +42,6 @@ + #include <boost/archive/iterators/transform_width.hpp> + #include <boost/archive/iterators/remove_whitespace.hpp> + #include <boost/version.hpp> +-#if BOOST_VERSION < 103700 +-# include <boost/pfto.hpp> +-#else +-# include <boost/serialization/pfto.hpp> +-#endif + + + #include "displayserverimage.h" +@@ -286,7 +281,7 @@ + std::string data = dataText->Value(); + std::vector<unsigned char> binaryData; + binaryData.reserve(count); +- base64_binary ti_begin = base64_binary(BOOST_MAKE_PFTO_WRAPPER(data.begin())); ++ base64_binary ti_begin = base64_binary(data.begin()); + std::size_t padding = 2 - count % 3; + while(--count > 0) + { 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 new file mode 100644 index 000000000000..158c96aeabce --- /dev/null +++ b/media-gfx/aqsis/files/aqsis-1.8.2-unbundle-tinyxml.patch @@ -0,0 +1,57 @@ +--- CMakeLists.txt.orig 2014-02-14 16:55:38.894647998 +0400 ++++ CMakeLists.txt 2014-02-14 16:56:14.017651059 +0400 +@@ -134,15 +134,15 @@ + endif() + endif() + +-## find tinyxml. If not found we use the version distributed with the aqsis +-## source. +-#if(AQSIS_USE_EXTERNAL_TINYXML) +-# find_package(TinyXML) +-# if(NOT TINYXML_FOUND) +-# message("** Cannot find external tinyxml library - using version included with the aqsis source.") +-# set(AQSIS_USE_EXTERNAL_TINYXML OFF) +-# endif() +-#endif() ++# find tinyxml. If not found we use the version distributed with the aqsis ++# source. ++if(AQSIS_USE_EXTERNAL_TINYXML) ++ find_package(TinyXML) ++ if(NOT AQSIS_TINYXML_FOUND) ++ message("** Cannot find external tinyxml library - using version included with the aqsis source.") ++ set(AQSIS_USE_EXTERNAL_TINYXML OFF) ++ endif() ++endif() + + + #------------------------------------------------------------------------------- +@@ -274,7 +274,9 @@ + ) + + # Thirdparty libs +-declare_subproject(thirdparty/tinyxml) ++if(NOT AQSIS_USE_EXTERNAL_TINYXML) ++ declare_subproject(thirdparty/tinyxml) ++endif() + declare_subproject(thirdparty/partio) + declare_subproject(libs/pointrender) + if(AQSIS_USE_PDIFF) +--- tools/piqsl/CMakeLists.txt.orig 2014-02-16 11:18:43.308699170 +0400 ++++ tools/piqsl/CMakeLists.txt 2014-02-16 11:18:52.620699981 +0400 +@@ -5,8 +5,6 @@ + message(FATAL_ERROR "Piqsl requires boost thread and Qt4 to build") + endif() + +-include_subproject(tinyxml) +- + set(piqsl_hdrs + displayserverimage.h + image.h +--- tools/displays/piqsl/CMakeLists.txt.orig 2014-02-16 11:21:25.820713332 +0400 ++++ tools/displays/piqsl/CMakeLists.txt 2014-02-16 11:21:34.676714104 +0400 +@@ -1,5 +1,4 @@ + include_subproject(dspyutil) +-include_subproject(tinyxml) + + aqsis_add_display(piqsl piqsldisplay.cpp ${dspyutil_srcs} + ${tinyxml_srcs} ${tinyxml_hdrs} diff --git a/media-gfx/aqsis/metadata.xml b/media-gfx/aqsis/metadata.xml new file mode 100644 index 000000000000..db7d814b78af --- /dev/null +++ b/media-gfx/aqsis/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>graphics@gentoo.org</email> + <name>Gentoo Graphics Project</name> + </maintainer> + <upstream> + <remote-id type="sourceforge">aqsis</remote-id> + </upstream> +</pkgmetadata> |