diff options
Diffstat (limited to 'media-gfx')
40 files changed, 597 insertions, 1005 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz Binary files differindex 62c5c03da4db..d84bdad02cd5 100644 --- a/media-gfx/Manifest.gz +++ b/media-gfx/Manifest.gz diff --git a/media-gfx/aqsis/Manifest b/media-gfx/aqsis/Manifest deleted file mode 100644 index 0b4e846b1c01..000000000000 --- a/media-gfx/aqsis/Manifest +++ /dev/null @@ -1,8 +0,0 @@ -AUX aqsis-1.8.2-boost-join-moc.patch 13879 BLAKE2B fbd32757f4bbe7483b1d9eec87b5e01d25a596e27189480a7a22386556d8764571f61a1d2e87abaec6f99c0d270657311292af2bb31d3779b394abd2ba0b52c8 SHA512 dcc0cd94c7239b210fddf93a4eac52ae87a1f6197e025b08d6e727ad96c1f6d1299edaf411c02c3b0e62d09bca311300282b7bc05725550306764dc7bc8a588a -AUX aqsis-1.8.2-gcc6.patch 1037 BLAKE2B f0f4342f09214731cb366acd4a8f9dd796ef40da720709234aeacc3a3548351812bf60f1d970b92e7ef0053f14eaa1e1c649fc1bc58f6ca5f4c7c388e480dbea SHA512 44d0b6c581666cfa904112d28a75abf082d462419b0ed7871d4e82bae4a50e68cb4b470966a50866fdcc606b9e51be0d6640b647222573b1c2dd26b5bea52aba -AUX aqsis-1.8.2-openexr-compat.patch 384 BLAKE2B 8ce781e45d7f68d2cbac761d95a1ba904022031ac65916ad8b812910199c141a6104c06683d2e448df3cb5206cdb26c98ddd93fb114a481f8db6decea12c4b96 SHA512 43e903cf2e81b1581c1e391b18aabe1aa5538187c2cb54fc5b105bcbad0e44ac51e5b8c50f6f5e8d4b18b96931ec79870e3e68a5970d270b47a93d22cdb8e332 -AUX aqsis-1.8.2-pfto-boost-1.59.patch 2024 BLAKE2B 590393122e3e113258071c37a09f4baa1c62efec4a68dfd40baf6157d8fb19be1b2f8eb7394c6702594f5b42cd1377b744ea5b94c61f63cdeb954a37a7a125c4 SHA512 2510fc40b617c8a54603950894a14329be8a3fc6292c1e000331e0e90a664abd2f1895c90a63595b3513ec6b3210912c6b6378f8ee78ee5339af0b38bcf36545 -AUX aqsis-1.8.2-unbundle-tinyxml.patch 1835 BLAKE2B 97c0dc773d7814248a52dfceafe02502b866b10881e4888b258f4568b4605582917287ce3557aaf8cf4d515d31f2d9edfc4b7f618032dc5f40a4a1facb03dd36 SHA512 836b5f19544c04c245d4772f64ba689a6590e90bf510c1aad11560589fb9b6f11821716bfb15f2e366a1439a401de08b13f39398d18f95eeb1b42afaa458bccc -DIST aqsis-1.8.2.tar.gz 5669285 BLAKE2B 1ac1ad7837812f8484634d39545df413e9b0916fb5cf8e0ef8506ec9a10395d8cf6ff303b5735634c161db9bf147785a2a087f10a63789886b58f982d36629bf SHA512 b571f9cfa46c0f1e659b054835698fe90f4d9bf43bea54caea257ac0b9d1d65fca68a0ea874772d18c98194630e13528acefb0e852ef398f353b1d1bb545cecc -EBUILD aqsis-1.8.2.ebuild 1333 BLAKE2B 071ea859bfc0dcf5a0109d6719a78397bd32d5cad9c29b9b0f9119ad34319bde6778306cc6f480b97d23feaddf339206a2ea4b71f9b8ea52d9de98e86fda5022 SHA512 af53b6ef5b042e831cf132f79f6dfd8de534c925907990d2b228fc574cc3b2d3af6dee3f5c1129ac50ee5cb2f5995c6a0f86dddb2af95daf90878f0ad35f5f53 -MISC metadata.xml 334 BLAKE2B b2e9f5d8daa01e966f0efa311b98b625ae850b9b136c0d951abb05ea9d1b34a781372417da3a20eff0100db6c6ed9caf1ee4e90b2ba02cd2c1a10bee0b6bc182 SHA512 77c45ef76b18a09a1e492cbc1ebf6d3dfbf3183d7c7eccc88ae4ab6233acacd7529cec677352236bc489ee83619c9cbdd0f1896f6887b260a5bebb794a8118c7 diff --git a/media-gfx/aqsis/aqsis-1.8.2.ebuild b/media-gfx/aqsis/aqsis-1.8.2.ebuild deleted file mode 100644 index 18ee7fcbed1d..000000000000 --- a/media-gfx/aqsis/aqsis-1.8.2.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# 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 deleted file mode 100644 index ce579d12242f..000000000000 --- a/media-gfx/aqsis/files/aqsis-1.8.2-boost-join-moc.patch +++ /dev/null @@ -1,568 +0,0 @@ -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 deleted file mode 100644 index c51f669c09b5..000000000000 --- a/media-gfx/aqsis/files/aqsis-1.8.2-gcc6.patch +++ /dev/null @@ -1,23 +0,0 @@ -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 deleted file mode 100644 index 155c93ebb295..000000000000 --- a/media-gfx/aqsis/files/aqsis-1.8.2-openexr-compat.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- 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 deleted file mode 100644 index 621853e245e5..000000000000 --- a/media-gfx/aqsis/files/aqsis-1.8.2-pfto-boost-1.59.patch +++ /dev/null @@ -1,41 +0,0 @@ -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 deleted file mode 100644 index 158c96aeabce..000000000000 --- a/media-gfx/aqsis/files/aqsis-1.8.2-unbundle-tinyxml.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- 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 deleted file mode 100644 index db7d814b78af..000000000000 --- a/media-gfx/aqsis/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?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> diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest index 8c48cdafaae7..413c36de2255 100644 --- a/media-gfx/blender/Manifest +++ b/media-gfx/blender/Manifest @@ -4,9 +4,11 @@ AUX blender-2.70-sse2.patch 1421 BLAKE2B d8566eccad25534f8c97100c7f12b630adec156 AUX blender-2.72-T42797.diff 342 BLAKE2B 0aa4724ae35004bc629db5c359059d4dd732d4f13fb9a8eabdde9cac9fbfcf009f52e435895405bd81180061ebab3c9a7030fbc257e967b2a1800753bcec37a3 SHA512 abe6c6e28a094ef76bad97c979f5927c464a8421a430bde3ea0fadc76eabd7a9049678a5d475363aba5e534fe12c8858ddcfd5e01fa39ba24ea79ebabec71407 AUX blender-2.72b-fix-util_simd.patch 292 BLAKE2B 176faae00e80e741297e0c06998b0c40d7b5a2d2939ca947094144ca90daf0a33d91ab0b7704aa32e09ef13f4aca9c79d5f969ecaad72251fc86e9b7bcce7a07 SHA512 17c328b9c64f1f42b4223d5f0777a68500235f95a85b761fdef216c5af4be17f67455e8044ab52fe6dd3e0bdfc6a7075cc3c21dae135a9cc7d174b6972b0326b AUX blender-2.72b-gcc6-fixes.patch 4828 BLAKE2B aa189c58028c61102be7f1b6485700fd8d2968e65f6f71b6a2527f38f4ada0039017c67d2110b4a532140f1903c7ea7fbeaffadebbafa781e07e900803bfeac8 SHA512 886d594a87aafe827ed65c6106c29c727ec31b92a3a2df32023cc2b728719c4e6e7a8418b725201d338331e23cca17a88f518b353735b33e40cee30a754050cc +AUX blender-2.79-fix-build-with-OSL-1.9.x.patch 1119 BLAKE2B f0289707d5383ee11af257b7d77a725e83aba3c086c12a4a2fb390bb5e02a27c4f3376083ddfd827e3ff3ca24212df4ea463062c6bea524aaee373847837986e SHA512 0a02efdcc6710d34e57ff99ff5c999cebeb7cf130fba76fa82ba29f0827ee63c97448eb01aa10982096d22b61fbc1751be5e1fe3154792e266b0c9dd04c54f42 AUX blender-fix-install-rules.patch 518 BLAKE2B 178929de7adb1b4a0063134da93248af8c2c42fe0d3e9730833272b4fe8387075ce592ee65668cc9862a1ad10c9857a31b3f1c0614c9e69f937998ccb5c86a17 SHA512 5343f0e9e6bba2d15a38cb5db95a1aeff0a704c0762e558b9b74d88dd58e2fb5077289f0d8f25a61fa092d083f7db916d27c4642dfd7cf84d4c989258c3253ec DIST blender-2.72b.tar.gz 52018242 BLAKE2B fa0b8ab3feaeb35e76d833415984eb21d7b6dca47b9e5fb337cdfbdc9924165d3345caa5608ee2849bf71855c917a6fa56d79d4f375b57ff367047ef92e8e0b9 SHA512 9767797621e443ff9b6810d1713dda110f883c33626d40d7fe5dda676f549e3591516dc24b75feebd85823dd13437c34521ca752139cd31ddacf31ea6b14e124 DIST blender-2.79.tar.gz 50145270 BLAKE2B 5c11b36840d4bf4a414f01d1f8efcbfb2879ce56c9e2ebe32d8bb0be3ce29fd194dec8b3aa5bca9bf664804c1be57d01394494fdfebc7a4d8257bd2c47866338 SHA512 9b81c41882f4e150476ebda5b301b78c2d35ea918394c8a01671fc031f7cb7a34b5a3d68b6a345f6d23fd9ecedd25bc0bd24f9f9b3ec771237ac4496bbde7d2f EBUILD blender-2.72b-r4.ebuild 8113 BLAKE2B a4d67b0ecd15f1a4f6eedb11d1160ef9514970052b2daa145848e8fc1247839bcfbeb61851a7c550be06b7153ea6e4e159932d36eddd7cb253d1bb6317221439 SHA512 837256447e727e165cb05e733236162ac03a82fa72a41e3a7d894c5efb60a26a959442cdc6eb528ad676b641f127b37d454080392ce54d14676cc8e29487c783 +EBUILD blender-2.79-r1.ebuild 8111 BLAKE2B a3812df81e30ed0bf22ffdffcdaf07f774b102a8012a9cac478689ba07d552feb87281c52e384829b9e894e5144b0efafd962f85cf66fe9ef41e6b8029b1a3b1 SHA512 29fd1536f1bcf1c99c752fea0fe256ce007a533177861cefdb73107dd2fe1e12f34ebaadc9ace523a9cf0383251697fd70145452320460be8bcd0db3e272a337 EBUILD blender-2.79.ebuild 8059 BLAKE2B d60a56884d15f6d1ddf5a2b8070de29284cf63ac152a19bfa4a0ecb3c66f4fdb200ce7831cd928133882614d5e29f2a5d3bde7c22cfc4506df5ead0792aea503 SHA512 99e7f652915b69087deb9ef11a5d78951b7553db60f8327150dd349a8a84672e9cb9fb2740acc00a927171388d346a3a57904ff2dfa0f826dddb2ce3c5e11eed -MISC metadata.xml 3716 BLAKE2B a83b3437a47923843bbe791b0508b34e75f1b5428984b7184b4939da073e07f1ec888121cd04bee106b870570eb82a31703a630ed3fb82230c99ed2d36522e12 SHA512 8ad522a14790a011fb26fe52a47ade818d161f2cfddb0cb49658a43e2dc0a9ddfd3a232e06b4f4441e852085bd1657a378219bdcd4a0249b2c30d341c24231ea +MISC metadata.xml 3716 BLAKE2B 2c04c8b2724d9153efc0bdf8772b4a107e072a009032d390977f53972fb4afe27eada91da3991f680f41d8114d22a75e84c4f359e00ef2b378e53d7b507a45de SHA512 77866e595fba02c31ac64d9a124af03a6fe9080b27434ea2f93e615c6e702d1a393103d96c361079b1b5af861f0775cc0e57888d23e528e32c326dca7af4c09d diff --git a/media-gfx/blender/blender-2.79-r1.ebuild b/media-gfx/blender/blender-2.79-r1.ebuild new file mode 100644 index 000000000000..108783768d04 --- /dev/null +++ b/media-gfx/blender/blender-2.79-r1.ebuild @@ -0,0 +1,290 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python{3_5,3_6} ) + +inherit check-reqs cmake-utils xdg-utils flag-o-matic gnome2-utils \ + pax-utils python-single-r1 toolchain-funcs versionator + +DESCRIPTION="3D Creation/Animation/Publishing System" +HOMEPAGE="http://www.blender.org" + +SRC_URI="http://download.blender.org/source/${P}.tar.gz" + +# Blender can have letters in the version string, +# so strip of the letter if it exists. +MY_PV="$(get_version_component_range 1-2)" + +SLOT="0" +LICENSE="|| ( GPL-2 BL )" +KEYWORDS="~amd64 ~x86" +IUSE="+bullet +dds +elbeem +game-engine +openexr collada colorio \ + cuda cycles debug doc ffmpeg fftw headless jack jemalloc jpeg2k libav \ + llvm man ndof nls openal opencl openimageio openmp opensubdiv openvdb \ + osl player sdl sndfile test tiff valgrind" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + player? ( game-engine !headless ) + cuda? ( cycles ) + cycles? ( openexr tiff openimageio ) + opencl? ( cycles ) + osl? ( cycles llvm )" + +RDEPEND="${PYTHON_DEPS} + >=dev-libs/boost-1.62:=[nls?,threads(+)] + dev-libs/lzo:2 + >=dev-python/numpy-1.10.1[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + media-libs/freetype + media-libs/glew:* + media-libs/libpng:0= + media-libs/libsamplerate + sys-libs/zlib + virtual/glu + virtual/jpeg:0= + virtual/libintl + virtual/opengl + collada? ( >=media-libs/opencollada-1.6.18:= ) + colorio? ( media-libs/opencolorio ) + cuda? ( dev-util/nvidia-cuda-toolkit:= ) + ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] ) + libav? ( >=media-video/libav-11.3:=[x264,mp3,encode,theora,jpeg2k?] ) + fftw? ( sci-libs/fftw:3.0= ) + !headless? ( + x11-libs/libX11 + x11-libs/libXi + x11-libs/libXxf86vm + ) + jack? ( virtual/jack ) + jemalloc? ( dev-libs/jemalloc:= ) + jpeg2k? ( media-libs/openjpeg:0 ) + llvm? ( sys-devel/llvm:= ) + ndof? ( + app-misc/spacenavd + dev-libs/libspnav + ) + nls? ( virtual/libiconv ) + openal? ( media-libs/openal ) + opencl? ( virtual/opencl ) + openimageio? ( >=media-libs/openimageio-1.7.0 ) + openexr? ( + >=media-libs/ilmbase-2.2.0:= + >=media-libs/openexr-2.2.0:= + ) + opensubdiv? ( >=media-libs/opensubdiv-3.3.0:=[cuda=,opencl=] ) + openvdb? ( + media-gfx/openvdb[${PYTHON_USEDEP},abi3-compat(+),openvdb-compression(+)] + dev-cpp/tbb + >=dev-libs/c-blosc-1.5.2 + ) + osl? ( media-libs/osl:= ) + sdl? ( media-libs/libsdl2[sound,joystick] ) + sndfile? ( media-libs/libsndfile ) + tiff? ( media-libs/tiff:0 ) + valgrind? ( dev-util/valgrind )" + +DEPEND="${RDEPEND} + virtual/pkgconfig + >=dev-cpp/eigen-3.2.8:3 + nls? ( sys-devel/gettext ) + doc? ( + app-doc/doxygen[-nodot(-),dot(+),latex] + dev-python/sphinx[latex] + )" + +PATCHES=( + "${FILESDIR}/${PN}-fix-install-rules.patch" + "${FILESDIR}/${P}-fix-build-with-OSL-1.9.x.patch" +) + +blender_check_requirements() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + + if use doc; then + CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend + fi +} + +pkg_pretend() { + blender_check_requirements +} + +pkg_setup() { + blender_check_requirements + python-single-r1_pkg_setup +} + +src_prepare() { + cmake-utils_src_prepare + + # we don't want static glew, but it's scattered across + # multiple files that differ from version to version + # !!!CHECK THIS SED ON EVERY VERSION BUMP!!! + local file + while IFS="" read -d $'\0' -r file ; do + sed -i -e '/-DGLEW_STATIC/d' "${file}" || die + done < <(find . -type f -name "CMakeLists.txt") + + # Disable MS Windows help generation. The variable doesn't do what it + # it sounds like. + sed -e "s|GENERATE_HTMLHELP = YES|GENERATE_HTMLHELP = NO|" \ + -i doc/doxygen/Doxyfile || die +} + +src_configure() { + # FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu + # shadows, see bug #276338 for reference + append-flags -funsigned-char + append-lfs-flags + append-cppflags -DOPENVDB_3_ABI_COMPATIBLE + + local mycmakeargs=( + -DPYTHON_VERSION="${EPYTHON/python/}" + -DPYTHON_LIBRARY="$(python_get_library_path)" + -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" + -DWITH_INSTALL_PORTABLE=OFF + -DWITH_PYTHON_INSTALL=OFF + -DWITH_PYTHON_INSTALL_NUMPY=OFF + -DWITH_STATIC_LIBS=OFF + -DWITH_SYSTEM_GLEW=ON + -DWITH_SYSTEM_OPENJPEG=ON + -DWITH_SYSTEM_EIGEN3=ON + -DWITH_SYSTEM_LZO=ON + -DWITH_C11=ON + -DWITH_CXX11=ON + -DWITH_BOOST=ON + -DWITH_BULLET=$(usex bullet) + -DWITH_CODEC_FFMPEG=$(usex ffmpeg) + -DWITH_CODEC_SNDFILE=$(usex sndfile) + -DWITH_CUDA=$(usex cuda) + -DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE) + -DWITH_CYCLES=$(usex cycles) + -DWITH_CYCLES_OSL=$(usex osl) + -DWITH_LLVM=$(usex llvm) + -DWITH_FFTW3=$(usex fftw) + -DWITH_GAMEENGINE=$(usex game-engine) + -DWITH_HEADLESS=$(usex headless) + -DWITH_X11=$(usex !headless) + -DWITH_IMAGE_DDS=$(usex dds) + -DWITH_IMAGE_OPENEXR=$(usex openexr) + -DWITH_IMAGE_OPENJPEG=$(usex jpeg2k) + -DWITH_IMAGE_TIFF=$(usex tiff) + -DWITH_INPUT_NDOF=$(usex ndof) + -DWITH_INTERNATIONAL=$(usex nls) + -DWITH_JACK=$(usex jack) + -DWITH_MOD_FLUID=$(usex elbeem) + -DWITH_MOD_OCEANSIM=$(usex fftw) + -DWITH_OPENAL=$(usex openal) + -DWITH_OPENCL=$(usex opencl) + -DWITH_OPENCOLORIO=$(usex colorio) + -DWITH_OPENCOLLADA=$(usex collada) + -DWITH_OPENIMAGEIO=$(usex openimageio) + -DWITH_OPENMP=$(usex openmp) + -DWITH_OPENSUBDIV=$(usex opensubdiv) + -DWITH_OPENVDB=$(usex openvdb) + -DWITH_OPENVDB_BLOSC=$(usex openvdb) + -DWITH_PLAYER=$(usex player) + -DWITH_SDL=$(usex sdl) + -DWITH_CXX_GUARDEDALLOC=$(usex debug) + -DWITH_ASSERT_ABORT=$(usex debug) + -DWITH_GTESTS=$(usex test) + -DWITH_DOC_MANPAGE=$(usex man) + -DWITH_MEM_JEMALLOC=$(usex jemalloc) + -DWITH_MEM_VALGRIND=$(usex valgrind) + ) + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile + + if use doc; then + # Workaround for binary drivers. + addpredict /dev/ati + addpredict /dev/dri + addpredict /dev/nvidiactl + + einfo "Generating Blender C/C++ API docs ..." + cd "${CMAKE_USE_DIR}"/doc/doxygen || die + doxygen -u Doxyfile || die + doxygen || die "doxygen failed to build API docs." + + cd "${CMAKE_USE_DIR}" || die + einfo "Generating (BPY) Blender Python API docs ..." + "${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed." + + cd "${CMAKE_USE_DIR}"/doc/python_api || die + sphinx-build sphinx-in BPY_API || die "sphinx failed." + fi +} + +src_test() { + if use test; then + einfo "Running Blender Unit Tests ..." + cd "${BUILD_DIR}"/bin/tests || die + local f + for f in *_test; do + ./"${f}" || die + done + fi +} + +src_install() { + # Pax mark blender for hardened support. + pax-mark m "${CMAKE_BUILD_DIR}"/bin/blender + + if use doc; then + docinto "html/API/python" + dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/. + + docinto "html/API/blender" + dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/. + fi + + cmake-utils_src_install + + # fix doc installdir + docinto "html" + dodoc "${CMAKE_USE_DIR}"/release/text/readme.html + rm -r "${ED%/}"/usr/share/doc/blender || die + + python_fix_shebang "${ED%/}/usr/bin/blender-thumbnailer.py" + python_optimize "${ED%/}/usr/share/blender/${MY_PV}/scripts" +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + elog + elog "Blender uses python integration. As such, may have some" + elog "inherit risks with running unknown python scripts." + elog + elog "It is recommended to change your blender temp directory" + elog "from /tmp to /home/user/tmp or another tmp file under your" + elog "home directory. This can be done by starting blender, then" + elog "dragging the main menu down do display all paths." + elog + ewarn + ewarn "This ebuild does not unbundle the massive amount of 3rd party" + ewarn "libraries which are shipped with blender. Note that" + ewarn "these have caused security issues in the past." + ewarn "If you are concerned about security, file a bug upstream:" + ewarn " https://developer.blender.org/" + ewarn + gnome2_icon_cache_update + xdg_mimeinfo_database_update +} + +pkg_postrm() { + gnome2_icon_cache_update + xdg_mimeinfo_database_update + + ewarn "" + ewarn "You may want to remove the following directory." + ewarn "~/.config/${PN}/${MY_PV}/cache/" + ewarn "It may contain extra render kernels not tracked by portage" + ewarn "" +} diff --git a/media-gfx/blender/files/blender-2.79-fix-build-with-OSL-1.9.x.patch b/media-gfx/blender/files/blender-2.79-fix-build-with-OSL-1.9.x.patch new file mode 100644 index 000000000000..6b22f9335fd7 --- /dev/null +++ b/media-gfx/blender/files/blender-2.79-fix-build-with-OSL-1.9.x.patch @@ -0,0 +1,26 @@ +From d089875c4c753f084e02849462ec1bd6f785eadf Mon Sep 17 00:00:00 2001 +From: Brecht Van Lommel <brechtvanlommel@gmail.com> +Date: Sat, 18 Nov 2017 06:11:17 +0100 +Subject: [PATCH] Fix build with OSL 1.9.x, automatically aligns to 16 bytes + now. + +--- + intern/cycles/kernel/osl/osl_closures.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/intern/cycles/kernel/osl/osl_closures.cpp b/intern/cycles/kernel/osl/osl_closures.cpp +index e3e85705ebc..597d25e9f30 100644 +--- a/intern/cycles/kernel/osl/osl_closures.cpp ++++ b/intern/cycles/kernel/osl/osl_closures.cpp +@@ -232,7 +232,11 @@ static void register_closure(OSL::ShadingSystem *ss, const char *name, int id, O + /* optimization: it's possible to not use a prepare function at all and + * only initialize the actual class when accessing the closure component + * data, but then we need to map the id to the class somehow */ ++#if OSL_LIBRARY_VERSION_CODE >= 10900 ++ ss->register_closure(name, id, params, prepare, NULL); ++#else + ss->register_closure(name, id, params, prepare, NULL, 16); ++#endif + } + + void OSLShader::register_closures(OSLShadingSystem *ss_) diff --git a/media-gfx/blender/metadata.xml b/media-gfx/blender/metadata.xml index 92981d95ed42..92c09eab0ec7 100644 --- a/media-gfx/blender/metadata.xml +++ b/media-gfx/blender/metadata.xml @@ -2,7 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer restrict=">=media-gfx/blender-2.77" type="person"> - <email>j.scruggs@gmail.com</email> + <email>dracwyrm@gentoo.org</email> <name>Jonathan Scruggs</name> </maintainer> <maintainer restrict=">=media-gfx/blender-2.77" type="person"> diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest index a963ec23e28a..7995dfb1dee7 100644 --- a/media-gfx/fontforge/Manifest +++ b/media-gfx/fontforge/Manifest @@ -2,5 +2,5 @@ AUX 20170731-gethex-unaligned.patch 510 BLAKE2B ed943be0d150c8de7c99decf898cc4cf AUX 20170731-startnoui-FindOrMakeEncoding.patch 751 BLAKE2B c4a0248affa9117c5150aacb40a54bcb6f29d84866e1d193898f49a4fe58735eda2319856b6cfdbce450492871a5fe2255443849dd0f98ee70285614f7e44bb1 SHA512 0135717d9760a0bbf6d35ce21c19fb9019d3da01859882918a5643bbe6011a55eaf57ad07c8063c2c5c20cd6c6907420f8015abf54210ccdd75b2ba473e6b366 AUX 20170731-tilepath.patch 411 BLAKE2B 39ef99a26b85fc25d6c0b778a6b0ddfdb2c366b6456bd8ed47b12ca8681e8970e65e3b69cd06880794832f761c6de801d9e7c51e1edfff5abf434aa7f7dcc7c2 SHA512 026f6765b2db7549f72cd6ccff8d23bdf357ab24035c89cd792fa933f6033445f6cbaf7fa20f1372bdeda2caa242b9f8237f3019292cba0cc551c6de9e5c8341 DIST fontforge-dist-20170731.tar.xz 13985256 BLAKE2B 7bc49a3b7747de419e4fafb445062873cf9bf56aa73fd7499509b787a1c0fd6c47b0b5d7bfeb2a69d9237f9f66f989af968b0d00e9d5e57030906394f042f29c SHA512 26f7a40714460716a24dd0229fdb027f3766bcc48db64b8993436ddcb6277898f9f3b67ad4fc0be515b2b38e01370d1c7d9ee3c6ece1be862b7d8c9882411f11 -EBUILD fontforge-20170731-r3.ebuild 2786 BLAKE2B 4286b3d304972b814fc8892bb2158e00ba51bd9b8c75f8e0e3893f12713472c250e2ccd8a5cb73658ec352bad724a8f45f8b1a557f1e0d4769daa23a5653a4be SHA512 4e564ee469131679ee5a22507a376c7b93bd97318208564e924013192181b12d45c0a25c00d4e76b6117da304bf9522fe233f9369f035241b99829edcc735c23 +EBUILD fontforge-20170731-r3.ebuild 2790 BLAKE2B 51fb3131e717afa822c83b77ab41f6756234c16ae9eb373b7eace3f6ace190d2593ef0b4c724f72bf8ba5d7e6315a82282996825197eb04baaa96280efea11f2 SHA512 71e76c36f491c7b50b0de45a16ad1d5653b420cfe46fe19680d5cf07e3f75d77b54fdef317b5427cc88264e6a3d0b249064421aa1c5530adcffb77cc317f4c8d MISC metadata.xml 908 BLAKE2B 57e840cbf69ebd2780ecaf5a3009905b782223a16339beae90acf1c087a185944e33fe952b477184244cb3f5f313fcce32a561ce903d751de457b77f4a90cd74 SHA512 973d4967be4eb7aad087ce977a4d94945a8894138604e8d37257dac97f74e98f7fb9a7cad7e7f46abb4c8c39dcb4bd79e9ad26f96838ad39ac1894e154834d28 diff --git a/media-gfx/fontforge/fontforge-20170731-r3.ebuild b/media-gfx/fontforge/fontforge-20170731-r3.ebuild index 41df600e7df5..0bfd3c437c45 100644 --- a/media-gfx/fontforge/fontforge-20170731-r3.ebuild +++ b/media-gfx/fontforge/fontforge-20170731-r3.ebuild @@ -3,7 +3,7 @@ EAPI=6 -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) inherit gnome2-utils python-single-r1 xdg-utils diff --git a/media-gfx/gnome-specimen/Manifest b/media-gfx/gnome-specimen/Manifest deleted file mode 100644 index d086283795e6..000000000000 --- a/media-gfx/gnome-specimen/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST gnome-specimen-0.4.tar.gz 220574 BLAKE2B e27960510602d47ec9fa8e5369d369d84bde4adf1f348c6478b150a5efab4e884060ce56829063c8f4ea5c2dce22c3ca5e4fd21916cd9df4e47618eb7a09f7da SHA512 87edab052f777a67671d644aa132c3461662f1905cecc494777da44cf909d9ad8f85c5ae7a1114f2944a671079b89dc6a1c72f2e7ee6cc05594ba970c149afc9 -EBUILD gnome-specimen-0.4-r1.ebuild 778 BLAKE2B 65643fbd9ab3abbc18b4169bf6ef92ac9a69b1a793a78f6537e7ed18103076556ab9db213530930a97f684c5a63a597914232f7c4578ac9b2af0e5d63a021a48 SHA512 4c7550c83da8c2041389278abe76d801d41ecad1411a88c94ecdad22b2c7586707ea7c73b17b63c08fbaa60d73856105ccefb425d46dbbb722cfc65e949c5359 -MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f diff --git a/media-gfx/gnome-specimen/gnome-specimen-0.4-r1.ebuild b/media-gfx/gnome-specimen/gnome-specimen-0.4-r1.ebuild deleted file mode 100644 index aa07ebda56af..000000000000 --- a/media-gfx/gnome-specimen/gnome-specimen-0.4-r1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -GCONF_DEBUG=no -PYTHON_COMPAT=( python2_7) - -inherit autotools gnome2 python-single-r1 - -DESCRIPTION="Font preview application" -HOMEPAGE="http://uwstopia.nl" -SRC_URI="http://uwstopia.nl/geek/projects/${PN}/releases/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" - -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - dev-python/gconf-python[${PYTHON_USEDEP}] - dev-python/libgnome-python[${PYTHON_USEDEP}] - dev-python/pygtk[${PYTHON_USEDEP}] - dev-python/pygobject:2[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND} - dev-util/intltool - virtual/pkgconfig - sys-devel/gettext -" - -src_prepare() { - eautoreconf # To fix bug 408099 - gnome2_src_prepare -} diff --git a/media-gfx/gnome-specimen/metadata.xml b/media-gfx/gnome-specimen/metadata.xml deleted file mode 100644 index 19bf1be2581e..000000000000 --- a/media-gfx/gnome-specimen/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?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> -</pkgmetadata> diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest index e713f3c630e3..5bdd4c355ef2 100644 --- a/media-gfx/graphviz/Manifest +++ b/media-gfx/graphviz/Manifest @@ -5,6 +5,6 @@ AUX graphviz-2.40.1-qt5.patch 4140 BLAKE2B d0d92dddd6ae1efb7e24e22ac0f32025b16ad DIST graphviz-2.38.0.tar.gz 25848858 BLAKE2B 2c35e7bde3824d7b99008d7879c08ee15bbf4c31272bfccc2be18e6ebf81622030fd856a6d48f7c62a03c8807c181593918f2841d8c0fd393e3b1c868dce81bd SHA512 0e51a97dae595f4e80bc9e4a12ba3c48485fab19941a28d522f5a0624b6a767e0ba720e9e55bff8efe8308dd1cd3793e2c99cb5fdfceb2d5cafb0cbee907e531 DIST graphviz-2.40.1.tar.gz 25633455 BLAKE2B 96ba5a8cb94d93cf4ecd424bf29c1bf67099e39e582be97fca088de0aad6bbbb46b00af55c197894e0b63f1a96177894b6cd23498295bb524fe19a75661cbc59 SHA512 a3f358a7050523a39b91a259563a95925b37853ffec799e571211af5b686d3af42457c937882954482785745d90416b1abd945caf05f8abb52b3876e07aa70f5 EBUILD graphviz-2.38.0-r1.ebuild 7863 BLAKE2B 838148d8be4b0c860c4686fd7415846e2e71edcf3a47595fa88550dcfe739c64dc999494b6571d6830207a8286d3bd58aa71e54bace259f28152745546bf66ba SHA512 2ba52aa50713c7a54318ac96ad60382eb389c94407203f6f96a85aafdb74c904d83b96a8d6174d8458d1686f956fa3e1bda41b96f38b23ed73d1a949d9ccc983 -EBUILD graphviz-2.40.1-r1.ebuild 7927 BLAKE2B 3dec5ef445546063ed1bf45dd8a3d75793bca09095f458cbbcfaf864e39404dfb72987c7da014d9492540c2524101443b4ef7d3e2880495addf62373b7ec33ec SHA512 aee2a8455ea962e819d0bbf1dc9d89ed3ad2c4bc3d39a6dc2fe2248211f1a8b043276e7e468769b80b435f818409277ed9beef71b809f90f1f842f93df5082bb +EBUILD graphviz-2.40.1-r1.ebuild 7926 BLAKE2B 2c765f8e8f0bf799eb8e3b7e76bf2edfc656594207e39fef930b5ae4389c63dbb26ecd4f3581dbf83df7bbfad25d8bc065a87257315dbb03dc47fb68ba388a84 SHA512 c16d7653b1e9b021d2f27cb8b32f46b653cc1d45a9703783896f115a9f79dd83a30ef9cd39eb064f6dc2190d05a62ce999665f34afa9dc0f3445c3cdc199d090 EBUILD graphviz-2.40.1.ebuild 7780 BLAKE2B d881286b10f52fd2167119ca979dcdd35e584262a0e324a71aece5a87d0b1280166f1d6b791c7f6dc511daf5e6ad8682027afd246e6558821a4adb7d649ae693 SHA512 222e64973188fe8287d764a7ae68e69ced364afd18393790b0e253030ba41783d1058814911f13099bc0dbef72855f4de169bd6ea4dd17215ebabdb1e428e874 MISC metadata.xml 2204 BLAKE2B cc6012ca977a477d6a557df8343e980e926f1e67f737064f3fea406db213e53c416db5fc50692b1132ebcd5b5ce52d4bb2f5a2cec91b0af846b905d36748e48c SHA512 cd26813c5d7d6341ae9a21be50ca4451657c9813e25b2d0d69cd972fbdecdacf63e763ecd1f1a56fee10f07a25e1063822f7b2e9a96df48e3bcf8c7d1d05de3a diff --git a/media-gfx/graphviz/graphviz-2.40.1-r1.ebuild b/media-gfx/graphviz/graphviz-2.40.1-r1.ebuild index d26dec591e7b..74292713eeb4 100644 --- a/media-gfx/graphviz/graphviz-2.40.1-r1.ebuild +++ b/media-gfx/graphviz/graphviz-2.40.1-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="http://www.graphviz.org/pub/graphviz/stable/SOURCES/${P}.tar.gz" LICENSE="CPL-1.0" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris" +KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris" IUSE="+cairo devil doc examples gdk-pixbuf gtk gts guile java lasi nls pdf perl postscript python qt5 ruby static-libs svg tcl X elibc_FreeBSD" REQUIRED_USE=" diff --git a/media-gfx/gscan2pdf/Manifest b/media-gfx/gscan2pdf/Manifest index 9a708aa46ae4..8d46a2b618c0 100644 --- a/media-gfx/gscan2pdf/Manifest +++ b/media-gfx/gscan2pdf/Manifest @@ -1,7 +1,5 @@ DIST gscan2pdf-1.8.10.tar.xz 406128 BLAKE2B 328c05f377e12742bbf8ebf92f327afddc4556533e4f7500b237d968fa07b6505f0a3be2c02f42318740e9d185611c094cf96c66804af02197097eebd16b880c SHA512 334979b10238d510da8c5807290920b50e3a06ddda99dad41ced96d33e1ca8467cafe1f3112fb81b6705f80bc232eb6f041d588a57e04d5eecd09a201f007a49 -DIST gscan2pdf-1.8.8.tar.xz 404456 BLAKE2B 23e81ad9d46867863f7cf14e0350cce568d9f9e7a57fd8eb9a4b1a56a112d72008adacf7cc4514c6d93dd6b225684d57494a5baa295c8f84a927de7bd208d722 SHA512 331821c0f9d7365866b7ba6bdbcd29d03b69516e44f95d186296a9a105887924c747fd1c89740bd708f04d5d67a65481b972d57fef09d8bee16dfe1b2655b9e3 -DIST gscan2pdf-1.8.9.tar.xz 405780 BLAKE2B 2b0b818f314064e03ecd6b1eed988f9d45808a7142c00d190dba552ac87f06da74aacb47341ce749a9e1c916cf607eafd4f1d412a6a239a07426e57c16e62dc9 SHA512 a9042b2a184b03bb7a53d5fa56abc93e873c6e675350db4094e38c04e3f7e784eb6f0369a950f598b052474e8cbaea007af10849a2cee18cdb18d90605d4d90a +DIST gscan2pdf-1.8.11.tar.xz 409212 BLAKE2B 37cb716f13818eaffc39c210b810b845368cc5e323569e8f9d5603b5b412c4182520798321358e4c21339fdbd5f15026a0acd6421a49e7db79ecca86633c3ab0 SHA512 1ea09b8768771be4a1700cb8a6523d5f74fcbf0ebe459d97796032b56f896fd0c50e5ca1ed4c96aedef7e61f6952a92986153cc70173dd5ad91ccfb72461c565 EBUILD gscan2pdf-1.8.10.ebuild 1733 BLAKE2B 34eb1f1882a31569fe2dec3549a037986dd50c024aed983e2b96762507cfcee70e9428103be4a862e76c8cadee6f92fb0a597000d4b9a4a4082d38f88f60fc80 SHA512 046288f89b95875f7acb9150a6f9099ad25d17e4dfd68cbaaeb5c147352fcee2ebe306bbf58e3dba3873eb2ace0d62eef97c445b75efd4abef469d29d49d742d -EBUILD gscan2pdf-1.8.8.ebuild 1733 BLAKE2B 34eb1f1882a31569fe2dec3549a037986dd50c024aed983e2b96762507cfcee70e9428103be4a862e76c8cadee6f92fb0a597000d4b9a4a4082d38f88f60fc80 SHA512 046288f89b95875f7acb9150a6f9099ad25d17e4dfd68cbaaeb5c147352fcee2ebe306bbf58e3dba3873eb2ace0d62eef97c445b75efd4abef469d29d49d742d -EBUILD gscan2pdf-1.8.9.ebuild 1733 BLAKE2B 34eb1f1882a31569fe2dec3549a037986dd50c024aed983e2b96762507cfcee70e9428103be4a862e76c8cadee6f92fb0a597000d4b9a4a4082d38f88f60fc80 SHA512 046288f89b95875f7acb9150a6f9099ad25d17e4dfd68cbaaeb5c147352fcee2ebe306bbf58e3dba3873eb2ace0d62eef97c445b75efd4abef469d29d49d742d +EBUILD gscan2pdf-1.8.11.ebuild 1733 BLAKE2B de1f8b855cbecf6a06846ce673d7b27f23a496635dd01e7d897a400bdc5ab7f7def3e5c099402bc5712e8f993740b0da160f3d4e3bdaa58dbccd0f27cff2c229 SHA512 5f4f08dee9d0b82514af42f465a70a9a460d1e21fca6421365413b3cc5b2af04480d8153c18a9bf243d515ba28515cae7b3337c1e71289953d9ef2d11d007597 MISC metadata.xml 439 BLAKE2B 835480b0d68a079941e94f2646d0136dfb8a8e750e0279f8a5a2e23e6690242582ffe660798f5e80ebfb4378a576aa5715332b53230555866391a99ec28f54ff SHA512 af1cc05ac693899586df81036d2fa11af187edbb3c9449862298ba05efd0dbd0c4c5b008a1a21328c1f9a27a690671bd7a9967d2e457efb31561044e45984401 diff --git a/media-gfx/gscan2pdf/gscan2pdf-1.8.9.ebuild b/media-gfx/gscan2pdf/gscan2pdf-1.8.11.ebuild index 00f29f30d45d..96b14c3454ad 100644 --- a/media-gfx/gscan2pdf/gscan2pdf-1.8.9.ebuild +++ b/media-gfx/gscan2pdf/gscan2pdf-1.8.11.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 diff --git a/media-gfx/gscan2pdf/gscan2pdf-1.8.8.ebuild b/media-gfx/gscan2pdf/gscan2pdf-1.8.8.ebuild deleted file mode 100644 index 00f29f30d45d..000000000000 --- a/media-gfx/gscan2pdf/gscan2pdf-1.8.8.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils perl-module - -DESCRIPTION="Scan documents, perform OCR, produce PDFs and DjVus" -HOMEPAGE="http://gscan2pdf.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -# OCR tests fail with tesseract[opencl], not fixed by addpredict -# and others on Wayland and the console -RESTRICT="test" - -RDEPEND=" - dev-perl/Config-General - dev-perl/Date-Calc - dev-perl/Data-UUID - dev-perl/Filesys-Df - dev-perl/glib-perl - dev-perl/Goo-Canvas - dev-perl/Gtk2-Ex-PodViewer - dev-perl/Gtk2-Ex-Simple-List - dev-perl/Gtk2-ImageView - dev-perl/Gtk2 - dev-perl/HTML-Parser - dev-perl/Image-Sane - dev-perl/Locale-gettext - dev-perl/List-MoreUtils - dev-perl/Log-Log4perl - dev-perl/PDF-API2 - dev-perl/Proc-ProcessTable - dev-perl/Readonly - dev-perl/Set-IntSpan - dev-perl/Try-Tiny - virtual/perl-Archive-Tar - virtual/perl-Carp - virtual/perl-Data-Dumper - virtual/perl-File-Temp - virtual/perl-Getopt-Long - virtual/perl-threads - virtual/perl-threads-shared - media-gfx/gtkimageview - media-gfx/imagemagick[png,tiff,perl] - media-gfx/sane-backends - media-libs/tiff" - -mydoc="History" - -pkg_postinst() { - optfeature "DjVu file support" "app-text/djvu[tiff] media-gfx/imagemagick[djvu]" - optfeature "creating PostScript files from PDFs" app-text/poppler[utils] - optfeature "adding to an existing PDF" app-text/poppler[utils] - optfeature "Optical Character Recognition" app-text/tesseract[osd,tiff] - optfeature "scan post-processing" app-text/unpaper - optfeature "automatic document feeder support" media-gfx/sane-frontends - optfeature "sending PDFs as email attachments" x11-misc/xdg-utils -} diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest index 593dcdb175fb..1f7674e36235 100644 --- a/media-gfx/hugin/Manifest +++ b/media-gfx/hugin/Manifest @@ -1,6 +1,8 @@ DIST hugin-2016.2.0.tar.bz2 10386216 BLAKE2B 8437a360880903fac33be7dc12fcdff7fbd16b15153de32e127bdc2b5fe5a47e9ebefe8bc4fb088ba2b818743b8bee9348560aaeb53781bfd0eeb57ec1adbe0b SHA512 9c652e685d0135afef6418bdf5fce39cec8ef1ec0dbe3a325151957c91495db0a2a3171ee04a28955a638493913c1bc800a90c37347ad17612584646c8a65510 DIST hugin-2017.0.tar.bz2 9803272 BLAKE2B fa7475347f6b1b561132d5370172fee410afd4f8b15c2c5d7d356023716d15cdcc5ecb8a13d743ce13f3c15ebb7f4b42f0e9653b9f94e752d5e6dea3ecef05b7 SHA512 bfd39135119fddb559ecec220da36a4c15d96bda7f93e738d8815aafca94685ba879239202e2cc81c87787188ee3b1b6dc5cbe8014aa12e2f95d654591dc1969 +DIST hugin-2018.0rc2.tar.bz2 9838518 BLAKE2B dc6d786e4e6a298d4dd4e48b2c42f9c9c297b4c431fbc00fa9090f129a4633f599e222402aef1f2a467aa9b498d356f3bbaca9548954cf697d331950afa6693a SHA512 30061f4af695137f349526272e8c3c2f1f6a167305acb32466a30629c46dabea3818bc2c3a77b6102fcb67aa390a803cdc5ba8d8a2ecc6065f88726392529cbc EBUILD hugin-2016.2.0.ebuild 1953 BLAKE2B 86adc5c3744ec3f8ceb7a66747b3adb8143c00a5da07d6eb7935ba545d124e7dcbc7ad9d216188f280b84ec130c82510e4c33c215efe03f5431b0df9758b1a2a SHA512 3ac14ba4ce23e0081be124aeb750fcbd61f6e66f3a510680bee999a73e2d1d6a4ce96cb0f5acd1ce930583c3f295ea241d018731255c22d8ac8f8d5d10eda539 EBUILD hugin-2017.0.ebuild 1929 BLAKE2B 6403a6bdd33ee0ccefecac86eeba844f71f22f4eead5872a0499c015e71acc95c916d062d473d78f1923952ab927ff9af3a1f4f4564c006f7cdb1e30bd2368db SHA512 2c4769e87d57cb9c7f4a287384ae7468a60985488882d9f882a71457b4ef898646206562466eed6485b379a747f460ee7828dfaee5a3acadf1912fd8c83e3258 +EBUILD hugin-2018.0_rc2.ebuild 1973 BLAKE2B eb8148bea08769a3991bbddca21fd5154a03503d06dfd60e8ef15c2f0a60d975e34ea06aa2dab01a9aa52603fe696a9c3f86cc7b731c212cbee3e444c6e72725 SHA512 d947ca49bf2d0b203ebbf39df1c19c7e193e624ed73729c9d6ffe02a3f57abdcf568ecfdbd2d7b6d638cce50cedcc14ceab9969ead1e4ec2772220adda867713 EBUILD hugin-9999.ebuild 1984 BLAKE2B e7a4f4e7a7531b9b766bb7ade9087b11a74e9022a0b9d6aeea41c131d70ee2d2d6869b71e91c14403e5076071ba94afe7c888560a9f9b08d78cf7b18256647e6 SHA512 0b186e5a80fa23b4cf34a1438eacc9b01c22941d0305df391ac3188814cefcf36ac01ecda00707b590e520565127e99fe0f8d7e1e344e267dca912d599122209 MISC metadata.xml 519 BLAKE2B bd02923a26374e3bd638778ce8100efc4694ab6bec54fd8c8cbd32d0b8c3d495fc965194692ebaf2fe909e495011978d7bb8f3c995037fc128cfd9626949549c SHA512 d4e0bfb870b5b6e5769be2c28983d914666e413333887ac7a7cdb868d2f45f6b284a99204f6e97b98e65958412c04291f6fbc21deed8de518d3ff64aae6ad01b diff --git a/media-gfx/hugin/hugin-2018.0_rc2.ebuild b/media-gfx/hugin/hugin-2018.0_rc2.ebuild new file mode 100644 index 000000000000..33d44b9ffacf --- /dev/null +++ b/media-gfx/hugin/hugin-2018.0_rc2.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +WX_GTK_VER="3.0" +PYTHON_COMPAT=( python{2_7,3_4,3_5} ) + +inherit python-single-r1 wxwidgets versionator cmake-utils + +DESCRIPTION="GUI for the creation & processing of panoramic images" +HOMEPAGE="http://hugin.sf.net" +SRC_URI="mirror://sourceforge/${PN}/${P/_/}.tar.bz2" + +LICENSE="GPL-2 SIFT" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" + +LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru sk sv zh-CN zh-TW" +IUSE="debug lapack python sift $(echo ${LANGS//\ /\ l10n_})" + +CDEPEND=" + !!dev-util/cocom + dev-db/sqlite:3 + dev-libs/boost:= + dev-libs/zthread + >=media-gfx/enblend-4.0 + media-gfx/exiv2:= + media-libs/freeglut + media-libs/glew:= + >=media-libs/libpano13-2.9.19_beta1:0= + media-libs/libpng:0= + media-libs/openexr:= + media-libs/tiff:0 + >=media-libs/vigra-1.11.0[openexr] + sci-libs/fftw:3.0= + sci-libs/flann + sys-libs/zlib + virtual/glu + virtual/jpeg:0 + virtual/opengl + x11-libs/wxGTK:3.0=[X,opengl] + lapack? ( virtual/blas virtual/lapack ) + python? ( ${PYTHON_DEPS} ) + sift? ( media-gfx/autopano-sift-C )" +RDEPEND="${CDEPEND} + media-libs/exiftool" +DEPEND="${CDEPEND} + dev-cpp/tclap + sys-devel/gettext + virtual/pkgconfig + python? ( >=dev-lang/swig-2.0.4 )" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +DOCS=( authors.txt README TODO ) + +S=${WORKDIR}/${PN}-$(get_version_component_range 1-2).0 + +pkg_setup() { + use python && python-single-r1_pkg_setup + setup-wxwidgets +} + +src_configure() { + local mycmakeargs=( + -DBUILD_HSI=$(usex python) + -DENABLE_LAPACK=$(usex lapack) + ) + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + use python && python_optimize + + local lang + for lang in ${LANGS} ; do + case ${lang} in + ca) dir=ca_ES;; + ca-valencia) dir=ca_ES@valencia;; + cs) dir=cs_CZ;; + *) dir=${lang/-/_};; + esac + if ! use l10n_${lang} ; then + rm -r "${ED%/}"/usr/share/locale/${dir} || die + fi + done +} diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest index d07f406b4bb4..510cd1c4a353 100644 --- a/media-gfx/inkscape/Manifest +++ b/media-gfx/inkscape/Manifest @@ -14,5 +14,5 @@ DIST inkscape-0.92.2.tar.bz2 31224100 BLAKE2B c0a7b01220d1b0b0863f71f3e1c8ba7bdb EBUILD inkscape-0.91-r3.ebuild 3976 BLAKE2B 6109a0638f125b59ce3a01681290a44371016d72ce9fa8147792f106180437b823969981f1fe8cda95c8bc26c9f70c09025aa32f60117ff594c7168491145e3c SHA512 4b9fc5881cd58b4a5e32adc416564e7943c520f8add50673013f6c953080cbccddcd0690742d938df81d93252d5ad3ce4e41f6bf6191c9d018ebc2667c93dca0 EBUILD inkscape-0.91-r4.ebuild 4051 BLAKE2B 5ccbbd94230ebb9aa4b6ebbd455b260a2b680247091a760d1556d9e4ad8c897441dda1a1edf90eb3846f42cb3885684863389ca067c11a4d7dde51bd6a74a2ee SHA512 93d3af17489e4a2230931cd53690cdf5bc8ffe9d0f5225b9539ba896cd14976c9c5345925e3974a1b57ac0ce0517333eae3b6a641017c94c37334dc35f9a8188 EBUILD inkscape-0.92.1-r1.ebuild 3755 BLAKE2B 9c16cd19ad761248ffcaf7f4b4c28ee8a7acac0e33ed7c0b58077904cf5c9dbab2069102363fdb1068b29a1a02c4f903324195ecbd6238f88b447225143501da SHA512 7dc891b411af3f5af45df67707db758deb0265b76e3d6d14fc55d20b0de73f9e4188cdf38f30667d7ecaeea69b799976b64551c33aabd242b4503e658cddc26e -EBUILD inkscape-0.92.2.ebuild 3878 BLAKE2B 3791bcd7a9407ee698be33e1877467de1d073c59bfe3c5b7248849a71e15973769dfb7c165513bf8481d8fa3e636303801d537e3df6e7f1b287f5537ab96d471 SHA512 41016b56b3392cc765fcde4e43baf0739fbd504eeb08d0e9718593dbab9759697104199cb9b17d09f7c123c489de86b1e0759ee326b57bda4b895f6441307d16 +EBUILD inkscape-0.92.2.ebuild 3877 BLAKE2B 1638d286d9082fff8bd4d9ff9f2007f5a3072708eff3d37bd134b2d4d69553aaff4715a59bc94c012ed095c86614a84735ea9a97e8603c20ef74780d552f7945 SHA512 80ded7611f22e204d361ffb78745c332e594cfa7ab9b56dd515373c7421ce1d97979d3a8ed21403731d724ae82ccaeb905cc280ed9122f5016c6c385c1f05fa9 MISC metadata.xml 812 BLAKE2B 9b06a44ec7ded4b7b4618813bb4b2b5deed3bbc45fd43cffcf435594f3141943a45e592bf2947b00895f0f40d40b0fbe51109daa63f73f3276f50afec620d9fa SHA512 dbe4bb2e918a4c8a20c9a273cef29976d8cfe74e6c2ae1ba8cb77f592c885e8353b7bc3ca8f529e00629f6a0ac7627877cdef68fe07472fc1f417abba5d0268b diff --git a/media-gfx/inkscape/inkscape-0.92.2.ebuild b/media-gfx/inkscape/inkscape-0.92.2.ebuild index 5aee47f5f692..2d1f741ddafa 100644 --- a/media-gfx/inkscape/inkscape-0.92.2.ebuild +++ b/media-gfx/inkscape/inkscape-0.92.2.ebuild @@ -16,7 +16,7 @@ https://dev.gentoo.org/~jstein/dist/inkscape-0.92.1-poppler.patch" LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86" IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex" IUSE+=" lcms nls spell static-libs visio wpg" diff --git a/media-gfx/luminance-hdr/Manifest b/media-gfx/luminance-hdr/Manifest index a7adb61fd781..944c1e135d7f 100644 --- a/media-gfx/luminance-hdr/Manifest +++ b/media-gfx/luminance-hdr/Manifest @@ -4,6 +4,12 @@ AUX luminance-hdr-2.3.1-openmp-automagic.patch 1646 BLAKE2B fa8be8d602d9b9cbe76b AUX luminance-hdr-2.4.0-fits-automagic.patch 1052 BLAKE2B 489563cc4b2aec85ef2238db26fe21325ff625142943e5e1d223a4c04f93433a28f08f23885bd73881439ced4df441d1e0205f4564cd3fdea881eabde7bf1641 SHA512 4aab01ea5e67726a5d15cd0056f1193262227fa653e65a7dd06e3f809837cf217f71e7bbdb5bc3ce54554a97475a0c42b454ba87ed26d33d55e6c17586a48546 AUX luminance-hdr-2.4.0-qtprinter.patch 3275 BLAKE2B 0fd7f432a52d51b7c64aad530e16d6a6a4dde08c400409718a715a4287852bd4fbf30b96653bc3d68263315cddd5041e1a83546c3649c449f2618bdc6ce05155 SHA512 8ad9056355f19fb74e099321a258b2aca3b9c2aaccd1769b4c7353b999ac881cbfac16f24a5455b21266d5d9b95ecd10b59e5b1f8d72e03143d568016685ff17 AUX luminance-hdr-2.4.0-qtquick.patch 447 BLAKE2B 82323fcb90f45f02911bfda1595658fe8956303d8962d74a14eae8402ea0c25a23582ee153e25bc69d112cd4051ceabb90e9bda79f71e1f1a74c871c8cbc0ed2 SHA512 71bcc28001970afffd562515f5dde8bbda2c2b28a5915814fe1d17feef34cf1b380bdfff4589ac7d7886f35c7b5ea28df19080c5d682f76789422be7be2494d0 +AUX luminance-hdr-2.5.1-docs.patch 908 BLAKE2B de7c675599a74ef7622c037eeec85546d99f2b3341c6df09f7f8880c7515468295b84962163f147bcf093adbce8425de8f8d86517c81b5c57a3b2dd3afe15ef0 SHA512 d675e6ec2b47c604002a1fa54578fd6d363c0f55079f519e0da3e3b06993b4a77024bd0e35101d22b06c2e7d5fa87bde52b1cbe6c9726ad6e6c02ebe1753bee2 +AUX luminance-hdr-2.5.1-fits-automagic.patch 518 BLAKE2B 47af51ffa1b521d8dd949e2b89c6990896e1b82e64c3cb9f93342bd4343b12ed2824d1b05fe378bb52cd9027fd86848d5a558a787545e86423ebf6da2d402e18 SHA512 49b127165c22864b0910a2cf0ebf694e74b0a8343577f06b752f3d4cdf50ae5990f1fa88b83d78565f16ddcddd0f7f87664a34602ebb1d11efafd0ab979e53ce +AUX luminance-hdr-2.5.1-no-git.patch 513 BLAKE2B b9a2a460538b709cf76fa3713b26709455bc604e1d30ef355db254b3b6dab7420d81d83e77f6aba7f0f62a8c1b4dfcb3c503004e0235b65ef15d81e461f8a14a SHA512 96e5096a5b1a482f4604e6a6067836268e4988f32907f67ceeee25978d4dd1c1b1e394102145e5241e663595156dddc9c69ab9b22e0e1710e1a0507016b10108 +AUX luminance-hdr-2.5.1-openmp-automagic.patch 1574 BLAKE2B e8c289b8a66e258dd0ea99baa54bdf76e6345b652071a8e37b2a8ab35d98dd006973f266c8d008ccc70330fa8e9f9082261eee9d08756b1d59a4575714c5d6a8 SHA512 6ccfbf8d75bdc27beb10b3632bd07d8679f9ae8bdd78588ff0bbad59b75c43a4ad3b443a42183541cbf5b53d426b4ac19f43f54e296542d3a1b4235ba302acaa DIST luminance-hdr-2.4.0.tar.bz2 10507522 BLAKE2B b8dc777211b63e4e03466612e1c4b7c685f921db292712c749fc14d9638a69fd735990fd5412c7376a7452911cb15212448afc03aa8407f0d6f9c65fac5d5769 SHA512 aa14a13d12ba382f5f8dcb79a57aa68864678db62f036ac2d8b8959da76f20b938481932a6fff3861eb6dbc5a1d4f06bc1f3e3ca9a6ce4f7a27a9db736aa8702 +DIST luminance-hdr-2.5.1.tar.bz2 10238826 BLAKE2B 02cc275e2433281e9305e07efb6f77a611ca8e8167ca478a0c4a4c16feab260203aeef501b24b52b54ff9ad92923fd52b2c6925d81e60b492f0ac2465e65b604 SHA512 5d2165ca69080b67426cbc7e30c3ad5545f1a9dacf09e76684c619633cd40b03ed2d0e32181a5dce9463addf20dce1afb58cbf4c0710688e143112687448be2c EBUILD luminance-hdr-2.4.0.ebuild 2010 BLAKE2B 725e43d724a797d695dcb8d6d0675442a30dad0b7fa4392daca1e3aafdffc479f30d3d5dc2777df7a8a7dfbbea30ec4a39d937d3f5b77cfeb08e6e7b6008f44c SHA512 017a18d18e0e724e7271f311371e19adadc40cc52a5699cd15f4b6383d4b761d2285833d408fe7db08fd8c2a9b8b0f9a3335f57112cadd40f9d73c6d9434521f +EBUILD luminance-hdr-2.5.1.ebuild 1942 BLAKE2B fdc60d5f4bf3ee0336e269a7457de2e16547e24bb2865603df2a5fdfff9360f03067e4d607fa99158d7e194ed3c7728998f6738e59ba7a616a5824220e6434c4 SHA512 2412f71b89971d678a41f0301c500986f5c1e24422ca52e4b222f972be4f54f8f8fb6f13b959f81481040f35ea8d2d60d006799ee70bc8f28daf014c510c3a7f MISC metadata.xml 1276 BLAKE2B 5b913b3c342f4d5a6fc67c30008d8eb9469c61cea7f6a10b8c29d1e60324da71e662a4f4d16a0d4a20c7431f5bab3dc9e157efbeae5dacbdadf4b2f5989e9058 SHA512 f1c9daadf3632c1f22297fe5987484a72cb7f0fa3f0758883c7d3c4fe798a6cad7838b855267b1ccc4ca74574692d915e725940c77e9891652a7cc80604a2597 diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-docs.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-docs.patch new file mode 100644 index 000000000000..48c156a382e3 --- /dev/null +++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-docs.patch @@ -0,0 +1,17 @@ +Don't install extra docs and fix install dir. + +--- luminance-hdr-2.3.1/CMakeLists.txt ++++ luminance-hdr-2.3.1/CMakeLists.txt +@@ -281,12 +281,6 @@ + INSTALL(FILES ${CMAKE_SOURCE_DIR}/program-icons/luminance-hdr.png DESTINATION share/icons/hicolor/48x48/apps) # icon + INSTALL(FILES ${CMAKE_SOURCE_DIR}/luminance-hdr.desktop DESTINATION share/applications) #desktop entry + INSTALL(FILES ${CMAKE_SOURCE_DIR}/luminance-hdr.appdata.xml DESTINATION share/appdata) #appstream +- INSTALL(FILES +- ${CMAKE_SOURCE_DIR}/AUTHORS +- ${CMAKE_SOURCE_DIR}/README.md +- ${CMAKE_SOURCE_DIR}/LICENSE +- ${CMAKE_SOURCE_DIR}/Changelog +- DESTINATION share/luminance-hdr) #info files + INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/help DESTINATION share/luminance-hdr) # help directory + INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/hdrhtml DESTINATION share/luminance-hdr) # hdrhtml directory + # Microsoft Windows diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-fits-automagic.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-fits-automagic.patch new file mode 100644 index 000000000000..c3b57861671b --- /dev/null +++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-fits-automagic.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 36cf008..1b75700 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -132,7 +132,11 @@ INCLUDE_DIRECTORIES(${GSL_INCLUDE_DIR} ${GSLCBLAS_INCLUDE_DIR}) + FIND_PACKAGE(JPEG REQUIRED) + INCLUDE_DIRECTORIES(${JPEGLIB_INCLUDE_DIR}) + +-FIND_PACKAGE(CFITSIO) ++OPTION(USE_FITS "Enable FITS support." ON) ++IF(USE_FITS) ++ FIND_PACKAGE(CFITSIO REQUIRED) ++ENDIF() ++ + IF(CFITSIO_FOUND) + INCLUDE_DIRECTORIES(${CFITSIO_INCLUDE_DIR}) + SET(LIBS ${LIBS} ${CFITSIO_LIBRARIES}) diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-no-git.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-no-git.patch new file mode 100644 index 000000000000..8665785736ee --- /dev/null +++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-no-git.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7e8975f..2e5ea5b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -59,11 +59,7 @@ set(LIBS ${LIBS} + ${QT_QTCORE_LIBRARIES} ${QT_QTGUI_LIBRARIES} ${QT_QTNETWORK_LIBRARIES} + ${QT_QTWEBENGINE_LIBRARIES} ${QT_QTXML_LIBRARIES} ${QT_QTSQL_LIBRARIES}) + +-FIND_PACKAGE(Git) +-IF(GIT_FOUND) +- include(GetGitRevisionDescription) +- get_git_head_revision(GIT_REFSPEC GIT_SHA1) +-ENDIF() ++SET(GIT_SHA1 "-- gentoo build --") + + IF(WIN32) + # Windows Section diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-openmp-automagic.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-openmp-automagic.patch new file mode 100644 index 000000000000..f0399d271a59 --- /dev/null +++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-openmp-automagic.patch @@ -0,0 +1,32 @@ +diff --git a/build_files/Modules/CompilerSettings.cmake b/build_files/Modules/CompilerSettings.cmake +index f55c130..81e1916 100644 +--- a/build_files/Modules/CompilerSettings.cmake ++++ b/build_files/Modules/CompilerSettings.cmake +@@ -45,16 +45,19 @@ else() + message(WARNING "Your C++ compiler does not support C++11.") + endif() + #OpenMP Support under Linux, Windows with MSVC & MacOS X with GCC >= 4.3 +-IF(MSVC) +- FIND_PACKAGE(OpenMP REQUIRED) +- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") +- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") +-ELSEIF(CMAKE_COMPILER_IS_GNUCC AND UNIX) +- EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION) +- IF(GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3) +- MESSAGE(STATUS "GCC >= 4.3") ++OPTION(USE_OPENMP "Use openmp threading support." ON) ++IF(USE_OPENMP) ++ IF(MSVC) + FIND_PACKAGE(OpenMP REQUIRED) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") ++ ELSEIF(CMAKE_COMPILER_IS_GNUCC AND UNIX) ++ EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION) ++ IF(GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3) ++ MESSAGE(STATUS "GCC >= 4.3") ++ FIND_PACKAGE(OpenMP REQUIRED) ++ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") ++ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") ++ ENDIF() + ENDIF() + ENDIF() diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.5.1.ebuild b/media-gfx/luminance-hdr/luminance-hdr-2.5.1.ebuild new file mode 100644 index 000000000000..8bf884629bcc --- /dev/null +++ b/media-gfx/luminance-hdr/luminance-hdr-2.5.1.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils toolchain-funcs eutils flag-o-matic + +MY_P=${P/_/.} +DESCRIPTION="Graphical user interface that provides a workflow for HDR imaging" +HOMEPAGE="http://qtpfsgui.sourceforge.net https://github.com/LuminanceHDR/LuminanceHDR" +SRC_URI="mirror://sourceforge/qtpfsgui/${MY_P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +LANGS=" cs de es fi fr hi hu id it pl ro ru sk tr zh" +IUSE="cpu_flags_x86_sse2 fits openmp test ${LANGS// / l10n_}" + +RDEPEND=" + dev-libs/boost:0= + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtprintsupport:5 + dev-qt/qtsql:5 + dev-qt/qtwebengine:5 + >=media-gfx/exiv2-0.14:0= + media-libs/lcms:2 + media-libs/libpng:0= + >=media-libs/libraw-0.13.4:= + media-libs/ilmbase:= + >=media-libs/openexr-1.2.2-r2:= + >=media-libs/tiff-3.8.2-r2:0 + sci-libs/fftw:3.0[threads] + fits? ( sci-libs/cfitsio ) + sci-libs/gsl + virtual/jpeg:0 +" +DEPEND="${RDEPEND} + dev-qt/linguist-tools:5 + test? ( dev-cpp/gtest ) +" + +DOCS=( AUTHORS BUGS Changelog README.md TODO ) + +PATCHES=( + "${FILESDIR}"/${PN}-2.5.1-no-git.patch + "${FILESDIR}"/${PN}-2.5.1-docs.patch + "${FILESDIR}"/${PN}-2.5.1-openmp-automagic.patch + "${FILESDIR}"/${PN}-2.5.1-fits-automagic.patch +) + +pkg_pretend() { + if use cpu_flags_x86_sse2 ; then + append-flags -msse2 + else + eerror "This package requires a CPU supporting the SSE2 instruction set." + die "SSE2 support missing" + fi + + if use openmp ; then + tc-has-openmp || die "Please switch to an openmp compatible compiler" + fi +} + +src_configure() { + mycmakeargs=( + -DUSE_OPENMP="$(usex openmp)" + -DUSE_FITS="$(usex fits)" + ) + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + + for lang in ${LANGS} ; do + if ! use l10n_${lang} ; then + rm -f "${D}"/usr/share/${PN}/i18n/{lang,qt}_${lang}.qm || die + fi + done +} diff --git a/media-gfx/nip2/Manifest b/media-gfx/nip2/Manifest deleted file mode 100644 index cc8611a052dd..000000000000 --- a/media-gfx/nip2/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST nip2-7.38.1.tar.gz 9507197 BLAKE2B cd3717128c220cf782e2327b31b551458ef43ef600056ce6337b8a0bb4320c99bb1177900bac904ff6d009b29dd624109fbee4bcc8ce4bd26a58949d1fa84266 SHA512 e5164a73a468d3aa90ef4c15d77243a285a8941393f5c3766fe83fcc4d518440ce4ac357acb75699e4877f7b47dc2c3e9097f67ed4080617af0a99e28721192f -EBUILD nip2-7.38.1.ebuild 1843 BLAKE2B 9ee653cbb197b89de36e84c5dcefc6e940d27c33345c74cbc0c2fbc783e00b22cb6c30705d7d5ba087ab2f56f093a99ae221ca02609476685531dd1868fbcb14 SHA512 b866a763ee1013d3a544b8c61a9b60433822bcbdb3e4be535ab4ac4537dc49adc90fcf1bcd139ff21b77c4c17905ebf15f7d81e3f5ede7224bcd43a9eeb6960b -MISC metadata.xml 424 BLAKE2B 19ca3b7b21dfb4ceba05b7b160addfc6d2999f290779f624dff22f8b7c1a53bebc94aec39992a9092cb0178862ddaba492624bbd767d39a2c1ef59ed8de12c9e SHA512 660f5437b6a0b7f3ab377d572b80bf3fc849fe663333f283c3b2dc36dc5d655fb528b32610831b1806ae391c7c2e0f48ae66d5f8c32e5e87e977aa3da261ddc3 diff --git a/media-gfx/nip2/metadata.xml b/media-gfx/nip2/metadata.xml deleted file mode 100644 index 1bc39a2f5412..000000000000 --- a/media-gfx/nip2/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?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> - <use> - <flag name="goffice">use <pkg>x11-libs/goffice</pkg> to show plots</flag> - </use> - <upstream> - <remote-id type="sourceforge">vips</remote-id> - </upstream> -</pkgmetadata> diff --git a/media-gfx/nip2/nip2-7.38.1.ebuild b/media-gfx/nip2/nip2-7.38.1.ebuild deleted file mode 100644 index 1fbed7e2f585..000000000000 --- a/media-gfx/nip2/nip2-7.38.1.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit fdo-mime gnome2-utils versionator - -MY_MAJ_VER=$(get_version_component_range 1-2) -DESCRIPTION="VIPS Image Processing Graphical User Interface" -SRC_URI="http://www.vips.ecs.soton.ac.uk/supported/${MY_MAJ_VER}/${P}.tar.gz" -HOMEPAGE="http://vips.sourceforge.net" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug fftw graphviz goffice gsl test" - -RDEPEND=">=dev-libs/glib-2.14:2 - dev-libs/libxml2 - x11-misc/xdg-utils - =media-libs/vips-${MY_MAJ_VER}*[fftw?] - >=x11-libs/gtk+-2.24:2 - goffice? ( x11-libs/goffice:0.8 ) - graphviz? ( <media-gfx/graphviz-2.30 ) - gsl? ( sci-libs/gsl ) - fftw? ( sci-libs/fftw:3.0 )" -DEPEND="${RDEPEND} - sys-devel/bison - sys-devel/flex - test? ( media-libs/vips[jpeg,lcms,tiff] )" - -# lots of tests use fftw transforms -REQUIRED_USE="test? ( fftw )" - -src_configure() { - econf \ - --disable-update-desktop \ - $(use_enable debug) \ - $(use_with goffice libgoffice) \ - $(use_with graphviz libgvc) \ - $(use_with gsl) \ - $(use_with fftw fftw3) -} - -src_test() { - if ! use gsl; then - ewarn "Some tests require USE=gsl. Disabling test_math.ws tests." - rm test/workspaces/test_math.ws - fi - emake check -} - -src_install() { - emake DESTDIR="${D}" install - dodoc AUTHORS ChangeLog THANKS - insinto /usr/share/icons/hicolor/128x128/apps - newins share/nip2/data/vips-128.png nip2.png - - mv "${D}"/usr/share/doc/${PN}/* "${D}"/usr/share/doc/${PF} || die - rmdir "${D}"/usr/share/doc/${PN}/ || die - dosym ../${PF}/html /usr/share/doc/${PN}/html -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update -} - -pkg_postrm() { - fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update -} diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest index 0409c734dd19..c4ec1cd7eae8 100644 --- a/media-gfx/openvdb/Manifest +++ b/media-gfx/openvdb/Manifest @@ -11,4 +11,4 @@ DIST openvdb-4.0.2.tar.gz 1689119 BLAKE2B dbc8d4ab44990440e201327d76bbf9bfe3e8f5 EBUILD openvdb-3.2.0.ebuild 4011 BLAKE2B ec6225fcd8d9aa3a17c3286765ceb082f134468fb8e436dc627af0ef74ffea4e462fabf3126f8e0e25d5c89638563f9c8ad8d808fc79fffdcda51cd715936ec9 SHA512 c84c3022dad66f313415e01d35db4c9ce28b5a0863a0e5fd8cb20f7c07537dfd06022d9ba688e0e6469224ca2777891c2d812758e53d649d750022463a14abc6 EBUILD openvdb-4.0.0.ebuild 1927 BLAKE2B 04de68eb7803c116db62397e227b6f56acb4e81f9208f4c615d3c20753fe6252a2ae2ba414b18a96e2c1015fb0d5623cca86f6b8e967c90de9cac50b4e201766 SHA512 dfffa4cb7393df8683df085935acd528683fc7596132cb49cea3c962772f89d732d9a36081403203a3e11470d258c24ee7c509caed2ae56f156ba2298cc9774e EBUILD openvdb-4.0.2.ebuild 1954 BLAKE2B 581425563f6b3b65329f30adcf9545f9810accee402cb3016626c61e9ab5a13b65e44b0414742b5b5e3acc9d3b5ba975a4e5cd4edf4f313432001d5e442fe06d SHA512 a08dce7c38f5475b28b1a1e4d501635ff0c70dadcaaf6a009ba4c0b9e7e701263e8c96491b52769bd6b594f1e90598bfe30e712af43bde4a80b61fe90c007d0b -MISC metadata.xml 1250 BLAKE2B 2ac98a9ac85c3fa35f7221dbf2f3bf1d191b27cebc8e49f162cdea805589407bdad42e815489501fa551eec66314b790d375a2f2e896a78aba75ddd4c49e18ab SHA512 658f3d0461bdd1c79af3224222b6ea1c8f3107de6520cc80b39590aef0588836d7d04e114200d027eb7b7d2dd1865e60f1135b982eeb3155d3ba102734f1db93 +MISC metadata.xml 1250 BLAKE2B 17d651b364b0c114b299c16a71755bda7a4d59a44d5bf6c72b651d65fb504248c36821e1f58c5cf0f3f80b41961369d701feb29a49116d7182450a23458b8c55 SHA512 0f89a03fc29a06e46e4b4960fbe42c304a5c9d3052e823bd4b5b58090b439e873fa9b915243bf905e187d766724df93b75ca57abf3c567070ab84bd26315cecc diff --git a/media-gfx/openvdb/metadata.xml b/media-gfx/openvdb/metadata.xml index 12b9cf4a8f77..453013e59bea 100644 --- a/media-gfx/openvdb/metadata.xml +++ b/media-gfx/openvdb/metadata.xml @@ -2,7 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer restrict=">=media-gfx/openvdb-3.1.0" type="person"> - <email>j.scruggs@gmail.com</email> + <email>dracwyrm@gentoo.org</email> <name>Jonathan Scruggs</name> </maintainer> <maintainer restrict=">=media-gfx/openvdb-3.1.0" type="person"> diff --git a/media-gfx/scour/Manifest b/media-gfx/scour/Manifest index 714da2a96f8d..0b92167b8853 100644 --- a/media-gfx/scour/Manifest +++ b/media-gfx/scour/Manifest @@ -1,5 +1,5 @@ DIST scour-0.35.tar.gz 80981 BLAKE2B 6cf0eba35a9deadf44534d3e8370187ec7b7655e9dc31f25b5bf465fee7482eb18ee985b0702c7fa8cb5db89cb1579186fee1c43b890ba4c74f4e86cd793927a SHA512 9a09d862d66e21a63744401a44f517eef268288408556e3541218713ee8c5b5c0414ab03ac61d5d2fdbd2f01fa3276793b17f110d44cdec1c53c7b7dee16afc0 DIST scour-0.36.tar.gz 91575 BLAKE2B be65b751151cf939601b6c0dec0613d13be6367f761fc8d7201bd58f2a3475858740be0d972446e2727852b79b1197b82d217b51dd3ae41c0bada10d53d462b7 SHA512 8593f46a0e36fe220f5ce6dd85696172435712491cd1a6983c12054965ce96eeb2a52be0877f8fa6967444817abfc353f9a00f1d8d676cbd6651cfd33a0790f7 EBUILD scour-0.35-r1.ebuild 655 BLAKE2B 0c6c37502c38260170e04f226c7a25bf78f98e14f5ddfb76b2eeb0ce89221cdf3588cc11f236664c4f8698a867409d531f1b5a7235b0e7f56c00e614beb8731e SHA512 ff88db744f396df8d9c0e964c7a48db367b2dea7bb2093bf06674c4cf1907b36617f27f68828c9a141fe19b23294ac3401fb314277228b3cde8269d8a582f954 -EBUILD scour-0.36.ebuild 665 BLAKE2B 3b30b4c52d75da28aa1f533eb4355f2553c3aceaf1d36ec03f1653f50dcfd47f626eebd941afa01f122a7801fdeba77c1f59f320d2ecb1dec9d1966b55192e73 SHA512 4801cabbfa090fdad0f751fe8bca031e7bd028aaa85bf2c608ae91d89d2419d163eea7ff63116ce839bcf03a79e8d4d30f53bb1400c4d9628aafd7da24a90198 +EBUILD scour-0.36.ebuild 664 BLAKE2B 0512cef93709d49344b9c1a17dd36a5526ce3889e1af4d2b6e6066283a6a3c9ce7a4330c3f492ef376e3e5a361bf91246d4659a564057706497007a4511502bd SHA512 73d1940e76b8486668f6842556d998f10bf45391a4affc1bc6367aff816c5765b16f9f0a321cb87887d68d24bcf4876e285d5cc443916e2a7aa06edd5ac2ba57 MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf diff --git a/media-gfx/scour/scour-0.36.ebuild b/media-gfx/scour/scour-0.36.ebuild index 2bf29d55e2ca..b975d46f12e2 100644 --- a/media-gfx/scour/scour-0.36.ebuild +++ b/media-gfx/scour/scour-0.36.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/scour-project/${PN}/archive/v${PV}.tar.gz -> ${P}.ta LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86" IUSE="" RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] |