* [gentoo-commits] repo/gentoo:master commit in: media-gfx/yafaray/files/, media-gfx/yafaray/
@ 2018-05-29 21:43 Michał Górny
0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2018-05-29 21:43 UTC (permalink / raw
To: gentoo-commits
commit: 11bd4094e336b9ac197ac5f571cf14253c6379dc
Author: Herb Miller Jr <herb <AT> hlmjr <DOT> com>
AuthorDate: Wed Mar 21 11:37:54 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue May 29 21:41:20 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11bd4094
media-gfx/yafaray: Create 3.3.0 ebuild.
Closes: https://bugs.gentoo.org/639046
Closes: https://github.com/gentoo/gentoo/pull/7530
Package-Manager: Portage-2.3.24, Repoman-2.3.6
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/metadata.xml | 23 +++++
media-gfx/yafaray/yafaray-3.3.0.ebuild | 101 +++++++++++++++++++++
6 files changed, 167 insertions(+)
diff --git a/media-gfx/yafaray/Manifest b/media-gfx/yafaray/Manifest
new file mode 100644
index 00000000000..967398bad99
--- /dev/null
+++ b/media-gfx/yafaray/Manifest
@@ -0,0 +1,2 @@
+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
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
new file mode 100644
index 00000000000..9bf4f2b91f6
--- /dev/null
+++ b/media-gfx/yafaray/files/yafaray-3.3.0-blender-exporter-paths.patch
@@ -0,0 +1,15 @@
+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
new file mode 100644
index 00000000000..c22ff7e41ea
--- /dev/null
+++ b/media-gfx/yafaray/files/yafaray-3.3.0-respect-cflags.patch
@@ -0,0 +1,14 @@
+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
new file mode 100644
index 00000000000..3bdb4eeef36
--- /dev/null
+++ b/media-gfx/yafaray/files/yafaray-3.3.0-strip-debug-mode.patch
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 00000000000..cee5f0b787f
--- /dev/null
+++ b/media-gfx/yafaray/metadata.xml
@@ -0,0 +1,23 @@
+<?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
new file mode 100644
index 00000000000..3b077ecb4aa
--- /dev/null
+++ b/media-gfx/yafaray/yafaray-3.3.0.ebuild
@@ -0,0 +1,101 @@
+# 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
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/yafaray/files/, media-gfx/yafaray/
@ 2020-04-26 13:37 Joonas Niilola
0 siblings, 0 replies; 4+ messages in thread
From: Joonas Niilola @ 2020-04-26 13:37 UTC (permalink / raw
To: gentoo-commits
commit: ed9a6660a5acb9a1729f4d68df61b9e6d0f3f4c8
Author: Bernd Waibel <waebbl <AT> gmail <DOT> com>
AuthorDate: Sun Apr 19 17:59:46 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Apr 26 13:36:46 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed9a6660
media-gfx/yafaray: drop old 3.3.0
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Bernd Waibel <waebbl <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/15415
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
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(-)
diff --git a/media-gfx/yafaray/Manifest b/media-gfx/yafaray/Manifest
index 58ccf86d69e..0d86321f1fd 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 9bf4f2b91f6..00000000000
--- 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 c22ff7e41ea..00000000000
--- 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 3bdb4eeef36..00000000000
--- 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 b1f99de4d34..00000000000
--- 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
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/yafaray/files/, media-gfx/yafaray/
@ 2021-03-13 7:31 Joonas Niilola
0 siblings, 0 replies; 4+ messages in thread
From: Joonas Niilola @ 2021-03-13 7:31 UTC (permalink / raw
To: gentoo-commits
commit: 035cffeb173bd85dba3276158e18f03a9609ed19
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Fri Mar 12 19:54:08 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Mar 13 07:30:53 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=035cffeb
media-gfx/yafaray: respect CFLAGS
Closes: https://bugs.gentoo.org/774858
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/19900
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
...ay-3.5.1-0001-respect-distribution-CFLAGS.patch | 39 ++++++++++++++++++++++
media-gfx/yafaray/yafaray-3.5.1.ebuild | 4 +++
2 files changed, 43 insertions(+)
diff --git a/media-gfx/yafaray/files/yafaray-3.5.1-0001-respect-distribution-CFLAGS.patch b/media-gfx/yafaray/files/yafaray-3.5.1-0001-respect-distribution-CFLAGS.patch
new file mode 100644
index 00000000000..67cb8ca3aad
--- /dev/null
+++ b/media-gfx/yafaray/files/yafaray-3.5.1-0001-respect-distribution-CFLAGS.patch
@@ -0,0 +1,39 @@
+From 2f7e31a06679798c15f737b2725d246a12bcc6b4 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Fri, 12 Mar 2021 20:43:20 +0100
+Subject: [PATCH] respect distribution CFLAGS
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ CMakeLists.txt | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 00dfda9..ade65a7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -234,18 +234,18 @@ if(NOT WIN32)
+ endif(NOT YAF_BINDINGS_RUBY_DIR)
+
+ # build flags
+- set(CMAKE_CXX_FLAGS "-Wall -Wno-unused-result" CACHE STRING "Default compiler flags" FORCE)
++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-unused-result" 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)
+- set(YAF_CXX_FLAGS_RELEASE "-Wall -std=c++11 -pthread -O3 -ffast-math -Wno-unused-result")
++ set(YAF_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wall -std=c++11 -pthread -O3 -ffast-math -Wno-unused-result")
+ endif(USER_RELEASE_OPTIMIZATION_FLAGS)
+
+ if(USER_DEBUG_OPTIMIZATION_FLAGS)
+ set(YAF_CXX_FLAGS_DEBUG ${USER_DEBUG_OPTIMIZATION_FLAGS})
+ else(USER_DEBUG_OPTIMIZATION_FLAGS)
+- set(YAF_CXX_FLAGS_DEBUG "-Wall -std=c++11 -pthread -ggdb -Wno-unused-result")
++ set(YAF_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -std=c++11 -pthread -ggdb -Wno-unused-result")
+ endif(USER_DEBUG_OPTIMIZATION_FLAGS)
+
+ if(APPLE)
+--
+2.30.1
+
diff --git a/media-gfx/yafaray/yafaray-3.5.1.ebuild b/media-gfx/yafaray/yafaray-3.5.1.ebuild
index cca93fade78..2b65a4e8f72 100644
--- a/media-gfx/yafaray/yafaray-3.5.1.ebuild
+++ b/media-gfx/yafaray/yafaray-3.5.1.ebuild
@@ -46,6 +46,10 @@ BDEPEND="python? (
dev-lang/swig
)"
+PATCHES=(
+ "${FILESDIR}"/${P}-0001-respect-distribution-CFLAGS.patch
+)
+
DOCS=( AUTHORS.md CHANGELOG.md CODING.md INSTALL.md README.md )
pkg_setup() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/yafaray/files/, media-gfx/yafaray/
@ 2023-04-25 21:30 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2023-04-25 21:30 UTC (permalink / raw
To: gentoo-commits
commit: 31730190420eb7e3b472c4649b7f3c67cdb1dbc9
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Tue Apr 25 14:20:49 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 25 21:27:10 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31730190
media-gfx/yafaray: fix build with gcc-13
add missing #include statement
Bug: https://github.com/YafaRay/libYafaRay/issues/14
Closes: https://bugs.gentoo.org/895208
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/30748
Signed-off-by: Sam James <sam <AT> gentoo.org>
....1-add-missing-include-statements-for-gcc-13.patch | 19 +++++++++++++++++++
media-gfx/yafaray/metadata.xml | 3 +++
media-gfx/yafaray/yafaray-3.5.1-r4.ebuild | 1 +
3 files changed, 23 insertions(+)
diff --git a/media-gfx/yafaray/files/yafaray-3.5.1-add-missing-include-statements-for-gcc-13.patch b/media-gfx/yafaray/files/yafaray-3.5.1-add-missing-include-statements-for-gcc-13.patch
new file mode 100644
index 000000000000..066824f39c60
--- /dev/null
+++ b/media-gfx/yafaray/files/yafaray-3.5.1-add-missing-include-statements-for-gcc-13.patch
@@ -0,0 +1,19 @@
+From ca340cbfc518cc4b0655840453198620215535df Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Tue, 25 Apr 2023 09:27:40 +0200
+Subject: [PATCH] add missing #include statements for gcc-13
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+--- a/include/core_api/session.h
++++ b/include/core_api/session.h
+@@ -25,6 +25,7 @@
+
+ #include <yafray_constants.h>
+ #include <utilities/threadUtils.h>
++#include <string>
+
+ __BEGIN_YAFRAY
+
+--
+2.40.0
+
diff --git a/media-gfx/yafaray/metadata.xml b/media-gfx/yafaray/metadata.xml
index b38bee5a6025..c509ab948629 100644
--- a/media-gfx/yafaray/metadata.xml
+++ b/media-gfx/yafaray/metadata.xml
@@ -28,4 +28,7 @@
Add support for <pkg>media-libs/opencv</pkg> image processing.
</flag>
</use>
+ <upstream>
+ <remote-id type="github">YafaRay/libYafaRay</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/media-gfx/yafaray/yafaray-3.5.1-r4.ebuild b/media-gfx/yafaray/yafaray-3.5.1-r4.ebuild
index 39fab8a3fae7..faee7f24fff4 100644
--- a/media-gfx/yafaray/yafaray-3.5.1-r4.ebuild
+++ b/media-gfx/yafaray/yafaray-3.5.1-r4.ebuild
@@ -47,6 +47,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${P}-0001-respect-distribution-CFLAGS.patch
"${FILESDIR}"/${P}-add-missing-limits-header.patch
+ "${FILESDIR}"/${PN}-3.5.1-add-missing-include-statements-for-gcc-13.patch
)
DOCS=( AUTHORS.md CHANGELOG.md CODING.md INSTALL.md README.md )
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-04-25 21:30 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-26 13:37 [gentoo-commits] repo/gentoo:master commit in: media-gfx/yafaray/files/, media-gfx/yafaray/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2023-04-25 21:30 Sam James
2021-03-13 7:31 Joonas Niilola
2018-05-29 21:43 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox