Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/yafaray/, media-gfx/yafaray/files/
Date: Sun, 30 Oct 2022 09:43:22
Message-Id: 1667122861.c7f74a47af6241528b895cbad48325edcb396856.sam@gentoo
1 commit: c7f74a47af6241528b895cbad48325edcb396856
2 Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
3 AuthorDate: Tue Oct 25 11:47:06 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 30 09:41:01 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7f74a47
7
8 media-gfx/yafaray: drop 3.4.1
9
10 Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 media-gfx/yafaray/Manifest | 1 -
14 ....1-0001-Respect-user-pre-defined-CXXFLAGS.patch | 35 -------
15 media-gfx/yafaray/yafaray-3.4.1.ebuild | 114 ---------------------
16 3 files changed, 150 deletions(-)
17
18 diff --git a/media-gfx/yafaray/Manifest b/media-gfx/yafaray/Manifest
19 index e5363adde333..f10e833aaf1d 100644
20 --- a/media-gfx/yafaray/Manifest
21 +++ b/media-gfx/yafaray/Manifest
22 @@ -1,2 +1 @@
23 DIST yafaray-3.5.1.tar.gz 1136455 BLAKE2B 6002f3b96f3626b83f57015eaf3ddd53dcb6b6fd863277912f7fec06e4f176ec81dc48b889a068e6259edf17727dd04d4b1bbc51b571bfe6aad5e48148201e2e SHA512 3ead4d8becd2d524aa5bb4bbde4b9d98b56f8a38d872e7aa49ba19081094406336def02e9bf1503e424ca8e6cade0db4b042214cea8f9345bd4fc542c9346dbe
24 -DIST yafaray-core-3.4.1.tar.gz 1136077 BLAKE2B a2ce3945f52315084ee744ff4a6733255018196f0000ca6b1786fbd2ec49ade64cb62e98dfba95dca4dec361f47235d59a8c9bd95ee7d095214fc0afbdcb1ee4 SHA512 a9116273fbc2aaaadbc38a65b1eaaa502070ff06f8a2929e880714a9db57188e65cf319c20a3f96e08146af36a67aea139709a633eb024be65319a64330e6f68
25
26 diff --git a/media-gfx/yafaray/files/yafaray-3.4.1-0001-Respect-user-pre-defined-CXXFLAGS.patch b/media-gfx/yafaray/files/yafaray-3.4.1-0001-Respect-user-pre-defined-CXXFLAGS.patch
27 deleted file mode 100644
28 index 90b2786c3c54..000000000000
29 --- a/media-gfx/yafaray/files/yafaray-3.4.1-0001-Respect-user-pre-defined-CXXFLAGS.patch
30 +++ /dev/null
31 @@ -1,35 +0,0 @@
32 -From 2f77edf05ed02955dc08821f322a529063dbfa28 Mon Sep 17 00:00:00 2001
33 -From: Bernd Waibel <waebbl@×××××.com>
34 -Date: Sun, 19 Apr 2020 15:39:45 +0200
35 -Subject: [PATCH] Respect user pre-defined CXXFLAGS
36 -
37 -Signed-off-by: Bernd Waibel <waebbl@×××××.com>
38 ----
39 - CMakeLists.txt | 4 ++--
40 - 1 file changed, 2 insertions(+), 2 deletions(-)
41 -
42 -diff --git a/CMakeLists.txt b/CMakeLists.txt
43 -index 047456f..6733b7d 100644
44 ---- a/CMakeLists.txt
45 -+++ b/CMakeLists.txt
46 -@@ -224,7 +224,7 @@ if(NOT WIN32)
47 - endif(NOT YAF_BINDINGS_RUBY_DIR)
48 -
49 - # build flags
50 -- set(CMAKE_CXX_FLAGS "-Wall" CACHE STRING "Default compiler flags" FORCE)
51 -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall" CACHE STRING "Default compiler flags" FORCE)
52 -
53 - if(USER_RELEASE_OPTIMIZATION_FLAGS)
54 - set(YAF_CXX_FLAGS_RELEASE ${USER_RELEASE_OPTIMIZATION_FLAGS})
55 -@@ -263,7 +263,7 @@ else(NOT WIN32)
56 -
57 - # build flags
58 - if(MINGW)
59 -- set(CMAKE_CXX_FLAGS "-Wall" CACHE STRING "Default compiler flags" FORCE)
60 -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall" CACHE STRING "Default compiler flags" FORCE)
61 -
62 - if(USER_RELEASE_OPTIMIZATION_FLAGS)
63 - set(YAF_CXX_FLAGS_RELEASE ${USER_RELEASE_OPTIMIZATION_FLAGS})
64 ---
65 -2.26.1
66 -
67
68 diff --git a/media-gfx/yafaray/yafaray-3.4.1.ebuild b/media-gfx/yafaray/yafaray-3.4.1.ebuild
69 deleted file mode 100644
70 index 4efd96180ca1..000000000000
71 --- a/media-gfx/yafaray/yafaray-3.4.1.ebuild
72 +++ /dev/null
73 @@ -1,114 +0,0 @@
74 -# Copyright 1999-2020 Gentoo Authors
75 -# Distributed under the terms of the GNU General Public License v2
76 -
77 -EAPI=7
78 -
79 -PYTHON_COMPAT=( python3_{7,8} )
80 -
81 -# doesn't build with ninja when qt5 and python USE flags are both enabled
82 -CMAKE_MAKEFILE_GENERATOR="emake"
83 -
84 -inherit cmake flag-o-matic python-single-r1
85 -
86 -DESCRIPTION="A free open-source montecarlo raytracing engine"
87 -HOMEPAGE="http://www.yafaray.org"
88 -SRC_URI="https://github.com/YafaRay/Core/archive/v${PV}.tar.gz -> ${PN}-core-${PV}.tar.gz"
89 -
90 -S="${WORKDIR}/Core-${PV}"
91 -
92 -LICENSE="LGPL-2.1"
93 -SLOT="0"
94 -KEYWORDS="~amd64 ~x86"
95 -IUSE="+fastmath +fasttrig jpeg opencv openexr png +python qt5 tiff truetype"
96 -RESTRICT="test"
97 -
98 -REQUIRED_USE="
99 - python? ( ${PYTHON_REQUIRED_USE} )
100 -"
101 -
102 -# Note: according to upstream, the blender plugin doesn't work with blender-2.8 (yet).
103 -RDEPEND="
104 - dev-libs/boost:=[nls]
105 - dev-libs/libxml2:2
106 - sys-libs/zlib
107 - jpeg? ( virtual/jpeg:0 )
108 - opencv? ( >=media-libs/opencv-3.1.0:= )
109 - openexr? ( >=media-libs/openexr-2.2.0:= )
110 - png? ( media-libs/libpng:0= )
111 - python? ( ${PYTHON_DEPS} )
112 - qt5? ( dev-qt/qtwidgets:5 )
113 - tiff? ( media-libs/tiff:0 )
114 - truetype? ( media-libs/freetype:2 )
115 -"
116 -DEPEND="${RDEPEND}"
117 -BDEPEND="python? ( dev-lang/swig )"
118 -
119 -PATCHES=(
120 - "${FILESDIR}/${P}-0001-Respect-user-pre-defined-CXXFLAGS.patch"
121 -)
122 -
123 -DOCS=( AUTHORS CHANGELOG CODING INSTALL README )
124 -
125 -pkg_setup() {
126 - use python && python-single-r1_pkg_setup
127 -}
128 -
129 -src_prepare() {
130 - append-flags -pthread
131 - append-ldflags -pthread
132 -
133 - cmake_src_prepare
134 -}
135 -
136 -src_configure() {
137 - local mycmakeargs=(
138 - # enabling BLENDER_ADDON doesn't build anything, but set's some wierd
139 - # installation paths, so keep it off and install the files manually.
140 - -DBLENDER_ADDON=OFF
141 - -DCMAKE_SKIP_RPATH=ON # NULL DT_RUNPATH security problem
142 - -DFAST_MATH=$(usex fastmath)
143 - -DFAST_TRIG=$(usex fasttrig)
144 - -DWITH_Freetype=$(usex truetype)
145 - -DWITH_JPEG=$(usex jpeg)
146 - -DWITH_OpenCV=$(usex opencv)
147 - -DWITH_OpenEXR=$(usex openexr)
148 - -DWITH_PNG=$(usex png)
149 - -DWITH_QT=$(usex qt5)
150 - -DWITH_TIFF=$(usex tiff)
151 - -DWITH_XML_LOADER=ON # internal
152 - -DWITH_YAF_PY_BINDINGS=$(usex python)
153 - -DWITH_YAF_RUBY_BINDINGS=OFF
154 - -DYAF_LIB_DIR=$(get_libdir)
155 - )
156 -
157 - if use python; then
158 - mycmakeargs+=( -DYAF_PY_VERSION=${EPYTHON#python} )
159 - fi
160 -
161 - cmake_src_configure
162 -}
163 -
164 -src_install() {
165 - cmake_src_install
166 -
167 - if use python; then
168 - python_domodule "${BUILD_DIR}/src/bindings/yafaray_v3_interface.py"
169 - mv "${ED}"/usr/$(get_libdir)/_yafaray_v3_interface.so "${ED}"/$(python_get_sitedir)/ || die
170 - rm -v "${ED}"/usr/$(get_libdir)/yafaray_v3_interface.py || die
171 -
172 - if use qt5; then
173 - python_domodule "${BUILD_DIR}/src/bindings/yafqt.py"
174 - mv "${ED}"/usr/$(get_libdir)/_yafqt.so "${ED}"/$(python_get_sitedir)/ || die
175 - rm -v "${ED}"/usr/$(get_libdir)/yafqt.py || die
176 - fi
177 - fi
178 -
179 - rm -rv "${ED}"/usr/share/doc/${PN} || die
180 -}
181 -
182 -pkg_postinst() {
183 - einfo "To confirm your installation is working as expected, run"
184 - einfo "yafaray-xml with /usr/share/yafaray/tests/test01/test01.xml"
185 - einfo "as an input file, then compare the result to"
186 - einfo "'/usr/share/yafaray/tests/test01/test01 - expected render result.png'"
187 -}