[gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/files/, media-gfx/openvdb/
commit: 177134bd1b059a651d7644a0c983444b4d122db4
Author: Violet Purcell inventati org>
AuthorDate: Sun Jul 9 14:18:06 2023 +
Commit: Sam James gentoo org>
CommitDate: Tue Jul 11 04:34:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=177134bd
media-gfx/openvdb: Fix usage of removed std::auto_ptr
auto_ptr was deprecated in C++11 and removed in C++17. This bug appears
to step from log4cplus, where auto_ptr was replaced with unique_ptr in
the 2.0 release. OpenVDB attempts to check for this with the
LOG4CPLUS_VERSION macro, however it's defined in the log4cplus/version.h
header, which is never included. This patch adds the missing include,
which fixes the issue with std::auto_ptr.
Closes: https://bugs.gentoo.org/901991
Signed-off-by: Violet Purcell inventati.org>
Closes: https://github.com/gentoo/gentoo/pull/31812
Signed-off-by: Sam James gentoo.org>
.../openvdb/files/openvdb-10.0.1-log4cplus-version.patch | 14 ++
media-gfx/openvdb/openvdb-10.0.1.ebuild| 1 +
2 files changed, 15 insertions(+)
diff --git a/media-gfx/openvdb/files/openvdb-10.0.1-log4cplus-version.patch
b/media-gfx/openvdb/files/openvdb-10.0.1-log4cplus-version.patch
new file mode 100644
index ..039fd3a9df6c
--- /dev/null
+++ b/media-gfx/openvdb/files/openvdb-10.0.1-log4cplus-version.patch
@@ -0,0 +1,14 @@
+auto_ptr was deprecated in C++11 and removed in C++17. This bug appears to
step from log4cplus, where auto_ptr was replaced with unique_ptr in the 2.0
release. OpenVDB attempts to check for this with the LOG4CPLUS_VERSION macro,
however it's defined in the log4cplus/version.h header, which is never
included. This patch adds the missing include, which fixes the issue with
std::auto_ptr.
+
+Bug: https://bugs.gentoo.org/901991
+
+--- a/openvdb/openvdb/util/logging.h
b/openvdb/openvdb/util/logging.h
+@@ -14,6 +14,7 @@
+ #include
+ #include
+ #include
++#include
+ #include // for std::remove()
+ #include // for ::strrchr()
+ #include
diff --git a/media-gfx/openvdb/openvdb-10.0.1.ebuild
b/media-gfx/openvdb/openvdb-10.0.1.ebuild
index 29778b9e3216..104a9d150db1 100644
--- a/media-gfx/openvdb/openvdb-10.0.1.ebuild
+++ b/media-gfx/openvdb/openvdb-10.0.1.ebuild
@@ -79,6 +79,7 @@ PATCHES=(
"${FILESDIR}/${PN}-9.0.0-fix-atomic.patch"
"${FILESDIR}/${PN}-10.0.1-fix-linking-of-vdb_tool-with-OpenEXR.patch"
"${FILESDIR}/${PN}-10.0.1-drop-failing-tests.patch"
+ "${FILESDIR}/${PN}-10.0.1-log4cplus-version.patch"
)
pkg_setup() {
[gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/files/, media-gfx/openvdb/
commit: 88522689ee0e092ed546dabecc58ab21dccd1af6
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Feb 1 18:42:20 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Feb 1 19:26:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88522689
media-gfx/openvdb: drop 8.2.0-r7, 9.0.0-r4
Closes: https://bugs.gentoo.org/886971
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/openvdb/Manifest | 2 -
...vdb-7.1.0-0001-Fix-multilib-header-source.patch | 75 --
...d-consistency-for-NumPy-find_package-call.patch | 21 ---
...lmbase-if-imath-and-ilmbase-are-installed.patch | 37 -
...unconditionally-search-Python-interpreter.patch | 34 -
media-gfx/openvdb/files/openvdb-9.0.0-numpy.patch | 151 -
...unconditionally-search-Python-interpreter.patch | 35 -
.../openvdb-9.1.0-disable-failing-tests.patch | 111 ---
media-gfx/openvdb/metadata.xml | 6 -
media-gfx/openvdb/openvdb-8.2.0-r7.ebuild | 134 --
media-gfx/openvdb/openvdb-9.0.0-r4.ebuild | 144
11 files changed, 750 deletions(-)
diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest
index dcf7ed71278e..4ddf7d7dbf21 100644
--- a/media-gfx/openvdb/Manifest
+++ b/media-gfx/openvdb/Manifest
@@ -1,3 +1 @@
DIST openvdb-10.0.1.tar.gz 3461352 BLAKE2B
506168a4bb29bab2a3a3cb37002858517000dc1682f04d95387fd1e250b61c61d92d2ffdf9b679d83ef1ce270909693ebd46224b732ce264685004d1e47b3027
SHA512
361cef8932b69b19ee94c47fe78f665a1acabfabc3f45ff9f490e830f73ff092c42f56ce698677476a8ccf062c89e3e4dc6d4c550aa6842438cbd4d404ee83bb
-DIST openvdb-8.2.0.tar.gz 2656278 BLAKE2B
b381459fb770800bb03bc8a6b3122c6684ab508f11be024e0eb3951bfbcef14e626e2d4468e91ea17fd6792f23810eafe8b05e19d46eb0e6200c73ccf296116a
SHA512
aed6b5884a9cfd42f72357ad090c5dcf7829b0e5672ab61e31206e889c085ce5a7bcb89476ceac552a837d394011951528e2b3cffc77baadc491a2e7a31d5e86
-DIST openvdb-9.0.0.tar.gz 2945040 BLAKE2B
c47a8088ba30d3cbecff04dbfd2d48b39a254e54149d8692c3a7157a99a1c555ef9747b77aeab6f8709b61c348d496765f2cfcbb0975e21f533072871f3fa422
SHA512
1410b7b04b03fb09d6775ebe7b95e7c0a484d5f29c84203530ed30ccb7c061470be1abb93189010617342e57f3fecdd66a115c6d222024e68e2384a7fb196194
diff --git
a/media-gfx/openvdb/files/openvdb-7.1.0-0001-Fix-multilib-header-source.patch
b/media-gfx/openvdb/files/openvdb-7.1.0-0001-Fix-multilib-header-source.patch
deleted file mode 100644
index 13d0f45fabf4..
---
a/media-gfx/openvdb/files/openvdb-7.1.0-0001-Fix-multilib-header-source.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 7558089b3dae599ffc80329da3a5c1decf882ca7 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel
-Date: Fri, 28 Feb 2020 17:01:25 +0100
-Subject: [PATCH] Fix multilib header source
-
-Signed-off-by: Bernd Waibel
- cmake/FindIlmBase.cmake | 10 --
- cmake/FindOpenEXR.cmake | 10 --
- 2 files changed, 16 insertions(+), 4 deletions(-)
-
-diff --git a/cmake/FindIlmBase.cmake b/cmake/FindIlmBase.cmake
-index f20f803..bb85019 100644
a/cmake/FindIlmBase.cmake
-+++ b/cmake/FindIlmBase.cmake
-@@ -168,9 +168,15 @@ find_path(IlmBase_INCLUDE_DIR IlmBaseConfig.h
- PATH_SUFFIXES include/OpenEXR OpenEXR
- )
-
-+if(EXISTS "/usr/include/${CHOST}/OpenEXR/IlmBaseConfig.h")
-+ set(_ILMBASE_HEADERS "/usr/include/${CHOST}/OpenEXR")
-+else()
-+ set(_ILMBASE_HEADERS ${IlmBase_INCLUDE_DIR})
-+endif()
-+
- if(EXISTS "${IlmBase_INCLUDE_DIR}/IlmBaseConfig.h")
- # Get the ILMBASE version information from the config header
-- file(STRINGS "${IlmBase_INCLUDE_DIR}/IlmBaseConfig.h"
-+ file(STRINGS "${_ILMBASE_HEADERS}/IlmBaseConfig.h"
- _ilmbase_version_major_string REGEX "#define ILMBASE_VERSION_MAJOR "
- )
- string(REGEX REPLACE "#define ILMBASE_VERSION_MAJOR" ""
-@@ -178,7 +184,7 @@ if(EXISTS "${IlmBase_INCLUDE_DIR}/IlmBaseConfig.h")
- )
- string(STRIP "${_ilmbase_version_major_string}" IlmBase_VERSION_MAJOR)
-
-- file(STRINGS "${IlmBase_INCLUDE_DIR}/IlmBaseConfig.h"
-+ file(STRINGS "${_ILMBASE_HEADERS}/IlmBaseConfig.h"
- _ilmbase_version_minor_string REGEX "#define ILMBASE_VERSION_MINOR "
- )
- string(REGEX REPLACE "#define ILMBASE_VERSION_MINOR" ""
-diff --git a/cmake/FindOpenEXR.cmake b/cmake/FindOpenEXR.cmake
-index d0d356f..0c5dd7b 100644
a/cmake/FindOpenEXR.cmake
-+++ b/cmake/FindOpenEXR.cmake
-@@ -161,9 +161,15 @@ find_path(OpenEXR_INCLUDE_DIR OpenEXRConfig.h
- PATH_SUFFIXES include/OpenEXR OpenEXR
- )
-
-+if(EXISTS "/usr/include/${CHOST}/OpenEXR/OpenEXRConfig.h")
-+ set(_OPENEXR_HEADERS "/usr/include/${CHOST}/OpenEXR")
-+else()
-+ set(_OPENEXR_HEADERS "${OpenEXR_INCLUDE_DIR}")
-+endif()
-+
- if(EXISTS "${OpenEXR_INCLUDE_DIR}/OpenEXRConfig.h")
- # Get the EXR version information from the config header
-- file(STRINGS "${OpenEXR_INCLUDE_DIR}/OpenEXRConfig.h"
-+ file(STRINGS "${_OPENEXR_HEADERS}/OpenEXRConfig.h"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/files/, media-gfx/openvdb/
commit: 634bcfd8e0642fd39cb304825d6b8f975babad75
Author: Bernd Waibel posteo net>
AuthorDate: Tue Oct 25 12:40:04 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Oct 30 09:40:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=634bcfd8
media-gfx/openvdb: drop 7.0.0-r4, 7.1.0-r5, 8.0.1-r4, 8.1.0, 8.2.0-r3
Cleanup old versions, which block removal of https://bugs.gentoo.org/878213
Signed-off-by: Bernd Waibel posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/27959
Signed-off-by: Sam James gentoo.org>
media-gfx/openvdb/Manifest | 4 -
.../openvdb-7.1.0-0002-Fix-doc-install-dir.patch | 25
.../openvdb/files/openvdb-8.0.1-glfw-libdir.patch | 12 --
media-gfx/openvdb/metadata.xml | 3 -
media-gfx/openvdb/openvdb-7.0.0-r4.ebuild | 124 ---
media-gfx/openvdb/openvdb-7.1.0-r5.ebuild | 124 ---
media-gfx/openvdb/openvdb-8.0.1-r4.ebuild | 126 ---
media-gfx/openvdb/openvdb-8.1.0.ebuild | 130 ---
media-gfx/openvdb/openvdb-8.2.0-r3.ebuild | 137 -
9 files changed, 685 deletions(-)
diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest
index 5650986bf6ab..56fc94e70097 100644
--- a/media-gfx/openvdb/Manifest
+++ b/media-gfx/openvdb/Manifest
@@ -1,7 +1,3 @@
-DIST openvdb-7.0.0.tar.gz 1872744 BLAKE2B
e3a8c8d51f77e115d3d397abde0860a6322d56eb6c4795c1ba39539a23aab6cf37602ce7122965fbc3098b15b118b25010263f567e8003363b78c9b7d9d5dfd8
SHA512
f5321b22b10e192012d544cc02921d3d52f621778ec5aa21ba6d450f3e29f2fdbd76486ad390a0c008394dbc6ee4aeecc04527ef30e73adf71c1a08a021746b7
-DIST openvdb-7.1.0.tar.gz 1956052 BLAKE2B
7778d67bcc65ecb17b86f6e67a9e5f2d6574de5869a0a9c675ad7bc8540154c0f249a91c68a9da9068a3951b3e919e5676450fcaf13921c6263e7c87012a2f29
SHA512
49806375f7e6d7b12eaba24e672a068531d2f8a05f12eba29069710d2682f9983f9e6ad26047eed4b28e337f8d0e738b90130582863c710e8dd1e720bf0addad
-DIST openvdb-8.0.1.tar.gz 2299276 BLAKE2B
e65bd4710ff65e20570013399d1e71a32e8f80c5e3b5527fc17d23c7f86ead7e04483cf7ba5266f26343604677d3a0dcafc01474baf7ef09b98f1f41a66119a2
SHA512
6a5a8b637429295efa72494aef82ff92dd83092591b713f56930ccf4aab3a33806d1263bfd090c27239eab97b4fdc053288dc545e631f8a7d4ca180a32331be2
-DIST openvdb-8.1.0.tar.gz 2619432 BLAKE2B
ba06e8dc24876da0ed1a2b5560e8793ad1e42b45b2018734c98c9b8f1d43bdb4aa098243a68de90efb18cb0454a9ea2a59c87f411d2c6492c5bce95dc047a6f0
SHA512
081ccedb122ff9bd73e0cd7ff083ad0ff0165e0cf6305187edcbe90ff12f01ec085c91ad5c52c53596035e0c2afd5b8801e6c00374b0fc4b0cc111f5c7f37eb5
DIST openvdb-8.2.0.tar.gz 2656278 BLAKE2B
b381459fb770800bb03bc8a6b3122c6684ab508f11be024e0eb3951bfbcef14e626e2d4468e91ea17fd6792f23810eafe8b05e19d46eb0e6200c73ccf296116a
SHA512
aed6b5884a9cfd42f72357ad090c5dcf7829b0e5672ab61e31206e889c085ce5a7bcb89476ceac552a837d394011951528e2b3cffc77baadc491a2e7a31d5e86
DIST openvdb-9.0.0.tar.gz 2945040 BLAKE2B
c47a8088ba30d3cbecff04dbfd2d48b39a254e54149d8692c3a7157a99a1c555ef9747b77aeab6f8709b61c348d496765f2cfcbb0975e21f533072871f3fa422
SHA512
1410b7b04b03fb09d6775ebe7b95e7c0a484d5f29c84203530ed30ccb7c061470be1abb93189010617342e57f3fecdd66a115c6d222024e68e2384a7fb196194
DIST openvdb-9.1.0.tar.gz 3107285 BLAKE2B
a30d000f14358935eadc9cad9a7904637ceb0b2e6cc53129614e3243b55748b973c29eedc09a6cc444fb754777f6ee752af22847690977eca7a84865fdbe445b
SHA512
434be61b03efec5d0022594d81064dce5f67595c1e34934d79e13627e573d2819bf947ca5b433fdca134642975b83eda71b46cf802f57e135d1611dbe2e5757e
diff --git
a/media-gfx/openvdb/files/openvdb-7.1.0-0002-Fix-doc-install-dir.patch
b/media-gfx/openvdb/files/openvdb-7.1.0-0002-Fix-doc-install-dir.patch
deleted file mode 100644
index 73d4b1ccd422..
--- a/media-gfx/openvdb/files/openvdb-7.1.0-0002-Fix-doc-install-dir.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 66dec67036116243893fdf74060e55b70f65ab17 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel
-Date: Fri, 28 Feb 2020 21:51:30 +0100
-Subject: [PATCH] Fix doc install dir
-
-Signed-off-by: Bernd Waibel
- doc/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
-index 1cf58ea..a6bd849 100644
a/doc/CMakeLists.txt
-+++ b/doc/CMakeLists.txt
-@@ -64,5 +64,5 @@ add_custom_target(doc ALL
- )
-
- # Suppress "Installing..." messages for all but one of the hundreds of
generated files.
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/openvdb/doc/html/index.html
DESTINATION doc/html)
--install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/openvdb/doc/html DESTINATION
doc MESSAGE_NEVER)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/openvdb/doc/html/index.html
DESTINATION ${CMAKE_INSTALL_DOCDIR}/html)
-+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/openvdb/doc/html DESTINATION
${CMAKE_INSTALL_DOCDIR} MESSAGE_NEVER)
---
-2.25.1
-
diff --git a/media-gfx/openvdb/files/openvdb-8.0.1-glfw-libdir
[gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/files/, media-gfx/openvdb/
commit: ca5b6410bfc01c83492baf228436676283c4c602
Author: Sam James gentoo org>
AuthorDate: Sat Feb 12 04:47:54 2022 +
Commit: Sam James gentoo org>
CommitDate: Sat Feb 12 04:47:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca5b6410
media-gfx/openvdb: flip over to OpenEXR 3 for 8.2.0
Things are getting complicated with trying to keep Blender
on OpenEXR 2. Blender needs to switch as a result, but
so do its dependencies.
Bug: https://bugs.gentoo.org/831357
Bug: https://bugs.gentoo.org/832862
Bug: https://bugs.gentoo.org/831425
Signed-off-by: Sam James gentoo.org>
.../files/openvdb-8.2.0-openexr-3-imath.patch | 16 +++
media-gfx/openvdb/openvdb-8.2.0-r2.ebuild | 139 +
2 files changed, 155 insertions(+)
diff --git a/media-gfx/openvdb/files/openvdb-8.2.0-openexr-3-imath.patch
b/media-gfx/openvdb/files/openvdb-8.2.0-openexr-3-imath.patch
new file mode 100644
index ..0a9dfe541f79
--- /dev/null
+++ b/media-gfx/openvdb/files/openvdb-8.2.0-openexr-3-imath.patch
@@ -0,0 +1,16 @@
+diff --git a/openvdb/openvdb/Types.h b/openvdb/openvdb/Types.h
+index a1d6a9f..f6ecb19 100644
+--- a/openvdb/openvdb/Types.h
b/openvdb/openvdb/Types.h
+@@ -10,9 +10,9 @@
+
+ #ifdef OPENVDB_USE_IMATH_HALF
+ #ifdef OPENVDB_IMATH_VERSION
+-#include
++#include
+ #else
+-#include
++#include
+ #endif
+ namespace openvdb {
+ OPENVDB_USE_VERSION_NAMESPACE
diff --git a/media-gfx/openvdb/openvdb-8.2.0-r2.ebuild
b/media-gfx/openvdb/openvdb-8.2.0-r2.ebuild
new file mode 100644
index ..ceb0d37949a9
--- /dev/null
+++ b/media-gfx/openvdb/openvdb-8.2.0-r2.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+inherit cmake python-single-r1
+
+DESCRIPTION="Library for the efficient manipulation of volumetric data"
+HOMEPAGE="https://www.openvdb.org";
+SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.gz
-> ${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0/8"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="cpu_flags_x86_avx cpu_flags_x86_sse4_2 +blosc doc numpy python
static-libs test utils zlib abi6-compat abi7-compat +abi8-compat"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+ numpy? ( python )
+ ^^ ( abi6-compat abi7-compat abi8-compat )
+ python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+ dev-cpp/tbb:=
+ dev-libs/boost:=
+ dev-libs/jemalloc:=
+ dev-libs/log4cplus:=
+ media-libs/glfw
+ media-libs/glu
+ sys-libs/zlib:=
+ x11-libs/libXcursor
+ x11-libs/libXi
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ blosc? ( dev-libs/c-blosc:= )
+ python? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-libs/boost:=[numpy?,python?,${PYTHON_USEDEP}]
+ numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
+ ')
+ )
+ utils? (
+ dev-libs/imath:=
+ media-libs/openexr:3=
+ )
+ zlib? ( sys-libs/zlib )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+ >=dev-util/cmake-3.16.2-r1
+ virtual/pkgconfig
+ doc? (
+ app-doc/doxygen
+ dev-texlive/texlive-bibtexextra
+ dev-texlive/texlive-fontsextra
+ dev-texlive/texlive-fontutils
+ dev-texlive/texlive-latex
+ dev-texlive/texlive-latexextra
+ )
+ test? ( dev-util/cppunit dev-cpp/gtest )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-7.1.0-0001-Fix-multilib-header-source.patch"
+
"${FILESDIR}/${PN}-8.0.1-add-consistency-for-NumPy-find_package-call.patch"
+ "${FILESDIR}/${PN}-8.1.0-glfw-libdir.patch"
+
"${FILESDIR}/${PN}-8.2.0-fix-finding-ilmbase-if-imath-and-ilmbase-are-installed.patch"
+
"${FILESDIR}/${PN}-8.2.0-unconditionally-search-Python-interpreter.patch"
+ "${FILESDIR}/${PN}-8.2.0-openexr-3-imath.patch"
+)
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+ local myprefix="${EPREFIX}/usr/"
+
+ local version
+ if use abi6-compat; then
+ version=6
+ elif use abi7-compat; then
+ version=7
+ elif use abi8-compat; then
+ version=8
+ else
+ die "OpenVDB ABI version is not compatible"
+ fi
+
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}/"
+ -DOPENVDB_ABI_VERSION_NUMBER="${version}"
+ -DOPENVDB_BUILD_BINARIES=$(usex utils)
+ -DOPENVDB_BUILD_DOCS=$(usex doc)
+ -DOPENVDB_BUILD_UNITTESTS=$(usex test)
+ -DOPENVDB_CORE_SHARED=ON
+ -DOPENVDB_CORE_STATIC=$(usex static-libs)
+ -DOPENVDB_ENABLE_RPATH=OFF
+ -DUSE_BLOSC=$(usex blos
[gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/files/, media-gfx/openvdb/
commit: b62193bab0b3de371047ddb0aacce74591cabcb8
Author: Bernd Waibel posteo net>
AuthorDate: Sat Dec 4 20:37:39 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Dec 4 21:52:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b62193ba
media-gfx/openvdb: fix issue if imath and ilmbase are both installed
The patch fixes an issue when OPENVDB_BUILD_BINARIES and OPENVDB_BUILD_RENDER
are set and both, dev-libs/imath and media-libs/ilmbase are being installed
and allows the package to configure properly in this case.
Additionally it fixes the installation location of the python module.
Bug: https://bugs.gentoo.org/790350
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Bernd Waibel posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/23185
Signed-off-by: Sam James gentoo.org>
...lmbase-if-imath-and-ilmbase-are-installed.patch | 37 ++
...unconditionally-search-Python-interpreter.patch | 34
...penvdb-8.2.0.ebuild => openvdb-8.2.0-r1.ebuild} | 24 ++
3 files changed, 88 insertions(+), 7 deletions(-)
diff --git
a/media-gfx/openvdb/files/openvdb-8.2.0-fix-finding-ilmbase-if-imath-and-ilmbase-are-installed.patch
b/media-gfx/openvdb/files/openvdb-8.2.0-fix-finding-ilmbase-if-imath-and-ilmbase-are-installed.patch
new file mode 100644
index ..88752e9fa0eb
--- /dev/null
+++
b/media-gfx/openvdb/files/openvdb-8.2.0-fix-finding-ilmbase-if-imath-and-ilmbase-are-installed.patch
@@ -0,0 +1,37 @@
+From: Bernd Waibel
+Date: Sat, 4 Dec 2021 20:16:42 +0100
+Subject: [PATCH] fix finding ilmbase if imath and ilmbase are installed
+
+If both, ilmbase-2.5 and imath-3 are installed, the configuration fails
+if OPENVDB_BUILD_BINARIES and OPENVDB_BUILD_RENDER are set.
+The patch adds an additional guard based on the USE_IMATH_HALF option
+being set and thus decide whether to search for and use imath or ilmbase.
+
+Signed-off-by: Bernd Waibel
+--- a/openvdb/openvdb/cmd/CMakeLists.txt
b/openvdb/openvdb/cmd/CMakeLists.txt
+@@ -81,12 +81,17 @@ endif()
+ vdb_render
+
+ if(OPENVDB_BUILD_VDB_RENDER)
+- find_package(Imath CONFIG)
+- if (NOT TARGET Imath::Imath)
++ if(USE_IMATH_HALF)
++find_package(Imath CONFIG)
++if (NOT TARGET Imath::Imath)
++ find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED COMPONENTS
Half Iex IlmThread Imath)
++ find_package(OpenEXR ${MINIMUM_OPENEXR_VERSION} REQUIRED COMPONENTS
IlmImf)
++else()
++ find_package(OpenEXR CONFIG)
++endif()
++ else()
+ find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED COMPONENTS Half
Iex IlmThread Imath)
+ find_package(OpenEXR ${MINIMUM_OPENEXR_VERSION} REQUIRED COMPONENTS
IlmImf)
+- else()
+-find_package(OpenEXR CONFIG)
+ endif()
+
+ set(VDB_RENDER_SOURCE_FILES openvdb_render.cc)
+--
+2.34.1
+
diff --git
a/media-gfx/openvdb/files/openvdb-8.2.0-unconditionally-search-Python-interpreter.patch
b/media-gfx/openvdb/files/openvdb-8.2.0-unconditionally-search-Python-interpreter.patch
new file mode 100644
index ..933d2965b2bc
--- /dev/null
+++
b/media-gfx/openvdb/files/openvdb-8.2.0-unconditionally-search-Python-interpreter.patch
@@ -0,0 +1,34 @@
+From: Bernd Waibel
+Date: Sat, 4 Dec 2021 20:45:49 +0100
+Subject: [PATCH] unconditionally search Python interpreter
+
+When setting PYOPENVDB_INSTALL_DIRECTORY, CMake would fail with:
+```
+-- Could NOT find Python (missing: Python_LIBRARIES Development
Development.Module Development.Embed) (found version "3.9.9")
+CMake Error at openvdb/openvdb/python/CMakeLists.txt:65 (message):
+ Could NOT find Python::Module (Required is at least version "2.7")
+Call Stack (most recent call first):
+ openvdb/openvdb/python/CMakeLists.txt:112 (openvdb_check_python_version)
+ ```
+
+It seems like we always need to search for the interpreter.
+
+Bug: https://bugs.gentoo.org/790350
+Signed-off-by: Bernd Waibel
+--- a/openvdb/openvdb/python/CMakeLists.txt
b/openvdb/openvdb/python/CMakeLists.txt
+@@ -73,10 +73,7 @@ endfunction()
+ # target but this was only added in CMake 3.15. See:
+ # https://github.com/AcademySoftwareFoundation/openvdb/issues/886
+ set(OPENVDB_PYTHON_DEPS)
+-set(OPENVDB_PYTHON_REQUIRED_COMPONENTS Development)
+-if(NOT DEFINED PYOPENVDB_INSTALL_DIRECTORY)
+-list(APPEND OPENVDB_PYTHON_REQUIRED_COMPONENTS Interpreter)
+-endif()
++set(OPENVDB_PYTHON_REQUIRED_COMPONENTS Development Interpreter)
+
+ if(${CMAKE_VERSION} VERSION_LESS 3.14)
+ find_package(Python QUIET COMPONENTS ${OPENVDB_PYTHON_REQUIRED_COMPONENTS})
+--
+2.34.1
+
diff --git a/media-gfx/openvdb/openvdb-8.2.0.ebuild
b/media-gfx/openvdb/openvdb-8.2.0-r1.ebuild
similarity index 86%
rename from media-gfx/openvdb/openvdb-8.2.0.ebuild
rename to media-gfx/openvdb/openvdb-8.2.0-r1.ebuild
index 9b71b3a635df..1a4d9c0e36e9 100644
--- a/media-gfx/openvdb/openvdb-8.2.0.ebuild
+++ b/media-gfx/openvdb/openvdb-8.2.0-r1.ebuild
@@ -31,8 +31,6
[gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/files/, media-gfx/openvdb/
commit: 1e960a28294ff0eae009fb059dcd1387989edd36
Author: Sam James gentoo org>
AuthorDate: Sun Oct 31 02:15:08 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Oct 31 02:18:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e960a28
media-gfx/openvdb: revbump for build configuration changes; rebase 8.1/9.0
Rebasing on waebbl's changes.
See: https://github.com/gentoo/gentoo/pull/22738
Signed-off-by: Sam James gentoo.org>
media-gfx/openvdb/files/openvdb-9.0.0-numpy.patch | 151 +
...vdb-7.1.0-r3.ebuild => openvdb-7.1.0-r4.ebuild} | 0
...vdb-8.0.1-r2.ebuild => openvdb-8.0.1-r3.ebuild} | 0
media-gfx/openvdb/openvdb-8.1.0.ebuild | 9 +-
media-gfx/openvdb/openvdb-9.0.0.ebuild | 11 +-
5 files changed, 164 insertions(+), 7 deletions(-)
diff --git a/media-gfx/openvdb/files/openvdb-9.0.0-numpy.patch
b/media-gfx/openvdb/files/openvdb-9.0.0-numpy.patch
new file mode 100644
index 000..972db42b355
--- /dev/null
+++ b/media-gfx/openvdb/files/openvdb-9.0.0-numpy.patch
@@ -0,0 +1,151 @@
+Grabbed relevant parts from upstream PR for 9.x; it's a variant
+of https://github.com/gentoo/gentoo/pull/22738 which wa sfor earlier versions.
+
+https://github.com/AcademySoftwareFoundation/openvdb/pull/1237
+
+From 3c5f69efeacca762406a80d74b39b970c7023bd6 Mon Sep 17 00:00:00 2001
+From: Nick Avramoussis <4256455+idc...@users.noreply.github.com>
+Date: Thu, 28 Oct 2021 16:54:10 +0100
+Subject: [PATCH 1/3] Improvements to find_package Python usage. Primarily
+ fixes an issues where NumPy needs to be specified along with the Development
+ and Interpreter components in a single call
+
+Signed-off-by: Nick Avramoussis <4256455+idc...@users.noreply.github.com>
+---
+ openvdb/openvdb/python/CMakeLists.txt | 97 +--
+ 1 file changed, 46 insertions(+), 51 deletions(-)
+
+diff --git a/openvdb/openvdb/python/CMakeLists.txt
b/openvdb/openvdb/python/CMakeLists.txt
+index 7b36379f9..5e9141e8c 100644
+--- a/openvdb/openvdb/python/CMakeLists.txt
b/openvdb/openvdb/python/CMakeLists.txt
+@@ -55,25 +55,39 @@ endif()
+ # be provided to find_package(Python) with differing major versions. e.g.
+ # calls to find_package(Python 2.7) fails if python3 is found on the system.
+ function(OPENVDB_CHECK_PYTHON_VERSION)
+- set(_PY_VERSION ${ARGV0})
+- set(_PY_PATH ${ARGV1})
+- if(NOT _PY_VERSION)
+-message(FATAL_ERROR "Could NOT find Python (Required is at least version "
+- "\"${MINIMUM_PYTHON_VERSION}\")"
+-)
+- elseif(_PY_VERSION VERSION_LESS MINIMUM_PYTHON_VERSION)
+-message(FATAL_ERROR "Could NOT find Python: Found unsuitable version
\"${_PY_VERSION}\""
+- "but required is at least \"${MINIMUM_PYTHON_VERSION}\" (found
${_PY_PATH})"
+-)
+- else()
+-message(STATUS "Found Python: ${_PY_PATH}) (found suitable version
\"${_PY_VERSION}\", "
+- "minimum required is \"${MINIMUM_PYTHON_VERSION}\")"
++ set(PY_TARGET ${ARGV0})
++ set(PY_TARGET_VERSION ${ARGV1})
++ set(PY_TARGET_INCLUDES ${ARGV2})
++ set(MIN_VERSION ${ARGV3})
++ set(FUTURE_MIN_VERSION ${ARGV4})
++
++ if(NOT TARGET ${PY_TARGET})
++message(FATAL_ERROR "Could NOT find ${PY_TARGET} (Required is at least
version "
++ "\"${MIN_VERSION}\")"
+ )
+ endif()
++
++ if(PY_TARGET_VERSION AND MIN_VERSION)
++if(PY_TARGET_VERSION VERSION_LESS MIN_VERSION)
++ message(FATAL_ERROR "Could NOT find ${PY_TARGET}: Found unsuitable
version "
++"\"${PY_TARGET_VERSION}\" but required is at least \"${MIN_VERSION}\"
(found ${PY_TARGET_INCLUDES})"
++ )
++endif()
++ endif()
++
++ message(STATUS "Found ${PY_TARGET}: ${PY_TARGET_INCLUDES}) (found suitable "
++"version \"${PY_TARGET_VERSION}\", minimum required is
\"${MIN_VERSION}\")"
++ )
++
++ if(OPENVDB_FUTURE_DEPRECATION AND PY_TARGET_VERSION AND FUTURE_MIN_VERSION)
++if(PY_TARGET_VERSION VERSION_LESS FUTURE_MIN_VERSION)
++ message(DEPRECATION "Support for ${PY_TARGET} versions <
${FUTURE_MIN_VERSION} "
++"is deprecated and will be removed.")
++endif()
++ endif()
+ endfunction()
+
+ # Configure Python and Numpy. Note that:
+-# - find_package(Python NumPy) requires CMake >= 3.14
+ # - find_package(Python Development) target Python::Module requires CMake >=
3.15
+ # - find_package(Python Development.Module) requires CMake >= 3.18
+ # To ensure consistent versions between components Interpreter, Compiler,
+@@ -85,38 +99,30 @@ endfunction()
+ set(OPENVDB_PYTHON_DEPS)
+ set(OPENVDB_PYTHON_REQUIRED_COMPONENTS Development)
+ if(NOT DEFINED PYOPENVDB_INSTALL_DIRECTORY)
+-list(APPEND OPENVDB_PYTHON_REQUIRED_COMPONENTS Interpreter)
++ list(APPEND OPENVDB_PYTHON_REQUIRED_COMPONENTS Interpreter)
+ endif()
+
+-find_package(Python QUIET COMPONENTS ${OPENVDB_PYTHON_REQUIRED_COMPONENTS})
+-OPENVDB_CHECK_PYTHON_VERSION(${Python_VERSION} ${Python_INCLUDE_DIRS})
+-
+ if(USE_NUMPY)
+- find_package(Python QUIET COMPONENTS
[gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/files/, media-gfx/openvdb/
commit: cdb48fb7dff718b541d13aefafdf53d5cd4fccbc
Author: Adrian Grigo yahoo com au>
AuthorDate: Tue Aug 18 02:36:18 2020 +
Commit: Sam James gentoo org>
CommitDate: Mon Aug 24 13:41:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdb48fb7
media-gfx/openvdb: Fix build failure with newer c-blosc and doc
The c-blosc 1.19 function blosc_compcode_to_compname now expects a
const char** rather than char**. This patch uses const_cast to fix the
compiler error.
When building with doc USE flag enabled, the doc target is not built by
default and the missing docs cause an install failure. This patch
ensures that when the doc target is defined, it will be built.
With these two patches, openvdb builds with all USE flags enabled.
Signed-off-by: Adrian Grigo yahoo.com.au>
Closes: https://bugs.gentoo.org/734102
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sam James gentoo.org>
media-gfx/openvdb/files/openvdb-4.0.2-fix-build-docs.patch | 12
.../openvdb-4.0.2-fix-const-correctness-for-unittest.patch | 12
media-gfx/openvdb/openvdb-4.0.2-r3.ebuild| 6 --
media-gfx/openvdb/openvdb-5.2.0-r1.ebuild| 4 ++--
4 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/media-gfx/openvdb/files/openvdb-4.0.2-fix-build-docs.patch
b/media-gfx/openvdb/files/openvdb-4.0.2-fix-build-docs.patch
new file mode 100644
index 000..25597ec381d
--- /dev/null
+++ b/media-gfx/openvdb/files/openvdb-4.0.2-fix-build-docs.patch
@@ -0,0 +1,12 @@
+diff -Naur a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt
+--- a/openvdb/CMakeLists.txt 2020-08-18 12:17:15.261321103 +1000
b/openvdb/CMakeLists.txt 2020-08-18 12:17:37.101397373 +1000
+@@ -394,7 +394,7 @@
+ FILE ( WRITE ${CMAKE_CURRENT_BINARY_DIR}/cmake-doxygen-config
${DOXYGEN_CONFIG_CONTENT} )
+ FILE ( APPEND ${CMAKE_CURRENT_BINARY_DIR}/cmake-doxygen-config
"OUTPUT_DIRECTORY=${CMAKE_CURRENT_BINARY_DIR}/doc\n" )
+
+- ADD_CUSTOM_TARGET ( doc
++ ADD_CUSTOM_TARGET ( doc ALL
+ ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/cmake-doxygen-config
+ WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+ COMMENT "Generating API documentation with Doxygen" VERBATIM
diff --git
a/media-gfx/openvdb/files/openvdb-4.0.2-fix-const-correctness-for-unittest.patch
b/media-gfx/openvdb/files/openvdb-4.0.2-fix-const-correctness-for-unittest.patch
new file mode 100644
index 000..8d3ef59e3ab
--- /dev/null
+++
b/media-gfx/openvdb/files/openvdb-4.0.2-fix-const-correctness-for-unittest.patch
@@ -0,0 +1,12 @@
+diff -Naur a/openvdb/unittest/TestFile.cc b/openvdb/unittest/TestFile.cc
+--- a/openvdb/unittest/TestFile.cc 2019-09-15 01:05:30.716633230 +0800
b/openvdb/unittest/TestFile.cc 2019-09-15 01:06:16.126633668 +0800
+@@ -2552,7 +2552,7 @@
+
+ for (int compcode = 0; compcode <= BLOSC_ZLIB; ++compcode) {
+ char* compname = nullptr;
+-if (0 > blosc_compcode_to_compname(compcode, &compname)) continue;
++if (0 > blosc_compcode_to_compname(compcode, const_cast(&compname))) continue;
+ /// @todo This changes the compressor setting globally.
+ if (blosc_set_compressor(compname) < 0) continue;
+
diff --git a/media-gfx/openvdb/openvdb-4.0.2-r3.ebuild
b/media-gfx/openvdb/openvdb-4.0.2-r3.ebuild
index 1996c6be2df..2205bebd492 100644
--- a/media-gfx/openvdb/openvdb-4.0.2-r3.ebuild
+++ b/media-gfx/openvdb/openvdb-4.0.2-r3.ebuild
@@ -7,9 +7,9 @@ PYTHON_COMPAT=( python3_6 )
inherit cmake flag-o-matic python-single-r1
-DESCRIPTION="Libs for the efficient manipulation of volumetric data"
+DESCRIPTION="Library for the efficient manipulation of volumetric data"
HOMEPAGE="https://www.openvdb.org";
-SRC_URI="https://github.com/dreamworksanimation/${PN}/archive/v${PV}.tar.gz ->
${P}.tar.gz
+SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.gz
-> ${P}.tar.gz
https://dev.gentoo.org/~dracwyrm/patches/${P}-patchset-02.tar.xz";
LICENSE="MPL-2.0"
@@ -57,6 +57,8 @@ PATCHES=(
"${WORKDIR}/${P}-patchset-02/0002-use-pkgconfig-for-ilmbase-and-openexr.patch"
"${WORKDIR}/${P}-patchset-02/0003-boost-1.65-numpy-support.patch"
"${FILESDIR}/${P}-findboost-fix.patch"
+ "${FILESDIR}/${P}-fix-const-correctness-for-unittest.patch"
+ "${FILESDIR}/${P}-fix-build-docs.patch"
)
pkg_setup() {
diff --git a/media-gfx/openvdb/openvdb-5.2.0-r1.ebuild
b/media-gfx/openvdb/openvdb-5.2.0-r1.ebuild
index 3955290220b..ef955f2c6ca 100644
--- a/media-gfx/openvdb/openvdb-5.2.0-r1.ebuild
+++ b/media-gfx/openvdb/openvdb-5.2.0-r1.ebuild
@@ -7,9 +7,9 @@ PYTHON_COMPAT=( python3_6 )
inherit cmake flag-o-matic python-single-r1
-DESCRIPTION="Libs for the efficient manipulation of volumetric data"
+DESCRIPTION="Library for the efficient manipulation of volumetric data"
HOMEPAGE="https://www.openvdb.org";
-SRC_URI="https://github.com/dreamworksanima
[gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/files/, media-gfx/openvdb/
commit: f4ceb32d7edcd0b37899d7fbd48ab197ceda9b79 Author: Jonathan Scruggs gmail com> AuthorDate: Sat Aug 4 17:18:32 2018 + Commit: Jonathan Scruggs gentoo org> CommitDate: Sat Aug 4 18:21:38 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4ceb32d media-gfx/openvdb: remove old versions media-gfx/openvdb/Manifest | 2 - .../files/openvdb-3.2.0-fix-build-system.patch | 262 - .../openvdb/files/openvdb-3.2.0-numpy-fix.patch| 17 -- .../files/openvdb-4.0.0-build-docs-once.patch | 32 --- .../files/openvdb-4.0.0-make-docs-optional.patch | 71 -- .../files/openvdb-4.0.0-namespace-fixes.patch | 65 - ...envdb-4.0.0-python-module-install-dir-fix.patch | 16 -- media-gfx/openvdb/metadata.xml | 5 - media-gfx/openvdb/openvdb-3.2.0.ebuild | 161 - media-gfx/openvdb/openvdb-4.0.0.ebuild | 77 -- 10 files changed, 708 deletions(-) diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest index 9959ca2ec65..058405560b7 100644 --- a/media-gfx/openvdb/Manifest +++ b/media-gfx/openvdb/Manifest @@ -1,4 +1,2 @@ -DIST openvdb-3.2.0.tar.gz 1368870 BLAKE2B 062afa0c3209e30c73310accd84daa6747defc583d003e65e9fbcbc0c2381e78132874b8bdd6f2602d526071761b5fd9d19760d557bdbbe5a39f81b19b3f2c6a SHA512 df9a4895b219aae3b5a9616c34eb846d565877ff76648405691f0c903507f6faba94e8eba9173423b50cb5cef80f3ec500a9f70977cb7161701d39fd105abc91 -DIST openvdb-4.0.0.tar.gz 1545221 BLAKE2B b418c5a1b51b6deb73867fe0a352d3afb4466dde31734cd1da9a83231f0589880ca3cbf2577389cfa08d419216166504abc8e58848b9fd01dbaea46a3d5470f4 SHA512 138e23408d725f153f5545c8083cd16f6b3e5cf80308e080d5e463f74f947759cdf5f9d818137ebffaf8b2de77bffa8f38ef0d20758a1418aea1c71702c0001d DIST openvdb-4.0.2-patchset-01.tar.xz 16420 BLAKE2B 2f825532d83d3a6756454f164a0608cfa776c1d4472cb4b25e4dad20d3c9648a952deef87ed0e24ce5f7c927c02da8cca76c829eafe1e2bb47fca061541668b3 SHA512 e9399d245d5e2b4130576d688691ac965f031b957df7803b8859f863634b27987c33aabadc5fb463b9d3eec333be84b89cb619dce5bc81c0390d8fb19da830c3 DIST openvdb-4.0.2.tar.gz 1689119 BLAKE2B dbc8d4ab44990440e201327d76bbf9bfe3e8f597505b1d008dedb95dc540277513f465d455079c59820acc5056c9a2edf56235e1097b6c73a1f7dd8c59609c15 SHA512 8e3e12583b81f9b9303b309e839c8321c67b67ff8a0e61bb56c87276bf25c0deff22f5a73c7c5b661b8e5df345bfdabfa6b0aea9bf16fce57d9c53a76751c75d diff --git a/media-gfx/openvdb/files/openvdb-3.2.0-fix-build-system.patch b/media-gfx/openvdb/files/openvdb-3.2.0-fix-build-system.patch deleted file mode 100644 index 66112af75da..000 --- a/media-gfx/openvdb/files/openvdb-3.2.0-fix-build-system.patch +++ /dev/null @@ -1,262 +0,0 @@ -* Make build system honour the proper ABI library directory. -* Replace -isystem arguments with -I, as the former causes issues with GCC 6. - See also: - https://bugs.gentoo.org/show_bug.cgi?id=597866 - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70129 - a/doxygen-config -+++ b/doxygen-config -@@ -2257,7 +2257,7 @@ - # The default value is: png. - # This tag requires that the tag HAVE_DOT is set to YES. - --DOT_IMAGE_FORMAT = png -+DOT_IMAGE_FORMAT = svg - - # If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to - # enable generation of interactive SVG images that allow zooming and panning. a/Makefile -+++ b/Makefile -@@ -82,6 +82,7 @@ - - # The directory into which to install libraries, executables and header files - DESTDIR := /tmp/OpenVDB -+libdir = lib - - # The parent directory of the boost/ header directory - BOOST_INCL_DIR := $(HT)/include -@@ -158,6 +159,9 @@ - # The directory containing libpython - PYTHON_LIB_DIR := $(HFS)/python/lib - PYTHON_LIB := -lpython$(PYTHON_VERSION) -+# The Directory to install the python module and includes to. -+PYTHON_INSTALL_INCL_DIR := $(DESTDIR)/python/include/python$(PYTHON_VERSION) -+PYTHON_INSTALL_LIB_DIR := $(DESTDIR)/python/lib/python$(PYTHON_VERSION) - # The directory containing libboost_python - BOOST_PYTHON_LIB_DIR := /rel/depot/third_party_build/boost/rhel6-1.46.1-0/lib - BOOST_PYTHON_LIB := -lboost_python-gcc41-mt-python26-1_46_1 -@@ -179,7 +183,6 @@ - # (leave blank if Doxygen is unavailable) - DOXYGEN := doxygen - -- - # - # Ideally, users shouldn't need to change anything below this line. - # -@@ -207,11 +210,7 @@ - endif - endif - --ifeq (yes,$(strip $(debug))) --OPTIMIZE := -g --else --OPTIMIZE := -O3 -DNDEBUG --endif -+OPTIMIZE := -DNDEBUG - - ifeq (yes,$(strip $(verbose))) - QUIET := -@@ -242,12 +241,12 @@ - has_python := yes - endif - --INCLDIRS := -I . -I .. -isystem $(BOOST_INCL_DIR) -isystem $(ILMBASE_INCL_DIR) -isystem $(TBB_INCL_DIR) -+INCLDIRS := -I. -I.. -I$(BOOST_INCL_DIR) -I$(ILMBASE_INCL_DIR) -I$(TBB_INCL_DIR) - ifeq (yes,$(has_blosc)) --INCLDIRS += -isystem $(BLOSC_INCL_DIR) -+INCLDIRS += -I$(BLOSC_INCL_DIR) - endif - ifeq (yes,$(has_log4cplus))
[gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/files/, media-gfx/openvdb/
commit: 6af03d83c698063b3328230c2106eab4134a4470
Author: Jonathan Scruggs gmail com>
AuthorDate: Sat Oct 22 17:23:53 2016 +
Commit: David Seifert gentoo org>
CommitDate: Sat Oct 22 23:25:26 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6af03d83
media-gfx/openvdb: New package
OpenVDB is an Academy Award-winning open-source C++ library
comprising a novel hierarchical data structure and a suite of tools
for the efficient storage and manipulation of sparse volumetric
data discretized on three-dimensional grids. It is developed and
maintained by DreamWorks Animation for use in volumetric
applications typically encountered in feature film production.
Gentoo-Bug: 482664
Signed off by: Jonathan Scruggs (j.scruggs gmail.com, irc: Dracwyrm)
Signed off by: Adrian Grigo (agrigo2001 yahoo.com.au)
Closes: https://github.com/gentoo/gentoo/pull/2531
Signed-off-by: David Seifert gentoo.org>
media-gfx/openvdb/Manifest | 1 +
.../openvdb/files/openvdb-3.2.0-build-fixes.patch | 33 +
.../files/openvdb-3.2.0-makefile-fixes.patch | 93
.../openvdb/files/openvdb-3.2.0-numpy-fix.patch| 17 +++
media-gfx/openvdb/metadata.xml | 28
media-gfx/openvdb/openvdb-3.2.0.ebuild | 158 +
6 files changed, 330 insertions(+)
diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest
new file mode 100644
index ..175e892
--- /dev/null
+++ b/media-gfx/openvdb/Manifest
@@ -0,0 +1 @@
+DIST openvdb-3.2.0.tar.gz 1368870 SHA256
d4b6eb63a2c1c62ca449399f3d7789638fde655c32a977b50717b727420a634b SHA512
df9a4895b219aae3b5a9616c34eb846d565877ff76648405691f0c903507f6faba94e8eba9173423b50cb5cef80f3ec500a9f70977cb7161701d39fd105abc91
WHIRLPOOL
3b76ba4998ac39405bbbdf0b1a80488234c5f25e8b0943d4520d9fa783384a111e48ff2120e942f5d9b3862e1f227ff89dcc633842e1290060afb1836785455f
diff --git a/media-gfx/openvdb/files/openvdb-3.2.0-build-fixes.patch
b/media-gfx/openvdb/files/openvdb-3.2.0-build-fixes.patch
new file mode 100644
index ..e919ec2
--- /dev/null
+++ b/media-gfx/openvdb/files/openvdb-3.2.0-build-fixes.patch
@@ -0,0 +1,33 @@
+diff -purN a/doxygen-config b/doxygen-config
+--- a/doxygen-config 2016-08-10 16:59:33.0 +0100
b/doxygen-config 2016-10-12 12:19:06.124785164 +0100
+@@ -2257,7 +2257,7 @@ DIRECTORY_GRAPH= YES
+ # The default value is: png.
+ # This tag requires that the tag HAVE_DOT is set to YES.
+
+-DOT_IMAGE_FORMAT = png
++DOT_IMAGE_FORMAT = svg
+
+ # If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+ # enable generation of interactive SVG images that allow zooming and panning.
+diff -purN a/Makefile b/Makefile
+--- a/Makefile 2016-08-10 16:59:33.0 +0100
b/Makefile 2016-10-12 12:18:32.434773635 +0100
+@@ -678,7 +678,7 @@ ALL_PRODUCTS := \
+ @echo "Building $@ because of $(call list_deps)"
+ $(CXX) -c $(CXXFLAGS) -fPIC -o $@ $<
+
+-all: lib python vdb_print vdb_render vdb_test depend
++all: lib python vdb_print vdb_render vdb_view vdb_test depend
+
+ $(OBJ_NAMES): %.o: %.cc
+ @echo "Building $@ because of $(call list_deps)"
+@@ -794,7 +794,7 @@ pydoc: $(PYTHON_MODULE) $(LIBOPENVDB_SON
+ echo "Created $${pydocdir}"; \
+ export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$(CURDIR); \
+ export PYTHONPATH=${PYTHONPATH}:$(CURDIR); \
+- $(EPYDOC) --html -o $${pydocdir} $(PYTHON_MODULE_NAME) $(QUIET)
++ $(EPYDOC) --html --html-dir $${pydocdir} $(PYTHON_MODULE_NAME)
$(QUIET)
+ else
+ pydoc:
+ @echo "$@"': $$EPYDOC is undefined'
diff --git a/media-gfx/openvdb/files/openvdb-3.2.0-makefile-fixes.patch
b/media-gfx/openvdb/files/openvdb-3.2.0-makefile-fixes.patch
new file mode 100644
index ..633c380
--- /dev/null
+++ b/media-gfx/openvdb/files/openvdb-3.2.0-makefile-fixes.patch
@@ -0,0 +1,93 @@
+diff --git a/Makefile b/Makefile
+index fba4fb6..0054f64 100644
+--- a/Makefile
b/Makefile
+@@ -158,6 +158,9 @@ PYCONFIG_INCL_DIR := $(PYTHON_INCL_DIR)
+ # The directory containing libpython
+ PYTHON_LIB_DIR := $(HFS)/python/lib
+ PYTHON_LIB := -lpython$(PYTHON_VERSION)
++# The Directory to install the python module and includes to.
++PYTHON_INSTALL_INCL_DIR := $(DESTDIR)/python/include/python$(PYTHON_VERSION)
++PYTHON_INSTALL_LIB_DIR := $(DESTDIR)/python/lib/python$(PYTHON_VERSION)
+ # The directory containing libboost_python
+ BOOST_PYTHON_LIB_DIR := /rel/depot/third_party_build/boost/rhel6-1.46.1-0/lib
+ BOOST_PYTHON_LIB := -lboost_python-gcc41-mt-python26-1_46_1
+@@ -179,7 +182,6 @@ PYTHON_WRAP_ALL_GRID_TYPES := no
+ # (leave blank if Doxygen is unavailable)
+ DOXYGEN := doxygen
+
+-
+ #
+ # Ideally, users shouldn't need to change anything below this line.
+ #
+@@ -717,8 +719,13 @@ $(DOC_PDF): doxygen-config $(INCLUDE_NAMES) $(SRC_NAMES)
$(DOC_FILES)
+ @echo "Generating documentation because of $(list_deps)"
+ echo
