* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/files/, media-gfx/openvdb/
@ 2016-10-22 23:26 David Seifert
0 siblings, 0 replies; 9+ messages in thread
From: David Seifert @ 2016-10-22 23:26 UTC (permalink / raw
To: gentoo-commits
commit: 6af03d83c698063b3328230c2106eab4134a4470
Author: Jonathan Scruggs <j.scruggs <AT> gmail <DOT> com>
AuthorDate: Sat Oct 22 17:23:53 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Oct 22 23:25:26 2016 +0000
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 <AT> gmail.com, irc: Dracwyrm)
Signed off by: Adrian Grigo (agrigo2001 <AT> yahoo.com.au)
Closes: https://github.com/gentoo/gentoo/pull/2531
Signed-off-by: David Seifert <soap <AT> 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 00000000..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 00000000..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.000000000 +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.000000000 +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 00000000..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 -e 'OUTPUT_DIRECTORY=./doc\nGENERATE_LATEX=YES\nGENERATE_HTML=NO' \
+ | cat doxygen-config - | $(DOXYGEN) - $(QUIET) \
+- && cd ./doc/latex && make refman.pdf $(QUIET) \
++ && cd ./doc/latex && $(MAKE) refman.pdf $(QUIET) \
+ && echo 'Created doc/latex/refman.pdf'
++ @#
++ mkdir -p $(DESTDIR)/share/doc/openvdb/pdf; \
++ echo "Created $(DESTDIR)/share/doc/openvdb/pdf"; \
++ cp -r -f doc/latex/refman.pdf $(DESTDIR)/share/doc/openvdb/pdf/; \
++ echo "Copied documentation to $(DESTDIR)/share/doc/openvdb/pdf/"; \
+
+ ifneq (,$(strip $(DOXYGEN)))
+ doc: $(DOC_INDEX)
+@@ -782,6 +789,22 @@ $(PYTHON_MODULE): $(LIBOPENVDB) $(PYTHON_OBJ_NAMES)
+ -Wl,-rpath,$(BOOST_PYTHON_LIB_DIR) -L$(BOOST_PYTHON_LIB_DIR) $(BOOST_PYTHON_LIB) \
+ $(LIBOPENVDB_RPATH) -L$(CURDIR) $(LIBOPENVDB) \
+ $(LIBS_RPATH) $(CONCURRENT_MALLOC_LIB)
++ @echo "Installing the python module and includes"
++ @#
++ mkdir -p $(PYTHON_INSTALL_INCL_DIR); \
++ echo "Created $(PYTHON_INSTALL_INCL_DIR)"; \
++ cp -f $(PYTHON_PUBLIC_INCLUDE_NAMES) $(PYTHON_INSTALL_INCL_DIR)/; \
++ echo "Copied Python header files to $(PYTHON_INSTALL_INCL_DIR)"; \
++ mkdir -p $(PYTHON_INSTALL_LIB_DIR); \
++ echo "Created $(PYTHON_INSTALL_LIB_DIR)"; \
++ cp -f $(PYTHON_MODULE) $(PYTHON_INSTALL_LIB_DIR)/; \
++ pushd $(PYTHON_INSTALL_LIB_DIR) > /dev/null; \
++ ln -f -s $(PYTHON_MODULE) $(PYTHON_SONAME); \
++ popd > /dev/null; \
++ echo "Copied Python module to $(PYTHON_INSTALL_LIB_DIR)"
++ @echo "Clean the Python modules so the next one will compile"
++ @#
++ $(RM) $(PYTHON_OBJ_NAMES)
+
+ ifeq (yes,$(has_python))
+ ifneq (,$(strip $(EPYDOC)))
+@@ -833,7 +856,7 @@ test:
+ @echo "$@"': $$(CPPUNIT_INCL_DIR) is undefined'
+ endif
+
+-install: lib python vdb_print vdb_render vdb_view doc pydoc
++install: lib vdb_print vdb_render vdb_view doc pydoc
+ mkdir -p $(DESTDIR)/include/openvdb
+ @echo "Created $(DESTDIR)/include/openvdb"
+ pushd $(DESTDIR)/include/openvdb > /dev/null; \
+@@ -870,23 +893,6 @@ install: lib python vdb_print vdb_render vdb_view doc pydoc
+ echo "Copied libopenvdb_viewer to $(DESTDIR)/lib/"; \
+ fi
+ @#
+- if [ -f $(PYTHON_MODULE) ]; \
+- then \
+- installdir=$(DESTDIR)/python/include/python$(PYTHON_VERSION); \
+- mkdir -p $${installdir}; \
+- echo "Created $${installdir}"; \
+- cp -f $(PYTHON_PUBLIC_INCLUDE_NAMES) $${installdir}/; \
+- echo "Copied Python header files to $${installdir}"; \
+- installdir=$(DESTDIR)/python/lib/python$(PYTHON_VERSION); \
+- mkdir -p $${installdir}; \
+- echo "Created $${installdir}"; \
+- cp -f $(PYTHON_MODULE) $${installdir}/; \
+- pushd $${installdir} > /dev/null; \
+- ln -f -s $(PYTHON_MODULE) $(PYTHON_SONAME); \
+- popd > /dev/null; \
+- echo "Copied Python module to $${installdir}"; \
+- fi
+- @#
+ mkdir -p $(DESTDIR)/bin
+ @echo "Created $(DESTDIR)/bin/"
+ cp -f vdb_print $(DESTDIR)/bin
diff --git a/media-gfx/openvdb/files/openvdb-3.2.0-numpy-fix.patch b/media-gfx/openvdb/files/openvdb-3.2.0-numpy-fix.patch
new file mode 100644
index 00000000..bef1024
--- /dev/null
+++ b/media-gfx/openvdb/files/openvdb-3.2.0-numpy-fix.patch
@@ -0,0 +1,17 @@
+diff --git a/python/pyOpenVDBModule.cc b/openvdb/python/pyOpenVDBModule.cc
+index 508c787..dd069e0 100644
+--- a/python/pyOpenVDBModule.cc
++++ b/python/pyOpenVDBModule.cc
+@@ -592,8 +592,12 @@ BOOST_PYTHON_MODULE(PY_OPENVDB_MODULE_NAME)
+
+ #ifdef PY_OPENVDB_USE_NUMPY
+ // Initialize NumPy.
++#if PY_MAJOR_VERSION >= 3
++ if (_import_array()) { };
++#else
+ import_array();
+ #endif
++#endif
+
+ using namespace openvdb::OPENVDB_VERSION_NAME;
+
diff --git a/media-gfx/openvdb/metadata.xml b/media-gfx/openvdb/metadata.xml
new file mode 100644
index 00000000..611db53
--- /dev/null
+++ b/media-gfx/openvdb/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer restrict=">=media-gfx/openvdb-3.1.0" type="person">
+ <email>j.scruggs@gmail.com</email>
+ <name>Jonathan Scruggs</name>
+ </maintainer>
+ <maintainer restrict=">=media-gfx/openvdb-3.1.0" type="person">
+ <email>agrigo2001@yahoo.com.au</email>
+ <name>Adrian Grigo</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <longdescription>
+ Libraries from Dreamworks Animation for the efficient manipulation
+ of volumetric data used in big budget movies like 'Cloudy with a
+ Chance of Meatballs2' and 'How to Train Your Dragon 2'.
+ </longdescription>
+ <use>
+ <flag name="openvdb-compression">
+ Adds enhanced compression to files through
+ <pkg>dev-libs/c-blosc</pkg>. Very useful so
+ enabled by dfault.
+ </flag>
+ </use>
+</pkgmetadata>
diff --git a/media-gfx/openvdb/openvdb-3.2.0.ebuild b/media-gfx/openvdb/openvdb-3.2.0.ebuild
new file mode 100644
index 00000000..649cd99
--- /dev/null
+++ b/media-gfx/openvdb/openvdb-3.2.0.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $id$
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit eutils python-r1
+
+DESCRIPTION="Libs for the efficient manipulation of volumetric data"
+HOMEPAGE="http://www.openvdb.org"
+
+SRC_URI="https://github.com/dreamworksanimation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+openvdb-compression doc python X"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="
+ sys-libs/zlib
+ >=dev-libs/boost-1.62:=[${PYTHON_USEDEP}]
+ media-libs/openexr
+ dev-util/cppunit
+ X? ( media-libs/glfw )
+ dev-libs/jemalloc
+ python? ( dev-python/numpy[${PYTHON_USEDEP}] )
+ openvdb-compression? ( >=dev-libs/c-blosc-1.5.0 )
+ dev-libs/log4cplus"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )
+ ${COMMON_DEPEND}"
+
+DEPEND="${RDEPEND}
+ dev-cpp/tbb
+ doc? (
+ app-doc/doxygen
+ python? ( dev-python/pdoc[${PYTHON_USEDEP}] )
+ )
+ ${COMMON_DEPEND}"
+
+S="${WORKDIR}/${P}/${PN}"
+
+PATCHES=( "${FILESDIR}"/${P}-numpy-fix.patch
+ "${FILESDIR}"/${P}-makefile-fixes.patch
+ "${FILESDIR}"/${P}-build-fixes.patch )
+
+python_module_compile() {
+ mypythonargs=(
+ PYTHON_VERSION=${EPYTHON/python/}
+ PYTHON_INCL_DIR="$(python_get_includedir)"
+ PYCONFIG_INCL_DIR="$(python_get_includedir)"
+ PYTHON_LIB_DIR="$(python_get_library_path)"
+ PYTHON_LIB="$(python_get_LIBS)"
+ PYTHON_INSTALL_INCL_DIR="${D}$(python_get_includedir)"
+ PYTHON_INSTALL_LIB_DIR="${D}$(python_get_sitedir)"
+ NUMPY_INCL_DIR="$(python_get_sitedir)"/numpy/core/include/numpy
+ BOOST_PYTHON_LIB_DIR="${myprefixlibdir}"
+ BOOST_PYTHON_LIB=-lboost_python-${EPYTHON/python/}
+ )
+
+ einfo "Compiling module for ${EPYTHON}."
+ emake python "${myemakeargs[@]}" "${mypythonargs[@]}" EPYDOC=""
+
+ # This is so the correct version of pdoc is used
+ mypyscriptdir=$(python_get_scriptdir)
+}
+
+src_compile() {
+ # The build system is designed to compile and install all
+ # in one go, so doing each phase separately would be be
+ # impossible and the functions would all overlap anyways.
+ # Do nothing
+ return
+}
+
+src_install() {
+ local myprefix="${EPREFIX}"/usr
+ local myprefixlibdir="${myprefix}"/"$(get_libdir)"
+ local mypyscriptdir
+
+ # So individule targets can be called without duplication
+ # Common depends:
+ local myemakeargs=(
+ rpath=no shared=yes
+ LIBOPENVDB_RPATH=
+ DESTDIR="${D}"
+ HFS="${myprefix}"
+ HT="${myprefix}"
+ HDSO="${myprefixlibdir}"
+ CPPUNIT_INCL_DIR="${myprefix}"/include/cppunit
+ CPPUNIT_LIB_DIR="${myprefixlibdir}"
+ LOG4CPLUS_INCL_DIR="${myprefix}"/include/log4cplus
+ LOG4CPLUS_LIB_DIR="${myprefixlibdir}"
+ )
+
+ # Create python list here for use during install phase:
+ # - If python is used, then the last used module will trigger
+ # document install phase. It's the same doc, so build once.
+ # - If no python used, then this will remail blanked out to
+ # disable pydoc.
+ # - pydoc will be called if doc and python use flags are set.
+ local mypythonargs=(
+ PYTHON_VERSION=
+ PYTHON_INCL_DIR=
+ PYCONFIG_INCL_DIR=
+ PYTHON_LIB_DIR=
+ PYTHON_LIB=
+ PYTHON_INSTALL_INCL_DIR=
+ PYTHON_INSTALL_LIB_DIR=
+ NUMPY_INCL_DIR=
+ BOOST_PYTHON_LIB_DIR=
+ BOOST_PYTHON_LIB=
+ )
+
+ # Optional depends:
+ if use X; then
+ myemakeargs+=(
+ GLFW_INCL_DIR="${myprefixlibdir}"
+ GLFW_LIB_DIR="${myprefixlibdir}"
+ )
+ else
+ myemakeargs+=(
+ GLFW_INCL_DIR=
+ GLFW_LIB_DIR=
+ GLFW_LIB=
+ GLFW_MAJOR_VERSION=
+ )
+ fi
+
+ if use openvdb-compression; then
+ myemakeargs+=(
+ BLOSC_INCL_DIR="${myprefix}"/include
+ BLOSC_LIB_DIR="${myprefixlibdir}"
+ )
+ else
+ myemakeargs+=(
+ BLOSC_INCL_DIR=
+ BLOSC_LIB_DIR=
+ )
+ fi
+
+ use doc || myemakeargs+=( DOXYGEN= )
+
+ # Create python modules for each version selected
+ use python && python_foreach_impl python_module_compile
+
+ if use python && use doc; then
+ mypythonargs+=( EPYDOC="${mypyscriptdir}"/pdoc )
+ else
+ mypythonargs+=( EPYDOC="" )
+ fi
+
+ einfo "Compiling the main components."
+ emake install "${myemakeargs[@]}" "${mypythonargs[@]}"
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/files/, media-gfx/openvdb/
@ 2018-08-04 18:21 Jonathan Scruggs
0 siblings, 0 replies; 9+ messages in thread
From: Jonathan Scruggs @ 2018-08-04 18:21 UTC (permalink / raw
To: gentoo-commits
commit: f4ceb32d7edcd0b37899d7fbd48ab197ceda9b79
Author: Jonathan Scruggs <j.scruggs <AT> gmail <DOT> com>
AuthorDate: Sat Aug 4 17:18:32 2018 +0000
Commit: Jonathan Scruggs <dracwyrm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 4 18:21:38 2018 +0000
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..00000000000
--- 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))
-- INCLDIRS += -isystem $(LOG4CPLUS_INCL_DIR)
-+ INCLDIRS += -I$(LOG4CPLUS_INCL_DIR)
- endif
-
- CXXFLAGS += -std=c++0x
-@@ -565,9 +564,9 @@
- python/pyTransform.cc \
- python/pyVec3Grid.cc \
- #
--PYCXXFLAGS := -fPIC -isystem python -isystem $(PYTHON_INCL_DIR) -isystem $(PYCONFIG_INCL_DIR)
-+PYCXXFLAGS := -fPIC -Ipython -I$(PYTHON_INCL_DIR) -I$(PYCONFIG_INCL_DIR)
- ifneq (,$(strip $(NUMPY_INCL_DIR)))
--PYCXXFLAGS += -isystem $(NUMPY_INCL_DIR) -DPY_OPENVDB_USE_NUMPY
-+PYCXXFLAGS += -I$(NUMPY_INCL_DIR) -DPY_OPENVDB_USE_NUMPY
- endif
- ifneq (no,$(strip $(PYTHON_WRAP_ALL_GRID_TYPES)))
- PYCXXFLAGS += -DPY_OPENVDB_WRAP_ALL_GRID_TYPES
-@@ -678,7 +677,7 @@
- @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)"
-@@ -719,8 +718,13 @@
- @echo "Generating documentation because of $(list_deps)"
- echo -e 'OUTPUT_DIRECTORY=./doc\nGENERATE_LATEX=YES\nGENERATE_HTML=NO' \
- | cat doxygen-config - | $(DOXYGEN) - $(QUIET) \
-- && cd ./doc/latex && make refman.pdf $(QUIET) \
-+ && cd ./doc/latex && $(MAKE) refman.pdf $(QUIET) \
- && echo 'Created doc/latex/refman.pdf'
-+ @#
-+ mkdir -p $(DESTDIR)/share/doc/openvdb/pdf; \
-+ echo "Created $(DESTDIR)/share/doc/openvdb/pdf"; \
-+ cp -r -f doc/latex/refman.pdf $(DESTDIR)/share/doc/openvdb/pdf/; \
-+ echo "Copied documentation to $(DESTDIR)/share/doc/openvdb/pdf/"; \
-
- ifneq (,$(strip $(DOXYGEN)))
- doc: $(DOC_INDEX)
-@@ -734,14 +738,14 @@
-
- vdb_print: $(LIBOPENVDB) cmd/openvdb_print/main.cc
- @echo "Building $@ because of $(list_deps)"
-- $(CXX) $(CXXFLAGS) -o $@ cmd/openvdb_print/main.cc -I . \
-+ $(CXX) $(CXXFLAGS) -o $@ cmd/openvdb_print/main.cc -I. \
- $(LIBOPENVDB_RPATH) -L$(CURDIR) $(LIBOPENVDB) \
- $(LIBS_RPATH) $(CONCURRENT_MALLOC_LIB)
-
- vdb_render: $(LIBOPENVDB) cmd/openvdb_render/main.cc
- @echo "Building $@ because of $(list_deps)"
-- $(CXX) $(CXXFLAGS) -o $@ cmd/openvdb_render/main.cc -I . \
-- -isystem $(EXR_INCL_DIR) -isystem $(ILMBASE_INCL_DIR) \
-+ $(CXX) $(CXXFLAGS) -o $@ cmd/openvdb_render/main.cc -I. \
-+ -I$(EXR_INCL_DIR) -I$(ILMBASE_INCL_DIR) \
- -Wl,-rpath,$(EXR_LIB_DIR) -L$(EXR_LIB_DIR) $(EXR_LIB) \
- -Wl,-rpath,$(ILMBASE_LIB_DIR) -L$(ILMBASE_LIB_DIR) $(ILMBASE_LIB) \
- $(LIBOPENVDB_RPATH) -L$(CURDIR) $(LIBOPENVDB) \
-@@ -761,12 +765,12 @@
- $(LIBVIEWER_OBJ_NAMES): $(LIBVIEWER_INCLUDE_NAMES)
- $(LIBVIEWER_OBJ_NAMES): %.o: %.cc
- @echo "Building $@ because of $(list_deps)"
-- $(CXX) -c $(CXXFLAGS) -I . -isystem $(GLFW_INCL_DIR) -DGL_GLEXT_PROTOTYPES=1 -fPIC -o $@ $<
-+ $(CXX) -c $(CXXFLAGS) -I. -I$(GLFW_INCL_DIR) -DGL_GLEXT_PROTOTYPES=1 -fPIC -o $@ $<
-
- vdb_view: $(LIBOPENVDB) $(LIBVIEWER_OBJ_NAMES) cmd/openvdb_view/main.cc
- @echo "Building $@ because of $(list_deps)"
- $(CXX) $(CXXFLAGS) -o $@ cmd/openvdb_view/main.cc $(LIBVIEWER_OBJ_NAMES) \
-- -I . -Wl,-rpath,$(GLFW_LIB_DIR) -L$(GLFW_LIB_DIR) $(GLFW_LIB) \
-+ -I. -Wl,-rpath,$(GLFW_LIB_DIR) -L$(GLFW_LIB_DIR) $(GLFW_LIB) \
- $(LIBOPENVDB_RPATH) -L$(CURDIR) $(LIBOPENVDB) \
- $(LIBVIEWER_FLAGS) $(LIBS_RPATH) $(BOOST_THREAD_LIB) $(CONCURRENT_MALLOC_LIB)
- endif
-@@ -776,7 +780,7 @@
- $(PYTHON_OBJ_NAMES): $(PYTHON_INCLUDE_NAMES)
- $(PYTHON_OBJ_NAMES): %.o: %.cc
- @echo "Building $@ because of $(list_deps)"
-- $(CXX) -c $(CXXFLAGS) -I . $(PYCXXFLAGS) -o $@ $<
-+ $(CXX) -c $(CXXFLAGS) -I. $(PYCXXFLAGS) -o $@ $<
- $(PYTHON_MODULE): $(LIBOPENVDB) $(PYTHON_OBJ_NAMES)
- @echo "Building $@ because of $(list_deps)"
- $(CXX) $(CXXFLAGS) $(PYCXXFLAGS) -shared $(PYTHON_SONAME_FLAGS) -o $@ $(PYTHON_OBJ_NAMES) \
-@@ -784,6 +788,22 @@
- -Wl,-rpath,$(BOOST_PYTHON_LIB_DIR) -L$(BOOST_PYTHON_LIB_DIR) $(BOOST_PYTHON_LIB) \
- $(LIBOPENVDB_RPATH) -L$(CURDIR) $(LIBOPENVDB) \
- $(LIBS_RPATH) $(CONCURRENT_MALLOC_LIB)
-+ @echo "Installing the python module and includes"
-+ @#
-+ mkdir -p $(PYTHON_INSTALL_INCL_DIR); \
-+ echo "Created $(PYTHON_INSTALL_INCL_DIR)"; \
-+ cp -f $(PYTHON_PUBLIC_INCLUDE_NAMES) $(PYTHON_INSTALL_INCL_DIR)/; \
-+ echo "Copied Python header files to $(PYTHON_INSTALL_INCL_DIR)"; \
-+ mkdir -p $(PYTHON_INSTALL_LIB_DIR); \
-+ echo "Created $(PYTHON_INSTALL_LIB_DIR)"; \
-+ cp -f $(PYTHON_MODULE) $(PYTHON_INSTALL_LIB_DIR)/; \
-+ pushd $(PYTHON_INSTALL_LIB_DIR) > /dev/null; \
-+ ln -f -s $(PYTHON_MODULE) $(PYTHON_SONAME); \
-+ popd > /dev/null; \
-+ echo "Copied Python module to $(PYTHON_INSTALL_LIB_DIR)"
-+ @echo "Clean the Python modules so the next one will compile"
-+ @#
-+ $(RM) $(PYTHON_OBJ_NAMES)
-
- ifeq (yes,$(has_python))
- ifneq (,$(strip $(EPYDOC)))
-@@ -794,7 +814,7 @@
- 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'
-@@ -815,7 +835,7 @@
-
- $(UNITTEST_OBJ_NAMES): %.o: %.cc
- @echo "Building $@ because of $(list_deps)"
-- $(CXX) -c $(CXXFLAGS) -isystem $(CPPUNIT_INCL_DIR) -fPIC -o $@ $<
-+ $(CXX) -c $(CXXFLAGS) -I$(CPPUNIT_INCL_DIR) -fPIC -o $@ $<
-
- ifneq (,$(strip $(CPPUNIT_INCL_DIR)))
- vdb_test: $(LIBOPENVDB) $(UNITTEST_OBJ_NAMES)
-@@ -835,7 +855,7 @@
- @echo "$@"': $$(CPPUNIT_INCL_DIR) is undefined'
- endif
-
--install: lib python vdb_print vdb_render vdb_view doc pydoc
-+install: lib vdb_print vdb_render vdb_view doc pydoc
- mkdir -p $(DESTDIR)/include/openvdb
- @echo "Created $(DESTDIR)/include/openvdb"
- pushd $(DESTDIR)/include/openvdb > /dev/null; \
-@@ -851,42 +871,25 @@
- fi
- @echo "Copied header files to $(DESTDIR)/include"
- @#
-- mkdir -p $(DESTDIR)/lib
-- @echo "Created $(DESTDIR)/lib/"
-- cp -f $(LIBOPENVDB) $(DESTDIR)/lib
-- pushd $(DESTDIR)/lib > /dev/null; \
-+ mkdir -p $(DESTDIR)/$(libdir)
-+ @echo "Created $(DESTDIR)/$(libdir)/"
-+ cp -f $(LIBOPENVDB) $(DESTDIR)/$(libdir)
-+ pushd $(DESTDIR)/$(libdir) > /dev/null; \
- if [ -f $(LIBOPENVDB_SHARED) ]; then \
- ln -f -s $(LIBOPENVDB_SHARED) $(LIBOPENVDB_SHARED_NAME); \
- ln -f -s $(LIBOPENVDB_SHARED) $(LIBOPENVDB_SONAME); \
- fi; \
- popd > /dev/null
-- @echo "Copied libopenvdb to $(DESTDIR)/lib/"
-+ @echo "Copied libopenvdb to $(DESTDIR)/$(libdir)/"
- @#
- if [ -f $(LIBVIEWER) ]; \
- then \
-- cp -f $(LIBVIEWER) $(DESTDIR)/lib; \
-- pushd $(DESTDIR)/lib > /dev/null; \
-+ cp -f $(LIBVIEWER) $(DESTDIR)/$(libdir); \
-+ pushd $(DESTDIR)/$(libdir) > /dev/null; \
- if [ -f $(LIBVIEWER_SHARED) ]; then \
- ln -f -s $(LIBVIEWER_SHARED) $(LIBVIEWER_SHARED_NAME); fi; \
- popd > /dev/null; \
-- echo "Copied libopenvdb_viewer to $(DESTDIR)/lib/"; \
-- fi
-- @#
-- if [ -f $(PYTHON_MODULE) ]; \
-- then \
-- installdir=$(DESTDIR)/python/include/python$(PYTHON_VERSION); \
-- mkdir -p $${installdir}; \
-- echo "Created $${installdir}"; \
-- cp -f $(PYTHON_PUBLIC_INCLUDE_NAMES) $${installdir}/; \
-- echo "Copied Python header files to $${installdir}"; \
-- installdir=$(DESTDIR)/python/lib/python$(PYTHON_VERSION); \
-- mkdir -p $${installdir}; \
-- echo "Created $${installdir}"; \
-- cp -f $(PYTHON_MODULE) $${installdir}/; \
-- pushd $${installdir} > /dev/null; \
-- ln -f -s $(PYTHON_MODULE) $(PYTHON_SONAME); \
-- popd > /dev/null; \
-- echo "Copied Python module to $${installdir}"; \
-+ echo "Copied libopenvdb_viewer to $(DESTDIR)/$(libdir)/"; \
- fi
- @#
- mkdir -p $(DESTDIR)/bin
-@@ -924,7 +927,7 @@
- for f in $(UNITTEST_SRC_NAMES); \
- do $(CXX) $(CXXFLAGS) -O0 \
- -MM $$f -MT `echo $$f | sed 's%\.[^.]*%.o%'` \
-- -isystem $(CPPUNIT_INCL_DIR) >> $(DEPEND); \
-+ -I$(CPPUNIT_INCL_DIR) >> $(DEPEND); \
- done; \
- fi
-
diff --git a/media-gfx/openvdb/files/openvdb-3.2.0-numpy-fix.patch b/media-gfx/openvdb/files/openvdb-3.2.0-numpy-fix.patch
deleted file mode 100644
index bef10240477..00000000000
--- a/media-gfx/openvdb/files/openvdb-3.2.0-numpy-fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/python/pyOpenVDBModule.cc b/openvdb/python/pyOpenVDBModule.cc
-index 508c787..dd069e0 100644
---- a/python/pyOpenVDBModule.cc
-+++ b/python/pyOpenVDBModule.cc
-@@ -592,8 +592,12 @@ BOOST_PYTHON_MODULE(PY_OPENVDB_MODULE_NAME)
-
- #ifdef PY_OPENVDB_USE_NUMPY
- // Initialize NumPy.
-+#if PY_MAJOR_VERSION >= 3
-+ if (_import_array()) { };
-+#else
- import_array();
- #endif
-+#endif
-
- using namespace openvdb::OPENVDB_VERSION_NAME;
-
diff --git a/media-gfx/openvdb/files/openvdb-4.0.0-build-docs-once.patch b/media-gfx/openvdb/files/openvdb-4.0.0-build-docs-once.patch
deleted file mode 100644
index 5a8baee0f26..00000000000
--- a/media-gfx/openvdb/files/openvdb-4.0.0-build-docs-once.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 5bb7bc424b09f93417a1d447f2d4f3081394f964 Mon Sep 17 00:00:00 2001
-From: Nicholas Yue <yue.nicholas@gmail.com>
-Date: Thu, 17 Nov 2016 16:59:47 -0800
-Subject: [PATCH] Refine Doxygen run so that it is done only once and only
- during the installation phase
-
----
- openvdb/CMakeLists.txt | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt
-index aa1a080..88e46ca 100644
---- a/openvdb/CMakeLists.txt
-+++ b/openvdb/CMakeLists.txt
-@@ -443,13 +443,15 @@ IF (OPENVDB_BUILD_DOCS)
- 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 ALL
-+ ADD_CUSTOM_TARGET ( doc
- ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/cmake-doxygen-config
- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
- COMMENT "Generating API documentation with Doxygen" VERBATIM
- )
-
-- INSTALL ( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html/ DESTINATION doc)
-+ INSTALL ( CODE "EXECUTE_PROCESS(COMMAND \"${CMAKE_COMMAND}\" --build \"${PROJECT_BINARY_DIR}\" --target doc)")
-+ INSTALL ( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html DESTINATION docs)
-+
- ENDIF ()
-
- # Installation
diff --git a/media-gfx/openvdb/files/openvdb-4.0.0-make-docs-optional.patch b/media-gfx/openvdb/files/openvdb-4.0.0-make-docs-optional.patch
deleted file mode 100644
index 92c4fa32059..00000000000
--- a/media-gfx/openvdb/files/openvdb-4.0.0-make-docs-optional.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 3c7f3247e443620658a5cb7b4e9cdea488c450d9 Mon Sep 17 00:00:00 2001
-From: Nicholas Yue <yue.nicholas@gmail.com>
-Date: Thu, 17 Nov 2016 03:58:58 -0800
-Subject: [PATCH] Fix the Doxygen generation problem but current solution is
- not very elegant as there was a regeneration run of Doxygen. Committing this
- for now so that at least it will work for the initial 4.0.0 release.
- Introduce a CMake option variable to toggle the generation and installation
- of doxygen
-
----
- CMakeLists.txt | 1 +
- openvdb/CMakeLists.txt | 27 +++++++++++++++------------
- 2 files changed, 16 insertions(+), 12 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 739d57f..32f82d2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -33,6 +33,7 @@ PROJECT ( OpenVDB )
- ENABLE_TESTING()
-
- OPTION ( OPENVDB_BUILD_UNITTESTS "Build the OpenVDB unit tests" ON )
-+OPTION ( OPENVDB_BUILD_DOCS "Build the OpenVDB documentation" OFF )
- OPTION ( OPENVDB_BUILD_PYTHON_MODULE "Build the pyopenvdb Python module" ON )
- OPTION ( OPENVDB_BUILD_HOUDINI_SOPS "Build the Houdini SOPs" OFF )
- OPTION ( OPENVDB_BUILD_MAYA_PLUGIN "Build the Maya plugin" OFF )
-diff --git a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt
-index f86b306..aa1a080 100644
---- a/openvdb/CMakeLists.txt
-+++ b/openvdb/CMakeLists.txt
-@@ -97,7 +97,9 @@ FIND_PACKAGE ( ZLIB REQUIRED )
- FIND_PACKAGE ( ILMBase REQUIRED )
- FIND_PACKAGE ( OpenEXR REQUIRED )
- FIND_PACKAGE ( OpenGL REQUIRED )
--FIND_PACKAGE ( Doxygen REQUIRED )
-+IF (OPENVDB_BUILD_DOCS)
-+ FIND_PACKAGE ( Doxygen REQUIRED )
-+ENDIF ()
- IF (OPENVDB_BUILD_UNITTESTS)
- FIND_PACKAGE ( CPPUnit REQUIRED )
- ENDIF ()
-@@ -435,17 +437,18 @@ IF ( OPENVDB_BUILD_PYTHON_MODULE )
- ENDIF ( OPENVDB_BUILD_PYTHON_MODULE )
-
- # Doxygen docmentation
--FILE ( READ ${CMAKE_CURRENT_SOURCE_DIR}/doxygen-config DOXYGEN_CONFIG_CONTENT )
--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
-- ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/cmake-doxygen-config
-- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-- COMMENT "Generating API documentation with Doxygen" VERBATIM
--)
--
--IF ( EXISTS ${CMAKE_CURRENT_BINARY_DIR}/doc/html )
-+IF (OPENVDB_BUILD_DOCS)
-+
-+ FILE ( READ ${CMAKE_CURRENT_SOURCE_DIR}/doxygen-config DOXYGEN_CONFIG_CONTENT )
-+ 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 ALL
-+ ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/cmake-doxygen-config
-+ WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-+ COMMENT "Generating API documentation with Doxygen" VERBATIM
-+ )
-+
- INSTALL ( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html/ DESTINATION doc)
- ENDIF ()
-
diff --git a/media-gfx/openvdb/files/openvdb-4.0.0-namespace-fixes.patch b/media-gfx/openvdb/files/openvdb-4.0.0-namespace-fixes.patch
deleted file mode 100644
index 913c6079a08..00000000000
--- a/media-gfx/openvdb/files/openvdb-4.0.0-namespace-fixes.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -purN a/cmake/FindILMBase.cmake b/cmake/FindILMBase.cmake
---- a/cmake/FindILMBase.cmake 2016-11-16 20:24:17.000000000 +0000
-+++ b/cmake/FindILMBase.cmake 2017-01-05 09:28:43.941910625 +0000
-@@ -57,15 +57,15 @@ OPTION ( ILMBASE_NAMESPACE_VERSIONING "N
-
- IF ( ILMBASE_FOUND )
-
-- FILE ( STRINGS "${ILMBASE_LOCATION}/include/OpenEXR/IlmBaseConfig.h" _ilmbase_version_major_string REGEX "#define ILMBASE_VERSION_MAJOR ")
-- STRING ( REGEX REPLACE "#define ILMBASE_VERSION_MAJOR" "" _ilmbase_version_major_unstrip "${_ilmbase_version_major_string}")
-- STRING ( STRIP ${_ilmbase_version_major_unstrip} ILMBASE_VERSION_MAJOR )
-+ IF ( ILMBASE_NAMESPACE_VERSIONING )
-+ FILE ( STRINGS "${ILMBASE_LOCATION}/include/OpenEXR/IlmBaseConfig.h" _ilmbase_version_major_string REGEX "#define ILMBASE_VERSION_MAJOR ")
-+ STRING ( REGEX REPLACE "#define ILMBASE_VERSION_MAJOR" "" _ilmbase_version_major_unstrip "${_ilmbase_version_major_string}")
-+ STRING ( STRIP ${_ilmbase_version_major_unstrip} ILMBASE_VERSION_MAJOR )
-
-- FILE ( STRINGS "${ILMBASE_LOCATION}/include/OpenEXR/IlmBaseConfig.h" _ilmbase_version_minor_string REGEX "#define ILMBASE_VERSION_MINOR ")
-- STRING ( REGEX REPLACE "#define ILMBASE_VERSION_MINOR" "" _ilmbase_version_minor_unstrip "${_ilmbase_version_minor_string}")
-- STRING ( STRIP ${_ilmbase_version_minor_unstrip} ILMBASE_VERSION_MINOR )
-+ FILE ( STRINGS "${ILMBASE_LOCATION}/include/OpenEXR/IlmBaseConfig.h" _ilmbase_version_minor_string REGEX "#define ILMBASE_VERSION_MINOR ")
-+ STRING ( REGEX REPLACE "#define ILMBASE_VERSION_MINOR" "" _ilmbase_version_minor_unstrip "${_ilmbase_version_minor_string}")
-+ STRING ( STRIP ${_ilmbase_version_minor_unstrip} ILMBASE_VERSION_MINOR )
-
-- IF ( ILMBASE_NAMESPACE_VERSIONING )
- SET ( IEX_LIBRARY_NAME Iex-${ILMBASE_VERSION_MAJOR}_${ILMBASE_VERSION_MINOR} )
- SET ( IEXMATH_LIBRARY_NAME IexMath-${ILMBASE_VERSION_MAJOR}_${ILMBASE_VERSION_MINOR} )
- SET ( ILMTHREAD_LIBRARY_NAME IlmThread-${ILMBASE_VERSION_MAJOR}_${ILMBASE_VERSION_MINOR} )
-diff -purN a/cmake/FindOpenEXR.cmake b/cmake/FindOpenEXR.cmake
---- a/cmake/FindOpenEXR.cmake 2016-11-16 20:24:17.000000000 +0000
-+++ b/cmake/FindOpenEXR.cmake 2017-01-05 09:34:51.167736304 +0000
-@@ -52,22 +52,24 @@ OPTION ( OPENEXR_NAMESPACE_VERSIONING "N
-
- IF ( OPENEXR_FOUND )
-
-- FILE ( STRINGS "${OPENEXR_LOCATION}/include/OpenEXR/OpenEXRConfig.h" _openexr_version_major_string REGEX "#define OPENEXR_VERSION_MAJOR ")
-- STRING ( REGEX REPLACE "#define OPENEXR_VERSION_MAJOR" "" _openexr_version_major_unstrip "${_openexr_version_major_string}")
-- STRING ( STRIP ${_openexr_version_major_unstrip} OPENEXR_VERSION_MAJOR )
--
-- FILE ( STRINGS "${OPENEXR_LOCATION}/include/OpenEXR/OpenEXRConfig.h" _openexr_version_minor_string REGEX "#define OPENEXR_VERSION_MINOR ")
-- STRING ( REGEX REPLACE "#define OPENEXR_VERSION_MINOR" "" _openexr_version_minor_unstrip "${_openexr_version_minor_string}")
-- STRING ( STRIP ${_openexr_version_minor_unstrip} OPENEXR_VERSION_MINOR )
--
-- MESSAGE ( STATUS "Found OpenEXR v${OPENEXR_VERSION_MAJOR}.${OPENEXR_VERSION_MINOR} at ${OPENEXR_LOCATION}" )
--
- IF ( OPENEXR_NAMESPACE_VERSIONING )
-+ FILE ( STRINGS "${OPENEXR_LOCATION}/include/OpenEXR/OpenEXRConfig.h" _openexr_version_major_string REGEX "#define OPENEXR_VERSION_MAJOR ")
-+ STRING ( REGEX REPLACE "#define OPENEXR_VERSION_MAJOR" "" _openexr_version_major_unstrip "${_openexr_version_major_string}")
-+ STRING ( STRIP ${_openexr_version_major_unstrip} OPENEXR_VERSION_MAJOR )
-+
-+ FILE ( STRINGS "${OPENEXR_LOCATION}/include/OpenEXR/OpenEXRConfig.h" _openexr_version_minor_string REGEX "#define OPENEXR_VERSION_MINOR ")
-+ STRING ( REGEX REPLACE "#define OPENEXR_VERSION_MINOR" "" _openexr_version_minor_unstrip "${_openexr_version_minor_string}")
-+ STRING ( STRIP ${_openexr_version_minor_unstrip} OPENEXR_VERSION_MINOR )
-+
-+ MESSAGE ( STATUS "Found OpenEXR v${OPENEXR_VERSION_MAJOR}.${OPENEXR_VERSION_MINOR} at ${OPENEXR_LOCATION}" )
-+
- SET ( ILMIMF_LIBRARY_NAME IlmImf-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR} )
- ELSE ( OPENEXR_NAMESPACE_VERSIONING )
-+ MESSAGE ( STATUS "Found OpenEXR at ${OPENEXR_LOCATION}" )
-+
- SET ( ILMIMF_LIBRARY_NAME IlmImf )
- ENDIF ( OPENEXR_NAMESPACE_VERSIONING )
--
-+
- SET ( OPENEXR_INCLUDE_DIRS
- ${OPENEXR_LOCATION}/include
- ${OPENEXR_LOCATION}/include/OpenEXR
diff --git a/media-gfx/openvdb/files/openvdb-4.0.0-python-module-install-dir-fix.patch b/media-gfx/openvdb/files/openvdb-4.0.0-python-module-install-dir-fix.patch
deleted file mode 100644
index 34c6c76ea9d..00000000000
--- a/media-gfx/openvdb/files/openvdb-4.0.0-python-module-install-dir-fix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -purN a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt
---- a/openvdb/CMakeLists.txt 2016-11-16 20:24:17.000000000 +0000
-+++ b/openvdb/CMakeLists.txt 2017-01-09 13:46:00.000000000 +0000
-@@ -426,10 +426,11 @@ IF ( OPENVDB_BUILD_PYTHON_MODULE )
- ADD_TEST ( pytest ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/python/test/TestOpenVDB.py )
- SET_TESTS_PROPERTIES ( pytest PROPERTIES ENVIRONMENT "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}")
-
-+ SET ( PYOENVDB_INSTALL_DIRECTORY lib/python${OPENVDB_PYTHON_VERSION_MAJOR}.${OPENVDB_PYTHON_VERSION_MINOR} CACHE STRING "The directory to install the pyopenvdb.so module.")
- INSTALL ( TARGETS
- pyopenvdb
- DESTINATION
-- lib/python${OPENVDB_PYTHON_VERSION_MAJOR}.${OPENVDB_PYTHON_VERSION_MINOR}
-+ ${PYOENVDB_INSTALL_DIRECTORY}
- )
-
- ENDIF ( OPENVDB_BUILD_PYTHON_MODULE )
diff --git a/media-gfx/openvdb/metadata.xml b/media-gfx/openvdb/metadata.xml
index 453013e59be..806981efae0 100644
--- a/media-gfx/openvdb/metadata.xml
+++ b/media-gfx/openvdb/metadata.xml
@@ -23,11 +23,6 @@
Enables compatibility with the old 3.x ABI.
enabled by dfault.
</flag>
- <flag restrict="<=media-gfx/openvdb-3.2.0" name="openvdb-compression">
- Adds enhanced compression to files through
- <pkg>dev-libs/c-blosc</pkg>. Very useful so
- enabled by dfault.
- </flag>
</use>
<upstream>
<remote-id type="github">dreamworksanimation/openvdb</remote-id>
diff --git a/media-gfx/openvdb/openvdb-3.2.0.ebuild b/media-gfx/openvdb/openvdb-3.2.0.ebuild
deleted file mode 100644
index bdd39bb6e1f..00000000000
--- a/media-gfx/openvdb/openvdb-3.2.0.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit eutils python-r1 toolchain-funcs
-
-DESCRIPTION="Libs for the efficient manipulation of volumetric data"
-HOMEPAGE="http://www.openvdb.org"
-
-SRC_URI="https://github.com/dreamworksanimation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+openvdb-compression doc python X"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="
- sys-libs/zlib
- >=dev-libs/boost-1.62:=[${PYTHON_USEDEP}]
- media-libs/openexr
- dev-util/cppunit
- X? ( media-libs/glfw )
- dev-libs/jemalloc
- python? ( dev-python/numpy[${PYTHON_USEDEP}] )
- openvdb-compression? ( >=dev-libs/c-blosc-1.5.0 )
- dev-libs/log4cplus"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )
- ${COMMON_DEPEND}"
-
-DEPEND="${RDEPEND}
- dev-cpp/tbb
- doc? (
- app-doc/doxygen
- python? ( dev-python/pdoc[${PYTHON_USEDEP}] )
- )
- ${COMMON_DEPEND}"
-
-S="${WORKDIR}/${P}/${PN}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-numpy-fix.patch
- "${FILESDIR}"/${P}-fix-build-system.patch
-)
-
-python_module_compile() {
- mypythonargs=(
- PYTHON_VERSION=${EPYTHON/python/}
- PYTHON_INCL_DIR="$(python_get_includedir)"
- PYCONFIG_INCL_DIR="$(python_get_includedir)"
- PYTHON_LIB_DIR="$(python_get_library_path)"
- PYTHON_LIB="$(python_get_LIBS)"
- PYTHON_INSTALL_INCL_DIR="${D%/}$(python_get_includedir)"
- PYTHON_INSTALL_LIB_DIR="${D%/}$(python_get_sitedir)"
- NUMPY_INCL_DIR="$(python_get_sitedir)"/numpy/core/include/numpy
- BOOST_PYTHON_LIB_DIR="${myprefixlibdir}"
- BOOST_PYTHON_LIB=-lboost_python-${EPYTHON/python/}
- )
-
- einfo "Compiling module for ${EPYTHON}."
- emake python "${myemakeargs[@]}" "${mypythonargs[@]}" EPYDOC="" CXX="$(tc-getCXX)"
-
- # This is so the correct version of pdoc is used
- mypyscriptdir=$(python_get_scriptdir)
-}
-
-src_compile() {
- # The build system is designed to compile and install all
- # in one go, so doing each phase separately would be be
- # impossible and the functions would all overlap anyways.
- # Do nothing
- return
-}
-
-src_install() {
- local myprefix="${EPREFIX}"/usr
- local myprefixlibdir="${myprefix}"/"$(get_libdir)"
- local mypyscriptdir
-
- # So individule targets can be called without duplication
- # Common depends:
- local myemakeargs=(
- rpath=no
- shared=yes
- libdir="$(get_libdir)"
- LIBOPENVDB_RPATH=
- DESTDIR="${D}"
- HFS="${myprefix}"
- HT="${myprefix}"
- HDSO="${myprefixlibdir}"
- CPPUNIT_INCL_DIR="${myprefix}"/include/cppunit
- CPPUNIT_LIB_DIR="${myprefixlibdir}"
- LOG4CPLUS_INCL_DIR="${myprefix}"/include/log4cplus
- LOG4CPLUS_LIB_DIR="${myprefixlibdir}"
- )
-
- # Create python list here for use during install phase:
- # - If python is used, then the last used module will trigger
- # document install phase. It's the same doc, so build once.
- # - If no python used, then this will remail blanked out to
- # disable pydoc.
- # - pydoc will be called if doc and python use flags are set.
- local mypythonargs=(
- PYTHON_VERSION=
- PYTHON_INCL_DIR=
- PYCONFIG_INCL_DIR=
- PYTHON_LIB_DIR=
- PYTHON_LIB=
- PYTHON_INSTALL_INCL_DIR=
- PYTHON_INSTALL_LIB_DIR=
- NUMPY_INCL_DIR=
- BOOST_PYTHON_LIB_DIR=
- BOOST_PYTHON_LIB=
- )
-
- # Optional depends:
- if use X; then
- myemakeargs+=(
- GLFW_INCL_DIR="${myprefixlibdir}"
- GLFW_LIB_DIR="${myprefixlibdir}"
- )
- else
- myemakeargs+=(
- GLFW_INCL_DIR=
- GLFW_LIB_DIR=
- GLFW_LIB=
- GLFW_MAJOR_VERSION=
- )
- fi
-
- if use openvdb-compression; then
- myemakeargs+=(
- BLOSC_INCL_DIR="${myprefix}"/include
- BLOSC_LIB_DIR="${myprefixlibdir}"
- )
- else
- myemakeargs+=(
- BLOSC_INCL_DIR=
- BLOSC_LIB_DIR=
- )
- fi
-
- use doc || myemakeargs+=( DOXYGEN= )
-
- # Create python modules for each version selected
- use python && python_foreach_impl python_module_compile
-
- if use python && use doc; then
- mypythonargs+=( EPYDOC="${mypyscriptdir}"/pdoc )
- else
- mypythonargs+=( EPYDOC="" )
- fi
-
- einfo "Compiling the main components."
- emake install "${myemakeargs[@]}" "${mypythonargs[@]}" CXX="$(tc-getCXX)"
-}
diff --git a/media-gfx/openvdb/openvdb-4.0.0.ebuild b/media-gfx/openvdb/openvdb-4.0.0.ebuild
deleted file mode 100644
index f3168eb1ec2..00000000000
--- a/media-gfx/openvdb/openvdb-4.0.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit eutils flag-o-matic cmake-utils python-single-r1
-
-DESCRIPTION="Libs for the efficient manipulation of volumetric data"
-HOMEPAGE="http://www.openvdb.org"
-
-SRC_URI="https://github.com/dreamworksanimation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+abi3-compat doc python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- >=dev-libs/boost-1.62:=[python?,${PYTHON_USEDEP}]
- >=dev-libs/c-blosc-1.5.0
- dev-libs/jemalloc
- dev-libs/log4cplus
- media-libs/glfw:=
- media-libs/openexr:=
- sys-libs/zlib
- x11-libs/libXi
- x11-libs/libXrandr
- x11-libs/libXinerama
- x11-libs/libXcursor
- python? (
- ${PYTHON_DEPS}
- dev-python/numpy[${PYTHON_USEDEP}]
- )"
-DEPEND="${RDEPEND}
- dev-cpp/tbb
- doc? (
- app-doc/doxygen
- python? ( dev-python/pdoc[${PYTHON_USEDEP}] )
- )"
-
-PATCHES=(
- "${FILESDIR}"/${P}-make-docs-optional.patch
- "${FILESDIR}"/${P}-build-docs-once.patch
- "${FILESDIR}"/${P}-namespace-fixes.patch
- "${FILESDIR}"/${P}-python-module-install-dir-fix.patch
-)
-
-src_configure() {
- local myprefix="${EPREFIX}"/usr/
-
- # To stay in sync with Boost
- append-cxxflags -std=c++14
-
- # Enable unit tests later in 4.0.1
- local mycmakeargs=(
- -DOPENVDB_BUILD_UNITTESTS=OFF
- -DOPENVDB_BUILD_DOCS=$(usex doc)
- -DOPENVDB_BUILD_PYTHON_MODULE=$(usex python)
- -DOPENVDB_ENABLE_3_ABI_COMPATIBLE=$(usex abi3-compat)
- -DBLOSC_LOCATION="${myprefix}"
- -DGLEW_LOCATION="${myprefix}"
- -DUSE_GLFW3=ON
- -DGLFW3_LOCATION="${myprefix}"
- -DILMBASE_LOCATION="${myprefix}"
- -DILMBASE_NAMESPACE_VERSIONING=OFF
- -DOPENEXR_LOCATION="${myprefix}"
- -DOPENEXR_NAMESPACE_VERSIONING=OFF
- -DTBB_LOCATION="${myprefix}"
- )
-
- use python && mycmakeargs+=( -DPYOENVDB_INSTALL_DIRECTORY=$(python_get_sitedir) )
-
- cmake-utils_src_configure
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/files/, media-gfx/openvdb/
@ 2020-08-24 13:42 Sam James
0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2020-08-24 13:42 UTC (permalink / raw
To: gentoo-commits
commit: cdb48fb7dff718b541d13aefafdf53d5cd4fccbc
Author: Adrian Grigo <agrigo2001 <AT> yahoo <DOT> com <DOT> au>
AuthorDate: Tue Aug 18 02:36:18 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug 24 13:41:49 2020 +0000
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 <agrigo2001 <AT> yahoo.com.au>
Closes: https://bugs.gentoo.org/734102
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sam James <sam <AT> 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 00000000000..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 00000000000..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<const char **>(&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/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"
LICENSE="MPL-2.0"
SLOT="0"
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/files/, media-gfx/openvdb/
@ 2021-10-31 2:19 Sam James
0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2021-10-31 2:19 UTC (permalink / raw
To: gentoo-commits
commit: 1e960a28294ff0eae009fb059dcd1387989edd36
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 31 02:15:08 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 31 02:18:29 2021 +0000
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 <sam <AT> 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 00000000000..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+Idclip@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+Idclip@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 NumPy)
+- if(NOT TARGET Python::NumPy)
+- message(FATAL_ERROR "Could NOT find NumPy (Required is at least version "
+- "\"${MINIMUM_NUMPY_VERSION}\")"
+- )
+- elseif(Python_NumPy_VERSION VERSION_LESS MINIMUM_NUMPY_VERSION)
+- message(FATAL_ERROR "Could NOT find NumPy: Found unsuitable version \"${Python_NumPy_VERSION}\""
+- "but required is at least \"${MINIMUM_NUMPY_VERSION}\" (found ${Python_NumPy_INCLUDE_DIRS})"
+- )
+- else()
+- message(STATUS "Found NumPy: ${Python_NumPy_INCLUDE_DIRS} (found suitable "
+- "version \"${Python_NumPy_VERSION}\", minimum required is "
+- "\"${MINIMUM_NUMPY_VERSION}\")"
+- )
+- endif()
+- list(APPEND OPENVDB_PYTHON_DEPS Python::NumPy)
++ list(APPEND OPENVDB_PYTHON_REQUIRED_COMPONENTS NumPy)
+ endif()
+
++# Make sure find_package(Python) is only ever invoked once with all required components
++find_package(Python COMPONENTS ${OPENVDB_PYTHON_REQUIRED_COMPONENTS})
++
++openvdb_check_python_version(Python::Module
++ "${Python_VERSION}"
++ "${Python_INCLUDE_DIRS}"
++ "${MINIMUM_PYTHON_VERSION}"
++ "${FUTURE_MINIMUM_PYTHON_VERSION}")
++list(APPEND OPENVDB_PYTHON_DEPS Python::Module)
++
+ if(USE_NUMPY)
+- if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_NUMPY_VERSION)
+- if(Python_NumPy_VERSION VERSION_LESS FUTURE_MINIMUM_NUMPY_VERSION)
+- message(DEPRECATION "Support for NumPy versions < ${FUTURE_MINIMUM_NUMPY_VERSION} "
+- "is deprecated and will be removed.")
+- endif()
+- endif()
++ openvdb_check_python_version(Python::NumPy
++ "${Python_NumPy_VERSION}"
++ "${Python_NumPy_INCLUDE_DIRS}"
++ "${MINIMUM_NUMPY_VERSION}"
++ "${FUTURE_MINIMUM_NUMPY_VERSION}")
++ list(APPEND OPENVDB_PYTHON_DEPS Python::NumPy)
+ endif()
+
+ if(TARGET openvdb_shared AND NOT Boost_USE_STATIC_LIBS)
+@@ -230,17 +236,6 @@ elseif(WIN32)
+ set_target_properties(pyopenvdb PROPERTIES SUFFIX ".pyd") # .pyd on windows
+ endif()
+
+-if(TARGET Python::Module)
+- list(APPEND OPENVDB_PYTHON_DEPS Python::Module)
+-else()
+- if(APPLE)
+- target_include_directories(pyopenvdb SYSTEM PUBLIC ${Python_INCLUDE_DIRS})
+- target_link_options(pyopenvdb PUBLIC -undefined dynamic_lookup)
+- else()
+- list(APPEND OPENVDB_PYTHON_DEPS Python::Python)
+- endif()
+-endif()
+-
+ target_link_libraries(pyopenvdb PUBLIC
+ ${OPENVDB_LIB}
+ ${OPENVDB_PYTHON_DEPS}
+
diff --git a/media-gfx/openvdb/openvdb-7.1.0-r3.ebuild b/media-gfx/openvdb/openvdb-7.1.0-r4.ebuild
similarity index 100%
rename from media-gfx/openvdb/openvdb-7.1.0-r3.ebuild
rename to media-gfx/openvdb/openvdb-7.1.0-r4.ebuild
diff --git a/media-gfx/openvdb/openvdb-8.0.1-r2.ebuild b/media-gfx/openvdb/openvdb-8.0.1-r3.ebuild
similarity index 100%
rename from media-gfx/openvdb/openvdb-8.0.1-r2.ebuild
rename to media-gfx/openvdb/openvdb-8.0.1-r3.ebuild
diff --git a/media-gfx/openvdb/openvdb-8.1.0.ebuild b/media-gfx/openvdb/openvdb-8.1.0.ebuild
index 72ac356edca..fef7bc659a9 100644
--- a/media-gfx/openvdb/openvdb-8.1.0.ebuild
+++ b/media-gfx/openvdb/openvdb-8.1.0.ebuild
@@ -67,6 +67,7 @@ BDEPEND="
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"
)
@@ -94,9 +95,9 @@ src_configure() {
-DOPENVDB_ABI_VERSION_NUMBER="${version}"
-DOPENVDB_BUILD_DOCS=$(usex doc)
-DOPENVDB_BUILD_UNITTESTS=$(usex test)
- -DOPENVDB_BUILD_VDB_LOD=$(usex !utils)
- -DOPENVDB_BUILD_VDB_RENDER=$(usex !utils)
- -DOPENVDB_BUILD_VDB_VIEW=$(usex !utils)
+ -DOPENVDB_BUILD_VDB_LOD=$(usex utils)
+ -DOPENVDB_BUILD_VDB_RENDER=$(usex utils)
+ -DOPENVDB_BUILD_VDB_VIEW=$(usex utils)
-DOPENVDB_CORE_SHARED=ON
-DOPENVDB_CORE_STATIC=$(usex static-libs)
-DOPENVDB_ENABLE_RPATH=OFF
@@ -113,8 +114,10 @@ src_configure() {
mycmakeargs+=(
-DOPENVDB_BUILD_PYTHON_MODULE=ON
-DUSE_NUMPY=$(usex numpy)
+ -DOPENVDB_BUILD_PYTHON_UNITTESTS=$(usex test)
-DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)"
-DPython_EXECUTABLE="${PYTHON}"
+ -DPython_INCLUDE_DIR="$(python_get_includedir)"
)
fi
diff --git a/media-gfx/openvdb/openvdb-9.0.0.ebuild b/media-gfx/openvdb/openvdb-9.0.0.ebuild
index 8f85563995d..278d5807af5 100644
--- a/media-gfx/openvdb/openvdb-9.0.0.ebuild
+++ b/media-gfx/openvdb/openvdb-9.0.0.ebuild
@@ -12,7 +12,7 @@ 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"
+SLOT="0/9"
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 )"
@@ -65,6 +65,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/${PN}-7.1.0-0001-Fix-multilib-header-source.patch"
"${FILESDIR}/${PN}-8.1.0-glfw-libdir.patch"
+ "${FILESDIR}/${PN}-9.0.0-numpy.patch"
)
pkg_setup() {
@@ -91,9 +92,9 @@ src_configure() {
-DOPENVDB_ABI_VERSION_NUMBER="${version}"
-DOPENVDB_BUILD_DOCS=$(usex doc)
-DOPENVDB_BUILD_UNITTESTS=$(usex test)
- -DOPENVDB_BUILD_VDB_LOD=$(usex !utils)
- -DOPENVDB_BUILD_VDB_RENDER=$(usex !utils)
- -DOPENVDB_BUILD_VDB_VIEW=$(usex !utils)
+ -DOPENVDB_BUILD_VDB_LOD=$(usex utils)
+ -DOPENVDB_BUILD_VDB_RENDER=$(usex utils)
+ -DOPENVDB_BUILD_VDB_VIEW=$(usex utils)
-DOPENVDB_CORE_SHARED=ON
-DOPENVDB_CORE_STATIC=$(usex static-libs)
-DOPENVDB_ENABLE_RPATH=OFF
@@ -109,8 +110,10 @@ src_configure() {
mycmakeargs+=(
-DOPENVDB_BUILD_PYTHON_MODULE=ON
-DUSE_NUMPY=$(usex numpy)
+ -DOPENVDB_BUILD_PYTHON_UNITTESTS=$(usex test)
-DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)"
-DPython_EXECUTABLE="${PYTHON}"
+ -DPython_INCLUDE_DIR="$(python_get_includedir)"
)
fi
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/files/, media-gfx/openvdb/
@ 2021-12-04 21:52 Sam James
0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2021-12-04 21:52 UTC (permalink / raw
To: gentoo-commits
commit: b62193bab0b3de371047ddb0aacce74591cabcb8
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Sat Dec 4 20:37:39 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 4 21:52:42 2021 +0000
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 <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/23185
Signed-off-by: Sam James <sam <AT> 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 000000000000..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 <waebbl-gentoo@posteo.net>
+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 <waebbl-gentoo@posteo.net>
+--- 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 000000000000..933d2965b2bc
--- /dev/null
+++ b/media-gfx/openvdb/files/openvdb-8.2.0-unconditionally-search-Python-interpreter.patch
@@ -0,0 +1,34 @@
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+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 <waebbl-gentoo@posteo.net>
+--- 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 @@ RDEPEND="
dev-libs/log4cplus:=
media-libs/glfw
media-libs/glu
- media-libs/ilmbase:=
- media-libs/openexr:0=
sys-libs/zlib:=
x11-libs/libXcursor
x11-libs/libXi
@@ -46,6 +44,10 @@ RDEPEND="
numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
')
)
+ utils? (
+ media-libs/ilmbase:=
+ media-libs/openexr:0=
+ )
zlib? ( sys-libs/zlib )
"
@@ -69,7 +71,8 @@ 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}-9.0.0-unconditionally-search-Python-interpreter.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"
)
pkg_setup() {
@@ -93,11 +96,9 @@ src_configure() {
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_BUILD_VDB_LOD=$(usex utils)
- -DOPENVDB_BUILD_VDB_RENDER=$(usex utils)
- -DOPENVDB_BUILD_VDB_VIEW=$(usex utils)
-DOPENVDB_CORE_SHARED=ON
-DOPENVDB_CORE_STATIC=$(usex static-libs)
-DOPENVDB_ENABLE_RPATH=OFF
@@ -113,10 +114,19 @@ src_configure() {
if use python; then
mycmakeargs+=(
-DOPENVDB_BUILD_PYTHON_MODULE=ON
- -DUSE_NUMPY=$(usex numpy)
-DOPENVDB_BUILD_PYTHON_UNITTESTS=$(usex test)
+ -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)"
-DPython_EXECUTABLE="${PYTHON}"
-DPython_INCLUDE_DIR="$(python_get_includedir)"
+ -DUSE_NUMPY=$(usex numpy)
+ )
+ fi
+
+ if use utils; then
+ mycmakeargs+=(
+ -DOPENVDB_BUILD_VDB_LOD=ON
+ -DOPENVDB_BUILD_VDB_RENDER=ON
+ -DOPENVDB_BUILD_VDB_VIEW=ON
)
fi
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/files/, media-gfx/openvdb/
@ 2022-02-12 4:49 Sam James
0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2022-02-12 4:49 UTC (permalink / raw
To: gentoo-commits
commit: ca5b6410bfc01c83492baf228436676283c4c602
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 12 04:47:54 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 12 04:47:54 2022 +0000
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 <sam <AT> 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 000000000000..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 <Imath/half.h>
++#include <Imath-3/half.h>
+ #else
+-#include <OpenEXR/half.h>
++#include <OpenEXR-3/half.h>
+ #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 000000000000..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 blosc)
+ -DUSE_ZLIB=$(usex zlib)
+ -DUSE_CCACHE=OFF
+ -DUSE_COLORED_OUTPUT=ON
+ -DUSE_IMATH_HALF=ON
+ -DUSE_LOG4CPLUS=ON
+ )
+
+ if use python; then
+ mycmakeargs+=(
+ -DOPENVDB_BUILD_PYTHON_MODULE=ON
+ -DOPENVDB_BUILD_PYTHON_UNITTESTS=$(usex test)
+ -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)"
+ -DPython_EXECUTABLE="${PYTHON}"
+ -DPython_INCLUDE_DIR="$(python_get_includedir)"
+ -DUSE_NUMPY=$(usex numpy)
+ )
+ fi
+
+ if use utils; then
+ mycmakeargs+=(
+ -DOPENVDB_BUILD_VDB_LOD=ON
+ -DOPENVDB_BUILD_VDB_RENDER=ON
+ -DOPENVDB_BUILD_VDB_VIEW=ON
+ )
+ fi
+
+ if use cpu_flags_x86_avx; then
+ mycmakeargs+=( -DOPENVDB_SIMD=AVX )
+ elif use cpu_flags_x86_sse4_2; then
+ mycmakeargs+=( -DOPENVDB_SIMD=SSE42 )
+ fi
+
+ cmake_src_configure
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/files/, media-gfx/openvdb/
@ 2022-10-30 9:43 Sam James
0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2022-10-30 9:43 UTC (permalink / raw
To: gentoo-commits
commit: 634bcfd8e0642fd39cb304825d6b8f975babad75
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Tue Oct 25 12:40:04 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 30 09:40:29 2022 +0000
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 <openexr-3.
Closes: https://bugs.gentoo.org/878213
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/27959
Signed-off-by: Sam James <sam <AT> 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..000000000000
--- 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 <waebbl@gmail.com>
-Date: Fri, 28 Feb 2020 21:51:30 +0100
-Subject: [PATCH] Fix doc install dir
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- 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.patch b/media-gfx/openvdb/files/openvdb-8.0.1-glfw-libdir.patch
deleted file mode 100644
index 991c5a6a568d..000000000000
--- a/media-gfx/openvdb/files/openvdb-8.0.1-glfw-libdir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Custom cmake file used to find GLFW always looks at lib/cmake first
-ignoring alternate libdirs and leads to using wrong libraries.
-https://bugs.gentoo.org/800200
---- a/cmake/OpenVDBGLFW3Setup.cmake
-+++ b/cmake/OpenVDBGLFW3Setup.cmake
-@@ -84,5 +84,5 @@
- list(APPEND _GLFW3_ROOT_SEARCH_DIR ${SYSTEM_LIBRARY_PATHS})
-
--set(_GLFW3_PATH_SUFFIXES "lib/cmake/glfw3" "cmake/glfw3" "glfw3")
-+set(_GLFW3_PATH_SUFFIXES "cmake/glfw3" "glfw3")
-
- # GLFW 3.1 installs CMake modules into glfw instead of glfw3
diff --git a/media-gfx/openvdb/metadata.xml b/media-gfx/openvdb/metadata.xml
index af37d11b4eda..87defec8f82a 100644
--- a/media-gfx/openvdb/metadata.xml
+++ b/media-gfx/openvdb/metadata.xml
@@ -31,9 +31,6 @@
<flag restrict=">=media-gfx/openvdb-7.0.0" name="numpy">
Build pyopenvdb with support for <pkg>dev-python/numpy</pkg>
</flag>
- <flag restrict="<=media-gfx/openvdb-7.1.0" name="abi5-compat">
- Disables newer features to maintain compatibility with ABI5.
- </flag>
<flag restrict=">=media-gfx/openvdb-6.0.0" name="abi6-compat">
Disables newer features to maintain compatibility with ABI6.
</flag>
diff --git a/media-gfx/openvdb/openvdb-7.0.0-r4.ebuild b/media-gfx/openvdb/openvdb-7.0.0-r4.ebuild
deleted file mode 100644
index f9b159f4213b..000000000000
--- a/media-gfx/openvdb/openvdb-7.0.0-r4.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit cmake flag-o-matic 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/7"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
-IUSE="cpu_flags_x86_avx cpu_flags_x86_sse4_2 doc numpy python static-libs test utils abi5-compat abi6-compat +abi7-compat"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
- numpy? ( python )
- ^^ ( abi5-compat abi6-compat abi7-compat )
- python? ( ${PYTHON_REQUIRED_USE} )
-"
-# Check if newer releases work with newer TBB, bug #820788
-RDEPEND="
- <dev-cpp/tbb-2021.4.0:=
- dev-libs/boost:=
- dev-libs/c-blosc:=
- dev-libs/jemalloc:=
- dev-libs/log4cplus:=
- media-libs/glfw
- media-libs/glu
- media-libs/ilmbase:=
- media-libs/openexr:0=
- sys-libs/zlib:=
- x11-libs/libXcursor
- x11-libs/libXi
- x11-libs/libXinerama
- x11-libs/libXrandr
- python? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-libs/boost:=[numpy?,python?,${PYTHON_USEDEP}]
- numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
- ')
- )
-"
-
-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 )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-7.1.0-0001-Fix-multilib-header-source.patch"
- "${FILESDIR}/${PN}-7.1.0-0002-Fix-doc-install-dir.patch"
- "${FILESDIR}/${PN}-8.0.1-glfw-libdir.patch"
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
- local myprefix="${EPREFIX}/usr/"
-
- local version
- if use abi5-compat; then
- version=5
- elif use abi6-compat; then
- version=6
- elif use abi7-compat; then
- version=7
- else
- die "Openvdb abi version is not compatible"
- fi
-
- local mycmakeargs=(
- -DCHOST="${CHOST}"
- -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}/"
- -DOPENVDB_ABI_VERSION_NUMBER="${version}"
- -DOPENVDB_BUILD_DOCS=$(usex doc)
- -DOPENVDB_BUILD_UNITTESTS=$(usex test)
- -DOPENVDB_BUILD_VDB_LOD=$(usex !utils)
- -DOPENVDB_BUILD_VDB_RENDER=$(usex !utils)
- -DOPENVDB_BUILD_VDB_VIEW=$(usex !utils)
- -DOPENVDB_CORE_SHARED=ON
- -DOPENVDB_CORE_STATIC=$(usex static-libs)
- -DOPENVDB_ENABLE_RPATH=OFF
- -DUSE_CCACHE=OFF
- -DUSE_COLORED_OUTPUT=ON
- -DUSE_EXR=ON
- -DUSE_LOG4CPLUS=ON
- )
-
- if use python; then
- mycmakeargs+=(
- -DOPENVDB_BUILD_PYTHON_MODULE=ON
- -DUSE_NUMPY=$(usex numpy)
- -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)"
- -DPython_EXECUTABLE="${PYTHON}"
- )
- fi
-
- if use cpu_flags_x86_avx; then
- mycmakeargs+=( -DOPENVDB_SIMD=AVX )
- elif use cpu_flags_x86_sse4_2; then
- mycmakeargs+=( -DOPENVDB_SIMD=SSE42 )
- fi
-
- cmake_src_configure
-}
diff --git a/media-gfx/openvdb/openvdb-7.1.0-r5.ebuild b/media-gfx/openvdb/openvdb-7.1.0-r5.ebuild
deleted file mode 100644
index ddf724c720fd..000000000000
--- a/media-gfx/openvdb/openvdb-7.1.0-r5.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-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/7"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="cpu_flags_x86_avx cpu_flags_x86_sse4_2 doc numpy python static-libs test utils abi6-compat +abi7-compat"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
- numpy? ( python )
- ^^ ( abi6-compat abi7-compat )
- python? ( ${PYTHON_REQUIRED_USE} )
-"
-# Check if newer releases work with newer TBB, bug #820788
-RDEPEND="
- <dev-cpp/tbb-2021.4.0:=
- dev-libs/boost:=
- dev-libs/c-blosc:=
- dev-libs/jemalloc:=
- dev-libs/log4cplus:=
- media-libs/glfw
- media-libs/glu
- media-libs/ilmbase:=
- media-libs/openexr:0=
- sys-libs/zlib:=
- x11-libs/libXcursor
- x11-libs/libXi
- x11-libs/libXinerama
- x11-libs/libXrandr
- python? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-libs/boost:=[numpy?,python?,${PYTHON_USEDEP}]
- numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
- ')
- )
-"
-
-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 )
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-0001-Fix-multilib-header-source.patch"
- "${FILESDIR}/${P}-0002-Fix-doc-install-dir.patch"
- "${FILESDIR}/${PN}-8.0.1-glfw-libdir.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
- else
- die "Openvdb abi version is not compatible"
- fi
-
- local mycmakeargs=(
- -DCHOST="${CHOST}"
- -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}/"
- -DOPENVDB_ABI_VERSION_NUMBER="${version}"
- -DOPENVDB_BUILD_DOCS=$(usex doc)
- -DOPENVDB_BUILD_UNITTESTS=$(usex test)
- -DOPENVDB_BUILD_VDB_LOD=$(usex utils)
- -DOPENVDB_BUILD_VDB_RENDER=$(usex utils)
- -DOPENVDB_BUILD_VDB_VIEW=$(usex utils)
- -DOPENVDB_CORE_SHARED=ON
- -DOPENVDB_CORE_STATIC=$(usex static-libs)
- -DOPENVDB_ENABLE_RPATH=OFF
- -DUSE_CCACHE=OFF
- -DUSE_COLORED_OUTPUT=ON
- -DUSE_EXR=ON
- -DUSE_LOG4CPLUS=ON
- )
-
- if use python; then
- mycmakeargs+=(
- -DOPENVDB_BUILD_PYTHON_MODULE=ON
- -DUSE_NUMPY=$(usex numpy)
- -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)"
- -DPython_EXECUTABLE="${PYTHON}"
- -DPython_INCLUDE_DIR="$(python_get_includedir)"
- -DPython_LIBRARY="$(python_get_library_path)"
- )
- fi
-
- if use cpu_flags_x86_avx; then
- mycmakeargs+=( -DOPENVDB_SIMD=AVX )
- elif use cpu_flags_x86_sse4_2; then
- mycmakeargs+=( -DOPENVDB_SIMD=SSE42 )
- fi
-
- cmake_src_configure
-}
diff --git a/media-gfx/openvdb/openvdb-8.0.1-r4.ebuild b/media-gfx/openvdb/openvdb-8.0.1-r4.ebuild
deleted file mode 100644
index 2e3f87c1aa79..000000000000
--- a/media-gfx/openvdb/openvdb-8.0.1-r4.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-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 doc numpy python static-libs test utils abi6-compat abi7-compat +abi8-compat"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
- numpy? ( python )
- ^^ ( abi6-compat abi7-compat abi8-compat )
- python? ( ${PYTHON_REQUIRED_USE} )
-"
-# Check if newer releases work with newer TBB, bug #820788
-RDEPEND="
- <dev-cpp/tbb-2021.4.0:=
- dev-libs/boost:=
- dev-libs/c-blosc:=
- dev-libs/jemalloc:=
- dev-libs/log4cplus:=
- media-libs/glfw
- media-libs/glu
- media-libs/ilmbase:=
- media-libs/openexr:0=
- sys-libs/zlib:=
- x11-libs/libXcursor
- x11-libs/libXi
- x11-libs/libXinerama
- x11-libs/libXrandr
- python? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-libs/boost:=[numpy?,python?,${PYTHON_USEDEP}]
- numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
- ')
- )
-"
-
-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}/${P}-glfw-libdir.patch"
- "${FILESDIR}/${P}-add-consistency-for-NumPy-find_package-call.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=(
- -DCHOST="${CHOST}"
- -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}/"
- -DOPENVDB_ABI_VERSION_NUMBER="${version}"
- -DOPENVDB_BUILD_DOCS=$(usex doc)
- -DOPENVDB_BUILD_UNITTESTS=$(usex test)
- -DOPENVDB_BUILD_VDB_LOD=$(usex utils)
- -DOPENVDB_BUILD_VDB_RENDER=$(usex utils)
- -DOPENVDB_BUILD_VDB_VIEW=$(usex utils)
- -DOPENVDB_CORE_SHARED=ON
- -DOPENVDB_CORE_STATIC=$(usex static-libs)
- -DOPENVDB_ENABLE_RPATH=OFF
- -DUSE_CCACHE=OFF
- -DUSE_COLORED_OUTPUT=ON
- -DUSE_EXR=ON
- -DUSE_LOG4CPLUS=ON
- )
-
- if use python; then
- mycmakeargs+=(
- -DOPENVDB_BUILD_PYTHON_MODULE=ON
- -DUSE_NUMPY=$(usex numpy)
- -DOPENVDB_BUILD_PYTHON_UNITTESTS=$(usex test)
- -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)"
- -DPython_EXECUTABLE="${PYTHON}"
- -DPython_INCLUDE_DIR="$(python_get_includedir)"
- )
- fi
-
- if use cpu_flags_x86_avx; then
- mycmakeargs+=( -DOPENVDB_SIMD=AVX )
- elif use cpu_flags_x86_sse4_2; then
- mycmakeargs+=( -DOPENVDB_SIMD=SSE42 )
- fi
-
- cmake_src_configure
-}
diff --git a/media-gfx/openvdb/openvdb-8.1.0.ebuild b/media-gfx/openvdb/openvdb-8.1.0.ebuild
deleted file mode 100644
index 5042d7339314..000000000000
--- a/media-gfx/openvdb/openvdb-8.1.0.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2021 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} )
-"
-# Check if newer releases work with newer TBB, bug #820788
-RDEPEND="
- <dev-cpp/tbb-2021.4.0:=
- dev-libs/boost:=
- dev-libs/jemalloc:=
- dev-libs/log4cplus:=
- media-libs/glfw
- media-libs/glu
- media-libs/ilmbase:=
- media-libs/openexr:0=
- 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}] )
- ')
- )
- 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"
-)
-
-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=(
- -DCHOST="${CHOST}"
- -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}/"
- -DOPENVDB_ABI_VERSION_NUMBER="${version}"
- -DOPENVDB_BUILD_DOCS=$(usex doc)
- -DOPENVDB_BUILD_UNITTESTS=$(usex test)
- -DOPENVDB_BUILD_VDB_LOD=$(usex utils)
- -DOPENVDB_BUILD_VDB_RENDER=$(usex utils)
- -DOPENVDB_BUILD_VDB_VIEW=$(usex utils)
- -DOPENVDB_CORE_SHARED=ON
- -DOPENVDB_CORE_STATIC=$(usex static-libs)
- -DOPENVDB_ENABLE_RPATH=OFF
- -DUSE_BLOSC=$(usex blosc)
- -DUSE_ZLIB=$(usex zlib)
- -DUSE_CCACHE=OFF
- -DUSE_COLORED_OUTPUT=ON
- # Off for now until 9.0.0 for OpenEXR 3 support
- -DUSE_IMATH_HALF=OFF
- -DUSE_LOG4CPLUS=ON
- )
-
- if use python; then
- mycmakeargs+=(
- -DOPENVDB_BUILD_PYTHON_MODULE=ON
- -DUSE_NUMPY=$(usex numpy)
- -DOPENVDB_BUILD_PYTHON_UNITTESTS=$(usex test)
- -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)"
- -DPython_EXECUTABLE="${PYTHON}"
- -DPython_INCLUDE_DIR="$(python_get_includedir)"
- )
- fi
-
- if use cpu_flags_x86_avx; then
- mycmakeargs+=( -DOPENVDB_SIMD=AVX )
- elif use cpu_flags_x86_sse4_2; then
- mycmakeargs+=( -DOPENVDB_SIMD=SSE42 )
- fi
-
- cmake_src_configure
-}
diff --git a/media-gfx/openvdb/openvdb-8.2.0-r3.ebuild b/media-gfx/openvdb/openvdb-8.2.0-r3.ebuild
deleted file mode 100644
index c77a66b4a5b2..000000000000
--- a/media-gfx/openvdb/openvdb-8.2.0-r3.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# 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? (
- media-libs/ilmbase:=
- media-libs/openexr:=
- )
- 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"
-)
-
-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 blosc)
- -DUSE_ZLIB=$(usex zlib)
- -DUSE_CCACHE=OFF
- -DUSE_COLORED_OUTPUT=ON
- -DUSE_IMATH_HALF=OFF
- -DUSE_LOG4CPLUS=ON
- )
-
- if use python; then
- mycmakeargs+=(
- -DOPENVDB_BUILD_PYTHON_MODULE=ON
- -DOPENVDB_BUILD_PYTHON_UNITTESTS=$(usex test)
- -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)"
- -DPython_EXECUTABLE="${PYTHON}"
- -DPython_INCLUDE_DIR="$(python_get_includedir)"
- -DUSE_NUMPY=$(usex numpy)
- )
- fi
-
- if use utils; then
- mycmakeargs+=(
- -DOPENVDB_BUILD_VDB_LOD=ON
- -DOPENVDB_BUILD_VDB_RENDER=ON
- -DOPENVDB_BUILD_VDB_VIEW=ON
- )
- fi
-
- if use cpu_flags_x86_avx; then
- mycmakeargs+=( -DOPENVDB_SIMD=AVX )
- elif use cpu_flags_x86_sse4_2; then
- mycmakeargs+=( -DOPENVDB_SIMD=SSE42 )
- fi
-
- cmake_src_configure
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/files/, media-gfx/openvdb/
@ 2023-02-01 19:27 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2023-02-01 19:27 UTC (permalink / raw
To: gentoo-commits
commit: 88522689ee0e092ed546dabecc58ab21dccd1af6
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 1 18:42:20 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 1 19:26:40 2023 +0000
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 <asturm <AT> gentoo.org>
media-gfx/openvdb/Manifest | 2 -
| 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..000000000000
--- 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 <waebbl@gmail.com>
-Date: Fri, 28 Feb 2020 17:01:25 +0100
-Subject: [PATCH] Fix multilib header source
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- 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"
- _openexr_version_major_string REGEX "#define OPENEXR_VERSION_MAJOR "
- )
- string(REGEX REPLACE "#define OPENEXR_VERSION_MAJOR" ""
-@@ -171,7 +177,7 @@ if(EXISTS "${OpenEXR_INCLUDE_DIR}/OpenEXRConfig.h")
- )
- string(STRIP "${_openexr_version_major_string}" OpenEXR_VERSION_MAJOR)
-
-- file(STRINGS "${OpenEXR_INCLUDE_DIR}/OpenEXRConfig.h"
-+ file(STRINGS "${_OPENEXR_HEADERS}/OpenEXRConfig.h"
- _openexr_version_minor_string REGEX "#define OPENEXR_VERSION_MINOR "
- )
- string(REGEX REPLACE "#define OPENEXR_VERSION_MINOR" ""
---
-2.25.1
-
-
diff --git a/media-gfx/openvdb/files/openvdb-8.0.1-add-consistency-for-NumPy-find_package-call.patch b/media-gfx/openvdb/files/openvdb-8.0.1-add-consistency-for-NumPy-find_package-call.patch
deleted file mode 100644
index 87d1d24755b4..000000000000
--- a/media-gfx/openvdb/files/openvdb-8.0.1-add-consistency-for-NumPy-find_package-call.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Thu, 28 Oct 2021 11:34:16 +0200
-Subject: [PATCH] add consistency for NumPy find_package call
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
-
-diff --git a/openvdb/openvdb/python/CMakeLists.txt b/openvdb/openvdb/python/CMakeLists.txt
-index b473beb..b468d4f 100644
---- a/openvdb/openvdb/python/CMakeLists.txt
-+++ b/openvdb/openvdb/python/CMakeLists.txt
-@@ -94,7 +94,7 @@ else()
- OPENVDB_CHECK_PYTHON_VERSION(${Python_VERSION} ${Python_INCLUDE_DIRS})
-
- if(USE_NUMPY)
-- find_package(Python QUIET COMPONENTS NumPy)
-+ find_package(Python QUIET COMPONENTS ${OPENVDB_PYTHON_REQUIRED_COMPONENTS} NumPy)
- if(NOT TARGET Python::NumPy)
- message(FATAL_ERROR "Could NOT find NumPy (Required is at least version "
- "\"${MINIMUM_NUMPY_VERSION}\")"
---
-2.33.1
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
deleted file mode 100644
index 88752e9fa0eb..000000000000
--- a/media-gfx/openvdb/files/openvdb-8.2.0-fix-finding-ilmbase-if-imath-and-ilmbase-are-installed.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-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 <waebbl-gentoo@posteo.net>
---- 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
deleted file mode 100644
index 933d2965b2bc..000000000000
--- a/media-gfx/openvdb/files/openvdb-8.2.0-unconditionally-search-Python-interpreter.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-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 <waebbl-gentoo@posteo.net>
---- 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/files/openvdb-9.0.0-numpy.patch b/media-gfx/openvdb/files/openvdb-9.0.0-numpy.patch
deleted file mode 100644
index 5fa90a7b6524..000000000000
--- a/media-gfx/openvdb/files/openvdb-9.0.0-numpy.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-Grabbed relevant parts from upstream PR for 9.x; it's a variant
-of https://github.com/gentoo/gentoo/pull/22738 which was for earlier versions.
-
-https://github.com/AcademySoftwareFoundation/openvdb/pull/1237
-
-From 3c5f69efeacca762406a80d74b39b970c7023bd6 Mon Sep 17 00:00:00 2001
-From: Nick Avramoussis <4256455+Idclip@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+Idclip@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 NumPy)
-- if(NOT TARGET Python::NumPy)
-- message(FATAL_ERROR "Could NOT find NumPy (Required is at least version "
-- "\"${MINIMUM_NUMPY_VERSION}\")"
-- )
-- elseif(Python_NumPy_VERSION VERSION_LESS MINIMUM_NUMPY_VERSION)
-- message(FATAL_ERROR "Could NOT find NumPy: Found unsuitable version \"${Python_NumPy_VERSION}\""
-- "but required is at least \"${MINIMUM_NUMPY_VERSION}\" (found ${Python_NumPy_INCLUDE_DIRS})"
-- )
-- else()
-- message(STATUS "Found NumPy: ${Python_NumPy_INCLUDE_DIRS} (found suitable "
-- "version \"${Python_NumPy_VERSION}\", minimum required is "
-- "\"${MINIMUM_NUMPY_VERSION}\")"
-- )
-- endif()
-- list(APPEND OPENVDB_PYTHON_DEPS Python::NumPy)
-+ list(APPEND OPENVDB_PYTHON_REQUIRED_COMPONENTS NumPy)
- endif()
-
-+# Make sure find_package(Python) is only ever invoked once with all required components
-+find_package(Python COMPONENTS ${OPENVDB_PYTHON_REQUIRED_COMPONENTS})
-+
-+openvdb_check_python_version(Python::Module
-+ "${Python_VERSION}"
-+ "${Python_INCLUDE_DIRS}"
-+ "${MINIMUM_PYTHON_VERSION}"
-+ "${FUTURE_MINIMUM_PYTHON_VERSION}")
-+list(APPEND OPENVDB_PYTHON_DEPS Python::Module)
-+
- if(USE_NUMPY)
-- if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_NUMPY_VERSION)
-- if(Python_NumPy_VERSION VERSION_LESS FUTURE_MINIMUM_NUMPY_VERSION)
-- message(DEPRECATION "Support for NumPy versions < ${FUTURE_MINIMUM_NUMPY_VERSION} "
-- "is deprecated and will be removed.")
-- endif()
-- endif()
-+ openvdb_check_python_version(Python::NumPy
-+ "${Python_NumPy_VERSION}"
-+ "${Python_NumPy_INCLUDE_DIRS}"
-+ "${MINIMUM_NUMPY_VERSION}"
-+ "${FUTURE_MINIMUM_NUMPY_VERSION}")
-+ list(APPEND OPENVDB_PYTHON_DEPS Python::NumPy)
- endif()
-
- if(TARGET openvdb_shared AND NOT Boost_USE_STATIC_LIBS)
-@@ -230,17 +236,6 @@ elseif(WIN32)
- set_target_properties(pyopenvdb PROPERTIES SUFFIX ".pyd") # .pyd on windows
- endif()
-
--if(TARGET Python::Module)
-- list(APPEND OPENVDB_PYTHON_DEPS Python::Module)
--else()
-- if(APPLE)
-- target_include_directories(pyopenvdb SYSTEM PUBLIC ${Python_INCLUDE_DIRS})
-- target_link_options(pyopenvdb PUBLIC -undefined dynamic_lookup)
-- else()
-- list(APPEND OPENVDB_PYTHON_DEPS Python::Python)
-- endif()
--endif()
--
- target_link_libraries(pyopenvdb PUBLIC
- ${OPENVDB_LIB}
- ${OPENVDB_PYTHON_DEPS}
-
diff --git a/media-gfx/openvdb/files/openvdb-9.0.0-unconditionally-search-Python-interpreter.patch b/media-gfx/openvdb/files/openvdb-9.0.0-unconditionally-search-Python-interpreter.patch
deleted file mode 100644
index 1a24f4c535c3..000000000000
--- a/media-gfx/openvdb/files/openvdb-9.0.0-unconditionally-search-Python-interpreter.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-https://bugs.gentoo.org/790350
-https://github.com/AcademySoftwareFoundation/openvdb/pull/1275
-
-From 86cbe16b5f8bf9df2c3825d7d7d90c58bc0d3391 Mon Sep 17 00:00:00 2001
-From: Nick Avramoussis <4256455+Idclip@users.noreply.github.com>
-Date: Wed, 8 Dec 2021 16:57:58 +0000
-Subject: [PATCH] Fixed an issue with find_python and cmake 3.18
-
-Signed-off-by: Nick Avramoussis <4256455+Idclip@users.noreply.github.com>
----
- openvdb/openvdb/python/CMakeLists.txt | 10 +++++++++-
- pendingchanges/cmake_python.txt | 2 ++
- 2 files changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/openvdb/openvdb/python/CMakeLists.txt b/openvdb/openvdb/python/CMakeLists.txt
-index 2821efb5d..179c0c57d 100644
---- a/openvdb/openvdb/python/CMakeLists.txt
-+++ b/openvdb/openvdb/python/CMakeLists.txt
-@@ -97,7 +97,15 @@ 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)
-+
-+# @note explicitly only search for Development.Module from 3.18 as searching
-+# Development.Embed can cause issues on linux systems where it doesn't exist
-+if(${CMAKE_VERSION} VERSION_LESS 3.18)
-+ set(OPENVDB_PYTHON_REQUIRED_COMPONENTS Development)
-+else()
-+ set(OPENVDB_PYTHON_REQUIRED_COMPONENTS Development.Module)
-+endif()
-+
- if(NOT DEFINED PYOPENVDB_INSTALL_DIRECTORY)
- list(APPEND OPENVDB_PYTHON_REQUIRED_COMPONENTS Interpreter)
- endif()
diff --git a/media-gfx/openvdb/files/openvdb-9.1.0-disable-failing-tests.patch b/media-gfx/openvdb/files/openvdb-9.1.0-disable-failing-tests.patch
deleted file mode 100644
index d60007981e59..000000000000
--- a/media-gfx/openvdb/files/openvdb-9.1.0-disable-failing-tests.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From 6ce3296bbace317844688747ba90b5713477a719 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Wed, 14 Sep 2022 08:33:09 +0200
-Subject: [PATCH] disable failing tests
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- openvdb/openvdb/unittest/TestLinearInterp.cc | 2 +-
- openvdb/openvdb/unittest/TestPointRasterizeFrustum.cc | 8 ++++----
- openvdb_ax/openvdb_ax/test/integration/TestAssign.cc | 2 +-
- openvdb_ax/openvdb_ax/test/integration/TestBinary.cc | 2 +-
- .../openvdb_ax/test/integration/TestStandardFunctions.cc | 6 +++---
- 5 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/openvdb/openvdb/unittest/TestLinearInterp.cc b/openvdb/openvdb/unittest/TestLinearInterp.cc
-index 944f0ef..4ba4e51 100644
---- a/openvdb/openvdb/unittest/TestLinearInterp.cc
-+++ b/openvdb/openvdb/unittest/TestLinearInterp.cc
-@@ -1032,5 +1032,5 @@ TestLinearInterp::testStencilsMatch()
- EXPECT_EQ(val1, val2);
- }
- }
--TEST_F(TestLinearInterp, testStencilsMatchFloat) { testStencilsMatch<openvdb::FloatGrid>(); }
-+//TEST_F(TestLinearInterp, testStencilsMatchFloat) { testStencilsMatch<openvdb::FloatGrid>(); }
- TEST_F(TestLinearInterp, testStencilsMatchDouble) { testStencilsMatch<openvdb::DoubleGrid>(); }
-diff --git a/openvdb/openvdb/unittest/TestPointRasterizeFrustum.cc b/openvdb/openvdb/unittest/TestPointRasterizeFrustum.cc
-index ba9627b..b80c41e 100644
---- a/openvdb/openvdb/unittest/TestPointRasterizeFrustum.cc
-+++ b/openvdb/openvdb/unittest/TestPointRasterizeFrustum.cc
-@@ -222,8 +222,8 @@ TEST_F(TestPointRasterizeFrustum, testScaleByVoxelVolume)
- EXPECT_EQ(Coord(0,0,0), iterV.getCoord());
- auto scaledSumV = (scale * velocities[0] + scale * velocities[1] +
- scale * velocities[2] + scale * velocities[4]) / voxelVolume;
-- EXPECT_NEAR(scaledSumV[0], (*iterV)[0], tolerance);
-- EXPECT_NEAR(scaledSumV[1], (*iterV)[1], tolerance);
-+// EXPECT_NEAR(scaledSumV[0], (*iterV)[0], tolerance);
-+// EXPECT_NEAR(scaledSumV[1], (*iterV)[1], tolerance);
- EXPECT_NEAR(scaledSumV[2], (*iterV)[2], tolerance);
- #endif
-
-@@ -603,7 +603,7 @@ TEST_F(TestPointRasterizeFrustum, testPointRasterization)
- auto scaledSumV = (scale * velocities[0] + scale * velocities[1] +
- scale * velocities[2] + scale * velocities[4]);
- EXPECT_NEAR(scaledSumV[0], (*iterV)[0], tolerance);
-- EXPECT_NEAR(scaledSumV[1], (*iterV)[1], tolerance);
-+// EXPECT_NEAR(scaledSumV[1], (*iterV)[1], tolerance);
- EXPECT_NEAR(scaledSumV[2], (*iterV)[2], tolerance);
-
- // explicitly specify Vec3f grid
-@@ -627,7 +627,7 @@ TEST_F(TestPointRasterizeFrustum, testPointRasterization)
- iterV = velocity->tree().cbeginLeaf()->cbeginValueOn();
- EXPECT_EQ(Coord(0,0,0), iter.getCoord());
- EXPECT_NEAR(scaledSumV[0], (*iterV)[0], tolerance);
-- EXPECT_NEAR(scaledSumV[1], (*iterV)[1], tolerance);
-+// EXPECT_NEAR(scaledSumV[1], (*iterV)[1], tolerance);
- EXPECT_NEAR(scaledSumV[2], (*iterV)[2], tolerance);
-
- // rasterize float attribute into double grid
-diff --git a/openvdb_ax/openvdb_ax/test/integration/TestAssign.cc b/openvdb_ax/openvdb_ax/test/integration/TestAssign.cc
-index 1f5aed6..7ff6f01 100644
---- a/openvdb_ax/openvdb_ax/test/integration/TestAssign.cc
-+++ b/openvdb_ax/openvdb_ax/test/integration/TestAssign.cc
-@@ -79,7 +79,7 @@ public:
- CPPUNIT_TEST(compoundIntegralAssignment);
- CPPUNIT_TEST(compoundFloatingAssignment);
- CPPUNIT_TEST(compoundVectorAssignment);
-- CPPUNIT_TEST(compoundMatrixAssignment);
-+// CPPUNIT_TEST(compoundMatrixAssignment);
- CPPUNIT_TEST(compoundStringAssignment);
- CPPUNIT_TEST(implicitScalarAssignment);
- CPPUNIT_TEST(implicitContainerAssignment);
-diff --git a/openvdb_ax/openvdb_ax/test/integration/TestBinary.cc b/openvdb_ax/openvdb_ax/test/integration/TestBinary.cc
-index 483af60..9824782 100644
---- a/openvdb_ax/openvdb_ax/test/integration/TestBinary.cc
-+++ b/openvdb_ax/openvdb_ax/test/integration/TestBinary.cc
-@@ -73,7 +73,7 @@ public:
- CPPUNIT_TEST_SUITE(TestBinary);
- CPPUNIT_TEST(plus);
- CPPUNIT_TEST(minus);
-- CPPUNIT_TEST(mult);
-+// CPPUNIT_TEST(mult);
- CPPUNIT_TEST(div);
- CPPUNIT_TEST(mod);
- CPPUNIT_TEST(btand);
-diff --git a/openvdb_ax/openvdb_ax/test/integration/TestStandardFunctions.cc b/openvdb_ax/openvdb_ax/test/integration/TestStandardFunctions.cc
-index 68f6eff..829780f 100644
---- a/openvdb_ax/openvdb_ax/test/integration/TestStandardFunctions.cc
-+++ b/openvdb_ax/openvdb_ax/test/integration/TestStandardFunctions.cc
-@@ -48,7 +48,7 @@ public:
- CPPUNIT_TEST(clamp);
- CPPUNIT_TEST(cofactor);
- CPPUNIT_TEST(cosh);
-- CPPUNIT_TEST(cross);
-+// CPPUNIT_TEST(cross);
- CPPUNIT_TEST(curlsimplexnoise);
- CPPUNIT_TEST(degrees);
- CPPUNIT_TEST(determinant);
-@@ -67,8 +67,8 @@ public:
- CPPUNIT_TEST(isfinite);
- CPPUNIT_TEST(isinf);
- CPPUNIT_TEST(isnan);
-- CPPUNIT_TEST(length);
-- CPPUNIT_TEST(lengthsq);
-+// CPPUNIT_TEST(length);
-+// CPPUNIT_TEST(lengthsq);
- CPPUNIT_TEST(lerp);
- CPPUNIT_TEST(max);
- CPPUNIT_TEST(min);
---
-2.37.3
-
diff --git a/media-gfx/openvdb/metadata.xml b/media-gfx/openvdb/metadata.xml
index 8870bee20b73..888390378264 100644
--- a/media-gfx/openvdb/metadata.xml
+++ b/media-gfx/openvdb/metadata.xml
@@ -18,12 +18,6 @@
<flag name="abi10-compat">
Disables newer features to maintain compatibility with ABI10
</flag>
- <flag name="abi6-compat">
- Disables newer features to maintain compatibility with ABI6
- </flag>
- <flag name="abi7-compat">
- Disables newer features to maintain compatibility with ABI7
- </flag>
<flag name="abi8-compat">
Disables newer features to maintain compatibility with ABI8
</flag>
diff --git a/media-gfx/openvdb/openvdb-8.2.0-r7.ebuild b/media-gfx/openvdb/openvdb-8.2.0-r7.ebuild
deleted file mode 100644
index e993e5e2f46a..000000000000
--- a/media-gfx/openvdb/openvdb-8.2.0-r7.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{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 +zlib abi6-compat abi7-compat +abi8-compat"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
- blosc? ( zlib )
- 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:=
- >=dev-libs/imath-3.1.4-r2:=
- media-libs/glfw
- media-libs/glu
- >=media-libs/openexr-3:=
- 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}] )
- ')
- )
- zlib? ( sys-libs/zlib )
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
- 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"
-)
-
-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=ON
- -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 blosc)
- -DUSE_ZLIB=$(usex zlib)
- -DUSE_CCACHE=OFF
- -DUSE_COLORED_OUTPUT=ON
- -DUSE_IMATH_HALF=ON
- -DUSE_LOG4CPLUS=ON
- )
-
- if use python; then
- mycmakeargs+=(
- -DOPENVDB_BUILD_PYTHON_MODULE=ON
- -DOPENVDB_BUILD_PYTHON_UNITTESTS=$(usex test)
- -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)"
- -DPython_EXECUTABLE="${PYTHON}"
- -DPython_INCLUDE_DIR="$(python_get_includedir)"
- -DUSE_NUMPY=$(usex numpy)
- )
- fi
-
- mycmakeargs+=(
- -DOPENVDB_BUILD_VDB_LOD=ON
- -DOPENVDB_BUILD_VDB_RENDER=ON
- -DOPENVDB_BUILD_VDB_VIEW=ON
- )
-
- if use cpu_flags_x86_avx; then
- mycmakeargs+=( -DOPENVDB_SIMD=AVX )
- elif use cpu_flags_x86_sse4_2; then
- mycmakeargs+=( -DOPENVDB_SIMD=SSE42 )
- fi
-
- cmake_src_configure
-}
diff --git a/media-gfx/openvdb/openvdb-9.0.0-r4.ebuild b/media-gfx/openvdb/openvdb-9.0.0-r4.ebuild
deleted file mode 100644
index 505f3490aaa3..000000000000
--- a/media-gfx/openvdb/openvdb-9.0.0-r4.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9,10} )
-
-inherit cmake cuda 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/9"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="cpu_flags_x86_avx cpu_flags_x86_sse4_2 +blosc cuda doc +nanovdb numpy python static-libs test utils +zlib abi7-compat abi8-compat +abi9-compat"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="blosc? ( zlib )
- numpy? ( python )
- cuda? ( nanovdb )
- ^^ ( abi7-compat abi8-compat abi9-compat )
- python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- >=dev-cpp/tbb-2020.3:=
- dev-libs/boost:=
- dev-libs/jemalloc:=
- dev-libs/log4cplus:=
- >=dev-libs/imath-3.1.4-r2:=
- media-libs/glfw
- media-libs/glu
- >=media-libs/openexr-3:=
- sys-libs/zlib:=
- x11-libs/libXcursor
- x11-libs/libXi
- x11-libs/libXinerama
- x11-libs/libXrandr
- blosc? ( dev-libs/c-blosc:= )
- cuda? ( >=dev-util/nvidia-cuda-toolkit-11 )
- python? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-libs/boost:=[numpy?,python?,${PYTHON_USEDEP}]
- numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
- ')
- )
- zlib? ( sys-libs/zlib )
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
- 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}-8.1.0-glfw-libdir.patch"
- "${FILESDIR}/${PN}-9.0.0-fix-atomic.patch"
- "${FILESDIR}/${PN}-9.0.0-numpy.patch"
- "${FILESDIR}/${PN}-9.0.0-unconditionally-search-Python-interpreter.patch"
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- cmake_src_prepare
-
- if use cuda; then
- cuda_add_sandbox -w
- cuda_src_prepare
- fi
-}
-
-src_configure() {
- local myprefix="${EPREFIX}/usr/"
-
- local version
- if use abi7-compat; then
- version=7
- elif use abi8-compat; then
- version=8
- elif use abi9-compat; then
- version=9
- else
- die "OpenVDB ABI version is not compatible"
- fi
-
- local mycmakeargs=(
- -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}/"
- -DOPENVDB_ABI_VERSION_NUMBER="${version}"
- -DOPENVDB_BUILD_DOCS=$(usex doc)
- -DOPENVDB_BUILD_UNITTESTS=$(usex test)
- -DOPENVDB_BUILD_VDB_LOD=$(usex utils)
- -DOPENVDB_BUILD_VDB_RENDER=$(usex utils)
- -DOPENVDB_BUILD_VDB_VIEW=$(usex utils)
- -DOPENVDB_CORE_SHARED=ON
- -DOPENVDB_CORE_STATIC=$(usex static-libs)
- -DOPENVDB_ENABLE_RPATH=OFF
- -DUSE_BLOSC=$(usex blosc)
- -DUSE_ZLIB=$(usex zlib)
- -DUSE_CCACHE=OFF
- -DUSE_COLORED_OUTPUT=ON
- -DUSE_IMATH_HALF=ON
- -DUSE_LOG4CPLUS=ON
- -DUSE_NANOVDB=$(usex nanovdb)
- )
-
- if use nanovdb; then
- mycmakeargs+=(
- -DNANOVDB_BUILD_UNITTESTS=$(usex test)
- -DNANOVDB_USE_CUDA=$(usex cuda)
- )
- fi
-
- if use python; then
- mycmakeargs+=(
- -DOPENVDB_BUILD_PYTHON_MODULE=ON
- -DUSE_NUMPY=$(usex numpy)
- -DOPENVDB_BUILD_PYTHON_UNITTESTS=$(usex test)
- -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)"
- -DPython_INCLUDE_DIR="$(python_get_includedir)"
- )
- fi
-
- if use cpu_flags_x86_avx; then
- mycmakeargs+=( -DOPENVDB_SIMD=AVX )
- elif use cpu_flags_x86_sse4_2; then
- mycmakeargs+=( -DOPENVDB_SIMD=SSE42 )
- fi
-
- cmake_src_configure
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/files/, media-gfx/openvdb/
@ 2023-07-11 4:35 Sam James
0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2023-07-11 4:35 UTC (permalink / raw
To: gentoo-commits
commit: 177134bd1b059a651d7644a0c983444b4d122db4
Author: Violet Purcell <vimproved <AT> inventati <DOT> org>
AuthorDate: Sun Jul 9 14:18:06 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jul 11 04:34:19 2023 +0000
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 <vimproved <AT> inventati.org>
Closes: https://github.com/gentoo/gentoo/pull/31812
Signed-off-by: Sam James <sam <AT> 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 000000000000..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 <log4cplus/layout.h>
+ #include <log4cplus/logger.h>
+ #include <log4cplus/spi/loggingevent.h>
++#include <log4cplus/version.h>
+ #include <algorithm> // for std::remove()
+ #include <cstring> // for ::strrchr()
+ #include <memory>
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() {
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2023-07-11 4:35 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-02-01 19:27 [gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/files/, media-gfx/openvdb/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2023-07-11 4:35 Sam James
2022-10-30 9:43 Sam James
2022-02-12 4:49 Sam James
2021-12-04 21:52 Sam James
2021-10-31 2:19 Sam James
2020-08-24 13:42 Sam James
2018-08-04 18:21 Jonathan Scruggs
2016-10-22 23:26 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox