1 |
commit: 3edc65ba9bca251aadcd5469e5c1f0f60df9feb3 |
2 |
Author: Adrian Grigo <agrigo2001 <AT> yahoo <DOT> com <DOT> au> |
3 |
AuthorDate: Thu Aug 20 02:40:52 2020 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Aug 24 13:41:54 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3edc65ba |
7 |
|
8 |
media-gfx/openvdb: Add python 3.9 support for openvdb 7.1.0 |
9 |
|
10 |
Openvdb 7.1.0 also supports python 3.9. |
11 |
|
12 |
We also fix BDEPEND up: pkgconfig, the doc dependencies, |
13 |
cppunit and cmake (where needed) have been moved into BDEPEND. |
14 |
|
15 |
Signed-off-by: Adrian Grigo <agrigo2001 <AT> yahoo.com.au> |
16 |
Package-Manager: Portage-2.3.103, Repoman-2.3.23 |
17 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
18 |
|
19 |
...2.0-use-pkgconfig-for-ilmbase-and-openexr.patch | 8 ++++++++ |
20 |
.../openvdb-6.2.1-fix-multilib-header-source.patch | 9 +++++++++ |
21 |
media-gfx/openvdb/openvdb-4.0.2-r3.ebuild | 16 ++++++++++----- |
22 |
media-gfx/openvdb/openvdb-5.2.0-r1.ebuild | 16 ++++++++++----- |
23 |
media-gfx/openvdb/openvdb-6.2.1.ebuild | 16 +++++++++------ |
24 |
media-gfx/openvdb/openvdb-7.0.0.ebuild | 21 +++++++++++++------- |
25 |
media-gfx/openvdb/openvdb-7.1.0.ebuild | 23 ++++++++++++++-------- |
26 |
7 files changed, 78 insertions(+), 31 deletions(-) |
27 |
|
28 |
diff --git a/media-gfx/openvdb/files/openvdb-5.2.0-use-pkgconfig-for-ilmbase-and-openexr.patch b/media-gfx/openvdb/files/openvdb-5.2.0-use-pkgconfig-for-ilmbase-and-openexr.patch |
29 |
index c3999e54f9c..dd0b83540aa 100644 |
30 |
--- a/media-gfx/openvdb/files/openvdb-5.2.0-use-pkgconfig-for-ilmbase-and-openexr.patch |
31 |
+++ b/media-gfx/openvdb/files/openvdb-5.2.0-use-pkgconfig-for-ilmbase-and-openexr.patch |
32 |
@@ -1,3 +1,11 @@ |
33 |
+This patch is an updated version of the patch created in dracwyrm's |
34 |
+patchset for openvdb 4.0.2 which uses PkgConfig to ensure that the |
35 |
+correct IlmBase and OpenEXR dependencies are found. |
36 |
+ |
37 |
+In subsequent versions this functionality is taken over by |
38 |
+altering the directory the header files are searched for in |
39 |
+multilib-header-source patch by Bernd Waibel |
40 |
+ |
41 |
diff -urN a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt |
42 |
--- a/openvdb/CMakeLists.txt 2018-08-28 12:20:33.000000000 +0100 |
43 |
+++ b/openvdb/CMakeLists.txt 2018-08-28 12:25:19.807755722 +0100 |
44 |
|
45 |
diff --git a/media-gfx/openvdb/files/openvdb-6.2.1-fix-multilib-header-source.patch b/media-gfx/openvdb/files/openvdb-6.2.1-fix-multilib-header-source.patch |
46 |
index c6e2bae5dfa..e8cfac755d3 100644 |
47 |
--- a/media-gfx/openvdb/files/openvdb-6.2.1-fix-multilib-header-source.patch |
48 |
+++ b/media-gfx/openvdb/files/openvdb-6.2.1-fix-multilib-header-source.patch |
49 |
@@ -1,3 +1,12 @@ |
50 |
+This patch changes the default location that the header files look for |
51 |
+IlmBaseConfig.h as in Gentoo the version containg the ILMBASE_VERSION_MAJOR |
52 |
+and ILMBASE_VERSION_MINOR is stored under /usr/include/chost. |
53 |
+ |
54 |
+Without this patch, compilation fails as it is unable to identify the |
55 |
+required IlmBase version. |
56 |
+ |
57 |
+Based on the fix multilib header patch for 7.1.0 by Bernd Waibel |
58 |
+ |
59 |
diff -Naur a/cmake/FindIlmBase.cmake b/cmake/FindIlmBase.cmake |
60 |
--- a/cmake/FindIlmBase.cmake 2020-02-02 01:03:55.000000000 +0800 |
61 |
+++ b/cmake/FindIlmBase.cmake 2020-02-02 01:09:05.000000000 +0800 |
62 |
|
63 |
diff --git a/media-gfx/openvdb/openvdb-4.0.2-r3.ebuild b/media-gfx/openvdb/openvdb-4.0.2-r3.ebuild |
64 |
index 0b960e20968..08c8438f028 100644 |
65 |
--- a/media-gfx/openvdb/openvdb-4.0.2-r3.ebuild |
66 |
+++ b/media-gfx/openvdb/openvdb-4.0.2-r3.ebuild |
67 |
@@ -38,13 +38,18 @@ RDEPEND=" |
68 |
python? ( |
69 |
${PYTHON_DEPS} |
70 |
$(python_gen_cond_dep ' |
71 |
- dev-libs/boost:=[python?,${PYTHON_MULTI_USEDEP}] |
72 |
- dev-python/numpy[${PYTHON_MULTI_USEDEP}] |
73 |
+ dev-libs/boost:=[python?,${PYTHON_USEDEP}] |
74 |
+ dev-python/numpy[${PYTHON_USEDEP}] |
75 |
') |
76 |
- )" |
77 |
+ ) |
78 |
+" |
79 |
|
80 |
-DEPEND="${RDEPEND} |
81 |
+DEPEND=" |
82 |
+ ${RDEPEND} |
83 |
dev-cpp/tbb |
84 |
+" |
85 |
+ |
86 |
+BDEPEND=" |
87 |
virtual/pkgconfig |
88 |
doc? ( |
89 |
app-doc/doxygen |
90 |
@@ -54,7 +59,8 @@ DEPEND="${RDEPEND} |
91 |
dev-texlive/texlive-latex |
92 |
dev-texlive/texlive-latexextra |
93 |
) |
94 |
- test? ( dev-util/cppunit )" |
95 |
+ test? ( dev-util/cppunit ) |
96 |
+" |
97 |
|
98 |
PATCHES=( |
99 |
"${WORKDIR}/${P}-patchset-02/0001-use-gnuinstalldirs.patch" |
100 |
|
101 |
diff --git a/media-gfx/openvdb/openvdb-5.2.0-r1.ebuild b/media-gfx/openvdb/openvdb-5.2.0-r1.ebuild |
102 |
index 2cfbd5d329f..a5f10d91edb 100644 |
103 |
--- a/media-gfx/openvdb/openvdb-5.2.0-r1.ebuild |
104 |
+++ b/media-gfx/openvdb/openvdb-5.2.0-r1.ebuild |
105 |
@@ -36,13 +36,18 @@ RDEPEND=" |
106 |
python? ( |
107 |
${PYTHON_DEPS} |
108 |
$(python_gen_cond_dep ' |
109 |
- dev-libs/boost:=[python?,${PYTHON_MULTI_USEDEP}] |
110 |
- dev-python/numpy[${PYTHON_MULTI_USEDEP}] |
111 |
+ dev-libs/boost:=[python?,${PYTHON_USEDEP}] |
112 |
+ dev-python/numpy[${PYTHON_USEDEP}] |
113 |
') |
114 |
- )" |
115 |
+ ) |
116 |
+" |
117 |
|
118 |
-DEPEND="${RDEPEND} |
119 |
+DEPEND=" |
120 |
+ ${RDEPEND} |
121 |
dev-cpp/tbb |
122 |
+" |
123 |
+ |
124 |
+BDEPEND=" |
125 |
virtual/pkgconfig |
126 |
doc? ( |
127 |
app-doc/doxygen |
128 |
@@ -52,7 +57,8 @@ DEPEND="${RDEPEND} |
129 |
dev-texlive/texlive-latex |
130 |
dev-texlive/texlive-latexextra |
131 |
) |
132 |
- test? ( dev-util/cppunit )" |
133 |
+ test? ( dev-util/cppunit ) |
134 |
+" |
135 |
|
136 |
PATCHES=( |
137 |
"${FILESDIR}/${P}-use-gnuinstalldirs.patch" |
138 |
|
139 |
diff --git a/media-gfx/openvdb/openvdb-6.2.1.ebuild b/media-gfx/openvdb/openvdb-6.2.1.ebuild |
140 |
index 28f00b1922d..03fcecce642 100644 |
141 |
--- a/media-gfx/openvdb/openvdb-6.2.1.ebuild |
142 |
+++ b/media-gfx/openvdb/openvdb-6.2.1.ebuild |
143 |
@@ -4,7 +4,6 @@ |
144 |
EAPI=7 |
145 |
|
146 |
PYTHON_COMPAT=( python3_{6,7,8,9} ) |
147 |
-CMAKE_MAKEFILE_GENERATOR="emake" |
148 |
|
149 |
inherit cmake flag-o-matic python-single-r1 |
150 |
|
151 |
@@ -38,14 +37,18 @@ RDEPEND=" |
152 |
python? ( |
153 |
${PYTHON_DEPS} |
154 |
$(python_gen_cond_dep ' |
155 |
- dev-libs/boost:=[python?,${PYTHON_MULTI_USEDEP}] |
156 |
- dev-python/numpy[${PYTHON_MULTI_USEDEP}] |
157 |
+ dev-libs/boost:=[python?,${PYTHON_USEDEP}] |
158 |
+ dev-python/numpy[${PYTHON_USEDEP}] |
159 |
') |
160 |
)" |
161 |
|
162 |
-DEPEND="${RDEPEND} |
163 |
- >=dev-util/cmake-3.16.2-r1 |
164 |
+DEPEND=" |
165 |
+ ${RDEPEND} |
166 |
dev-cpp/tbb |
167 |
+" |
168 |
+ |
169 |
+BDEPEND=" |
170 |
+ >=dev-util/cmake-3.16.2-r1 |
171 |
virtual/pkgconfig |
172 |
doc? ( |
173 |
app-doc/doxygen |
174 |
@@ -55,7 +58,8 @@ DEPEND="${RDEPEND} |
175 |
dev-texlive/texlive-latex |
176 |
dev-texlive/texlive-latexextra |
177 |
) |
178 |
- test? ( dev-util/cppunit )" |
179 |
+ test? ( dev-util/cppunit ) |
180 |
+" |
181 |
|
182 |
PATCHES=( |
183 |
"${FILESDIR}/${P}-fix-multilib-header-source.patch" |
184 |
|
185 |
diff --git a/media-gfx/openvdb/openvdb-7.0.0.ebuild b/media-gfx/openvdb/openvdb-7.0.0.ebuild |
186 |
index ccd8415c286..c6d6c15d1bf 100644 |
187 |
--- a/media-gfx/openvdb/openvdb-7.0.0.ebuild |
188 |
+++ b/media-gfx/openvdb/openvdb-7.0.0.ebuild |
189 |
@@ -3,7 +3,6 @@ |
190 |
|
191 |
EAPI=7 |
192 |
|
193 |
-CMAKE_MAKEFILE_GENERATOR="emake" |
194 |
PYTHON_COMPAT=( python3_{6,7,8,9} ) |
195 |
|
196 |
inherit cmake flag-o-matic python-single-r1 |
197 |
@@ -39,8 +38,8 @@ RDEPEND=" |
198 |
python? ( |
199 |
${PYTHON_DEPS} |
200 |
$(python_gen_cond_dep ' |
201 |
- dev-libs/boost:=[numpy?,python?,${PYTHON_MULTI_USEDEP}] |
202 |
- numpy? ( dev-python/numpy[${PYTHON_MULTI_USEDEP}] ) |
203 |
+ dev-libs/boost:=[numpy?,python?,${PYTHON_USEDEP}] |
204 |
+ numpy? ( dev-python/numpy[${PYTHON_USEDEP}] ) |
205 |
') |
206 |
) |
207 |
" |
208 |
@@ -48,6 +47,9 @@ RDEPEND=" |
209 |
DEPEND=" |
210 |
${RDEPEND} |
211 |
dev-cpp/tbb |
212 |
+" |
213 |
+ |
214 |
+BDEPEND=" |
215 |
>=dev-util/cmake-3.16.2-r1 |
216 |
virtual/pkgconfig |
217 |
doc? ( |
218 |
@@ -89,7 +91,6 @@ src_configure() { |
219 |
-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}/" |
220 |
-DOPENVDB_ABI_VERSION_NUMBER="${version}" |
221 |
-DOPENVDB_BUILD_DOCS=$(usex doc) |
222 |
- -DOPENVDB_BUILD_PYTHON_MODULE=$(usex python) |
223 |
-DOPENVDB_BUILD_UNITTESTS=$(usex test) |
224 |
-DOPENVDB_BUILD_VDB_LOD=$(usex !utils) |
225 |
-DOPENVDB_BUILD_VDB_RENDER=$(usex !utils) |
226 |
@@ -101,11 +102,17 @@ src_configure() { |
227 |
-DUSE_COLORED_OUTPUT=ON |
228 |
-DUSE_EXR=ON |
229 |
-DUSE_LOG4CPLUS=ON |
230 |
- -DUSE_NUMPY=$(usex numpy) |
231 |
- -DPYOPENVDB_INSTALL_DIRECTORY="${python_get_sitedir}" |
232 |
- -DPython_EXECUTABLE="${PYTHON}" |
233 |
) |
234 |
|
235 |
+ if use python; then |
236 |
+ mycmakeargs+=( |
237 |
+ -DOPENVDB_BUILD_PYTHON_MODULE=ON |
238 |
+ -DUSE_NUMPY=$(usex numpy) |
239 |
+ -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)" |
240 |
+ -DPython_EXECUTABLE="${EPYTHON}" |
241 |
+ ) |
242 |
+ fi |
243 |
+ |
244 |
if use cpu_flags_x86_avx; then |
245 |
mycmakeargs+=( -DOPENVDB_SIMD=AVX ) |
246 |
elif use cpu_flags_x86_sse4_2; then |
247 |
|
248 |
diff --git a/media-gfx/openvdb/openvdb-7.1.0.ebuild b/media-gfx/openvdb/openvdb-7.1.0.ebuild |
249 |
index 90ec1ad79ad..a61b6f125cc 100644 |
250 |
--- a/media-gfx/openvdb/openvdb-7.1.0.ebuild |
251 |
+++ b/media-gfx/openvdb/openvdb-7.1.0.ebuild |
252 |
@@ -3,8 +3,7 @@ |
253 |
|
254 |
EAPI=7 |
255 |
|
256 |
-CMAKE_MAKEFILE_GENERATOR="emake" |
257 |
-PYTHON_COMPAT=( python3_{6,7,8} ) |
258 |
+PYTHON_COMPAT=( python3_{6,7,8,9} ) |
259 |
|
260 |
inherit cmake flag-o-matic python-single-r1 |
261 |
|
262 |
@@ -39,8 +38,8 @@ RDEPEND=" |
263 |
python? ( |
264 |
${PYTHON_DEPS} |
265 |
$(python_gen_cond_dep ' |
266 |
- dev-libs/boost:=[numpy?,python?,${PYTHON_MULTI_USEDEP}] |
267 |
- numpy? ( dev-python/numpy[${PYTHON_MULTI_USEDEP}] ) |
268 |
+ dev-libs/boost:=[numpy?,python?,${PYTHON_USEDEP}] |
269 |
+ numpy? ( dev-python/numpy[${PYTHON_USEDEP}] ) |
270 |
') |
271 |
) |
272 |
" |
273 |
@@ -48,6 +47,9 @@ RDEPEND=" |
274 |
DEPEND=" |
275 |
${RDEPEND} |
276 |
dev-cpp/tbb |
277 |
+" |
278 |
+ |
279 |
+BDEPEND=" |
280 |
>=dev-util/cmake-3.16.2-r1 |
281 |
virtual/pkgconfig |
282 |
doc? ( |
283 |
@@ -87,7 +89,6 @@ src_configure() { |
284 |
-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}/" |
285 |
-DOPENVDB_ABI_VERSION_NUMBER="${version}" |
286 |
-DOPENVDB_BUILD_DOCS=$(usex doc) |
287 |
- -DOPENVDB_BUILD_PYTHON_MODULE=$(usex python) |
288 |
-DOPENVDB_BUILD_UNITTESTS=$(usex test) |
289 |
-DOPENVDB_BUILD_VDB_LOD=$(usex !utils) |
290 |
-DOPENVDB_BUILD_VDB_RENDER=$(usex !utils) |
291 |
@@ -99,11 +100,17 @@ src_configure() { |
292 |
-DUSE_COLORED_OUTPUT=ON |
293 |
-DUSE_EXR=ON |
294 |
-DUSE_LOG4CPLUS=ON |
295 |
- -DUSE_NUMPY=$(usex numpy) |
296 |
- -DPYOPENVDB_INSTALL_DIRECTORY="${python_get_sitedir}" |
297 |
- -DPython_EXECUTABLE="${PYTHON}" |
298 |
) |
299 |
|
300 |
+ if use python; then |
301 |
+ mycmakeargs+=( |
302 |
+ -DOPENVDB_BUILD_PYTHON_MODULE=ON |
303 |
+ -DUSE_NUMPY=$(usex numpy) |
304 |
+ -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)" |
305 |
+ -DPython_EXECUTABLE="${EPYTHON}" |
306 |
+ ) |
307 |
+ fi |
308 |
+ |
309 |
if use cpu_flags_x86_avx; then |
310 |
mycmakeargs+=( -DOPENVDB_SIMD=AVX ) |
311 |
elif use cpu_flags_x86_sse4_2; then |