diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-06-02 17:13:10 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-06-02 17:13:10 +0100 |
commit | 0bff53119f08d677db6c1a991bd30741682a8a08 (patch) | |
tree | 6ec8d4c38152bb4f2bb4b93277236ebd9fbbd21d /media-gfx/yafaray | |
parent | 6c14fa2586d9e9c4427b5f727dc6c8ab77587cec (diff) |
Revert "gentoo resync : 02.06.2018"
This reverts commit 6c14fa2586d9e9c4427b5f727dc6c8ab77587cec.
Diffstat (limited to 'media-gfx/yafaray')
-rw-r--r-- | media-gfx/yafaray/Manifest | 7 | ||||
-rw-r--r-- | media-gfx/yafaray/files/yafaray-3.3.0-blender-exporter-paths.patch | 15 | ||||
-rw-r--r-- | media-gfx/yafaray/files/yafaray-3.3.0-respect-cflags.patch | 14 | ||||
-rw-r--r-- | media-gfx/yafaray/files/yafaray-3.3.0-strip-debug-mode.patch | 12 | ||||
-rw-r--r-- | media-gfx/yafaray/metadata.xml | 23 | ||||
-rw-r--r-- | media-gfx/yafaray/yafaray-3.3.0.ebuild | 101 |
6 files changed, 0 insertions, 172 deletions
diff --git a/media-gfx/yafaray/Manifest b/media-gfx/yafaray/Manifest deleted file mode 100644 index c3bd529a7936..000000000000 --- a/media-gfx/yafaray/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -AUX yafaray-3.3.0-blender-exporter-paths.patch 536 BLAKE2B 558b85f1ffc6afe3daf58a395b54e31d7affc239a5f5fd79dead9410925e09b14ff907bb2ddf3899b57451e19b11d776cd5c7a0ebf8e590a8c45a337a5100abd SHA512 a7ee5f2112a21da653049f36b50851551f3402a54b4f1644e3e151beb83b827493c2992059a94ad06583e9906bd58f8929a79c6da49ccc9dcba63c9397e69440 -AUX yafaray-3.3.0-respect-cflags.patch 502 BLAKE2B 1df4f8667e8c2577812c690baf17c200912abc12748b41f0ea436add977eb111077b0655ba0cf83b3994d819e96b35893fa8ba4c29c85414b000178497115577 SHA512 ce1ebe180240861d553b54bccc42cbf01a91b5767a5e52e0d1578c8b4be4247a92331069a3946a628fa45d62fd02fd2112c3cd028cf1d1cdc05083d4e1dabd79 -AUX yafaray-3.3.0-strip-debug-mode.patch 767 BLAKE2B 42351950158441bd328e3fd3265e8e9e0f96ee51cf9aadf427c3dda7b57b77716e022801183271dd7206d9ec58b1e239159736894423ca53885c033a2b7e8e0f SHA512 f139d622162d02bfd1d95d38ffa2fcb29fd32cdd51cc14aec986dc481c00aa3c982e537ead2ae8d1972401312aaf9ef8cd92b81fc1fd3ee819f350eadac5d2d2 -DIST yafaray-blender-exporter-3.3.0.tar.gz 377928 BLAKE2B 7876c78ca6228282648909e566803b33304be0082fab48819340845e3927877b9734f7bc7e09702bf7cbf6477c68932637eb766dc98b9e8e4ab42ca99d2a3595 SHA512 70a1a806d97f6f3b43cdb5d6caac6104f0f63720d5920f6a623078e05e6977d065d2fabca4da1644deb97f09176b88347f0278e4bc699c783d807d3f530421d0 -DIST yafaray-core-3.3.0.tar.gz 1135360 BLAKE2B 67f6956a3866bfe0b4167f30a7c2c7f05ee23556e9fff7041ff3937e90011e4c2538b706ae27e02351ae555d0d05531f3eb711257591d85f779683c9c42ac6f7 SHA512 32efb87872485c4a188483ae1172cac2eca2281e7b9ab29f184c047b94f3986d65da199a74c169d0e2fd6af59cf37b7deb69dcfb1cb4763bb1ebca30d46b5b90 -EBUILD yafaray-3.3.0.ebuild 3372 BLAKE2B 29ec1802d482a60e654fafdf990209fb4faad705c0ef9747f05cbbf744d164c57e70fd527ef37cf64d8130c0ae169aefc7e5dde224f903021cc3d2ac7009e5ed SHA512 928e5a003e822d9e2a282245efebf5cb007852a9101283a3a3178240d04a28378e5e9e99d631ac29084da036f0e5ccdc02fd5435e637abf6fe3d4a976b2793f8 -MISC metadata.xml 1133 BLAKE2B 17e445d385b5d94bcb6eafa02e211423d6a515c8fd6b756a856e312817117e958652a11a223e08ea062aef9fe0df1e23b623b0025f34b6b3b1a53a32cb1cabf6 SHA512 d1d8237a273d994de3f77328ab97bb6c4008ce94c0598d3fa345ecef047bbcaaa6f75b3fe3b05d80f65adbca05be7a30d7759e7ae37034a8e42e52d7483cc981 diff --git a/media-gfx/yafaray/files/yafaray-3.3.0-blender-exporter-paths.patch b/media-gfx/yafaray/files/yafaray-3.3.0-blender-exporter-paths.patch deleted file mode 100644 index 9bf4f2b91f68..000000000000 --- a/media-gfx/yafaray/files/yafaray-3.3.0-blender-exporter-paths.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/work/Blender-Exporter-3.3.0/__init__.py b/work/Blender-Exporter-3.3.0/__init__.py -index 85dc1c2..70a79e8 100644 ---- a/__init__.py -+++ b/__init__.py -@@ -22,8 +22,8 @@ import sys - import os - import ctypes - --PLUGIN_PATH = os.path.join(__path__[0], 'bin', 'yafaray-plugins') --BIN_PATH = os.path.join(__path__[0], 'bin') -+PLUGIN_PATH = '/usr/lib/yafaray-plugins' -+BIN_PATH = '/usr/bin' - YAF_ID_NAME = "YAFA_V3_RENDER" - - # Version to be automatically populated during the cmake build process, getting the version from git tags diff --git a/media-gfx/yafaray/files/yafaray-3.3.0-respect-cflags.patch b/media-gfx/yafaray/files/yafaray-3.3.0-respect-cflags.patch deleted file mode 100644 index c22ff7e41ea6..000000000000 --- a/media-gfx/yafaray/files/yafaray-3.3.0-respect-cflags.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/work/Core-3.3.0/CMakeLists.txt b/work/Core-3.3.0/CMakeLists.txt -index 75fd2c6..94c2502 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -219,9 +219,6 @@ if(NOT WIN32) - set(YAF_BINDINGS_RUBY_DIR ${YAF_LIB_DIR}) - endif(NOT YAF_BINDINGS_RUBY_DIR) - -- # build flags -- set(CMAKE_CXX_FLAGS "-Wall" CACHE STRING "Default compiler flags" FORCE) -- - if(USER_RELEASE_OPTIMIZATION_FLAGS) - set(YAF_CXX_FLAGS_RELEASE ${USER_RELEASE_OPTIMIZATION_FLAGS}) - else(USER_RELEASE_OPTIMIZATION_FLAGS) diff --git a/media-gfx/yafaray/files/yafaray-3.3.0-strip-debug-mode.patch b/media-gfx/yafaray/files/yafaray-3.3.0-strip-debug-mode.patch deleted file mode 100644 index 3bdb4eeef361..000000000000 --- a/media-gfx/yafaray/files/yafaray-3.3.0-strip-debug-mode.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/work/Core-3.3.0/CMakeLists.txt b/work/Core-3.3.0/CMakeLists.txt -index 75fd2c6..52c6b3d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -17,7 +17,6 @@ option(WITH_YAF_PY_BINDINGS "Enable the YafaRay Python bindings" ON) - option(WITH_YAF_RUBY_BINDINGS "Enable the YafaRay Ruby bindings" OFF) - option(WITH_OSX_ADDON "Enable the use of blender's included python lib on OSX platforms" OFF) - option(WITH_OpenCV "Build OpenCV image processing support" ON) --option(DEBUG_BUILD "Enable debug build mode" OFF) - option(EMBED_FONT_QT "Embed font for QT GUI (usefull for some buggy QT installations)" OFF) - option(FAST_MATH "Enable mathematic approximations to make code faster" ON) - option(FAST_TRIG "Enable trigonometric approximations to make code faster" ON) diff --git a/media-gfx/yafaray/metadata.xml b/media-gfx/yafaray/metadata.xml deleted file mode 100644 index cee5f0b787f1..000000000000 --- a/media-gfx/yafaray/metadata.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>herb@hlmjr.com</email> - <name>Herb Miller Jr. (herbmillerjr)</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - <longdescription lang="en"> - YafaRay is a raytracing open source render engine. Raytracing is a rendering technique for generating realistic images by tracing the path of light through a 3D scene. - An render engine consists of a "faceless" computer program that interacts with a host 3D application to provide very specific raytracing capabilties "on demand". Blender 3D is the host application of YafaRay. - </longdescription> - <use> - <flag name="blender">Install addon for <pkg>media-gfx/blender</pkg></flag> - <flag name="fastmath">Enable mathematic approximations to make code faster</flag> - <flag name="fasttrig">Enable trigonometric approximations to make code faster</flag> - <flag name="opencv">Use <pkg>media-libs/opencv</pkg></flag> - </use> -</pkgmetadata> - diff --git a/media-gfx/yafaray/yafaray-3.3.0.ebuild b/media-gfx/yafaray/yafaray-3.3.0.ebuild deleted file mode 100644 index 3b077ecb4aa8..000000000000 --- a/media-gfx/yafaray/yafaray-3.3.0.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{5,6} ) -inherit cmake-utils python-single-r1 - -DESCRIPTION="A free open-source montecarlo raytracing engine" -HOMEPAGE="http://www.yafaray.org" -SRC_URI="https://github.com/YafaRay/Core/archive/v${PV}.tar.gz -> ${PN}-core-${PV}.tar.gz - https://github.com/YafaRay/Blender-Exporter/archive/v${PV}.tar.gz -> ${PN}-blender-exporter-${PV}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+blender +fastmath +fasttrig jpeg opencv openexr png +python tiff truetype" - -RDEPEND="dev-libs/boost:= - dev-libs/libxml2 - sys-libs/zlib - blender? ( media-gfx/blender ) - jpeg? ( virtual/jpeg:0 ) - opencv? ( >=media-libs/opencv-3.1.0:=[openexr?] ) - openexr? ( >=media-libs/openexr-2.2.0:= ) - png? ( media-libs/libpng:= ) - python? ( ${PYTHON_DEPS} ) - tiff? ( media-libs/tiff:0 ) - truetype? ( media-libs/freetype )" -DEPEND="${RDEPEND} - dev-lang/swig" - -S="${WORKDIR}/Core-${PV}" - -src_prepare() { - cmake-utils_src_prepare - - sed -i -e "s/@YAFARAY_BLENDER_EXPORTER_VERSION@/v${PV}/" "${WORKDIR}/Blender-Exporter-${PV}/__init__.py" || die - - eapply "${FILESDIR}/${P}-strip-debug-mode.patch" - eapply "${FILESDIR}/${P}-respect-cflags.patch" - pushd "${WORKDIR}/Blender-Exporter-${PV}" || die - eapply "${FILESDIR}/${P}-blender-exporter-paths.patch" - popd || dir - eapply_user -} - -src_configure() { - local mycmakeargs=( - -DYAF_LIB_DIR=$(get_libdir) - -DWITH_YAF_PY_BINDINGS=$(usex python) - -DWITH_YAF_RUBY_BINDINGS=OFF - -DBLENDER_ADDON=OFF # addon is a separate package called blender-exporter - -DCMAKE_SKIP_RPATH=ON # NULL DT_RUNPATH security problem - -DFAST_MATH=$(usex fastmath) - -DFAST_TRIG=$(usex fasttrig) - -DWITH_JPEG="$(usex jpeg)" - -DWITH_OpenCV="$(usex opencv)" - -DWITH_OpenEXR="$(usex openexr)" - -DWITH_PNG="$(usex png)" - -DWITH_QT=OFF # qt4 only at the moment - -DWITH_TIFF="$(usex tiff)" - -DWITH_Freetype="$(usex truetype)" - ) - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - python_domodule "${BUILD_DIR}/src/bindings/yafaray_v3_interface.py" - python_domodule "${BUILD_DIR}/src/bindings/_yafaray_v3_interface.so" - rm -v "${D}"usr/$(get_libdir)/{yafaray_v3_interface.py,_yafaray_v3_interface.so} || die - - if use blender; then - pushd "${WORKDIR}/Blender-Exporter-${PV}" || die - rm README LICENSES INSTALL CHANGELOG .gitignore || die - # grab blender version number for plugin directory - local blender_plugin_dir=$(best_version media-gfx/blender) - blender_plugin_dir=${blender_plugin_dir##*/} # remove category - blender_plugin_dir=${blender_plugin_dir#*-} # remove package name - blender_plugin_dir=${blender_plugin_dir%%-*} # remove revision number if exists - insinto /usr/share/blender/${blender_plugin_dir}/scripts/addons/yafaray_v3 - doins -r . - popd || die - fi -} - -pkg_postinst() { - elog "To confirm your installation is working as expected, run" - elog "yafaray-xml with /usr/share/yafaray/tests/test01/test01.xml" - elog "as an input file, then compare the result to" - elog "'/usr/share/yafaray/tests/test01/test01 - expected render result.png'" - if use blender; then - elog - elog "To use within Blender, navigate to File -> User Preferences -> Add-ons (tab)" - elog "and enable 'Render: YafaRay v3 Exporter'. This will make YafaRay available" - elog "in the render engines drop-down." - fi -} |