From ed9a6660a5acb9a1729f4d68df61b9e6d0f3f4c8 Mon Sep 17 00:00:00 2001 From: Bernd Waibel Date: Sun, 19 Apr 2020 19:59:46 +0200 Subject: media-gfx/yafaray: drop old 3.3.0 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Bernd Waibel Closes: https://github.com/gentoo/gentoo/pull/15415 Signed-off-by: Joonas Niilola --- media-gfx/yafaray/Manifest | 2 - .../yafaray-3.3.0-blender-exporter-paths.patch | 15 --- .../files/yafaray-3.3.0-respect-cflags.patch | 14 --- .../files/yafaray-3.3.0-strip-debug-mode.patch | 12 --- media-gfx/yafaray/yafaray-3.3.0-r2.ebuild | 111 --------------------- 5 files changed, 154 deletions(-) delete mode 100644 media-gfx/yafaray/files/yafaray-3.3.0-blender-exporter-paths.patch delete mode 100644 media-gfx/yafaray/files/yafaray-3.3.0-respect-cflags.patch delete mode 100644 media-gfx/yafaray/files/yafaray-3.3.0-strip-debug-mode.patch delete mode 100644 media-gfx/yafaray/yafaray-3.3.0-r2.ebuild diff --git a/media-gfx/yafaray/Manifest b/media-gfx/yafaray/Manifest index 58ccf86d69e0..0d86321f1fd2 100644 --- a/media-gfx/yafaray/Manifest +++ b/media-gfx/yafaray/Manifest @@ -1,4 +1,2 @@ -DIST yafaray-blender-exporter-3.3.0.tar.gz 377928 BLAKE2B 7876c78ca6228282648909e566803b33304be0082fab48819340845e3927877b9734f7bc7e09702bf7cbf6477c68932637eb766dc98b9e8e4ab42ca99d2a3595 SHA512 70a1a806d97f6f3b43cdb5d6caac6104f0f63720d5920f6a623078e05e6977d065d2fabca4da1644deb97f09176b88347f0278e4bc699c783d807d3f530421d0 DIST yafaray-blender-exporter-3.4.1.tar.gz 381253 BLAKE2B b1483c79b14581729f598b92ca504af4a8a73cff54ff2014e8be646eaa2eea7f10074d1dc8c58251d8a987ac6e5ac10d1bc34b80c229f74e6d580bbaa3a3c461 SHA512 1f7baf7bf5953be8b4e004b1509cc23164df0a05e28d33a2301195ea21ad4d4cd6fdd67a0b1af11c1075bab7018e64b38f564be8b647d8513db46feee7d8bf85 -DIST yafaray-core-3.3.0.tar.gz 1135360 BLAKE2B 67f6956a3866bfe0b4167f30a7c2c7f05ee23556e9fff7041ff3937e90011e4c2538b706ae27e02351ae555d0d05531f3eb711257591d85f779683c9c42ac6f7 SHA512 32efb87872485c4a188483ae1172cac2eca2281e7b9ab29f184c047b94f3986d65da199a74c169d0e2fd6af59cf37b7deb69dcfb1cb4763bb1ebca30d46b5b90 DIST yafaray-core-3.4.1.tar.gz 1136077 BLAKE2B a2ce3945f52315084ee744ff4a6733255018196f0000ca6b1786fbd2ec49ade64cb62e98dfba95dca4dec361f47235d59a8c9bd95ee7d095214fc0afbdcb1ee4 SHA512 a9116273fbc2aaaadbc38a65b1eaaa502070ff06f8a2929e880714a9db57188e65cf319c20a3f96e08146af36a67aea139709a633eb024be65319a64330e6f68 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/yafaray-3.3.0-r2.ebuild b/media-gfx/yafaray/yafaray-3.3.0-r2.ebuild deleted file mode 100644 index b1f99de4d347..000000000000 --- a/media-gfx/yafaray/yafaray-3.3.0-r2.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) - -inherit cmake flag-o-matic 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" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - dev-libs/boost:= - dev-libs/libxml2:2 - 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:0= ) - python? ( ${PYTHON_DEPS} ) - tiff? ( media-libs/tiff:0 ) - truetype? ( media-libs/freetype:2 ) -" -DEPEND="${RDEPEND}" -BDEPEND="dev-lang/swig" - -S="${WORKDIR}/Core-${PV}" - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - append-flags "-pthread" - cmake_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) - -DYAF_PY_VERSION=${EPYTHON#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_src_configure -} - -src_install() { - cmake_src_install - - python_domodule "${BUILD_DIR}/src/bindings/yafaray_v3_interface.py" - python_domodule "${BUILD_DIR}/src/bindings/_yafaray_v3_interface.so" - rm -v "${ED}"/usr/$(get_libdir)/{yafaray_v3_interface.py,_yafaray_v3_interface.so} || die - rm -rv "${ED}"/usr/share/doc/${PN} || 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() { - einfo "To confirm your installation is working as expected, run" - einfo "yafaray-xml with /usr/share/yafaray/tests/test01/test01.xml" - einfo "as an input file, then compare the result to" - einfo "'/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 -} -- cgit v1.2.3-18-g5258