* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/, media-gfx/openvdb/files/
@ 2016-10-27 18:34 David Seifert
0 siblings, 0 replies; 21+ messages in thread
From: David Seifert @ 2016-10-27 18:34 UTC (permalink / raw
To: gentoo-commits
commit: f0504839a891e2a6fa94dd3da3e520c8b9dc8cb3
Author: Jonathan Scruggs <j.scruggs <AT> gmail <DOT> com>
AuthorDate: Thu Oct 27 12:16:22 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Oct 27 18:34:11 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0504839
media-gfx/openvdb: replace -isystem with -I for GCC 6 compatibility
Gentoo-bug: 597866
* Respect CXX
* Respect ABI libdirs
* Remove '-O3' from compile lines
Signed-off by: Jonathan Scruggs (j.scruggs <AT> gmail.com)
Closes: https://github.com/gentoo/gentoo/pull/2677
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../openvdb/files/openvdb-3.2.0-build-fixes.patch | 33 ---
.../files/openvdb-3.2.0-fix-build-system.patch | 262 +++++++++++++++++++++
.../files/openvdb-3.2.0-makefile-fixes.patch | 93 --------
media-gfx/openvdb/openvdb-3.2.0.ebuild | 24 +-
4 files changed, 276 insertions(+), 136 deletions(-)
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
deleted file mode 100644
index e919ec2..00000000
--- a/media-gfx/openvdb/files/openvdb-3.2.0-build-fixes.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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-fix-build-system.patch b/media-gfx/openvdb/files/openvdb-3.2.0-fix-build-system.patch
new file mode 100644
index 00000000..66112af
--- /dev/null
+++ b/media-gfx/openvdb/files/openvdb-3.2.0-fix-build-system.patch
@@ -0,0 +1,262 @@
+* 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-makefile-fixes.patch b/media-gfx/openvdb/files/openvdb-3.2.0-makefile-fixes.patch
deleted file mode 100644
index 633c380..00000000
--- a/media-gfx/openvdb/files/openvdb-3.2.0-makefile-fixes.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-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/openvdb-3.2.0.ebuild b/media-gfx/openvdb/openvdb-3.2.0.ebuild
index 649cd99..ed84fad 100644
--- a/media-gfx/openvdb/openvdb-3.2.0.ebuild
+++ b/media-gfx/openvdb/openvdb-3.2.0.ebuild
@@ -2,10 +2,11 @@
# Distributed under the terms of the GNU General Public License v2
# $id$
-EAPI="6"
+EAPI=6
+
PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-inherit eutils python-r1
+inherit eutils python-r1 toolchain-funcs
DESCRIPTION="Libs for the efficient manipulation of volumetric data"
HOMEPAGE="http://www.openvdb.org"
@@ -43,9 +44,10 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/${P}/${PN}"
-PATCHES=( "${FILESDIR}"/${P}-numpy-fix.patch
- "${FILESDIR}"/${P}-makefile-fixes.patch
- "${FILESDIR}"/${P}-build-fixes.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-numpy-fix.patch
+ "${FILESDIR}"/${P}-fix-build-system.patch
+)
python_module_compile() {
mypythonargs=(
@@ -54,15 +56,15 @@ python_module_compile() {
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)"
+ 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=""
+ emake python "${myemakeargs[@]}" "${mypythonargs[@]}" EPYDOC="" CXX="$(tc-getCXX)"
# This is so the correct version of pdoc is used
mypyscriptdir=$(python_get_scriptdir)
@@ -84,7 +86,9 @@ src_install() {
# So individule targets can be called without duplication
# Common depends:
local myemakeargs=(
- rpath=no shared=yes
+ rpath=no
+ shared=yes
+ libdir="$(get_libdir)"
LIBOPENVDB_RPATH=
DESTDIR="${D}"
HFS="${myprefix}"
@@ -154,5 +158,5 @@ src_install() {
fi
einfo "Compiling the main components."
- emake install "${myemakeargs[@]}" "${mypythonargs[@]}"
+ emake install "${myemakeargs[@]}" "${mypythonargs[@]}" CXX="$(tc-getCXX)"
}
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/, media-gfx/openvdb/files/
@ 2017-01-15 13:34 David Seifert
0 siblings, 0 replies; 21+ messages in thread
From: David Seifert @ 2017-01-15 13:34 UTC (permalink / raw
To: gentoo-commits
commit: e85a57635ca71d56e2c0df6acbbb26e2f92c6e61
Author: Jonathan Scruggs <j.scruggs <AT> gmail <DOT> com>
AuthorDate: Sun Jan 15 11:20:28 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jan 15 13:31:36 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e85a5763
media-gfx/openvdb: Version bump to 4.0.0
* Switched to CMake and a sane ebuild
* Added abi3-compat USE Flag
* Removed openvdb-compression as it's now hard enabled
Signed-off by: Jonathan Scruggs (j.scruggs <AT> gmail.com)
Closes: https://github.com/gentoo/gentoo/pull/3473
media-gfx/openvdb/Manifest | 1 +
.../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 | 6 +-
media-gfx/openvdb/openvdb-4.0.0.ebuild | 78 ++++++++++++++++++++++
7 files changed, 268 insertions(+), 1 deletion(-)
diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest
index 175e892..50e0668 100644
--- a/media-gfx/openvdb/Manifest
+++ b/media-gfx/openvdb/Manifest
@@ -1 +1,2 @@
DIST openvdb-3.2.0.tar.gz 1368870 SHA256 d4b6eb63a2c1c62ca449399f3d7789638fde655c32a977b50717b727420a634b SHA512 df9a4895b219aae3b5a9616c34eb846d565877ff76648405691f0c903507f6faba94e8eba9173423b50cb5cef80f3ec500a9f70977cb7161701d39fd105abc91 WHIRLPOOL 3b76ba4998ac39405bbbdf0b1a80488234c5f25e8b0943d4520d9fa783384a111e48ff2120e942f5d9b3862e1f227ff89dcc633842e1290060afb1836785455f
+DIST openvdb-4.0.0.tar.gz 1545221 SHA256 eaf37b8e723cfd011df350cb0ef93ffa22d927bf7cb1f72c38176fce523b3537 SHA512 138e23408d725f153f5545c8083cd16f6b3e5cf80308e080d5e463f74f947759cdf5f9d818137ebffaf8b2de77bffa8f38ef0d20758a1418aea1c71702c0001d WHIRLPOOL 8b6413dc3bb7aa6efb2b5472b9df0ccc8493082be02ddd9243fa6ccc1cf183612c8700e3384d1a26f321dda99022292338d61bfa3576cc6ad96a0f35de6fd226
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
new file mode 100644
index 00000000..5a8baee
--- /dev/null
+++ b/media-gfx/openvdb/files/openvdb-4.0.0-build-docs-once.patch
@@ -0,0 +1,32 @@
+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
new file mode 100644
index 00000000..92c4fa3
--- /dev/null
+++ b/media-gfx/openvdb/files/openvdb-4.0.0-make-docs-optional.patch
@@ -0,0 +1,71 @@
+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
new file mode 100644
index 00000000..913c607
--- /dev/null
+++ b/media-gfx/openvdb/files/openvdb-4.0.0-namespace-fixes.patch
@@ -0,0 +1,65 @@
+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
new file mode 100644
index 00000000..34c6c76
--- /dev/null
+++ b/media-gfx/openvdb/files/openvdb-4.0.0-python-module-install-dir-fix.patch
@@ -0,0 +1,16 @@
+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 611db53..0faae8b 100644
--- a/media-gfx/openvdb/metadata.xml
+++ b/media-gfx/openvdb/metadata.xml
@@ -19,7 +19,11 @@
Chance of Meatballs2' and 'How to Train Your Dragon 2'.
</longdescription>
<use>
- <flag name="openvdb-compression">
+ <flag restrict=">=media-gfx/openvdb-4.0.0" name="abi3-compat">
+ 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.
diff --git a/media-gfx/openvdb/openvdb-4.0.0.ebuild b/media-gfx/openvdb/openvdb-4.0.0.ebuild
new file mode 100644
index 00000000..f352014
--- /dev/null
+++ b/media-gfx/openvdb/openvdb-4.0.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2017 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 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] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/, media-gfx/openvdb/files/
@ 2018-08-04 18:21 Jonathan Scruggs
0 siblings, 0 replies; 21+ messages in thread
From: Jonathan Scruggs @ 2018-08-04 18:21 UTC (permalink / raw
To: gentoo-commits
commit: 74320c01dacb7c27d6901caac7ef67e47f0114e7
Author: Jonathan Scruggs <j.scruggs <AT> gmail <DOT> com>
AuthorDate: Sat Aug 4 17:09:39 2018 +0000
Commit: Jonathan Scruggs <dracwyrm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 4 18:21:37 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74320c01
media-gfx/openvdb: revision bump to fix FindBoost
Add patch from Dennis Schridde <devurandom <AT> gmx.net> to fix finding
boost with CMake 3.11
Closes: https://bugs.gentoo.org/652266
Closes: https://github.com/gentoo/gentoo/pull/9443
.../files/openvdb-4.0.2-findboost-fix.patch | 11 +++
media-gfx/openvdb/openvdb-4.0.2-r1.ebuild | 79 ++++++++++++++++++++++
2 files changed, 90 insertions(+)
diff --git a/media-gfx/openvdb/files/openvdb-4.0.2-findboost-fix.patch b/media-gfx/openvdb/files/openvdb-4.0.2-findboost-fix.patch
new file mode 100644
index 00000000000..12245be3e46
--- /dev/null
+++ b/media-gfx/openvdb/files/openvdb-4.0.2-findboost-fix.patch
@@ -0,0 +1,11 @@
+--- openvdb-4.0.2/openvdb/python/CMakeLists.txt.orig 2018-07-12 20:29:50.745624805 +0200
++++ openvdb-4.0.2/openvdb/python/CMakeLists.txt 2018-07-12 20:30:10.452305180 +0200
+@@ -3,7 +3,7 @@
+
+ FIND_PACKAGE ( PythonInterp REQUIRED )
+ FIND_PACKAGE ( PythonLibs REQUIRED )
+-FIND_PACKAGE ( Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS python )
++FIND_PACKAGE ( Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR} )
+
+
+ IF ( NOT OPENVDB_BUILD_CORE )
diff --git a/media-gfx/openvdb/openvdb-4.0.2-r1.ebuild b/media-gfx/openvdb/openvdb-4.0.2-r1.ebuild
new file mode 100644
index 00000000000..d23f5b3c717
--- /dev/null
+++ b/media-gfx/openvdb/openvdb-4.0.2-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit cmake-utils flag-o-matic 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
+ https://github.com/dracwyrm/gentoo-patches/raw/master/${PN}/${P}-patchset-01.tar.xz"
+
+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/libXcursor
+ x11-libs/libXi
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ python? (
+ ${PYTHON_DEPS}
+ dev-python/numpy[${PYTHON_USEDEP}]
+ )
+"
+
+DEPEND="${RDEPEND}
+ dev-cpp/tbb
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen[latex] )
+"
+
+PATCHES=(
+ "${WORKDIR}/0001-Change-hardcoded-paths-to-GNUInstallDirs-variables.patch"
+ "${WORKDIR}/0002-Use-PkgConfig-to-find-IlmBase-and-OpenEXR.patch"
+ "${WORKDIR}/0003-Boost-1.65-NumPy-support.patch"
+ "${FILESDIR}/${P}-findboost-fix.patch"
+)
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+ local myprefix="${EPREFIX}/usr/"
+
+ # To stay in sync with Boost
+ append-cxxflags -std=c++14
+
+ local mycmakeargs=(
+ -DBLOSC_LOCATION="${myprefix}"
+ -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+ -DGLEW_LOCATION="${myprefix}"
+ -DGLFW3_LOCATION="${myprefix}"
+ -DOPENVDB_BUILD_DOCS=$(usex doc)
+ -DOPENVDB_BUILD_PYTHON_MODULE=$(usex python)
+ -DOPENVDB_BUILD_UNITTESTS=OFF
+ -DOPENVDB_ENABLE_3_ABI_COMPATIBLE=$(usex abi3-compat)
+ -DOPENVDB_ENABLE_RPATH=OFF
+ -DTBB_LOCATION="${myprefix}"
+ -DUSE_GLFW3=ON
+ )
+
+ use python && mycmakeargs+=( -DPYOENVDB_INSTALL_DIRECTORY=${python_get_sitedir} )
+
+ cmake-utils_src_configure
+}
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/, media-gfx/openvdb/files/
@ 2018-08-14 11:39 Jonathan Scruggs
0 siblings, 0 replies; 21+ messages in thread
From: Jonathan Scruggs @ 2018-08-14 11:39 UTC (permalink / raw
To: gentoo-commits
commit: 0ba534ffc7995382d92438f2a57208ee886f6614
Author: Jonathan Scruggs <j.scruggs <AT> gmail <DOT> com>
AuthorDate: Sat Aug 11 13:14:59 2018 +0000
Commit: Jonathan Scruggs <dracwyrm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 14 11:39:10 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ba534ff
media-gfx/openvdb: revision bump to 4.0.2-r2
Remove unused inherit in 4.0.2 ebuild
Fixed unittests and add test use flag
Fixed boost linker errors
removed unused option as it was Win32 only
Closes: https://bugs.gentoo.org/660278
Update manifest for upcoming v5 release and fix descriptions
Closes: https://github.com/gentoo/gentoo/pull/9535
media-gfx/openvdb/Manifest | 1 +
.../files/openvdb-4.0.2-findboost-fix.patch | 16 +++++--
media-gfx/openvdb/metadata.xml | 9 ++--
...penvdb-4.0.2.ebuild => openvdb-4.0.2-r2.ebuild} | 50 ++++++++++++----------
media-gfx/openvdb/openvdb-4.0.2.ebuild | 2 +-
5 files changed, 46 insertions(+), 32 deletions(-)
diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest
index 058405560b7..54f79981082 100644
--- a/media-gfx/openvdb/Manifest
+++ b/media-gfx/openvdb/Manifest
@@ -1,2 +1,3 @@
DIST openvdb-4.0.2-patchset-01.tar.xz 16420 BLAKE2B 2f825532d83d3a6756454f164a0608cfa776c1d4472cb4b25e4dad20d3c9648a952deef87ed0e24ce5f7c927c02da8cca76c829eafe1e2bb47fca061541668b3 SHA512 e9399d245d5e2b4130576d688691ac965f031b957df7803b8859f863634b27987c33aabadc5fb463b9d3eec333be84b89cb619dce5bc81c0390d8fb19da830c3
+DIST openvdb-4.0.2-patchset-02.tar.xz 12428 BLAKE2B 2684ddf010df975912fcfc8c4f944d9a9ba447b48750140b6c46db31d49297f7495e5c77e9d5b85af0b2e1d0c4987184865642dc95f1fb3e463e85ee5987d203 SHA512 04377d552e218a8eb31c43381ba32263ba206a0870dccda1bcc031863dfdbcc953da7ea89fd420dc1a338fbd6123ac30bac2039c0a2a01c1fa9253a3fdd0b54d
DIST openvdb-4.0.2.tar.gz 1689119 BLAKE2B dbc8d4ab44990440e201327d76bbf9bfe3e8f597505b1d008dedb95dc540277513f465d455079c59820acc5056c9a2edf56235e1097b6c73a1f7dd8c59609c15 SHA512 8e3e12583b81f9b9303b309e839c8321c67b67ff8a0e61bb56c87276bf25c0deff22f5a73c7c5b661b8e5df345bfdabfa6b0aea9bf16fce57d9c53a76751c75d
diff --git a/media-gfx/openvdb/files/openvdb-4.0.2-findboost-fix.patch b/media-gfx/openvdb/files/openvdb-4.0.2-findboost-fix.patch
index 12245be3e46..fbb29883fe2 100644
--- a/media-gfx/openvdb/files/openvdb-4.0.2-findboost-fix.patch
+++ b/media-gfx/openvdb/files/openvdb-4.0.2-findboost-fix.patch
@@ -1,11 +1,21 @@
---- openvdb-4.0.2/openvdb/python/CMakeLists.txt.orig 2018-07-12 20:29:50.745624805 +0200
-+++ openvdb-4.0.2/openvdb/python/CMakeLists.txt 2018-07-12 20:30:10.452305180 +0200
+diff -urN a/openvdb/python/CMakeLists.txt b/openvdb/python/CMakeLists.txt
+--- a/openvdb/python/CMakeLists.txt 2017-07-31 19:16:32.000000000 +0100
++++ b/openvdb/python/CMakeLists.txt 2018-08-11 12:37:40.179360277 +0100
@@ -3,7 +3,7 @@
FIND_PACKAGE ( PythonInterp REQUIRED )
FIND_PACKAGE ( PythonLibs REQUIRED )
-FIND_PACKAGE ( Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS python )
-+FIND_PACKAGE ( Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR} )
++FIND_PACKAGE ( Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} )
IF ( NOT OPENVDB_BUILD_CORE )
+@@ -92,7 +92,7 @@
+ ${GLFW_LINK_LIBRARY}
+ ${GLFW_DEPENDENT_LIBRARIES}
+ ${GLEW_GLEW_LIBRARY}
+- ${Boost_PYTHON_LIBRARY}
++ ${Boost_LIBRARIES}
+ ${PYTHON_LIBRARY}
+ ${Ilmbase_HALF_LIBRARY}
+ )
diff --git a/media-gfx/openvdb/metadata.xml b/media-gfx/openvdb/metadata.xml
index 806981efae0..71a04b9d558 100644
--- a/media-gfx/openvdb/metadata.xml
+++ b/media-gfx/openvdb/metadata.xml
@@ -1,11 +1,11 @@
<?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">
+ <maintainer type="person">
<email>dracwyrm@gentoo.org</email>
<name>Jonathan Scruggs</name>
</maintainer>
- <maintainer restrict=">=media-gfx/openvdb-3.1.0" type="person">
+ <maintainer type="person">
<email>agrigo2001@yahoo.com.au</email>
<name>Adrian Grigo</name>
</maintainer>
@@ -19,9 +19,8 @@
Chance of Meatballs2' and 'How to Train Your Dragon 2'.
</longdescription>
<use>
- <flag restrict=">=media-gfx/openvdb-4.0.0" name="abi3-compat">
- Enables compatibility with the old 3.x ABI.
- enabled by dfault.
+ <flag restrict="<media-gfx/openvdb-5.0.0" name="abi3-compat">
+ Disables newer features to maintain compatibility with ABI3. Enabled by default.
</flag>
</use>
<upstream>
diff --git a/media-gfx/openvdb/openvdb-4.0.2.ebuild b/media-gfx/openvdb/openvdb-4.0.2-r2.ebuild
similarity index 65%
copy from media-gfx/openvdb/openvdb-4.0.2.ebuild
copy to media-gfx/openvdb/openvdb-4.0.2-r2.ebuild
index 24ec7fce3e5..73415cb7ea2 100644
--- a/media-gfx/openvdb/openvdb-4.0.2.ebuild
+++ b/media-gfx/openvdb/openvdb-4.0.2-r2.ebuild
@@ -2,46 +2,50 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
+
PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-inherit cmake-utils flag-o-matic python-single-r1 versionator
+inherit cmake-utils flag-o-matic 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
- https://github.com/dracwyrm/gentoo-patches/raw/master/${PN}/${P}-patchset-01.tar.xz"
+ https://dev.gentoo.org/~dracwyrm/patches/${P}-patchset-02.tar.xz"
LICENSE="MPL-2.0"
SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="+abi3-compat doc python"
+KEYWORDS="~amd64 ~x86"
+IUSE="+abi3-compat doc python test"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RDEPEND="sys-libs/zlib:=
+RDEPEND="
>=dev-libs/boost-1.62:=[python?,${PYTHON_USEDEP}]
- media-libs/openexr:=
+ >=dev-libs/c-blosc-1.5.0
+ dev-libs/jemalloc
+ dev-libs/log4cplus
media-libs/glfw:=
+ media-libs/openexr:=
+ sys-libs/zlib:=
+ x11-libs/libXcursor
x11-libs/libXi
- x11-libs/libXrandr
x11-libs/libXinerama
- x11-libs/libXcursor
- dev-libs/jemalloc
- >=dev-libs/c-blosc-1.5.0
- dev-libs/log4cplus
+ x11-libs/libXrandr
python? (
${PYTHON_DEPS}
dev-python/numpy[${PYTHON_USEDEP}]
)"
DEPEND="${RDEPEND}
- virtual/pkgconfig
dev-cpp/tbb
- doc? ( app-doc/doxygen[latex] )"
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen[latex] )
+ test? ( dev-util/cppunit )"
PATCHES=(
- "${WORKDIR}/0001-Change-hardcoded-paths-to-GNUInstallDirs-variables.patch"
- "${WORKDIR}/0002-Use-PkgConfig-to-find-IlmBase-and-OpenEXR.patch"
- "${WORKDIR}/0003-Boost-1.65-NumPy-support.patch"
+ "${WORKDIR}/${P}-patchset-02/0001-use-gnuinstalldirs.patch"
+ "${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"
)
pkg_setup() {
@@ -55,20 +59,20 @@ src_configure() {
append-cxxflags -std=c++14
local mycmakeargs=(
- -DOPENVDB_BUILD_UNITTESTS=OFF
- -DOPENVDB_BUILD_DOCS=$(usex doc)
+ -DBLOSC_LOCATION="${myprefix}"
-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+ -DGLFW3_LOCATION="${myprefix}"
+ -DOPENVDB_BUILD_DOCS=$(usex doc)
-DOPENVDB_BUILD_PYTHON_MODULE=$(usex python)
+ -DOPENVDB_BUILD_UNITTESTS=$(usex test)
-DOPENVDB_ENABLE_3_ABI_COMPATIBLE=$(usex abi3-compat)
-DOPENVDB_ENABLE_RPATH=OFF
- -DUSE_GLFW3=ON
- -DBLOSC_LOCATION="${myprefix}"
- -DGLEW_LOCATION="${myprefix}"
- -DGLFW3_LOCATION="${myprefix}"
-DTBB_LOCATION="${myprefix}"
+ -DUSE_GLFW3=ON
)
- use python && mycmakeargs+=( -DPYOENVDB_INSTALL_DIRECTORY=${python_get_sitedir} )
+ use python && mycmakeargs+=( -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)" )
+ use test && mycmakeargs+=( -DCPPUNIT_LOCATION="${myprefix}" )
cmake-utils_src_configure
}
diff --git a/media-gfx/openvdb/openvdb-4.0.2.ebuild b/media-gfx/openvdb/openvdb-4.0.2.ebuild
index 24ec7fce3e5..97720b303f0 100644
--- a/media-gfx/openvdb/openvdb-4.0.2.ebuild
+++ b/media-gfx/openvdb/openvdb-4.0.2.ebuild
@@ -4,7 +4,7 @@
EAPI=6
PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-inherit cmake-utils flag-o-matic python-single-r1 versionator
+inherit cmake-utils flag-o-matic python-single-r1
DESCRIPTION="Libs for the efficient manipulation of volumetric data"
HOMEPAGE="http://www.openvdb.org"
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/, media-gfx/openvdb/files/
@ 2018-08-15 20:08 Jonathan Scruggs
0 siblings, 0 replies; 21+ messages in thread
From: Jonathan Scruggs @ 2018-08-15 20:08 UTC (permalink / raw
To: gentoo-commits
commit: ca3a8092585eb3d517934b8577b1e0b1cf25ce89
Author: Jonathan Scruggs <j.scruggs <AT> gmail <DOT> com>
AuthorDate: Wed Aug 15 17:42:57 2018 +0000
Commit: Jonathan Scruggs <dracwyrm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 15 20:08:18 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca3a8092
media-gfx/openvdb: bump to version 5.1.0
media-gfx/openvdb/Manifest | 1 +
.../files/openvdb-5.1.0-use-gnuinstalldirs.patch | 327 +++++++++++++++++++++
...1.0-use-pkgconfig-for-ilmbase-and-openexr.patch | 93 ++++++
media-gfx/openvdb/openvdb-5.1.0.ebuild | 72 +++++
4 files changed, 493 insertions(+)
diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest
index 54f79981082..b37baf5dcfb 100644
--- a/media-gfx/openvdb/Manifest
+++ b/media-gfx/openvdb/Manifest
@@ -1,3 +1,4 @@
DIST openvdb-4.0.2-patchset-01.tar.xz 16420 BLAKE2B 2f825532d83d3a6756454f164a0608cfa776c1d4472cb4b25e4dad20d3c9648a952deef87ed0e24ce5f7c927c02da8cca76c829eafe1e2bb47fca061541668b3 SHA512 e9399d245d5e2b4130576d688691ac965f031b957df7803b8859f863634b27987c33aabadc5fb463b9d3eec333be84b89cb619dce5bc81c0390d8fb19da830c3
DIST openvdb-4.0.2-patchset-02.tar.xz 12428 BLAKE2B 2684ddf010df975912fcfc8c4f944d9a9ba447b48750140b6c46db31d49297f7495e5c77e9d5b85af0b2e1d0c4987184865642dc95f1fb3e463e85ee5987d203 SHA512 04377d552e218a8eb31c43381ba32263ba206a0870dccda1bcc031863dfdbcc953da7ea89fd420dc1a338fbd6123ac30bac2039c0a2a01c1fa9253a3fdd0b54d
DIST openvdb-4.0.2.tar.gz 1689119 BLAKE2B dbc8d4ab44990440e201327d76bbf9bfe3e8f597505b1d008dedb95dc540277513f465d455079c59820acc5056c9a2edf56235e1097b6c73a1f7dd8c59609c15 SHA512 8e3e12583b81f9b9303b309e839c8321c67b67ff8a0e61bb56c87276bf25c0deff22f5a73c7c5b661b8e5df345bfdabfa6b0aea9bf16fce57d9c53a76751c75d
+DIST openvdb-5.1.0.tar.gz 1739517 BLAKE2B e6ef09497d57dfd2069b8dd22856faa9dcc0591ca844b58c785ad0f2ab5b134d6c5278b0eb1820d2b7802303f1f073aea2380111ebda82ef04d7c503ba1d558b SHA512 c71d040a1862f5e31f084125e9695da3ebf171788956d7d4c16f99ead26a099a81d5a9c30ba2cc61f29e32e21f822796ae34f6c62496050894087735a19489f6
diff --git a/media-gfx/openvdb/files/openvdb-5.1.0-use-gnuinstalldirs.patch b/media-gfx/openvdb/files/openvdb-5.1.0-use-gnuinstalldirs.patch
new file mode 100644
index 00000000000..791e0557872
--- /dev/null
+++ b/media-gfx/openvdb/files/openvdb-5.1.0-use-gnuinstalldirs.patch
@@ -0,0 +1,327 @@
+diff -urN a/cmake/FindBlosc.cmake b/cmake/FindBlosc.cmake
+--- a/cmake/FindBlosc.cmake 2018-04-10 19:22:17.000000000 +0100
++++ b/cmake/FindBlosc.cmake 2018-08-07 21:01:16.869879255 +0100
+@@ -37,7 +37,7 @@
+
+ FIND_PACKAGE ( PackageHandleStandardArgs )
+
+-FIND_PATH( BLOSC_LOCATION include/blosc.h
++FIND_PATH( BLOSC_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/blosc.h
+ "$ENV{BLOSC_ROOT}"
+ NO_DEFAULT_PATH
+ NO_SYSTEM_ENVIRONMENT_PATH
+@@ -49,7 +49,7 @@
+
+ IF ( BLOSC_FOUND )
+
+- SET ( BLOSC_LIBRARYDIR ${BLOSC_LOCATION}/lib
++ SET ( BLOSC_LIBRARYDIR ${BLOSC_LOCATION}/${CMAKE_INSTALL_LIBDIR}
+ CACHE STRING "Blosc library directories")
+
+ SET ( _blosc_library_name "blosc" )
+@@ -75,6 +75,6 @@
+ SET( CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_BACKUP} )
+ ENDIF()
+
+- SET( BLOSC_INCLUDE_DIR "${BLOSC_LOCATION}/include" CACHE STRING "Blosc include directory" )
++ SET( BLOSC_INCLUDE_DIR "${BLOSC_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "Blosc include directory" )
+
+ ENDIF ( BLOSC_FOUND )
+diff -urN a/cmake/FindCPPUnit.cmake b/cmake/FindCPPUnit.cmake
+--- a/cmake/FindCPPUnit.cmake 2018-04-10 19:22:17.000000000 +0100
++++ b/cmake/FindCPPUnit.cmake 2018-08-07 21:02:15.421037954 +0100
+@@ -38,7 +38,7 @@
+
+ FIND_PACKAGE ( PackageHandleStandardArgs )
+
+-FIND_PATH( CPPUNIT_LOCATION include/cppunit/Test.h
++FIND_PATH( CPPUNIT_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/cppunit/Test.h
+ "$ENV{CPPUNIT_ROOT}"
+ NO_DEFAULT_PATH
+ NO_CMAKE_ENVIRONMENT_PATH
+@@ -53,13 +53,13 @@
+
+ IF ( CPPUNIT_FOUND )
+
+- SET( CPPUNIT_INCLUDE_DIR "${CPPUNIT_LOCATION}/include" CACHE STRING "CPPUNIT include directory")
++ SET( CPPUNIT_INCLUDE_DIR "${CPPUNIT_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "CPPUNIT include directory")
+ IF (CPPUnit_USE_STATIC_LIBS)
+ SET( CPPUNIT_LIBRARY_NAME libcppunit.a)
+ ELSE ()
+ SET( CPPUNIT_LIBRARY_NAME cppunit)
+ ENDIF ()
+ FIND_LIBRARY ( CPPUnit_cppunit_LIBRARY ${CPPUNIT_LIBRARY_NAME}
+- PATHS ${CPPUNIT_LOCATION}/lib )
++ PATHS ${CPPUNIT_LOCATION}/${CMAKE_INSTALL_LIBDIR} )
+
+ ENDIF ( CPPUNIT_FOUND )
+diff -urN a/cmake/FindGLEW.cmake b/cmake/FindGLEW.cmake
+--- a/cmake/FindGLEW.cmake 2018-04-10 19:22:17.000000000 +0100
++++ b/cmake/FindGLEW.cmake 2018-08-07 21:04:32.804431135 +0100
+@@ -39,7 +39,7 @@
+
+ FIND_PACKAGE ( PackageHandleStandardArgs )
+
+-FIND_PATH( GLEW_LOCATION include/GL/glew.h
++FIND_PATH( GLEW_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/GL/glew.h
+ "$ENV{GLEW_ROOT}"
+ NO_DEFAULT_PATH
+ NO_SYSTEM_ENVIRONMENT_PATH
+@@ -51,7 +51,7 @@
+
+ IF ( GLEW_LOCATION )
+
+- SET( GLEW_INCLUDE_DIR "${GLEW_LOCATION}/include" CACHE STRING "GLEW include path")
++ SET( GLEW_INCLUDE_DIR "${GLEW_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "GLEW include path")
+
+ SET ( ORIGINAL_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
+ IF (GLEW_USE_STATIC_LIBS)
+@@ -74,11 +74,11 @@
+ FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEW32MXS PATHS ${GLEW_LOCATION}/lib )
+ ELSE (APPLE)
+ SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
+- FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW PATHS ${GLEW_LOCATION}/lib
++ FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW PATHS ${GLEW_LOCATION}/${CMAKE_INSTALL_LIBDIR}
+ NO_DEFAULT_PATH
+ NO_SYSTEM_ENVIRONMENT_PATH
+ )
+- FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEWmx PATHS ${GLEW_LOCATION}/lib
++ FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEWmx PATHS ${GLEW_LOCATION}/${CMAKE_INSTALL_LIBDIR}
+ NO_DEFAULT_PATH
+ NO_SYSTEM_ENVIRONMENT_PATH
+ )
+@@ -107,11 +107,11 @@
+ )
+ ELSE (APPLE)
+ # Unices
+- FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW PATHS ${GLEW_LOCATION}/lib
++ FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW PATHS ${GLEW_LOCATION}/${CMAKE_INSTALL_LIBDIR}
+ NO_DEFAULT_PATH
+ NO_SYSTEM_ENVIRONMENT_PATH
+ )
+- FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEWmx PATHS ${GLEW_LOCATION}/lib
++ FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEWmx PATHS ${GLEW_LOCATION}/${CMAKE_INSTALL_LIBDIR}
+ NO_DEFAULT_PATH
+ NO_SYSTEM_ENVIRONMENT_PATH
+ )
+diff -urN a/cmake/FindGLFW3.cmake b/cmake/FindGLFW3.cmake
+--- a/cmake/FindGLFW3.cmake 2018-04-10 19:22:17.000000000 +0100
++++ b/cmake/FindGLFW3.cmake 2018-08-07 21:07:24.458954825 +0100
+@@ -39,7 +39,7 @@
+
+ FIND_PACKAGE ( PackageHandleStandardArgs )
+
+-FIND_PATH( GLFW3_LOCATION include/GLFW/glfw3.h
++FIND_PATH( GLFW3_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/GLFW/glfw3.h
+ "$ENV{GLFW3_ROOT}"
+ NO_DEFAULT_PATH
+ NO_SYSTEM_ENVIRONMENT_PATH
+@@ -50,9 +50,9 @@
+ )
+
+ IF (GLFW3_FOUND)
+- SET( GLFW3_INCLUDE_DIR "${GLFW3_LOCATION}/include" CACHE STRING "GLFW3 include path")
++ SET( GLFW3_INCLUDE_DIR "${GLFW3_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "GLFW3 include path")
+ IF (GLFW3_USE_STATIC_LIBS)
+- FIND_LIBRARY ( GLFW3_glfw_LIBRARY glfw3 ${GLFW3_LOCATION}/lib
++ FIND_LIBRARY ( GLFW3_glfw_LIBRARY glfw3 ${GLFW3_LOCATION}/${CMAKE_INSTALL_LIBDIR}
+ NO_DEFAULT_PATH
+ NO_CMAKE_ENVIRONMENT_PATH
+ NO_CMAKE_PATH
+@@ -60,7 +60,7 @@
+ NO_CMAKE_SYSTEM_PATH
+ )
+ ELSE (GLFW3_USE_STATIC_LIBS)
+- FIND_LIBRARY ( GLFW3_glfw_LIBRARY glfw ${GLFW3_LOCATION}/lib
++ FIND_LIBRARY ( GLFW3_glfw_LIBRARY glfw ${GLFW3_LOCATION}/${CMAKE_INSTALL_LIBDIR}
+ NO_DEFAULT_PATH
+ NO_CMAKE_ENVIRONMENT_PATH
+ NO_CMAKE_PATH
+diff -urN a/cmake/FindGLFW.cmake b/cmake/FindGLFW.cmake
+--- a/cmake/FindGLFW.cmake 2018-04-10 19:22:17.000000000 +0100
++++ b/cmake/FindGLFW.cmake 2018-08-07 21:06:26.358774164 +0100
+@@ -38,12 +38,12 @@
+
+ SET ( GLFW_FOUND FALSE )
+
+-FIND_PATH( GLFW_LOCATION include/GL/glfw.h
++FIND_PATH( GLFW_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/GL/glfw.h
+ "$ENV{GLFW_ROOT}"
+ NO_SYSTEM_ENVIRONMENT_PATH
+ )
+
+-SET( GLFW_INCLUDE_DIR "${GLFW_LOCATION}/include" CACHE STRING "GLFW include path")
++SET( GLFW_INCLUDE_DIR "${GLFW_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "GLFW include path")
+
+ SET ( ORIGINAL_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
+ IF (GLFW_USE_STATIC_LIBS)
+@@ -61,7 +61,7 @@
+ FIND_LIBRARY ( GLFW_LIBRARY_PATH GLFW32S PATHS ${GLFW_LOCATION}/lib )
+ ELSE (APPLE)
+ SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
+- FIND_LIBRARY ( GLFW_LIBRARY_PATH glfw PATHS ${GLFW_LOCATION}/lib ${GLFW_LOCATION}/lib64
++ FIND_LIBRARY ( GLFW_LIBRARY_PATH glfw PATHS ${GLFW_LOCATION}/${CMAKE_INSTALL_LIBDIR}
+ NO_DEFAULT_PATH
+ NO_SYSTEM_ENVIRONMENT_PATH
+ )
+@@ -84,7 +84,7 @@
+ )
+ ELSE (APPLE)
+ # Unices
+- FIND_LIBRARY ( GLFW_LIBRARY_PATH glfw PATHS ${GLFW_LOCATION}/lib ${GLFW_LOCATION}/lib64
++ FIND_LIBRARY ( GLFW_LIBRARY_PATH glfw PATHS ${GLFW_LOCATION}/${CMAKE_INSTALL_LIBDIR}
+ NO_SYSTEM_ENVIRONMENT_PATH
+ )
+ ENDIF (APPLE)
+diff -urN a/cmake/FindOpenVDB.cmake b/cmake/FindOpenVDB.cmake
+--- a/cmake/FindOpenVDB.cmake 2018-04-10 19:22:17.000000000 +0100
++++ b/cmake/FindOpenVDB.cmake 2018-08-07 21:10:41.640588458 +0100
+@@ -45,7 +45,7 @@
+
+ FIND_PACKAGE( PackageHandleStandardArgs )
+
+-FIND_PATH( OPENVDB_LOCATION include/openvdb/version.h
++FIND_PATH( OPENVDB_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/openvdb/version.h
+ "$ENV{OPENVDB_ROOT}"
+ NO_DEFAULT_PATH
+ NO_SYSTEM_ENVIRONMENT_PATH
+@@ -56,10 +56,10 @@
+ )
+
+ IF( OpenVDB_FOUND )
+- SET( OpenVDB_INCLUDE_DIR ${OPENVDB_LOCATION}/include
++ SET( OpenVDB_INCLUDE_DIR ${OPENVDB_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}
+ CACHE PATH "OpenVDB include directory")
+
+- SET( OpenVDB_LIBRARY_DIR ${OPENVDB_LOCATION}/lib
++ SET( OpenVDB_LIBRARY_DIR ${OPENVDB_LOCATION}/${CMAKE_INSTALL_LIBDIR}
+ CACHE PATH "OpenVDB library directory" )
+
+ FIND_LIBRARY( OpenVDB_OPENVDB_LIBRARY openvdb
+diff -urN a/cmake/FindTBB.cmake b/cmake/FindTBB.cmake
+--- a/cmake/FindTBB.cmake 2018-04-10 19:22:17.000000000 +0100
++++ b/cmake/FindTBB.cmake 2018-08-07 21:11:48.477809067 +0100
+@@ -42,7 +42,7 @@
+
+ # SET ( TBB_FOUND FALSE )
+
+-FIND_PATH( TBB_LOCATION include/tbb/tbb.h
++FIND_PATH( TBB_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/tbb/tbb.h
+ "$ENV{TBB_ROOT}"
+ NO_DEFAULT_PATH
+ NO_CMAKE_ENVIRONMENT_PATH
+@@ -57,7 +57,7 @@
+
+ IF ( TBB_FOUND )
+
+- SET( TBB_INCLUDE_DIR "${TBB_LOCATION}/include" CACHE STRING "TBB include directory")
++ SET( TBB_INCLUDE_DIR "${TBB_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "TBB include directory")
+
+ IF (APPLE)
+ IF (TBB_FOR_CLANG)
+@@ -86,7 +86,7 @@
+ LIST ( APPEND TBB_LIBRARIES_LIST ${TBB_LIBRARY_PATH} ${TBBmx_LIBRARY_PATH} )
+ ELSE (APPLE)
+ # MESSAGE ( "CMAKE_COMPILER_IS_GNUCXX = ${CMAKE_COMPILER_IS_GNUCXX}")
+- SET ( TBB_LIBRARYDIR ${TBB_LOCATION}/lib CACHE STRING "TBB library directory")
++ SET ( TBB_LIBRARYDIR ${TBB_LOCATION}/${CMAKE_INSTALL_LIBDIR} CACHE STRING "TBB library directory")
+ IF (${CMAKE_COMPILER_IS_GNUCXX})
+ IF ( TBB_MATCH_COMPILER_VERSION )
+ STRING(REGEX MATCHALL "[0-9]+" GCC_VERSION_COMPONENTS ${CMAKE_CXX_COMPILER_VERSION})
+diff -urN a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2018-04-10 19:22:17.000000000 +0100
++++ b/CMakeLists.txt 2018-08-07 20:59:54.149613568 +0100
+@@ -32,6 +32,8 @@
+
+ ENABLE_TESTING()
+
++INCLUDE ( GNUInstallDirs )
++
+ find_program(CCACHE_FOUND ccache)
+ if(CCACHE_FOUND)
+ set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
+diff -urN a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt
+--- a/openvdb/CMakeLists.txt 2018-04-10 19:22:17.000000000 +0100
++++ b/openvdb/CMakeLists.txt 2018-08-07 21:21:02.352705838 +0100
+@@ -414,7 +414,7 @@
+ )
+
+ INSTALL ( CODE "EXECUTE_PROCESS(COMMAND \"${CMAKE_COMMAND}\" --build \"${PROJECT_BINARY_DIR}\" --target doc)")
+- INSTALL ( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html DESTINATION docs)
++ INSTALL ( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html DESTINATION ${CMAKE_INSTALL_DOCDIR})
+
+ ENDIF ()
+
+@@ -423,37 +423,37 @@
+ INSTALL ( TARGETS
+ vdb_view
+ DESTINATION
+- bin
++ ${CMAKE_INSTALL_BINDIR}
+ )
+ ENDIF ()
+ INSTALL ( TARGETS
+ vdb_print
+ vdb_render
+ DESTINATION
+- bin
++ ${CMAKE_INSTALL_BINDIR}
+ )
+
+ INSTALL ( TARGETS
+ openvdb_static
+ DESTINATION
+- lib
++ ${CMAKE_INSTALL_LIBDIR}
+ )
+
+ IF (WIN32)
+ INSTALL ( TARGETS
+ openvdb_shared
+- RUNTIME DESTINATION bin COMPONENT Runtime
+- ARCHIVE DESTINATION lib COMPONENT Runtime
++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Runtime
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Runtime
+ )
+ ELSE()
+ INSTALL ( TARGETS
+ openvdb_shared
+ DESTINATION
+- lib
++ ${CMAKE_INSTALL_LIBDIR}
+ )
+ ENDIF ()
+
+-INSTALL ( DIRECTORY ${PROJECT_SOURCE_DIR} DESTINATION include
++INSTALL ( DIRECTORY ${PROJECT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+ FILES_MATCHING PATTERN "*.h"
+ PATTERN "python" EXCLUDE
+ PATTERN "cmd" EXCLUDE
+diff -urN a/openvdb/python/CMakeLists.txt b/openvdb/python/CMakeLists.txt
+--- a/openvdb/python/CMakeLists.txt 2018-04-10 19:22:17.000000000 +0100
++++ b/openvdb/python/CMakeLists.txt 2018-08-07 21:20:56.549685541 +0100
+@@ -54,10 +54,12 @@
+ pyVec3Grid.cc
+ )
+
+-SET ( PYOPENVDB_INSTALL_DIRECTORY
+- lib/python${OPENVDB_PYTHON_VERSION_MAJOR}.${OPENVDB_PYTHON_VERSION_MINOR}
+- CACHE STRING "The directory to install the pyopenvdb.so module."
+- )
++IF ( NOT DEFINED PYOPENVDB_INSTALL_DIRECTORY )
++ SET ( PYOPENVDB_INSTALL_DIRECTORY
++ lib/python${OPENVDB_PYTHON_VERSION_MAJOR}.${OPENVDB_PYTHON_VERSION_MINOR}
++ CACHE STRING "The directory to install the pyopenvdb.so module."
++ )
++ENDIF ( NOT DEFINED PYOPENVDB_INSTALL_DIRECTORY )
+
+ SET_SOURCE_FILES_PROPERTIES ( ${OPENVDB_PYTHON_MODULE_SOURCE_FILES}
+ PROPERTIES
+@@ -110,6 +112,6 @@
+ ${PYOPENVDB_INSTALL_DIRECTORY}
+ )
+
+-INSTALL ( DIRECTORY ${PROJECT_SOURCE_DIR} DESTINATION include
++INSTALL ( DIRECTORY ${PROJECT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+ FILES_MATCHING PATTERN "*.h"
+ )
diff --git a/media-gfx/openvdb/files/openvdb-5.1.0-use-pkgconfig-for-ilmbase-and-openexr.patch b/media-gfx/openvdb/files/openvdb-5.1.0-use-pkgconfig-for-ilmbase-and-openexr.patch
new file mode 100644
index 00000000000..c2ecac0bf82
--- /dev/null
+++ b/media-gfx/openvdb/files/openvdb-5.1.0-use-pkgconfig-for-ilmbase-and-openexr.patch
@@ -0,0 +1,93 @@
+diff -urN a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt
+--- a/openvdb/CMakeLists.txt 2018-08-07 21:21:02.000000000 +0100
++++ b/openvdb/CMakeLists.txt 2018-08-07 21:47:02.355277361 +0100
+@@ -83,11 +83,12 @@
+ ADD_DEFINITIONS ( -DBOOST_ALL_NO_LIB )
+ ENDIF ()
+
++FIND_PACKAGE ( PkgConfig REQUIRED )
+ FIND_PACKAGE ( Blosc REQUIRED )
+ FIND_PACKAGE ( TBB REQUIRED )
+ FIND_PACKAGE ( ZLIB REQUIRED )
+-FIND_PACKAGE ( ILMBase REQUIRED )
+-FIND_PACKAGE ( OpenEXR REQUIRED )
++PKG_CHECK_MODULES ( ILMBASE_LIBS REQUIRED IlmBase )
++PKG_CHECK_MODULES ( OPENEXR_LIBS REQUIRED OpenEXR )
+ FIND_PACKAGE ( OpenGL REQUIRED )
+ IF (OPENVDB_BUILD_DOCS)
+ FIND_PACKAGE ( Doxygen REQUIRED )
+@@ -111,8 +112,8 @@
+ INCLUDE_DIRECTORIES ( SYSTEM ${ZLIB_INCLUDE_DIR} )
+ ENDIF ()
+
+-INCLUDE_DIRECTORIES ( SYSTEM ${ILMBASE_INCLUDE_DIRS} )
+-INCLUDE_DIRECTORIES ( SYSTEM ${OPENEXR_INCLUDE_DIRS} )
++INCLUDE_DIRECTORIES ( SYSTEM ${ILMBASE_LIBS_INCLUDE_DIRS} )
++INCLUDE_DIRECTORIES ( SYSTEM ${OPENEXR_LIBS_INCLUDE_DIRS} )
+ INCLUDE_DIRECTORIES ( SYSTEM ${GLFW_INCLUDE_DIRECTORY} )
+
+ IF (WIN32)
+@@ -184,7 +185,7 @@
+ ${Boost_IOSTREAMS_LIBRARY}
+ ${Boost_SYSTEM_LIBRARY}
+ ${Tbb_TBB_LIBRARY}
+- ${Ilmbase_HALF_LIBRARY}
++ ${ILMBASE_LIBS_LDFLAGS}
+ ${ZLIB_LIBRARY}
+ ${BLOSC_blosc_LIBRARY}
+ )
+@@ -192,7 +193,7 @@
+ ${Boost_IOSTREAMS_LIBRARY}
+ ${Boost_SYSTEM_LIBRARY}
+ ${Tbb_TBB_LIBRARY}
+- ${Ilmbase_HALF_LIBRARY}
++ ${ILMBASE_LIBS_LDFLAGS}
+ ${ZLIB_LIBRARY}
+ ${BLOSC_blosc_LIBRARY}
+ )
+@@ -246,9 +247,8 @@
+ openvdb_shared
+ ${CMAKE_THREAD_LIBS_INIT}
+ ${BLOSC_blosc_LIBRARY}
+- ${Openexr_ILMIMF_LIBRARY}
+- ${Ilmbase_ILMTHREAD_LIBRARY}
+- ${Ilmbase_IEX_LIBRARY}
++ ${OPENEXR_LIBS_LDFLAGS}
++ ${ILMBASE_LIBS_LDFLAGS}
+ m
+ stdc++
+ )
+diff -urN a/openvdb/python/CMakeLists.txt b/openvdb/python/CMakeLists.txt
+--- a/openvdb/python/CMakeLists.txt 2018-08-07 21:20:56.000000000 +0100
++++ b/openvdb/python/CMakeLists.txt 2018-08-07 21:31:55.508016795 +0100
+@@ -9,8 +9,8 @@
+ IF ( NOT OPENVDB_BUILD_CORE )
+ FIND_PACKAGE ( OpenVDB REQUIRED )
+
+- FIND_PACKAGE ( ILMBase REQUIRED )
+- FIND_PACKAGE ( OpenEXR REQUIRED )
++ PKG_CHECK_MODULES ( ILMBASE_LIBS REQUIRED IlmBase )
++ PKG_CHECK_MODULES ( OPENEXR_LIBS REQUIRED OpenEXR )
+ FIND_PACKAGE ( Blosc REQUIRED )
+ FIND_PACKAGE ( TBB REQUIRED )
+ FIND_PACKAGE ( ZLIB REQUIRED )
+@@ -29,8 +29,8 @@
+ SET ( OPENVDB_LIB openvdb_shared)
+ ENDIF ( NOT OPENVDB_BUILD_CORE )
+
+-INCLUDE_DIRECTORIES ( SYSTEM ${ILMBASE_INCLUDE_DIRS} )
+-INCLUDE_DIRECTORIES ( SYSTEM ${OPENEXR_INCLUDE_DIRS} )
++INCLUDE_DIRECTORIES ( SYSTEM ${ILMBASE_LIBS_INCLUDE_DIRS} )
++INCLUDE_DIRECTORIES ( SYSTEM ${OPENEXR_LIBS_INCLUDE_DIRS} )
+ INCLUDE_DIRECTORIES ( SYSTEM ${Boost_INCLUDE_DIR} )
+ INCLUDE_DIRECTORIES ( SYSTEM ${BLOSC_INCLUDE_DIR} )
+ INCLUDE_DIRECTORIES ( SYSTEM ${TBB_INCLUDE_DIR} )
+@@ -96,7 +96,7 @@
+ ${GLEW_GLEW_LIBRARY}
+ ${Boost_PYTHON_LIBRARY}
+ ${PYTHON_LIBRARY}
+- ${Ilmbase_HALF_LIBRARY}
++ ${ILMBASE_LIBS_LDFLAGS}
+ )
+
+ SET_TARGET_PROPERTIES ( pyopenvdb PROPERTIES
diff --git a/media-gfx/openvdb/openvdb-5.1.0.ebuild b/media-gfx/openvdb/openvdb-5.1.0.ebuild
new file mode 100644
index 00000000000..c93ccbfb940
--- /dev/null
+++ b/media-gfx/openvdb/openvdb-5.1.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+inherit cmake-utils flag-o-matic 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="doc python test"
+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/libXcursor
+ x11-libs/libXi
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ python? (
+ ${PYTHON_DEPS}
+ dev-python/numpy[${PYTHON_USEDEP}]
+ )"
+
+DEPEND="${RDEPEND}
+ dev-cpp/tbb
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen[latex] )
+ test? ( dev-util/cppunit )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.0.2-findboost-fix.patch"
+ "${FILESDIR}/${P}-use-gnuinstalldirs.patch"
+ "${FILESDIR}/${P}-use-pkgconfig-for-ilmbase-and-openexr.patch"
+)
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+ local myprefix="${EPREFIX}/usr/"
+
+ local mycmakeargs=(
+ -DBLOSC_LOCATION="${myprefix}"
+ -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+ -DGLFW3_LOCATION="${myprefix}"
+ -DOPENVDB_BUILD_DOCS=$(usex doc)
+ -DOPENVDB_BUILD_PYTHON_MODULE=$(usex python)
+ -DOPENVDB_BUILD_UNITTESTS=$(usex test)
+ -DOPENVDB_ENABLE_RPATH=OFF
+ -DTBB_LOCATION="${myprefix}"
+ -DUSE_GLFW3=ON
+ )
+
+ use python && mycmakeargs+=( -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)" )
+ use test && mycmakeargs+=( -DCPPUNIT_LOCATION="${myprefix}" )
+
+ cmake-utils_src_configure
+}
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/, media-gfx/openvdb/files/
@ 2018-08-28 14:43 Jonathan Scruggs
0 siblings, 0 replies; 21+ messages in thread
From: Jonathan Scruggs @ 2018-08-28 14:43 UTC (permalink / raw
To: gentoo-commits
commit: 9c2ee61a556c98be362dac911c952a11b1d6dd83
Author: Jonathan Scruggs <j.scruggs <AT> gmail <DOT> com>
AuthorDate: Tue Aug 28 13:22:57 2018 +0000
Commit: Jonathan Scruggs <dracwyrm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 28 14:42:46 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c2ee61a
media-gfx/openvdb: bump to version 5.2.0
Closes: https://github.com/gentoo/gentoo/pull/9720
media-gfx/openvdb/Manifest | 1 +
.../files/openvdb-5.2.0-use-gnuinstalldirs.patch | 312 +++++++++++++++++++++
...2.0-use-pkgconfig-for-ilmbase-and-openexr.patch | 93 ++++++
media-gfx/openvdb/metadata.xml | 7 +-
media-gfx/openvdb/openvdb-5.2.0.ebuild | 71 +++++
5 files changed, 480 insertions(+), 4 deletions(-)
diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest
index b37baf5dcfb..5c46e65dda8 100644
--- a/media-gfx/openvdb/Manifest
+++ b/media-gfx/openvdb/Manifest
@@ -2,3 +2,4 @@ DIST openvdb-4.0.2-patchset-01.tar.xz 16420 BLAKE2B 2f825532d83d3a6756454f164a06
DIST openvdb-4.0.2-patchset-02.tar.xz 12428 BLAKE2B 2684ddf010df975912fcfc8c4f944d9a9ba447b48750140b6c46db31d49297f7495e5c77e9d5b85af0b2e1d0c4987184865642dc95f1fb3e463e85ee5987d203 SHA512 04377d552e218a8eb31c43381ba32263ba206a0870dccda1bcc031863dfdbcc953da7ea89fd420dc1a338fbd6123ac30bac2039c0a2a01c1fa9253a3fdd0b54d
DIST openvdb-4.0.2.tar.gz 1689119 BLAKE2B dbc8d4ab44990440e201327d76bbf9bfe3e8f597505b1d008dedb95dc540277513f465d455079c59820acc5056c9a2edf56235e1097b6c73a1f7dd8c59609c15 SHA512 8e3e12583b81f9b9303b309e839c8321c67b67ff8a0e61bb56c87276bf25c0deff22f5a73c7c5b661b8e5df345bfdabfa6b0aea9bf16fce57d9c53a76751c75d
DIST openvdb-5.1.0.tar.gz 1739517 BLAKE2B e6ef09497d57dfd2069b8dd22856faa9dcc0591ca844b58c785ad0f2ab5b134d6c5278b0eb1820d2b7802303f1f073aea2380111ebda82ef04d7c503ba1d558b SHA512 c71d040a1862f5e31f084125e9695da3ebf171788956d7d4c16f99ead26a099a81d5a9c30ba2cc61f29e32e21f822796ae34f6c62496050894087735a19489f6
+DIST openvdb-5.2.0.tar.gz 1788969 BLAKE2B d146b78dd7db4936779ca214b1f7957d4868bf76aedb95c9a98e21d25983b750337a63bf4bc9ccb438b683988af7a3d708676dcf7b4662c84e4926e8000ceb68 SHA512 69e21190c27a055e476a319b0c2d961303fa2f3fec30bec93ed44072d01816ef89e5e8f0abfc3a22d1c73742aa31284c664596747b49cd985fea1a751776506e
diff --git a/media-gfx/openvdb/files/openvdb-5.2.0-use-gnuinstalldirs.patch b/media-gfx/openvdb/files/openvdb-5.2.0-use-gnuinstalldirs.patch
new file mode 100644
index 00000000000..d72f835adaa
--- /dev/null
+++ b/media-gfx/openvdb/files/openvdb-5.2.0-use-gnuinstalldirs.patch
@@ -0,0 +1,312 @@
+diff -urN a/cmake/FindBlosc.cmake b/cmake/FindBlosc.cmake
+--- a/cmake/FindBlosc.cmake 2018-08-13 16:33:07.000000000 +0100
++++ b/cmake/FindBlosc.cmake 2018-08-28 12:20:33.331930720 +0100
+@@ -37,7 +37,7 @@
+
+ FIND_PACKAGE ( PackageHandleStandardArgs )
+
+-FIND_PATH( BLOSC_LOCATION include/blosc.h
++FIND_PATH( BLOSC_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/blosc.h
+ "$ENV{BLOSC_ROOT}"
+ NO_DEFAULT_PATH
+ NO_SYSTEM_ENVIRONMENT_PATH
+@@ -49,7 +49,7 @@
+
+ IF ( BLOSC_FOUND )
+
+- SET ( BLOSC_LIBRARYDIR ${BLOSC_LOCATION}/lib
++ SET ( BLOSC_LIBRARYDIR ${BLOSC_LOCATION}/${CMAKE_INSTALL_LIBDIR}
+ CACHE STRING "Blosc library directories")
+
+ SET ( _blosc_library_name "blosc" )
+@@ -75,6 +75,6 @@
+ SET( CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_BACKUP} )
+ ENDIF()
+
+- SET( BLOSC_INCLUDE_DIR "${BLOSC_LOCATION}/include" CACHE STRING "Blosc include directory" )
++ SET( BLOSC_INCLUDE_DIR "${BLOSC_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "Blosc include directory" )
+
+ ENDIF ( BLOSC_FOUND )
+diff -urN a/cmake/FindCPPUnit.cmake b/cmake/FindCPPUnit.cmake
+--- a/cmake/FindCPPUnit.cmake 2018-08-13 16:33:07.000000000 +0100
++++ b/cmake/FindCPPUnit.cmake 2018-08-28 12:20:33.333930718 +0100
+@@ -38,7 +38,7 @@
+
+ FIND_PACKAGE ( PackageHandleStandardArgs )
+
+-FIND_PATH( CPPUNIT_LOCATION include/cppunit/Test.h
++FIND_PATH( CPPUNIT_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/cppunit/Test.h
+ "$ENV{CPPUNIT_ROOT}"
+ NO_DEFAULT_PATH
+ NO_CMAKE_ENVIRONMENT_PATH
+@@ -53,13 +53,13 @@
+
+ IF ( CPPUNIT_FOUND )
+
+- SET( CPPUNIT_INCLUDE_DIR "${CPPUNIT_LOCATION}/include" CACHE STRING "CPPUNIT include directory")
++ SET( CPPUNIT_INCLUDE_DIR "${CPPUNIT_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "CPPUNIT include directory")
+ IF (CPPUnit_USE_STATIC_LIBS)
+ SET( CPPUNIT_LIBRARY_NAME libcppunit.a)
+ ELSE ()
+ SET( CPPUNIT_LIBRARY_NAME cppunit)
+ ENDIF ()
+ FIND_LIBRARY ( CPPUnit_cppunit_LIBRARY ${CPPUNIT_LIBRARY_NAME}
+- PATHS ${CPPUNIT_LOCATION}/lib )
++ PATHS ${CPPUNIT_LOCATION}/${CMAKE_INSTALL_LIBDIR} )
+
+ ENDIF ( CPPUNIT_FOUND )
+diff -urN a/cmake/FindGLEW.cmake b/cmake/FindGLEW.cmake
+--- a/cmake/FindGLEW.cmake 2018-08-13 16:33:07.000000000 +0100
++++ b/cmake/FindGLEW.cmake 2018-08-28 12:20:33.333930718 +0100
+@@ -39,7 +39,7 @@
+
+ FIND_PACKAGE ( PackageHandleStandardArgs )
+
+-FIND_PATH( GLEW_LOCATION include/GL/glew.h
++FIND_PATH( GLEW_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/GL/glew.h
+ "$ENV{GLEW_ROOT}"
+ NO_DEFAULT_PATH
+ NO_SYSTEM_ENVIRONMENT_PATH
+@@ -51,7 +51,7 @@
+
+ IF ( GLEW_LOCATION )
+
+- SET( GLEW_INCLUDE_DIR "${GLEW_LOCATION}/include" CACHE STRING "GLEW include path")
++ SET( GLEW_INCLUDE_DIR "${GLEW_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "GLEW include path")
+
+ SET ( ORIGINAL_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
+ IF (GLEW_USE_STATIC_LIBS)
+@@ -74,11 +74,11 @@
+ FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEW32MXS PATHS ${GLEW_LOCATION}/lib )
+ ELSE (APPLE)
+ SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
+- FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW PATHS ${GLEW_LOCATION}/lib
++ FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW PATHS ${GLEW_LOCATION}/${CMAKE_INSTALL_LIBDIR}
+ NO_DEFAULT_PATH
+ NO_SYSTEM_ENVIRONMENT_PATH
+ )
+- FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEWmx PATHS ${GLEW_LOCATION}/lib
++ FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEWmx PATHS ${GLEW_LOCATION}/${CMAKE_INSTALL_LIBDIR}
+ NO_DEFAULT_PATH
+ NO_SYSTEM_ENVIRONMENT_PATH
+ )
+@@ -107,11 +107,11 @@
+ )
+ ELSE (APPLE)
+ # Unices
+- FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW PATHS ${GLEW_LOCATION}/lib
++ FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW PATHS ${GLEW_LOCATION}/${CMAKE_INSTALL_LIBDIR}
+ NO_DEFAULT_PATH
+ NO_SYSTEM_ENVIRONMENT_PATH
+ )
+- FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEWmx PATHS ${GLEW_LOCATION}/lib
++ FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEWmx PATHS ${GLEW_LOCATION}/${CMAKE_INSTALL_LIBDIR}
+ NO_DEFAULT_PATH
+ NO_SYSTEM_ENVIRONMENT_PATH
+ )
+diff -urN a/cmake/FindGLFW3.cmake b/cmake/FindGLFW3.cmake
+--- a/cmake/FindGLFW3.cmake 2018-08-13 16:33:07.000000000 +0100
++++ b/cmake/FindGLFW3.cmake 2018-08-28 12:20:33.334930718 +0100
+@@ -39,7 +39,7 @@
+
+ FIND_PACKAGE ( PackageHandleStandardArgs )
+
+-FIND_PATH( GLFW3_LOCATION include/GLFW/glfw3.h
++FIND_PATH( GLFW3_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/GLFW/glfw3.h
+ "$ENV{GLFW3_ROOT}"
+ NO_DEFAULT_PATH
+ NO_SYSTEM_ENVIRONMENT_PATH
+@@ -50,11 +50,11 @@
+ )
+
+ IF (GLFW3_FOUND)
+- SET( GLFW3_INCLUDE_DIR "${GLFW3_LOCATION}/include" CACHE STRING "GLFW3 include path")
++ SET( GLFW3_INCLUDE_DIR "${GLFW3_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "GLFW3 include path")
+ SET (GLFW3_PATH_SUFFIXES x86_64-linux-gnu)
+ IF (GLFW3_USE_STATIC_LIBS)
+ FIND_LIBRARY ( GLFW3_glfw_LIBRARY glfw3
+- PATHS ${GLFW3_LOCATION}/lib
++ PATHS ${GLFW3_LOCATION}/${CMAKE_INSTALL_LIBDIR}
+ PATH_SUFFIXES ${GLFW3_PATH_SUFFIXES}
+ NO_DEFAULT_PATH
+ NO_CMAKE_ENVIRONMENT_PATH
+@@ -64,7 +64,7 @@
+ )
+ ELSE (GLFW3_USE_STATIC_LIBS)
+ FIND_LIBRARY ( GLFW3_glfw_LIBRARY glfw
+- PATHS ${GLFW3_LOCATION}/lib
++ PATHS ${GLFW3_LOCATION}/${CMAKE_INSTALL_LIBDIR}
+ PATH_SUFFIXES ${GLFW3_PATH_SUFFIXES}
+ NO_DEFAULT_PATH
+ NO_CMAKE_ENVIRONMENT_PATH
+diff -urN a/cmake/FindGLFW.cmake b/cmake/FindGLFW.cmake
+--- a/cmake/FindGLFW.cmake 2018-08-13 16:33:07.000000000 +0100
++++ b/cmake/FindGLFW.cmake 2018-08-28 12:20:33.334930718 +0100
+@@ -38,12 +38,12 @@
+
+ SET ( GLFW_FOUND FALSE )
+
+-FIND_PATH( GLFW_LOCATION include/GL/glfw.h
++FIND_PATH( GLFW_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/GL/glfw.h
+ "$ENV{GLFW_ROOT}"
+ NO_SYSTEM_ENVIRONMENT_PATH
+ )
+
+-SET( GLFW_INCLUDE_DIR "${GLFW_LOCATION}/include" CACHE STRING "GLFW include path")
++SET( GLFW_INCLUDE_DIR "${GLFW_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "GLFW include path")
+
+ SET ( ORIGINAL_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
+ IF (GLFW_USE_STATIC_LIBS)
+@@ -61,7 +61,7 @@
+ FIND_LIBRARY ( GLFW_LIBRARY_PATH GLFW32S PATHS ${GLFW_LOCATION}/lib )
+ ELSE (APPLE)
+ SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
+- FIND_LIBRARY ( GLFW_LIBRARY_PATH glfw PATHS ${GLFW_LOCATION}/lib ${GLFW_LOCATION}/lib64
++ FIND_LIBRARY ( GLFW_LIBRARY_PATH glfw PATHS ${GLFW_LOCATION}/${CMAKE_INSTALL_LIBDIR}
+ NO_DEFAULT_PATH
+ NO_SYSTEM_ENVIRONMENT_PATH
+ )
+@@ -84,7 +84,7 @@
+ )
+ ELSE (APPLE)
+ # Unices
+- FIND_LIBRARY ( GLFW_LIBRARY_PATH glfw PATHS ${GLFW_LOCATION}/lib ${GLFW_LOCATION}/lib64
++ FIND_LIBRARY ( GLFW_LIBRARY_PATH glfw PATHS ${GLFW_LOCATION}/${CMAKE_INSTALL_LIBDIR}
+ NO_SYSTEM_ENVIRONMENT_PATH
+ )
+ ENDIF (APPLE)
+diff -urN a/cmake/FindOpenVDB.cmake b/cmake/FindOpenVDB.cmake
+--- a/cmake/FindOpenVDB.cmake 2018-08-13 16:33:07.000000000 +0100
++++ b/cmake/FindOpenVDB.cmake 2018-08-28 12:20:33.334930718 +0100
+@@ -45,7 +45,7 @@
+
+ FIND_PACKAGE( PackageHandleStandardArgs )
+
+-FIND_PATH( OPENVDB_LOCATION include/openvdb/version.h
++FIND_PATH( OPENVDB_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/openvdb/version.h
+ "$ENV{OPENVDB_ROOT}"
+ NO_DEFAULT_PATH
+ NO_SYSTEM_ENVIRONMENT_PATH
+@@ -56,10 +56,10 @@
+ )
+
+ IF( OpenVDB_FOUND )
+- SET( OpenVDB_INCLUDE_DIR ${OPENVDB_LOCATION}/include
++ SET( OpenVDB_INCLUDE_DIR ${OPENVDB_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}
+ CACHE PATH "OpenVDB include directory")
+
+- SET( OpenVDB_LIBRARY_DIR ${OPENVDB_LOCATION}/lib
++ SET( OpenVDB_LIBRARY_DIR ${OPENVDB_LOCATION}/${CMAKE_INSTALL_LIBDIR}
+ CACHE PATH "OpenVDB library directory" )
+
+ FIND_LIBRARY( OpenVDB_OPENVDB_LIBRARY openvdb
+diff -urN a/cmake/FindTBB.cmake b/cmake/FindTBB.cmake
+--- a/cmake/FindTBB.cmake 2018-08-13 16:33:07.000000000 +0100
++++ b/cmake/FindTBB.cmake 2018-08-28 12:20:33.335930717 +0100
+@@ -42,7 +42,7 @@
+
+ # SET ( TBB_FOUND FALSE )
+
+-FIND_PATH( TBB_LOCATION include/tbb/tbb.h
++FIND_PATH( TBB_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/tbb/tbb.h
+ "$ENV{TBB_ROOT}"
+ NO_DEFAULT_PATH
+ NO_CMAKE_ENVIRONMENT_PATH
+@@ -57,7 +57,7 @@
+
+ IF ( TBB_FOUND )
+
+- SET( TBB_INCLUDE_DIR "${TBB_LOCATION}/include" CACHE STRING "TBB include directory")
++ SET( TBB_INCLUDE_DIR "${TBB_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "TBB include directory")
+
+ IF (APPLE)
+ IF (TBB_FOR_CLANG)
+@@ -86,7 +86,7 @@
+ LIST ( APPEND TBB_LIBRARIES_LIST ${TBB_LIBRARY_PATH} ${TBBmx_LIBRARY_PATH} )
+ ELSE (APPLE)
+ # MESSAGE ( "CMAKE_COMPILER_IS_GNUCXX = ${CMAKE_COMPILER_IS_GNUCXX}")
+- SET ( TBB_LIBRARYDIR ${TBB_LOCATION}/lib CACHE STRING "TBB library directory")
++ SET ( TBB_LIBRARYDIR ${TBB_LOCATION}/${CMAKE_INSTALL_LIBDIR} CACHE STRING "TBB library directory")
+ IF (${CMAKE_COMPILER_IS_GNUCXX})
+ IF ( TBB_MATCH_COMPILER_VERSION )
+ STRING(REGEX MATCHALL "[0-9]+" GCC_VERSION_COMPONENTS ${CMAKE_CXX_COMPILER_VERSION})
+diff -urN a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2018-08-13 16:33:07.000000000 +0100
++++ b/CMakeLists.txt 2018-08-28 12:20:33.335930717 +0100
+@@ -32,6 +32,8 @@
+
+ ENABLE_TESTING()
+
++INCLUDE ( GNUInstallDirs )
++
+ find_program(CCACHE_FOUND ccache)
+ if(CCACHE_FOUND)
+ set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
+diff -urN a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt
+--- a/openvdb/CMakeLists.txt 2018-08-13 16:33:07.000000000 +0100
++++ b/openvdb/CMakeLists.txt 2018-08-28 12:20:33.335930717 +0100
+@@ -414,7 +414,7 @@
+ )
+
+ INSTALL ( CODE "EXECUTE_PROCESS(COMMAND \"${CMAKE_COMMAND}\" --build \"${PROJECT_BINARY_DIR}\" --target doc)")
+- INSTALL ( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html DESTINATION docs)
++ INSTALL ( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html DESTINATION ${CMAKE_INSTALL_DOCDIR})
+
+ ENDIF ()
+
+@@ -423,37 +423,37 @@
+ INSTALL ( TARGETS
+ vdb_view
+ DESTINATION
+- bin
++ ${CMAKE_INSTALL_BINDIR}
+ )
+ ENDIF ()
+ INSTALL ( TARGETS
+ vdb_print
+ vdb_render
+ DESTINATION
+- bin
++ ${CMAKE_INSTALL_BINDIR}
+ )
+
+ INSTALL ( TARGETS
+ openvdb_static
+ DESTINATION
+- lib
++ ${CMAKE_INSTALL_LIBDIR}
+ )
+
+ IF (WIN32)
+ INSTALL ( TARGETS
+ openvdb_shared
+- RUNTIME DESTINATION bin COMPONENT Runtime
+- ARCHIVE DESTINATION lib COMPONENT Runtime
++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Runtime
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Runtime
+ )
+ ELSE()
+ INSTALL ( TARGETS
+ openvdb_shared
+ DESTINATION
+- lib
++ ${CMAKE_INSTALL_LIBDIR}
+ )
+ ENDIF ()
+
+-INSTALL ( DIRECTORY ${PROJECT_SOURCE_DIR} DESTINATION include
++INSTALL ( DIRECTORY ${PROJECT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+ FILES_MATCHING PATTERN "*.h"
+ PATTERN "python" EXCLUDE
+ PATTERN "cmd" EXCLUDE
+diff -urN a/openvdb/python/CMakeLists.txt b/openvdb/python/CMakeLists.txt
+--- a/openvdb/python/CMakeLists.txt 2018-08-13 16:33:07.000000000 +0100
++++ b/openvdb/python/CMakeLists.txt 2018-08-28 12:20:33.336930716 +0100
+@@ -107,6 +107,6 @@
+ ${PYOPENVDB_INSTALL_DIRECTORY}
+ )
+
+-INSTALL ( DIRECTORY ${PROJECT_SOURCE_DIR} DESTINATION include
++INSTALL ( DIRECTORY ${PROJECT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+ FILES_MATCHING PATTERN "*.h"
+ )
diff --git a/media-gfx/openvdb/files/openvdb-5.2.0-use-pkgconfig-for-ilmbase-and-openexr.patch b/media-gfx/openvdb/files/openvdb-5.2.0-use-pkgconfig-for-ilmbase-and-openexr.patch
new file mode 100644
index 00000000000..c3999e54f9c
--- /dev/null
+++ b/media-gfx/openvdb/files/openvdb-5.2.0-use-pkgconfig-for-ilmbase-and-openexr.patch
@@ -0,0 +1,93 @@
+diff -urN a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt
+--- a/openvdb/CMakeLists.txt 2018-08-28 12:20:33.000000000 +0100
++++ b/openvdb/CMakeLists.txt 2018-08-28 12:25:19.807755722 +0100
+@@ -83,11 +83,12 @@
+ ADD_DEFINITIONS ( -DBOOST_ALL_NO_LIB )
+ ENDIF ()
+
++FIND_PACKAGE ( PkgConfig REQUIRED )
+ FIND_PACKAGE ( Blosc REQUIRED )
+ FIND_PACKAGE ( TBB REQUIRED )
+ FIND_PACKAGE ( ZLIB REQUIRED )
+-FIND_PACKAGE ( ILMBase REQUIRED )
+-FIND_PACKAGE ( OpenEXR REQUIRED )
++PKG_CHECK_MODULES ( ILMBASE_LIBS REQUIRED IlmBase )
++PKG_CHECK_MODULES ( OPENEXR_LIBS REQUIRED OpenEXR )
+ FIND_PACKAGE ( OpenGL REQUIRED )
+ IF (OPENVDB_BUILD_DOCS)
+ FIND_PACKAGE ( Doxygen REQUIRED )
+@@ -111,8 +112,8 @@
+ INCLUDE_DIRECTORIES ( SYSTEM ${ZLIB_INCLUDE_DIR} )
+ ENDIF ()
+
+-INCLUDE_DIRECTORIES ( SYSTEM ${ILMBASE_INCLUDE_DIRS} )
+-INCLUDE_DIRECTORIES ( SYSTEM ${OPENEXR_INCLUDE_DIRS} )
++INCLUDE_DIRECTORIES ( SYSTEM ${ILMBASE_LIBS_INCLUDE_DIRS} )
++INCLUDE_DIRECTORIES ( SYSTEM ${OPENEXR_LIBS_INCLUDE_DIRS} )
+ INCLUDE_DIRECTORIES ( SYSTEM ${GLFW_INCLUDE_DIRECTORY} )
+
+ IF (WIN32)
+@@ -184,7 +185,7 @@
+ ${Boost_IOSTREAMS_LIBRARY}
+ ${Boost_SYSTEM_LIBRARY}
+ ${Tbb_TBB_LIBRARY}
+- ${Ilmbase_HALF_LIBRARY}
++ ${ILMBASE_LIBS_LDFLAGS}
+ ${ZLIB_LIBRARY}
+ ${BLOSC_blosc_LIBRARY}
+ )
+@@ -192,7 +193,7 @@
+ ${Boost_IOSTREAMS_LIBRARY}
+ ${Boost_SYSTEM_LIBRARY}
+ ${Tbb_TBB_LIBRARY}
+- ${Ilmbase_HALF_LIBRARY}
++ ${ILMBASE_LIBS_LDFLAGS}
+ ${ZLIB_LIBRARY}
+ ${BLOSC_blosc_LIBRARY}
+ )
+@@ -246,9 +247,8 @@
+ openvdb_shared
+ ${CMAKE_THREAD_LIBS_INIT}
+ ${BLOSC_blosc_LIBRARY}
+- ${Openexr_ILMIMF_LIBRARY}
+- ${Ilmbase_ILMTHREAD_LIBRARY}
+- ${Ilmbase_IEX_LIBRARY}
++ ${OPENEXR_LIBS_LDFLAGS}
++ ${ILMBASE_LIBS_LDFLAGS}
+ m
+ stdc++
+ )
+diff -urN a/openvdb/python/CMakeLists.txt b/openvdb/python/CMakeLists.txt
+--- a/openvdb/python/CMakeLists.txt 2018-08-28 12:20:33.000000000 +0100
++++ b/openvdb/python/CMakeLists.txt 2018-08-28 12:25:19.808755721 +0100
+@@ -9,8 +9,8 @@
+ IF ( NOT OPENVDB_BUILD_CORE )
+ FIND_PACKAGE ( OpenVDB REQUIRED )
+
+- FIND_PACKAGE ( ILMBase REQUIRED )
+- FIND_PACKAGE ( OpenEXR REQUIRED )
++ PKG_CHECK_MODULES ( ILMBASE_LIBS REQUIRED IlmBase )
++ PKG_CHECK_MODULES ( OPENEXR_LIBS REQUIRED OpenEXR )
+ FIND_PACKAGE ( Blosc REQUIRED )
+ FIND_PACKAGE ( TBB REQUIRED )
+ FIND_PACKAGE ( ZLIB REQUIRED )
+@@ -29,8 +29,8 @@
+ SET ( OPENVDB_LIB openvdb_shared)
+ ENDIF ( NOT OPENVDB_BUILD_CORE )
+
+-INCLUDE_DIRECTORIES ( SYSTEM ${ILMBASE_INCLUDE_DIRS} )
+-INCLUDE_DIRECTORIES ( SYSTEM ${OPENEXR_INCLUDE_DIRS} )
++INCLUDE_DIRECTORIES ( SYSTEM ${ILMBASE_LIBS_INCLUDE_DIRS} )
++INCLUDE_DIRECTORIES ( SYSTEM ${OPENEXR_LIBS_INCLUDE_DIRS} )
+ INCLUDE_DIRECTORIES ( SYSTEM ${Boost_INCLUDE_DIR} )
+ INCLUDE_DIRECTORIES ( SYSTEM ${BLOSC_INCLUDE_DIR} )
+ INCLUDE_DIRECTORIES ( SYSTEM ${TBB_INCLUDE_DIR} )
+@@ -91,7 +91,7 @@
+ ${GLEW_GLEW_LIBRARY}
+ ${Boost_PYTHON_LIBRARY}
+ ${PYTHON_LIBRARY}
+- ${Ilmbase_HALF_LIBRARY}
++ ${ILMBASE_LIBS_LDFLAGS}
+ )
+
+ SET_TARGET_PROPERTIES ( pyopenvdb PROPERTIES
diff --git a/media-gfx/openvdb/metadata.xml b/media-gfx/openvdb/metadata.xml
index 71a04b9d558..b059b111063 100644
--- a/media-gfx/openvdb/metadata.xml
+++ b/media-gfx/openvdb/metadata.xml
@@ -9,10 +9,6 @@
<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
@@ -22,6 +18,9 @@
<flag restrict="<media-gfx/openvdb-5.0.0" name="abi3-compat">
Disables newer features to maintain compatibility with ABI3. Enabled by default.
</flag>
+ <flag restrict=">=media-gfx/openvdb-5.0.0" name="abi4-compat">
+ Disables newer features to maintain compatibility with ABI4. Enabled by default.
+ </flag>
</use>
<upstream>
<remote-id type="github">dreamworksanimation/openvdb</remote-id>
diff --git a/media-gfx/openvdb/openvdb-5.2.0.ebuild b/media-gfx/openvdb/openvdb-5.2.0.ebuild
new file mode 100644
index 00000000000..eb5d399b7a6
--- /dev/null
+++ b/media-gfx/openvdb/openvdb-5.2.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+inherit cmake-utils flag-o-matic 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="+abi4-compat doc python test"
+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/libXcursor
+ x11-libs/libXi
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ python? (
+ ${PYTHON_DEPS}
+ dev-python/numpy[${PYTHON_USEDEP}]
+ )"
+
+DEPEND="${RDEPEND}
+ dev-cpp/tbb
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen[latex] )
+ test? ( dev-util/cppunit )"
+
+PATCHES=( "${FILESDIR}/${P}-use-gnuinstalldirs.patch"
+ "${FILESDIR}/${P}-use-pkgconfig-for-ilmbase-and-openexr.patch"
+)
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+ local myprefix="${EPREFIX}/usr/"
+
+ local mycmakeargs=(
+ -DBLOSC_LOCATION="${myprefix}"
+ -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+ -DGLFW3_LOCATION="${myprefix}"
+ -DOPENVDB_ABI_VERSION_NUMBER=$(usex abi4-compat 4 5)
+ -DOPENVDB_BUILD_DOCS=$(usex doc)
+ -DOPENVDB_BUILD_PYTHON_MODULE=$(usex python)
+ -DOPENVDB_BUILD_UNITTESTS=$(usex test)
+ -DOPENVDB_ENABLE_RPATH=OFF
+ -DTBB_LOCATION="${myprefix}"
+ -DUSE_GLFW3=ON
+ )
+
+ use python && mycmakeargs+=( -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)" )
+ use test && mycmakeargs+=( -DCPPUNIT_LOCATION="${myprefix}" )
+
+ cmake-utils_src_configure
+}
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/, media-gfx/openvdb/files/
@ 2018-08-28 14:43 Jonathan Scruggs
0 siblings, 0 replies; 21+ messages in thread
From: Jonathan Scruggs @ 2018-08-28 14:43 UTC (permalink / raw
To: gentoo-commits
commit: fc4930db846af69d1e023214daebcb0ff359470c
Author: Jonathan Scruggs <j.scruggs <AT> gmail <DOT> com>
AuthorDate: Tue Aug 28 13:27:00 2018 +0000
Commit: Jonathan Scruggs <dracwyrm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 28 14:42:53 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc4930db
media-gfx/openvdb: remove version 5.1.0
media-gfx/openvdb/Manifest | 1 -
.../files/openvdb-5.1.0-use-gnuinstalldirs.patch | 327 ---------------------
...1.0-use-pkgconfig-for-ilmbase-and-openexr.patch | 93 ------
media-gfx/openvdb/openvdb-5.1.0.ebuild | 72 -----
4 files changed, 493 deletions(-)
diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest
index 5c46e65dda8..fea2b25cc35 100644
--- a/media-gfx/openvdb/Manifest
+++ b/media-gfx/openvdb/Manifest
@@ -1,5 +1,4 @@
DIST openvdb-4.0.2-patchset-01.tar.xz 16420 BLAKE2B 2f825532d83d3a6756454f164a0608cfa776c1d4472cb4b25e4dad20d3c9648a952deef87ed0e24ce5f7c927c02da8cca76c829eafe1e2bb47fca061541668b3 SHA512 e9399d245d5e2b4130576d688691ac965f031b957df7803b8859f863634b27987c33aabadc5fb463b9d3eec333be84b89cb619dce5bc81c0390d8fb19da830c3
DIST openvdb-4.0.2-patchset-02.tar.xz 12428 BLAKE2B 2684ddf010df975912fcfc8c4f944d9a9ba447b48750140b6c46db31d49297f7495e5c77e9d5b85af0b2e1d0c4987184865642dc95f1fb3e463e85ee5987d203 SHA512 04377d552e218a8eb31c43381ba32263ba206a0870dccda1bcc031863dfdbcc953da7ea89fd420dc1a338fbd6123ac30bac2039c0a2a01c1fa9253a3fdd0b54d
DIST openvdb-4.0.2.tar.gz 1689119 BLAKE2B dbc8d4ab44990440e201327d76bbf9bfe3e8f597505b1d008dedb95dc540277513f465d455079c59820acc5056c9a2edf56235e1097b6c73a1f7dd8c59609c15 SHA512 8e3e12583b81f9b9303b309e839c8321c67b67ff8a0e61bb56c87276bf25c0deff22f5a73c7c5b661b8e5df345bfdabfa6b0aea9bf16fce57d9c53a76751c75d
-DIST openvdb-5.1.0.tar.gz 1739517 BLAKE2B e6ef09497d57dfd2069b8dd22856faa9dcc0591ca844b58c785ad0f2ab5b134d6c5278b0eb1820d2b7802303f1f073aea2380111ebda82ef04d7c503ba1d558b SHA512 c71d040a1862f5e31f084125e9695da3ebf171788956d7d4c16f99ead26a099a81d5a9c30ba2cc61f29e32e21f822796ae34f6c62496050894087735a19489f6
DIST openvdb-5.2.0.tar.gz 1788969 BLAKE2B d146b78dd7db4936779ca214b1f7957d4868bf76aedb95c9a98e21d25983b750337a63bf4bc9ccb438b683988af7a3d708676dcf7b4662c84e4926e8000ceb68 SHA512 69e21190c27a055e476a319b0c2d961303fa2f3fec30bec93ed44072d01816ef89e5e8f0abfc3a22d1c73742aa31284c664596747b49cd985fea1a751776506e
diff --git a/media-gfx/openvdb/files/openvdb-5.1.0-use-gnuinstalldirs.patch b/media-gfx/openvdb/files/openvdb-5.1.0-use-gnuinstalldirs.patch
deleted file mode 100644
index 791e0557872..00000000000
--- a/media-gfx/openvdb/files/openvdb-5.1.0-use-gnuinstalldirs.patch
+++ /dev/null
@@ -1,327 +0,0 @@
-diff -urN a/cmake/FindBlosc.cmake b/cmake/FindBlosc.cmake
---- a/cmake/FindBlosc.cmake 2018-04-10 19:22:17.000000000 +0100
-+++ b/cmake/FindBlosc.cmake 2018-08-07 21:01:16.869879255 +0100
-@@ -37,7 +37,7 @@
-
- FIND_PACKAGE ( PackageHandleStandardArgs )
-
--FIND_PATH( BLOSC_LOCATION include/blosc.h
-+FIND_PATH( BLOSC_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/blosc.h
- "$ENV{BLOSC_ROOT}"
- NO_DEFAULT_PATH
- NO_SYSTEM_ENVIRONMENT_PATH
-@@ -49,7 +49,7 @@
-
- IF ( BLOSC_FOUND )
-
-- SET ( BLOSC_LIBRARYDIR ${BLOSC_LOCATION}/lib
-+ SET ( BLOSC_LIBRARYDIR ${BLOSC_LOCATION}/${CMAKE_INSTALL_LIBDIR}
- CACHE STRING "Blosc library directories")
-
- SET ( _blosc_library_name "blosc" )
-@@ -75,6 +75,6 @@
- SET( CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_BACKUP} )
- ENDIF()
-
-- SET( BLOSC_INCLUDE_DIR "${BLOSC_LOCATION}/include" CACHE STRING "Blosc include directory" )
-+ SET( BLOSC_INCLUDE_DIR "${BLOSC_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "Blosc include directory" )
-
- ENDIF ( BLOSC_FOUND )
-diff -urN a/cmake/FindCPPUnit.cmake b/cmake/FindCPPUnit.cmake
---- a/cmake/FindCPPUnit.cmake 2018-04-10 19:22:17.000000000 +0100
-+++ b/cmake/FindCPPUnit.cmake 2018-08-07 21:02:15.421037954 +0100
-@@ -38,7 +38,7 @@
-
- FIND_PACKAGE ( PackageHandleStandardArgs )
-
--FIND_PATH( CPPUNIT_LOCATION include/cppunit/Test.h
-+FIND_PATH( CPPUNIT_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/cppunit/Test.h
- "$ENV{CPPUNIT_ROOT}"
- NO_DEFAULT_PATH
- NO_CMAKE_ENVIRONMENT_PATH
-@@ -53,13 +53,13 @@
-
- IF ( CPPUNIT_FOUND )
-
-- SET( CPPUNIT_INCLUDE_DIR "${CPPUNIT_LOCATION}/include" CACHE STRING "CPPUNIT include directory")
-+ SET( CPPUNIT_INCLUDE_DIR "${CPPUNIT_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "CPPUNIT include directory")
- IF (CPPUnit_USE_STATIC_LIBS)
- SET( CPPUNIT_LIBRARY_NAME libcppunit.a)
- ELSE ()
- SET( CPPUNIT_LIBRARY_NAME cppunit)
- ENDIF ()
- FIND_LIBRARY ( CPPUnit_cppunit_LIBRARY ${CPPUNIT_LIBRARY_NAME}
-- PATHS ${CPPUNIT_LOCATION}/lib )
-+ PATHS ${CPPUNIT_LOCATION}/${CMAKE_INSTALL_LIBDIR} )
-
- ENDIF ( CPPUNIT_FOUND )
-diff -urN a/cmake/FindGLEW.cmake b/cmake/FindGLEW.cmake
---- a/cmake/FindGLEW.cmake 2018-04-10 19:22:17.000000000 +0100
-+++ b/cmake/FindGLEW.cmake 2018-08-07 21:04:32.804431135 +0100
-@@ -39,7 +39,7 @@
-
- FIND_PACKAGE ( PackageHandleStandardArgs )
-
--FIND_PATH( GLEW_LOCATION include/GL/glew.h
-+FIND_PATH( GLEW_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/GL/glew.h
- "$ENV{GLEW_ROOT}"
- NO_DEFAULT_PATH
- NO_SYSTEM_ENVIRONMENT_PATH
-@@ -51,7 +51,7 @@
-
- IF ( GLEW_LOCATION )
-
-- SET( GLEW_INCLUDE_DIR "${GLEW_LOCATION}/include" CACHE STRING "GLEW include path")
-+ SET( GLEW_INCLUDE_DIR "${GLEW_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "GLEW include path")
-
- SET ( ORIGINAL_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
- IF (GLEW_USE_STATIC_LIBS)
-@@ -74,11 +74,11 @@
- FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEW32MXS PATHS ${GLEW_LOCATION}/lib )
- ELSE (APPLE)
- SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
-- FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW PATHS ${GLEW_LOCATION}/lib
-+ FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW PATHS ${GLEW_LOCATION}/${CMAKE_INSTALL_LIBDIR}
- NO_DEFAULT_PATH
- NO_SYSTEM_ENVIRONMENT_PATH
- )
-- FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEWmx PATHS ${GLEW_LOCATION}/lib
-+ FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEWmx PATHS ${GLEW_LOCATION}/${CMAKE_INSTALL_LIBDIR}
- NO_DEFAULT_PATH
- NO_SYSTEM_ENVIRONMENT_PATH
- )
-@@ -107,11 +107,11 @@
- )
- ELSE (APPLE)
- # Unices
-- FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW PATHS ${GLEW_LOCATION}/lib
-+ FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW PATHS ${GLEW_LOCATION}/${CMAKE_INSTALL_LIBDIR}
- NO_DEFAULT_PATH
- NO_SYSTEM_ENVIRONMENT_PATH
- )
-- FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEWmx PATHS ${GLEW_LOCATION}/lib
-+ FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEWmx PATHS ${GLEW_LOCATION}/${CMAKE_INSTALL_LIBDIR}
- NO_DEFAULT_PATH
- NO_SYSTEM_ENVIRONMENT_PATH
- )
-diff -urN a/cmake/FindGLFW3.cmake b/cmake/FindGLFW3.cmake
---- a/cmake/FindGLFW3.cmake 2018-04-10 19:22:17.000000000 +0100
-+++ b/cmake/FindGLFW3.cmake 2018-08-07 21:07:24.458954825 +0100
-@@ -39,7 +39,7 @@
-
- FIND_PACKAGE ( PackageHandleStandardArgs )
-
--FIND_PATH( GLFW3_LOCATION include/GLFW/glfw3.h
-+FIND_PATH( GLFW3_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/GLFW/glfw3.h
- "$ENV{GLFW3_ROOT}"
- NO_DEFAULT_PATH
- NO_SYSTEM_ENVIRONMENT_PATH
-@@ -50,9 +50,9 @@
- )
-
- IF (GLFW3_FOUND)
-- SET( GLFW3_INCLUDE_DIR "${GLFW3_LOCATION}/include" CACHE STRING "GLFW3 include path")
-+ SET( GLFW3_INCLUDE_DIR "${GLFW3_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "GLFW3 include path")
- IF (GLFW3_USE_STATIC_LIBS)
-- FIND_LIBRARY ( GLFW3_glfw_LIBRARY glfw3 ${GLFW3_LOCATION}/lib
-+ FIND_LIBRARY ( GLFW3_glfw_LIBRARY glfw3 ${GLFW3_LOCATION}/${CMAKE_INSTALL_LIBDIR}
- NO_DEFAULT_PATH
- NO_CMAKE_ENVIRONMENT_PATH
- NO_CMAKE_PATH
-@@ -60,7 +60,7 @@
- NO_CMAKE_SYSTEM_PATH
- )
- ELSE (GLFW3_USE_STATIC_LIBS)
-- FIND_LIBRARY ( GLFW3_glfw_LIBRARY glfw ${GLFW3_LOCATION}/lib
-+ FIND_LIBRARY ( GLFW3_glfw_LIBRARY glfw ${GLFW3_LOCATION}/${CMAKE_INSTALL_LIBDIR}
- NO_DEFAULT_PATH
- NO_CMAKE_ENVIRONMENT_PATH
- NO_CMAKE_PATH
-diff -urN a/cmake/FindGLFW.cmake b/cmake/FindGLFW.cmake
---- a/cmake/FindGLFW.cmake 2018-04-10 19:22:17.000000000 +0100
-+++ b/cmake/FindGLFW.cmake 2018-08-07 21:06:26.358774164 +0100
-@@ -38,12 +38,12 @@
-
- SET ( GLFW_FOUND FALSE )
-
--FIND_PATH( GLFW_LOCATION include/GL/glfw.h
-+FIND_PATH( GLFW_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/GL/glfw.h
- "$ENV{GLFW_ROOT}"
- NO_SYSTEM_ENVIRONMENT_PATH
- )
-
--SET( GLFW_INCLUDE_DIR "${GLFW_LOCATION}/include" CACHE STRING "GLFW include path")
-+SET( GLFW_INCLUDE_DIR "${GLFW_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "GLFW include path")
-
- SET ( ORIGINAL_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
- IF (GLFW_USE_STATIC_LIBS)
-@@ -61,7 +61,7 @@
- FIND_LIBRARY ( GLFW_LIBRARY_PATH GLFW32S PATHS ${GLFW_LOCATION}/lib )
- ELSE (APPLE)
- SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
-- FIND_LIBRARY ( GLFW_LIBRARY_PATH glfw PATHS ${GLFW_LOCATION}/lib ${GLFW_LOCATION}/lib64
-+ FIND_LIBRARY ( GLFW_LIBRARY_PATH glfw PATHS ${GLFW_LOCATION}/${CMAKE_INSTALL_LIBDIR}
- NO_DEFAULT_PATH
- NO_SYSTEM_ENVIRONMENT_PATH
- )
-@@ -84,7 +84,7 @@
- )
- ELSE (APPLE)
- # Unices
-- FIND_LIBRARY ( GLFW_LIBRARY_PATH glfw PATHS ${GLFW_LOCATION}/lib ${GLFW_LOCATION}/lib64
-+ FIND_LIBRARY ( GLFW_LIBRARY_PATH glfw PATHS ${GLFW_LOCATION}/${CMAKE_INSTALL_LIBDIR}
- NO_SYSTEM_ENVIRONMENT_PATH
- )
- ENDIF (APPLE)
-diff -urN a/cmake/FindOpenVDB.cmake b/cmake/FindOpenVDB.cmake
---- a/cmake/FindOpenVDB.cmake 2018-04-10 19:22:17.000000000 +0100
-+++ b/cmake/FindOpenVDB.cmake 2018-08-07 21:10:41.640588458 +0100
-@@ -45,7 +45,7 @@
-
- FIND_PACKAGE( PackageHandleStandardArgs )
-
--FIND_PATH( OPENVDB_LOCATION include/openvdb/version.h
-+FIND_PATH( OPENVDB_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/openvdb/version.h
- "$ENV{OPENVDB_ROOT}"
- NO_DEFAULT_PATH
- NO_SYSTEM_ENVIRONMENT_PATH
-@@ -56,10 +56,10 @@
- )
-
- IF( OpenVDB_FOUND )
-- SET( OpenVDB_INCLUDE_DIR ${OPENVDB_LOCATION}/include
-+ SET( OpenVDB_INCLUDE_DIR ${OPENVDB_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}
- CACHE PATH "OpenVDB include directory")
-
-- SET( OpenVDB_LIBRARY_DIR ${OPENVDB_LOCATION}/lib
-+ SET( OpenVDB_LIBRARY_DIR ${OPENVDB_LOCATION}/${CMAKE_INSTALL_LIBDIR}
- CACHE PATH "OpenVDB library directory" )
-
- FIND_LIBRARY( OpenVDB_OPENVDB_LIBRARY openvdb
-diff -urN a/cmake/FindTBB.cmake b/cmake/FindTBB.cmake
---- a/cmake/FindTBB.cmake 2018-04-10 19:22:17.000000000 +0100
-+++ b/cmake/FindTBB.cmake 2018-08-07 21:11:48.477809067 +0100
-@@ -42,7 +42,7 @@
-
- # SET ( TBB_FOUND FALSE )
-
--FIND_PATH( TBB_LOCATION include/tbb/tbb.h
-+FIND_PATH( TBB_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/tbb/tbb.h
- "$ENV{TBB_ROOT}"
- NO_DEFAULT_PATH
- NO_CMAKE_ENVIRONMENT_PATH
-@@ -57,7 +57,7 @@
-
- IF ( TBB_FOUND )
-
-- SET( TBB_INCLUDE_DIR "${TBB_LOCATION}/include" CACHE STRING "TBB include directory")
-+ SET( TBB_INCLUDE_DIR "${TBB_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "TBB include directory")
-
- IF (APPLE)
- IF (TBB_FOR_CLANG)
-@@ -86,7 +86,7 @@
- LIST ( APPEND TBB_LIBRARIES_LIST ${TBB_LIBRARY_PATH} ${TBBmx_LIBRARY_PATH} )
- ELSE (APPLE)
- # MESSAGE ( "CMAKE_COMPILER_IS_GNUCXX = ${CMAKE_COMPILER_IS_GNUCXX}")
-- SET ( TBB_LIBRARYDIR ${TBB_LOCATION}/lib CACHE STRING "TBB library directory")
-+ SET ( TBB_LIBRARYDIR ${TBB_LOCATION}/${CMAKE_INSTALL_LIBDIR} CACHE STRING "TBB library directory")
- IF (${CMAKE_COMPILER_IS_GNUCXX})
- IF ( TBB_MATCH_COMPILER_VERSION )
- STRING(REGEX MATCHALL "[0-9]+" GCC_VERSION_COMPONENTS ${CMAKE_CXX_COMPILER_VERSION})
-diff -urN a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt 2018-04-10 19:22:17.000000000 +0100
-+++ b/CMakeLists.txt 2018-08-07 20:59:54.149613568 +0100
-@@ -32,6 +32,8 @@
-
- ENABLE_TESTING()
-
-+INCLUDE ( GNUInstallDirs )
-+
- find_program(CCACHE_FOUND ccache)
- if(CCACHE_FOUND)
- set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
-diff -urN a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt
---- a/openvdb/CMakeLists.txt 2018-04-10 19:22:17.000000000 +0100
-+++ b/openvdb/CMakeLists.txt 2018-08-07 21:21:02.352705838 +0100
-@@ -414,7 +414,7 @@
- )
-
- INSTALL ( CODE "EXECUTE_PROCESS(COMMAND \"${CMAKE_COMMAND}\" --build \"${PROJECT_BINARY_DIR}\" --target doc)")
-- INSTALL ( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html DESTINATION docs)
-+ INSTALL ( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html DESTINATION ${CMAKE_INSTALL_DOCDIR})
-
- ENDIF ()
-
-@@ -423,37 +423,37 @@
- INSTALL ( TARGETS
- vdb_view
- DESTINATION
-- bin
-+ ${CMAKE_INSTALL_BINDIR}
- )
- ENDIF ()
- INSTALL ( TARGETS
- vdb_print
- vdb_render
- DESTINATION
-- bin
-+ ${CMAKE_INSTALL_BINDIR}
- )
-
- INSTALL ( TARGETS
- openvdb_static
- DESTINATION
-- lib
-+ ${CMAKE_INSTALL_LIBDIR}
- )
-
- IF (WIN32)
- INSTALL ( TARGETS
- openvdb_shared
-- RUNTIME DESTINATION bin COMPONENT Runtime
-- ARCHIVE DESTINATION lib COMPONENT Runtime
-+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Runtime
-+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Runtime
- )
- ELSE()
- INSTALL ( TARGETS
- openvdb_shared
- DESTINATION
-- lib
-+ ${CMAKE_INSTALL_LIBDIR}
- )
- ENDIF ()
-
--INSTALL ( DIRECTORY ${PROJECT_SOURCE_DIR} DESTINATION include
-+INSTALL ( DIRECTORY ${PROJECT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
- FILES_MATCHING PATTERN "*.h"
- PATTERN "python" EXCLUDE
- PATTERN "cmd" EXCLUDE
-diff -urN a/openvdb/python/CMakeLists.txt b/openvdb/python/CMakeLists.txt
---- a/openvdb/python/CMakeLists.txt 2018-04-10 19:22:17.000000000 +0100
-+++ b/openvdb/python/CMakeLists.txt 2018-08-07 21:20:56.549685541 +0100
-@@ -54,10 +54,12 @@
- pyVec3Grid.cc
- )
-
--SET ( PYOPENVDB_INSTALL_DIRECTORY
-- lib/python${OPENVDB_PYTHON_VERSION_MAJOR}.${OPENVDB_PYTHON_VERSION_MINOR}
-- CACHE STRING "The directory to install the pyopenvdb.so module."
-- )
-+IF ( NOT DEFINED PYOPENVDB_INSTALL_DIRECTORY )
-+ SET ( PYOPENVDB_INSTALL_DIRECTORY
-+ lib/python${OPENVDB_PYTHON_VERSION_MAJOR}.${OPENVDB_PYTHON_VERSION_MINOR}
-+ CACHE STRING "The directory to install the pyopenvdb.so module."
-+ )
-+ENDIF ( NOT DEFINED PYOPENVDB_INSTALL_DIRECTORY )
-
- SET_SOURCE_FILES_PROPERTIES ( ${OPENVDB_PYTHON_MODULE_SOURCE_FILES}
- PROPERTIES
-@@ -110,6 +112,6 @@
- ${PYOPENVDB_INSTALL_DIRECTORY}
- )
-
--INSTALL ( DIRECTORY ${PROJECT_SOURCE_DIR} DESTINATION include
-+INSTALL ( DIRECTORY ${PROJECT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
- FILES_MATCHING PATTERN "*.h"
- )
diff --git a/media-gfx/openvdb/files/openvdb-5.1.0-use-pkgconfig-for-ilmbase-and-openexr.patch b/media-gfx/openvdb/files/openvdb-5.1.0-use-pkgconfig-for-ilmbase-and-openexr.patch
deleted file mode 100644
index c2ecac0bf82..00000000000
--- a/media-gfx/openvdb/files/openvdb-5.1.0-use-pkgconfig-for-ilmbase-and-openexr.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff -urN a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt
---- a/openvdb/CMakeLists.txt 2018-08-07 21:21:02.000000000 +0100
-+++ b/openvdb/CMakeLists.txt 2018-08-07 21:47:02.355277361 +0100
-@@ -83,11 +83,12 @@
- ADD_DEFINITIONS ( -DBOOST_ALL_NO_LIB )
- ENDIF ()
-
-+FIND_PACKAGE ( PkgConfig REQUIRED )
- FIND_PACKAGE ( Blosc REQUIRED )
- FIND_PACKAGE ( TBB REQUIRED )
- FIND_PACKAGE ( ZLIB REQUIRED )
--FIND_PACKAGE ( ILMBase REQUIRED )
--FIND_PACKAGE ( OpenEXR REQUIRED )
-+PKG_CHECK_MODULES ( ILMBASE_LIBS REQUIRED IlmBase )
-+PKG_CHECK_MODULES ( OPENEXR_LIBS REQUIRED OpenEXR )
- FIND_PACKAGE ( OpenGL REQUIRED )
- IF (OPENVDB_BUILD_DOCS)
- FIND_PACKAGE ( Doxygen REQUIRED )
-@@ -111,8 +112,8 @@
- INCLUDE_DIRECTORIES ( SYSTEM ${ZLIB_INCLUDE_DIR} )
- ENDIF ()
-
--INCLUDE_DIRECTORIES ( SYSTEM ${ILMBASE_INCLUDE_DIRS} )
--INCLUDE_DIRECTORIES ( SYSTEM ${OPENEXR_INCLUDE_DIRS} )
-+INCLUDE_DIRECTORIES ( SYSTEM ${ILMBASE_LIBS_INCLUDE_DIRS} )
-+INCLUDE_DIRECTORIES ( SYSTEM ${OPENEXR_LIBS_INCLUDE_DIRS} )
- INCLUDE_DIRECTORIES ( SYSTEM ${GLFW_INCLUDE_DIRECTORY} )
-
- IF (WIN32)
-@@ -184,7 +185,7 @@
- ${Boost_IOSTREAMS_LIBRARY}
- ${Boost_SYSTEM_LIBRARY}
- ${Tbb_TBB_LIBRARY}
-- ${Ilmbase_HALF_LIBRARY}
-+ ${ILMBASE_LIBS_LDFLAGS}
- ${ZLIB_LIBRARY}
- ${BLOSC_blosc_LIBRARY}
- )
-@@ -192,7 +193,7 @@
- ${Boost_IOSTREAMS_LIBRARY}
- ${Boost_SYSTEM_LIBRARY}
- ${Tbb_TBB_LIBRARY}
-- ${Ilmbase_HALF_LIBRARY}
-+ ${ILMBASE_LIBS_LDFLAGS}
- ${ZLIB_LIBRARY}
- ${BLOSC_blosc_LIBRARY}
- )
-@@ -246,9 +247,8 @@
- openvdb_shared
- ${CMAKE_THREAD_LIBS_INIT}
- ${BLOSC_blosc_LIBRARY}
-- ${Openexr_ILMIMF_LIBRARY}
-- ${Ilmbase_ILMTHREAD_LIBRARY}
-- ${Ilmbase_IEX_LIBRARY}
-+ ${OPENEXR_LIBS_LDFLAGS}
-+ ${ILMBASE_LIBS_LDFLAGS}
- m
- stdc++
- )
-diff -urN a/openvdb/python/CMakeLists.txt b/openvdb/python/CMakeLists.txt
---- a/openvdb/python/CMakeLists.txt 2018-08-07 21:20:56.000000000 +0100
-+++ b/openvdb/python/CMakeLists.txt 2018-08-07 21:31:55.508016795 +0100
-@@ -9,8 +9,8 @@
- IF ( NOT OPENVDB_BUILD_CORE )
- FIND_PACKAGE ( OpenVDB REQUIRED )
-
-- FIND_PACKAGE ( ILMBase REQUIRED )
-- FIND_PACKAGE ( OpenEXR REQUIRED )
-+ PKG_CHECK_MODULES ( ILMBASE_LIBS REQUIRED IlmBase )
-+ PKG_CHECK_MODULES ( OPENEXR_LIBS REQUIRED OpenEXR )
- FIND_PACKAGE ( Blosc REQUIRED )
- FIND_PACKAGE ( TBB REQUIRED )
- FIND_PACKAGE ( ZLIB REQUIRED )
-@@ -29,8 +29,8 @@
- SET ( OPENVDB_LIB openvdb_shared)
- ENDIF ( NOT OPENVDB_BUILD_CORE )
-
--INCLUDE_DIRECTORIES ( SYSTEM ${ILMBASE_INCLUDE_DIRS} )
--INCLUDE_DIRECTORIES ( SYSTEM ${OPENEXR_INCLUDE_DIRS} )
-+INCLUDE_DIRECTORIES ( SYSTEM ${ILMBASE_LIBS_INCLUDE_DIRS} )
-+INCLUDE_DIRECTORIES ( SYSTEM ${OPENEXR_LIBS_INCLUDE_DIRS} )
- INCLUDE_DIRECTORIES ( SYSTEM ${Boost_INCLUDE_DIR} )
- INCLUDE_DIRECTORIES ( SYSTEM ${BLOSC_INCLUDE_DIR} )
- INCLUDE_DIRECTORIES ( SYSTEM ${TBB_INCLUDE_DIR} )
-@@ -96,7 +96,7 @@
- ${GLEW_GLEW_LIBRARY}
- ${Boost_PYTHON_LIBRARY}
- ${PYTHON_LIBRARY}
-- ${Ilmbase_HALF_LIBRARY}
-+ ${ILMBASE_LIBS_LDFLAGS}
- )
-
- SET_TARGET_PROPERTIES ( pyopenvdb PROPERTIES
diff --git a/media-gfx/openvdb/openvdb-5.1.0.ebuild b/media-gfx/openvdb/openvdb-5.1.0.ebuild
deleted file mode 100644
index c93ccbfb940..00000000000
--- a/media-gfx/openvdb/openvdb-5.1.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit cmake-utils flag-o-matic 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="doc python test"
-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/libXcursor
- x11-libs/libXi
- x11-libs/libXinerama
- x11-libs/libXrandr
- python? (
- ${PYTHON_DEPS}
- dev-python/numpy[${PYTHON_USEDEP}]
- )"
-
-DEPEND="${RDEPEND}
- dev-cpp/tbb
- virtual/pkgconfig
- doc? ( app-doc/doxygen[latex] )
- test? ( dev-util/cppunit )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.0.2-findboost-fix.patch"
- "${FILESDIR}/${P}-use-gnuinstalldirs.patch"
- "${FILESDIR}/${P}-use-pkgconfig-for-ilmbase-and-openexr.patch"
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
- local myprefix="${EPREFIX}/usr/"
-
- local mycmakeargs=(
- -DBLOSC_LOCATION="${myprefix}"
- -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
- -DGLFW3_LOCATION="${myprefix}"
- -DOPENVDB_BUILD_DOCS=$(usex doc)
- -DOPENVDB_BUILD_PYTHON_MODULE=$(usex python)
- -DOPENVDB_BUILD_UNITTESTS=$(usex test)
- -DOPENVDB_ENABLE_RPATH=OFF
- -DTBB_LOCATION="${myprefix}"
- -DUSE_GLFW3=ON
- )
-
- use python && mycmakeargs+=( -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)" )
- use test && mycmakeargs+=( -DCPPUNIT_LOCATION="${myprefix}" )
-
- cmake-utils_src_configure
-}
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/, media-gfx/openvdb/files/
@ 2020-08-24 13:42 Sam James
0 siblings, 0 replies; 21+ messages in thread
From: Sam James @ 2020-08-24 13:42 UTC (permalink / raw
To: gentoo-commits
commit: e819fe84528199b19b564f48573b9b7b6b972b68
Author: Adrian Grigo <agrigo2001 <AT> yahoo <DOT> com <DOT> au>
AuthorDate: Tue Aug 18 08:14:26 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug 24 13:41:52 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e819fe84
media-gfx/openvdb: Add version 7.0.0
Blender builds against version 7.0.0, but does not build against
version 7.1.0 when linking against the openvdb headers,
complaining that make_unique is not in std, even though the file
includes memory.
Given that 7.0.0 is the last version of openvdb that still includes
ABI 5 compatiblity, it might be worthwhile to keep it around.
Signed-off-by: Adrian Grigo <agrigo2001 <AT> yahoo.com.au>
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-gfx/openvdb/Manifest | 1 +
.../files/openvdb-4.0.2-fix-build-docs.patch | 20 ++++
...-4.0.2-fix-const-correctness-for-unittest.patch | 33 +++++-
media-gfx/openvdb/openvdb-7.0.0.ebuild | 116 +++++++++++++++++++++
4 files changed, 165 insertions(+), 5 deletions(-)
diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest
index fa609180181..9a616a88aea 100644
--- a/media-gfx/openvdb/Manifest
+++ b/media-gfx/openvdb/Manifest
@@ -2,4 +2,5 @@ DIST openvdb-4.0.2-patchset-02.tar.xz 12428 BLAKE2B 2684ddf010df975912fcfc8c4f94
DIST openvdb-4.0.2.tar.gz 1689119 BLAKE2B dbc8d4ab44990440e201327d76bbf9bfe3e8f597505b1d008dedb95dc540277513f465d455079c59820acc5056c9a2edf56235e1097b6c73a1f7dd8c59609c15 SHA512 8e3e12583b81f9b9303b309e839c8321c67b67ff8a0e61bb56c87276bf25c0deff22f5a73c7c5b661b8e5df345bfdabfa6b0aea9bf16fce57d9c53a76751c75d
DIST openvdb-5.2.0.tar.gz 1788969 BLAKE2B d146b78dd7db4936779ca214b1f7957d4868bf76aedb95c9a98e21d25983b750337a63bf4bc9ccb438b683988af7a3d708676dcf7b4662c84e4926e8000ceb68 SHA512 69e21190c27a055e476a319b0c2d961303fa2f3fec30bec93ed44072d01816ef89e5e8f0abfc3a22d1c73742aa31284c664596747b49cd985fea1a751776506e
DIST openvdb-6.2.1.tar.gz 1935325 BLAKE2B 24ca340e513d2f22521994fbb2315a1c3f817bb35a7402ca481b12444e5ced58dfd773cc07b47a56d1ed9f6951e58cf1ef0b5c35917620b031383faed21c6557 SHA512 f5d830880316b5ca3921c77c75f3a254aba47d144ac6c0223fc2732d99cbd6b7ffb7f27049f8ab3760ad77b3658fc08a82728325ba753bc29932aa46336457de
+DIST openvdb-7.0.0.tar.gz 1872744 BLAKE2B e3a8c8d51f77e115d3d397abde0860a6322d56eb6c4795c1ba39539a23aab6cf37602ce7122965fbc3098b15b118b25010263f567e8003363b78c9b7d9d5dfd8 SHA512 f5321b22b10e192012d544cc02921d3d52f621778ec5aa21ba6d450f3e29f2fdbd76486ad390a0c008394dbc6ee4aeecc04527ef30e73adf71c1a08a021746b7
DIST openvdb-7.1.0.tar.gz 1956052 BLAKE2B 7778d67bcc65ecb17b86f6e67a9e5f2d6574de5869a0a9c675ad7bc8540154c0f249a91c68a9da9068a3951b3e919e5676450fcaf13921c6263e7c87012a2f29 SHA512 49806375f7e6d7b12eaba24e672a068531d2f8a05f12eba29069710d2682f9983f9e6ad26047eed4b28e337f8d0e738b90130582863c710e8dd1e720bf0addad
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
index 25597ec381d..cdbb9440a1a 100644
--- 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
@@ -1,3 +1,23 @@
+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. Otherwise it might be possible to fix it using a separate step
+in src_compile to build the documentation specifically, prior to running
+install.
+
+This has been tested and is required on 4.0.2 and 5.2.0, but is not
+needed in >=openvdb-6
+
+To reproduce the bug, enable the doc USE flag and emerge openvdb 4 or 5
+without this patch. The install fails as the doc file is missing.
+
+To show it is fixed. enable the doc USE flag and this patch and emerge
+again. The install succeeds and the documentation can be found at
+/usr/share/doc/openvdb-X
+
+Patch by Adrian Grigo
+
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
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
index 8d3ef59e3ab..ceda282a2bb 100644
--- 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
@@ -1,12 +1,35 @@
+Blosc changed the signature of blosc_compcode_to_compname in 1.15 so
+that the second parameter is now const char** not char **. This causes
+compile failures when using openvdb with earlier versions of blosc.
+
+The fix, which is backported from openvdb-7, is to check the blosc
+version and cast the char** to const char** for modern versions of
+blosc.
+
+The bug can be produced by emerging blosc 1.15+, and then openvdb.
+Without this patch, the compiler will fail with
+error: invalid conversion from ‘char**’ to ‘const char**’
+
+To test that the patch has been properly implemented, emerge modern
+blosc and then openvdb with this patch, and the compile will succeed.
+
+Fixes bug https://bugs.gentoo.org/734102
+Upstream commit https://github.com/AcademySoftwareFoundation/openvdb/commit/d2e8bd87a63d1e9f66a558ecbb6e6cbd54f7de13
+
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 @@
+--- a/openvdb/unittest/TestFile.cc 2020-08-19 01:32:17.137844464 +1000
++++ b/openvdb/unittest/TestFile.cc 2020-08-19 01:36:03.698539134 +1000
+@@ -2666,7 +2666,12 @@
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;
+- if (0 > blosc_compcode_to_compname(compcode, const_cast<const char **>(&compname))) continue;
++#if BLOSC_VERSION_MAJOR > 1 || (BLOSC_VERSION_MAJOR == 1 && BLOSC_VERSION_MINOR >= 15)
++ if (0 > blosc_compcode_to_compname(compcode, const_cast<const char**>(&compname)))
++#else
++ if (0 > blosc_compcode_to_compname(compcode, &compname))
++#endif
++ continue;
/// @todo This changes the compressor setting globally.
if (blosc_set_compressor(compname) < 0) continue;
diff --git a/media-gfx/openvdb/openvdb-7.0.0.ebuild b/media-gfx/openvdb/openvdb-7.0.0.ebuild
new file mode 100644
index 00000000000..12d084386ef
--- /dev/null
+++ b/media-gfx/openvdb/openvdb-7.0.0.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+PYTHON_COMPAT=( python3_{7,8} )
+
+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"
+KEYWORDS="~amd64 ~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} )
+"
+
+RDEPEND="
+ dev-libs/boost:=
+ dev-libs/c-blosc
+ dev-libs/jemalloc
+ dev-libs/log4cplus
+ media-libs/glfw:=
+ media-libs/openexr:=
+ 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_MULTI_USEDEP}]
+ numpy? ( dev-python/numpy[${PYTHON_MULTI_USEDEP}] )
+ ')
+ )
+"
+
+DEPEND="
+ ${RDEPEND}
+ dev-cpp/tbb
+ >=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"
+)
+
+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_PYTHON_MODULE=$(usex python)
+ -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
+ -DUSE_NUMPY=$(usex numpy)
+ -DPYOPENVDB_INSTALL_DIRECTORY="${python_get_sitedir}"
+ -DPython_EXECUTABLE="${PYTHON}"
+ )
+
+ 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] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/, media-gfx/openvdb/files/
@ 2020-08-24 13:42 Sam James
0 siblings, 0 replies; 21+ messages in thread
From: Sam James @ 2020-08-24 13:42 UTC (permalink / raw
To: gentoo-commits
commit: c91c00513d5e61359095c22d52072d726e5b7f49
Author: Adrian Grigo <agrigo2001 <AT> yahoo <DOT> com <DOT> au>
AuthorDate: Tue Aug 18 06:18:56 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug 24 13:41:51 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c91c0051
media-gfx/openvdb: Version bump to 6.2.1
Version bump to openvdb 6.2.1, requiring an additional use flag for
abi6-compat.
This version requires cmake 3.16 or higher.
Other changes:
* Compared to version 5, the gnuinstalldirs patch no longer needs
BLOSC_LOCATION, GLFW3_LOCATION or TBB_LOCATION so these have been
removed.
* The new multilib header patch needs to know the CHOST so it is set
in the arguments passed to cmake.
* USE_GLFW3 is no longer used by the build system so it has been
removed also.
* Update the github upstream source as dreamworksanimation now redirects to
AcademySoftwareFoundation.
Signed-off-by: Adrian Grigo <agrigo2001 <AT> yahoo.com.au>
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-gfx/openvdb/Manifest | 1 +
| 29 ++++++
.../files/openvdb-6.2.1-use-gnuinstalldirs.patch | 54 +++++++++++
media-gfx/openvdb/metadata.xml | 5 +-
media-gfx/openvdb/openvdb-6.2.1.ebuild | 100 +++++++++++++++++++++
5 files changed, 188 insertions(+), 1 deletion(-)
diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest
index fda421e16ae..f02f09bc37d 100644
--- a/media-gfx/openvdb/Manifest
+++ b/media-gfx/openvdb/Manifest
@@ -1,3 +1,4 @@
DIST openvdb-4.0.2-patchset-02.tar.xz 12428 BLAKE2B 2684ddf010df975912fcfc8c4f944d9a9ba447b48750140b6c46db31d49297f7495e5c77e9d5b85af0b2e1d0c4987184865642dc95f1fb3e463e85ee5987d203 SHA512 04377d552e218a8eb31c43381ba32263ba206a0870dccda1bcc031863dfdbcc953da7ea89fd420dc1a338fbd6123ac30bac2039c0a2a01c1fa9253a3fdd0b54d
DIST openvdb-4.0.2.tar.gz 1689119 BLAKE2B dbc8d4ab44990440e201327d76bbf9bfe3e8f597505b1d008dedb95dc540277513f465d455079c59820acc5056c9a2edf56235e1097b6c73a1f7dd8c59609c15 SHA512 8e3e12583b81f9b9303b309e839c8321c67b67ff8a0e61bb56c87276bf25c0deff22f5a73c7c5b661b8e5df345bfdabfa6b0aea9bf16fce57d9c53a76751c75d
DIST openvdb-5.2.0.tar.gz 1788969 BLAKE2B d146b78dd7db4936779ca214b1f7957d4868bf76aedb95c9a98e21d25983b750337a63bf4bc9ccb438b683988af7a3d708676dcf7b4662c84e4926e8000ceb68 SHA512 69e21190c27a055e476a319b0c2d961303fa2f3fec30bec93ed44072d01816ef89e5e8f0abfc3a22d1c73742aa31284c664596747b49cd985fea1a751776506e
+DIST openvdb-6.2.1.tar.gz 1935325 BLAKE2B 24ca340e513d2f22521994fbb2315a1c3f817bb35a7402ca481b12444e5ced58dfd773cc07b47a56d1ed9f6951e58cf1ef0b5c35917620b031383faed21c6557 SHA512 f5d830880316b5ca3921c77c75f3a254aba47d144ac6c0223fc2732d99cbd6b7ffb7f27049f8ab3760ad77b3658fc08a82728325ba753bc29932aa46336457de
--git a/media-gfx/openvdb/files/openvdb-6.2.1-fix-multilib-header-source.patch b/media-gfx/openvdb/files/openvdb-6.2.1-fix-multilib-header-source.patch
new file mode 100644
index 00000000000..c6e2bae5dfa
--- /dev/null
+++ b/media-gfx/openvdb/files/openvdb-6.2.1-fix-multilib-header-source.patch
@@ -0,0 +1,29 @@
+diff -Naur a/cmake/FindIlmBase.cmake b/cmake/FindIlmBase.cmake
+--- a/cmake/FindIlmBase.cmake 2020-02-02 01:03:55.000000000 +0800
++++ b/cmake/FindIlmBase.cmake 2020-02-02 01:09:05.000000000 +0800
+@@ -168,9 +168,15 @@
+ 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 @@
+ )
+ 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/media-gfx/openvdb/files/openvdb-6.2.1-use-gnuinstalldirs.patch b/media-gfx/openvdb/files/openvdb-6.2.1-use-gnuinstalldirs.patch
new file mode 100644
index 00000000000..ac73d82f9c3
--- /dev/null
+++ b/media-gfx/openvdb/files/openvdb-6.2.1-use-gnuinstalldirs.patch
@@ -0,0 +1,54 @@
+diff -Naur a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2020-01-08 22:16:00.493079361 +0800
++++ b/CMakeLists.txt 2020-01-08 22:16:44.790285583 +0800
+@@ -252,6 +252,8 @@
+
+ enable_testing()
+
++INCLUDE ( GNUInstallDirs )
++
+ # Add our cmake modules
+
+ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
+diff -Naur a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt
+--- a/openvdb/CMakeLists.txt 2020-01-08 22:16:07.362646127 +0800
++++ b/openvdb/CMakeLists.txt 2020-01-08 22:19:54.638308684 +0800
+@@ -492,7 +492,7 @@
+ install(TARGETS
+ openvdb_static
+ DESTINATION
+- lib
++ ${CMAKE_INSTALL_LIBDIR}
+ )
+ endif()
+
+@@ -500,14 +500,14 @@
+ if(WIN32)
+ install(TARGETS
+ openvdb_shared
+- RUNTIME DESTINATION bin COMPONENT Runtime
+- ARCHIVE DESTINATION lib COMPONENT Runtime
++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Runtime
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Runtime
+ )
+ else()
+ install(TARGETS
+ openvdb_shared
+ DESTINATION
+- lib
++ ${CMAKE_INSTALL_LIBDIR}
+ )
+ endif()
+ endif()
+diff -Naur a/openvdb/python/CMakeLists.txt b/openvdb/python/CMakeLists.txt
+--- a/openvdb/python/CMakeLists.txt 2020-01-08 22:16:14.452199013 +0800
++++ b/openvdb/python/CMakeLists.txt 2020-01-08 22:21:45.311324663 +0800
+@@ -232,7 +232,7 @@
+ ${PYOPENVDB_INSTALL_DIRECTORY}
+ )
+
+-install(FILES ${PYTHON_PUBLIC_INCLUDE_NAMES} DESTINATION include/openvdb/python)
++install(FILES ${PYTHON_PUBLIC_INCLUDE_NAMES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/openvdb/python)
+
+ # pytest
+
diff --git a/media-gfx/openvdb/metadata.xml b/media-gfx/openvdb/metadata.xml
index 43363d09c1a..58f434001fc 100644
--- a/media-gfx/openvdb/metadata.xml
+++ b/media-gfx/openvdb/metadata.xml
@@ -24,8 +24,11 @@
<flag restrict=">=media-gfx/openvdb-5.0.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>
</use>
<upstream>
- <remote-id type="github">dreamworksanimation/openvdb</remote-id>
+ <remote-id type="github">AcademySoftwareFoundation/openvdb</remote-id>
</upstream>
</pkgmetadata>
diff --git a/media-gfx/openvdb/openvdb-6.2.1.ebuild b/media-gfx/openvdb/openvdb-6.2.1.ebuild
new file mode 100644
index 00000000000..ec7599df5b9
--- /dev/null
+++ b/media-gfx/openvdb/openvdb-6.2.1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+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"
+KEYWORDS="~amd64 ~x86"
+IUSE="abi3-compat abi4-compat abi5-compat abi6-compat doc python test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+ python? ( ${PYTHON_REQUIRED_USE} )
+ ^^ ( abi3-compat abi4-compat abi5-compat abi6-compat )
+"
+
+RDEPEND="
+ dev-libs/boost:=
+ dev-libs/c-blosc
+ dev-libs/jemalloc
+ dev-libs/log4cplus
+ media-libs/glfw:=
+ media-libs/openexr:=
+ 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:=[python?,${PYTHON_MULTI_USEDEP}]
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+ ')
+ )"
+
+DEPEND="${RDEPEND}
+ >=dev-util/cmake-3.16.2-r1
+ dev-cpp/tbb
+ 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}-fix-multilib-header-source.patch"
+ "${FILESDIR}/${PN}-4.0.2-fix-const-correctness-for-unittest.patch"
+ "${FILESDIR}/${P}-use-gnuinstalldirs.patch"
+)
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+ local myprefix="${EPREFIX}/usr/"
+
+ local version
+ if use abi3-compat; then
+ version=3
+ elif use abi4-compat; then
+ version=4
+ elif use abi5-compat; then
+ version=5
+ elif use abi6-compat; then
+ version=6
+ else
+ die "Openvdb ABI version not specified"
+ fi
+
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+ -DOPENVDB_ABI_VERSION_NUMBER="${version}"
+ -DOPENVDB_BUILD_DOCS=$(usex doc)
+ -DOPENVDB_BUILD_PYTHON_MODULE=$(usex python)
+ -DOPENVDB_BUILD_UNITTESTS=$(usex test)
+ -DOPENVDB_ENABLE_RPATH=OFF
+ -DCHOST="${CHOST}"
+ )
+
+ use python && mycmakeargs+=( -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)" )
+ use test && mycmakeargs+=( -DCPPUNIT_LOCATION="${myprefix}" )
+
+ cmake_src_configure
+}
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/, media-gfx/openvdb/files/
@ 2020-08-24 13:42 Sam James
0 siblings, 0 replies; 21+ messages in thread
From: Sam James @ 2020-08-24 13:42 UTC (permalink / raw
To: gentoo-commits
commit: 97b1512e054c43c4b76d5ad620bafab8fdfef36b
Author: Adrian Grigo <agrigo2001 <AT> yahoo <DOT> com <DOT> au>
AuthorDate: Tue Aug 18 07:31:07 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug 24 13:41:52 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97b1512e
media-gfx/openvdb: Version bump to openvdb-7.1.0
This bumps the version of openvdb to 7.1.0
Upstream have deprecated ABI prior to 6 with this version.
It adds an abi7-compat USE flag to build against ABI 7, and makes use
of avx and sse4.2 cpu flags if set. There are additional use flags to
control building the utilities, and linking against numpy is now
optional. The library can also be built as a static library if desired.
Thanks to Bernd Waibel for some of the initial code and digging into
the available cmake build options.
Other changes:
* Similar to version 6, the gnuinstalldirs patch no longer needs
BLOSC_LOCATION, GLFW3_LOCATION or TBB_LOCATION so these have been
removed.
* The new multilib header patch needs to know the CHOST so it is set
in the arguments passed to cmake.
* USE_GLFW3 is no longer used by the build system so it has been
removed also.
Signed-off-by: Adrian Grigo <agrigo2001 <AT> yahoo.com.au>
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-gfx/openvdb/Manifest | 1 +
| 75 ++++++++++++++
.../openvdb-7.1.0-0002-Fix-doc-install-dir.patch | 25 +++++
media-gfx/openvdb/metadata.xml | 15 ++-
media-gfx/openvdb/openvdb-7.1.0.ebuild | 114 +++++++++++++++++++++
5 files changed, 227 insertions(+), 3 deletions(-)
diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest
index f02f09bc37d..fa609180181 100644
--- a/media-gfx/openvdb/Manifest
+++ b/media-gfx/openvdb/Manifest
@@ -2,3 +2,4 @@ DIST openvdb-4.0.2-patchset-02.tar.xz 12428 BLAKE2B 2684ddf010df975912fcfc8c4f94
DIST openvdb-4.0.2.tar.gz 1689119 BLAKE2B dbc8d4ab44990440e201327d76bbf9bfe3e8f597505b1d008dedb95dc540277513f465d455079c59820acc5056c9a2edf56235e1097b6c73a1f7dd8c59609c15 SHA512 8e3e12583b81f9b9303b309e839c8321c67b67ff8a0e61bb56c87276bf25c0deff22f5a73c7c5b661b8e5df345bfdabfa6b0aea9bf16fce57d9c53a76751c75d
DIST openvdb-5.2.0.tar.gz 1788969 BLAKE2B d146b78dd7db4936779ca214b1f7957d4868bf76aedb95c9a98e21d25983b750337a63bf4bc9ccb438b683988af7a3d708676dcf7b4662c84e4926e8000ceb68 SHA512 69e21190c27a055e476a319b0c2d961303fa2f3fec30bec93ed44072d01816ef89e5e8f0abfc3a22d1c73742aa31284c664596747b49cd985fea1a751776506e
DIST openvdb-6.2.1.tar.gz 1935325 BLAKE2B 24ca340e513d2f22521994fbb2315a1c3f817bb35a7402ca481b12444e5ced58dfd773cc07b47a56d1ed9f6951e58cf1ef0b5c35917620b031383faed21c6557 SHA512 f5d830880316b5ca3921c77c75f3a254aba47d144ac6c0223fc2732d99cbd6b7ffb7f27049f8ab3760ad77b3658fc08a82728325ba753bc29932aa46336457de
+DIST openvdb-7.1.0.tar.gz 1956052 BLAKE2B 7778d67bcc65ecb17b86f6e67a9e5f2d6574de5869a0a9c675ad7bc8540154c0f249a91c68a9da9068a3951b3e919e5676450fcaf13921c6263e7c87012a2f29 SHA512 49806375f7e6d7b12eaba24e672a068531d2f8a05f12eba29069710d2682f9983f9e6ad26047eed4b28e337f8d0e738b90130582863c710e8dd1e720bf0addad
--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
new file mode 100644
index 00000000000..13d0f45fabf
--- /dev/null
+++ b/media-gfx/openvdb/files/openvdb-7.1.0-0001-Fix-multilib-header-source.patch
@@ -0,0 +1,75 @@
+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-7.1.0-0002-Fix-doc-install-dir.patch b/media-gfx/openvdb/files/openvdb-7.1.0-0002-Fix-doc-install-dir.patch
new file mode 100644
index 00000000000..73d4b1ccd42
--- /dev/null
+++ b/media-gfx/openvdb/files/openvdb-7.1.0-0002-Fix-doc-install-dir.patch
@@ -0,0 +1,25 @@
+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/metadata.xml b/media-gfx/openvdb/metadata.xml
index 58f434001fc..7d62609da7c 100644
--- a/media-gfx/openvdb/metadata.xml
+++ b/media-gfx/openvdb/metadata.xml
@@ -15,18 +15,27 @@
Chance of Meatballs2' and 'How to Train Your Dragon 2'.
</longdescription>
<use>
- <flag name="abi3-compat">
+ <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.0.0" name="abi3-compat">
Disables newer features to maintain compatibility with ABI3.
</flag>
- <flag restrict=">=media-gfx/openvdb-4.0.0" name="abi4-compat">
+ <flag restrict="<=media-gfx/openvdb-7.0.0" name="abi4-compat">
Disables newer features to maintain compatibility with ABI4.
</flag>
- <flag restrict=">=media-gfx/openvdb-5.0.0" name="abi5-compat">
+ <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>
+ <flag restrict=">=media-gfx/openvdb-7.0.0" name="abi7-compat">
+ Disables newer features to maintain compatibility with ABI7.
+ </flag>
+ <flag restrict=">=media-gfx/openvdb-7.0.0" name="utils">
+ Build utility binaries
+ </flag>
</use>
<upstream>
<remote-id type="github">AcademySoftwareFoundation/openvdb</remote-id>
diff --git a/media-gfx/openvdb/openvdb-7.1.0.ebuild b/media-gfx/openvdb/openvdb-7.1.0.ebuild
new file mode 100644
index 00000000000..125f6475bf3
--- /dev/null
+++ b/media-gfx/openvdb/openvdb-7.1.0.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+PYTHON_COMPAT=( python3_{7,8} )
+
+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"
+KEYWORDS="~amd64 ~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} )
+"
+
+RDEPEND="
+ dev-libs/boost:=
+ dev-libs/c-blosc
+ dev-libs/jemalloc
+ dev-libs/log4cplus
+ media-libs/glfw:=
+ media-libs/openexr:=
+ 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_MULTI_USEDEP}]
+ numpy? ( dev-python/numpy[${PYTHON_MULTI_USEDEP}] )
+ ')
+ )
+"
+
+DEPEND="
+ ${RDEPEND}
+ dev-cpp/tbb
+ >=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"
+)
+
+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_PYTHON_MODULE=$(usex python)
+ -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
+ -DUSE_NUMPY=$(usex numpy)
+ -DPYOPENVDB_INSTALL_DIRECTORY="${python_get_sitedir}"
+ -DPython_EXECUTABLE="${PYTHON}"
+ )
+
+ 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] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/, media-gfx/openvdb/files/
@ 2020-08-24 13:42 Sam James
0 siblings, 0 replies; 21+ messages in thread
From: Sam James @ 2020-08-24 13:42 UTC (permalink / raw
To: gentoo-commits
commit: 3edc65ba9bca251aadcd5469e5c1f0f60df9feb3
Author: Adrian Grigo <agrigo2001 <AT> yahoo <DOT> com <DOT> au>
AuthorDate: Thu Aug 20 02:40:52 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug 24 13:41:54 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3edc65ba
media-gfx/openvdb: Add python 3.9 support for openvdb 7.1.0
Openvdb 7.1.0 also supports python 3.9.
We also fix BDEPEND up: pkgconfig, the doc dependencies,
cppunit and cmake (where needed) have been moved into BDEPEND.
Signed-off-by: Adrian Grigo <agrigo2001 <AT> yahoo.com.au>
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sam James <sam <AT> gentoo.org>
...2.0-use-pkgconfig-for-ilmbase-and-openexr.patch | 8 ++++++++
| 9 +++++++++
media-gfx/openvdb/openvdb-4.0.2-r3.ebuild | 16 ++++++++++-----
media-gfx/openvdb/openvdb-5.2.0-r1.ebuild | 16 ++++++++++-----
media-gfx/openvdb/openvdb-6.2.1.ebuild | 16 +++++++++------
media-gfx/openvdb/openvdb-7.0.0.ebuild | 21 +++++++++++++-------
media-gfx/openvdb/openvdb-7.1.0.ebuild | 23 ++++++++++++++--------
7 files changed, 78 insertions(+), 31 deletions(-)
diff --git a/media-gfx/openvdb/files/openvdb-5.2.0-use-pkgconfig-for-ilmbase-and-openexr.patch b/media-gfx/openvdb/files/openvdb-5.2.0-use-pkgconfig-for-ilmbase-and-openexr.patch
index c3999e54f9c..dd0b83540aa 100644
--- a/media-gfx/openvdb/files/openvdb-5.2.0-use-pkgconfig-for-ilmbase-and-openexr.patch
+++ b/media-gfx/openvdb/files/openvdb-5.2.0-use-pkgconfig-for-ilmbase-and-openexr.patch
@@ -1,3 +1,11 @@
+This patch is an updated version of the patch created in dracwyrm's
+patchset for openvdb 4.0.2 which uses PkgConfig to ensure that the
+correct IlmBase and OpenEXR dependencies are found.
+
+In subsequent versions this functionality is taken over by
+altering the directory the header files are searched for in
+multilib-header-source patch by Bernd Waibel
+
diff -urN a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt
--- a/openvdb/CMakeLists.txt 2018-08-28 12:20:33.000000000 +0100
+++ b/openvdb/CMakeLists.txt 2018-08-28 12:25:19.807755722 +0100
--git a/media-gfx/openvdb/files/openvdb-6.2.1-fix-multilib-header-source.patch b/media-gfx/openvdb/files/openvdb-6.2.1-fix-multilib-header-source.patch
index c6e2bae5dfa..e8cfac755d3 100644
--- a/media-gfx/openvdb/files/openvdb-6.2.1-fix-multilib-header-source.patch
+++ b/media-gfx/openvdb/files/openvdb-6.2.1-fix-multilib-header-source.patch
@@ -1,3 +1,12 @@
+This patch changes the default location that the header files look for
+IlmBaseConfig.h as in Gentoo the version containg the ILMBASE_VERSION_MAJOR
+and ILMBASE_VERSION_MINOR is stored under /usr/include/chost.
+
+Without this patch, compilation fails as it is unable to identify the
+required IlmBase version.
+
+Based on the fix multilib header patch for 7.1.0 by Bernd Waibel
+
diff -Naur a/cmake/FindIlmBase.cmake b/cmake/FindIlmBase.cmake
--- a/cmake/FindIlmBase.cmake 2020-02-02 01:03:55.000000000 +0800
+++ b/cmake/FindIlmBase.cmake 2020-02-02 01:09:05.000000000 +0800
diff --git a/media-gfx/openvdb/openvdb-4.0.2-r3.ebuild b/media-gfx/openvdb/openvdb-4.0.2-r3.ebuild
index 0b960e20968..08c8438f028 100644
--- a/media-gfx/openvdb/openvdb-4.0.2-r3.ebuild
+++ b/media-gfx/openvdb/openvdb-4.0.2-r3.ebuild
@@ -38,13 +38,18 @@ RDEPEND="
python? (
${PYTHON_DEPS}
$(python_gen_cond_dep '
- dev-libs/boost:=[python?,${PYTHON_MULTI_USEDEP}]
- dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+ dev-libs/boost:=[python?,${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
')
- )"
+ )
+"
-DEPEND="${RDEPEND}
+DEPEND="
+ ${RDEPEND}
dev-cpp/tbb
+"
+
+BDEPEND="
virtual/pkgconfig
doc? (
app-doc/doxygen
@@ -54,7 +59,8 @@ DEPEND="${RDEPEND}
dev-texlive/texlive-latex
dev-texlive/texlive-latexextra
)
- test? ( dev-util/cppunit )"
+ test? ( dev-util/cppunit )
+"
PATCHES=(
"${WORKDIR}/${P}-patchset-02/0001-use-gnuinstalldirs.patch"
diff --git a/media-gfx/openvdb/openvdb-5.2.0-r1.ebuild b/media-gfx/openvdb/openvdb-5.2.0-r1.ebuild
index 2cfbd5d329f..a5f10d91edb 100644
--- a/media-gfx/openvdb/openvdb-5.2.0-r1.ebuild
+++ b/media-gfx/openvdb/openvdb-5.2.0-r1.ebuild
@@ -36,13 +36,18 @@ RDEPEND="
python? (
${PYTHON_DEPS}
$(python_gen_cond_dep '
- dev-libs/boost:=[python?,${PYTHON_MULTI_USEDEP}]
- dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+ dev-libs/boost:=[python?,${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
')
- )"
+ )
+"
-DEPEND="${RDEPEND}
+DEPEND="
+ ${RDEPEND}
dev-cpp/tbb
+"
+
+BDEPEND="
virtual/pkgconfig
doc? (
app-doc/doxygen
@@ -52,7 +57,8 @@ DEPEND="${RDEPEND}
dev-texlive/texlive-latex
dev-texlive/texlive-latexextra
)
- test? ( dev-util/cppunit )"
+ test? ( dev-util/cppunit )
+"
PATCHES=(
"${FILESDIR}/${P}-use-gnuinstalldirs.patch"
diff --git a/media-gfx/openvdb/openvdb-6.2.1.ebuild b/media-gfx/openvdb/openvdb-6.2.1.ebuild
index 28f00b1922d..03fcecce642 100644
--- a/media-gfx/openvdb/openvdb-6.2.1.ebuild
+++ b/media-gfx/openvdb/openvdb-6.2.1.ebuild
@@ -4,7 +4,6 @@
EAPI=7
PYTHON_COMPAT=( python3_{6,7,8,9} )
-CMAKE_MAKEFILE_GENERATOR="emake"
inherit cmake flag-o-matic python-single-r1
@@ -38,14 +37,18 @@ RDEPEND="
python? (
${PYTHON_DEPS}
$(python_gen_cond_dep '
- dev-libs/boost:=[python?,${PYTHON_MULTI_USEDEP}]
- dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+ dev-libs/boost:=[python?,${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
')
)"
-DEPEND="${RDEPEND}
- >=dev-util/cmake-3.16.2-r1
+DEPEND="
+ ${RDEPEND}
dev-cpp/tbb
+"
+
+BDEPEND="
+ >=dev-util/cmake-3.16.2-r1
virtual/pkgconfig
doc? (
app-doc/doxygen
@@ -55,7 +58,8 @@ DEPEND="${RDEPEND}
dev-texlive/texlive-latex
dev-texlive/texlive-latexextra
)
- test? ( dev-util/cppunit )"
+ test? ( dev-util/cppunit )
+"
PATCHES=(
"${FILESDIR}/${P}-fix-multilib-header-source.patch"
diff --git a/media-gfx/openvdb/openvdb-7.0.0.ebuild b/media-gfx/openvdb/openvdb-7.0.0.ebuild
index ccd8415c286..c6d6c15d1bf 100644
--- a/media-gfx/openvdb/openvdb-7.0.0.ebuild
+++ b/media-gfx/openvdb/openvdb-7.0.0.ebuild
@@ -3,7 +3,6 @@
EAPI=7
-CMAKE_MAKEFILE_GENERATOR="emake"
PYTHON_COMPAT=( python3_{6,7,8,9} )
inherit cmake flag-o-matic python-single-r1
@@ -39,8 +38,8 @@ RDEPEND="
python? (
${PYTHON_DEPS}
$(python_gen_cond_dep '
- dev-libs/boost:=[numpy?,python?,${PYTHON_MULTI_USEDEP}]
- numpy? ( dev-python/numpy[${PYTHON_MULTI_USEDEP}] )
+ dev-libs/boost:=[numpy?,python?,${PYTHON_USEDEP}]
+ numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
')
)
"
@@ -48,6 +47,9 @@ RDEPEND="
DEPEND="
${RDEPEND}
dev-cpp/tbb
+"
+
+BDEPEND="
>=dev-util/cmake-3.16.2-r1
virtual/pkgconfig
doc? (
@@ -89,7 +91,6 @@ src_configure() {
-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}/"
-DOPENVDB_ABI_VERSION_NUMBER="${version}"
-DOPENVDB_BUILD_DOCS=$(usex doc)
- -DOPENVDB_BUILD_PYTHON_MODULE=$(usex python)
-DOPENVDB_BUILD_UNITTESTS=$(usex test)
-DOPENVDB_BUILD_VDB_LOD=$(usex !utils)
-DOPENVDB_BUILD_VDB_RENDER=$(usex !utils)
@@ -101,11 +102,17 @@ src_configure() {
-DUSE_COLORED_OUTPUT=ON
-DUSE_EXR=ON
-DUSE_LOG4CPLUS=ON
- -DUSE_NUMPY=$(usex numpy)
- -DPYOPENVDB_INSTALL_DIRECTORY="${python_get_sitedir}"
- -DPython_EXECUTABLE="${PYTHON}"
)
+ if use python; then
+ mycmakeargs+=(
+ -DOPENVDB_BUILD_PYTHON_MODULE=ON
+ -DUSE_NUMPY=$(usex numpy)
+ -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)"
+ -DPython_EXECUTABLE="${EPYTHON}"
+ )
+ fi
+
if use cpu_flags_x86_avx; then
mycmakeargs+=( -DOPENVDB_SIMD=AVX )
elif use cpu_flags_x86_sse4_2; then
diff --git a/media-gfx/openvdb/openvdb-7.1.0.ebuild b/media-gfx/openvdb/openvdb-7.1.0.ebuild
index 90ec1ad79ad..a61b6f125cc 100644
--- a/media-gfx/openvdb/openvdb-7.1.0.ebuild
+++ b/media-gfx/openvdb/openvdb-7.1.0.ebuild
@@ -3,8 +3,7 @@
EAPI=7
-CMAKE_MAKEFILE_GENERATOR="emake"
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
inherit cmake flag-o-matic python-single-r1
@@ -39,8 +38,8 @@ RDEPEND="
python? (
${PYTHON_DEPS}
$(python_gen_cond_dep '
- dev-libs/boost:=[numpy?,python?,${PYTHON_MULTI_USEDEP}]
- numpy? ( dev-python/numpy[${PYTHON_MULTI_USEDEP}] )
+ dev-libs/boost:=[numpy?,python?,${PYTHON_USEDEP}]
+ numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
')
)
"
@@ -48,6 +47,9 @@ RDEPEND="
DEPEND="
${RDEPEND}
dev-cpp/tbb
+"
+
+BDEPEND="
>=dev-util/cmake-3.16.2-r1
virtual/pkgconfig
doc? (
@@ -87,7 +89,6 @@ src_configure() {
-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}/"
-DOPENVDB_ABI_VERSION_NUMBER="${version}"
-DOPENVDB_BUILD_DOCS=$(usex doc)
- -DOPENVDB_BUILD_PYTHON_MODULE=$(usex python)
-DOPENVDB_BUILD_UNITTESTS=$(usex test)
-DOPENVDB_BUILD_VDB_LOD=$(usex !utils)
-DOPENVDB_BUILD_VDB_RENDER=$(usex !utils)
@@ -99,11 +100,17 @@ src_configure() {
-DUSE_COLORED_OUTPUT=ON
-DUSE_EXR=ON
-DUSE_LOG4CPLUS=ON
- -DUSE_NUMPY=$(usex numpy)
- -DPYOPENVDB_INSTALL_DIRECTORY="${python_get_sitedir}"
- -DPython_EXECUTABLE="${PYTHON}"
)
+ if use python; then
+ mycmakeargs+=(
+ -DOPENVDB_BUILD_PYTHON_MODULE=ON
+ -DUSE_NUMPY=$(usex numpy)
+ -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)"
+ -DPython_EXECUTABLE="${EPYTHON}"
+ )
+ fi
+
if use cpu_flags_x86_avx; then
mycmakeargs+=( -DOPENVDB_SIMD=AVX )
elif use cpu_flags_x86_sse4_2; then
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/, media-gfx/openvdb/files/
@ 2021-03-14 0:25 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2021-03-14 0:25 UTC (permalink / raw
To: gentoo-commits
commit: 8d1cea4c79b0bdb6ea2042b9be83c2c4138dc420
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 28 10:10:55 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 14 00:24:31 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d1cea4c
media-gfx/openvdb: Drop 4.0.2-r4, 5.2.0-r2, 6.2.1-r1
Bug: https://bugs.gentoo.org/746740
Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/openvdb/Manifest | 4 -
.../files/openvdb-4.0.2-findboost-fix.patch | 21 --
.../files/openvdb-4.0.2-fix-build-docs.patch | 32 ---
...-4.0.2-fix-const-correctness-for-unittest.patch | 35 ---
.../files/openvdb-5.2.0-use-gnuinstalldirs.patch | 312 ---------------------
...2.0-use-pkgconfig-for-ilmbase-and-openexr.patch | 101 -------
| 38 ---
.../files/openvdb-6.2.1-use-gnuinstalldirs.patch | 54 ----
media-gfx/openvdb/metadata.xml | 6 -
media-gfx/openvdb/openvdb-4.0.2-r4.ebuild | 110 --------
media-gfx/openvdb/openvdb-5.2.0-r2.ebuild | 105 -------
media-gfx/openvdb/openvdb-6.2.1-r1.ebuild | 102 -------
12 files changed, 920 deletions(-)
diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest
index 9a616a88aea..b3d4fe59418 100644
--- a/media-gfx/openvdb/Manifest
+++ b/media-gfx/openvdb/Manifest
@@ -1,6 +1,2 @@
-DIST openvdb-4.0.2-patchset-02.tar.xz 12428 BLAKE2B 2684ddf010df975912fcfc8c4f944d9a9ba447b48750140b6c46db31d49297f7495e5c77e9d5b85af0b2e1d0c4987184865642dc95f1fb3e463e85ee5987d203 SHA512 04377d552e218a8eb31c43381ba32263ba206a0870dccda1bcc031863dfdbcc953da7ea89fd420dc1a338fbd6123ac30bac2039c0a2a01c1fa9253a3fdd0b54d
-DIST openvdb-4.0.2.tar.gz 1689119 BLAKE2B dbc8d4ab44990440e201327d76bbf9bfe3e8f597505b1d008dedb95dc540277513f465d455079c59820acc5056c9a2edf56235e1097b6c73a1f7dd8c59609c15 SHA512 8e3e12583b81f9b9303b309e839c8321c67b67ff8a0e61bb56c87276bf25c0deff22f5a73c7c5b661b8e5df345bfdabfa6b0aea9bf16fce57d9c53a76751c75d
-DIST openvdb-5.2.0.tar.gz 1788969 BLAKE2B d146b78dd7db4936779ca214b1f7957d4868bf76aedb95c9a98e21d25983b750337a63bf4bc9ccb438b683988af7a3d708676dcf7b4662c84e4926e8000ceb68 SHA512 69e21190c27a055e476a319b0c2d961303fa2f3fec30bec93ed44072d01816ef89e5e8f0abfc3a22d1c73742aa31284c664596747b49cd985fea1a751776506e
-DIST openvdb-6.2.1.tar.gz 1935325 BLAKE2B 24ca340e513d2f22521994fbb2315a1c3f817bb35a7402ca481b12444e5ced58dfd773cc07b47a56d1ed9f6951e58cf1ef0b5c35917620b031383faed21c6557 SHA512 f5d830880316b5ca3921c77c75f3a254aba47d144ac6c0223fc2732d99cbd6b7ffb7f27049f8ab3760ad77b3658fc08a82728325ba753bc29932aa46336457de
DIST openvdb-7.0.0.tar.gz 1872744 BLAKE2B e3a8c8d51f77e115d3d397abde0860a6322d56eb6c4795c1ba39539a23aab6cf37602ce7122965fbc3098b15b118b25010263f567e8003363b78c9b7d9d5dfd8 SHA512 f5321b22b10e192012d544cc02921d3d52f621778ec5aa21ba6d450f3e29f2fdbd76486ad390a0c008394dbc6ee4aeecc04527ef30e73adf71c1a08a021746b7
DIST openvdb-7.1.0.tar.gz 1956052 BLAKE2B 7778d67bcc65ecb17b86f6e67a9e5f2d6574de5869a0a9c675ad7bc8540154c0f249a91c68a9da9068a3951b3e919e5676450fcaf13921c6263e7c87012a2f29 SHA512 49806375f7e6d7b12eaba24e672a068531d2f8a05f12eba29069710d2682f9983f9e6ad26047eed4b28e337f8d0e738b90130582863c710e8dd1e720bf0addad
diff --git a/media-gfx/openvdb/files/openvdb-4.0.2-findboost-fix.patch b/media-gfx/openvdb/files/openvdb-4.0.2-findboost-fix.patch
deleted file mode 100644
index fbb29883fe2..00000000000
--- a/media-gfx/openvdb/files/openvdb-4.0.2-findboost-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -urN a/openvdb/python/CMakeLists.txt b/openvdb/python/CMakeLists.txt
---- a/openvdb/python/CMakeLists.txt 2017-07-31 19:16:32.000000000 +0100
-+++ b/openvdb/python/CMakeLists.txt 2018-08-11 12:37:40.179360277 +0100
-@@ -3,7 +3,7 @@
-
- FIND_PACKAGE ( PythonInterp REQUIRED )
- FIND_PACKAGE ( PythonLibs REQUIRED )
--FIND_PACKAGE ( Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS python )
-+FIND_PACKAGE ( Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} )
-
-
- IF ( NOT OPENVDB_BUILD_CORE )
-@@ -92,7 +92,7 @@
- ${GLFW_LINK_LIBRARY}
- ${GLFW_DEPENDENT_LIBRARIES}
- ${GLEW_GLEW_LIBRARY}
-- ${Boost_PYTHON_LIBRARY}
-+ ${Boost_LIBRARIES}
- ${PYTHON_LIBRARY}
- ${Ilmbase_HALF_LIBRARY}
- )
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
deleted file mode 100644
index cdbb9440a1a..00000000000
--- a/media-gfx/openvdb/files/openvdb-4.0.2-fix-build-docs.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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. Otherwise it might be possible to fix it using a separate step
-in src_compile to build the documentation specifically, prior to running
-install.
-
-This has been tested and is required on 4.0.2 and 5.2.0, but is not
-needed in >=openvdb-6
-
-To reproduce the bug, enable the doc USE flag and emerge openvdb 4 or 5
-without this patch. The install fails as the doc file is missing.
-
-To show it is fixed. enable the doc USE flag and this patch and emerge
-again. The install succeeds and the documentation can be found at
-/usr/share/doc/openvdb-X
-
-Patch by Adrian Grigo
-
-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
deleted file mode 100644
index cb266032994..00000000000
--- a/media-gfx/openvdb/files/openvdb-4.0.2-fix-const-correctness-for-unittest.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Blosc changed the signature of blosc_compcode_to_compname in 1.15 so
-that the second parameter is now const char** not char **. This causes
-compile failures when using openvdb with earlier versions of blosc.
-
-The fix, which is backported from openvdb-7, is to check the blosc
-version and cast the char** to const char** for modern versions of
-blosc.
-
-The bug can be produced by emerging blosc 1.15+, and then openvdb.
-Without this patch, the compiler will fail with
-error: invalid conversion from ‘char**’ to ‘const char**’
-
-To test that the patch has been properly implemented, emerge modern
-blosc and then openvdb with this patch, and the compile will succeed.
-
-Fixes bug https://bugs.gentoo.org/734102
-Upstream commit https://github.com/AcademySoftwareFoundation/openvdb/commit/d2e8bd87a63d1e9f66a558ecbb6e6cbd54f7de13
-
-diff -Naur a/openvdb/unittest/TestFile.cc b/openvdb/unittest/TestFile.cc
---- a/openvdb/unittest/TestFile.cc 2020-08-19 02:11:48.945711312 +1000
-+++ b/openvdb/unittest/TestFile.cc 2020-08-19 02:13:31.106074899 +1000
-@@ -2666,7 +2666,12 @@
-
- for (int compcode = 0; compcode <= BLOSC_ZLIB; ++compcode) {
- char* compname = nullptr;
-- if (0 > blosc_compcode_to_compname(compcode, &compname)) continue;
-+#if BLOSC_VERSION_MAJOR > 1 || (BLOSC_VERSION_MAJOR == 1 && BLOSC_VERSION_MINOR >= 15)
-+ if (0 > blosc_compcode_to_compname(compcode, const_cast<const char**>(&compname)))
-+#else
-+ if (0 > blosc_compcode_to_compname(compcode, &compname))
-+#endif
-+ continue;
- /// @todo This changes the compressor setting globally.
- if (blosc_set_compressor(compname) < 0) continue;
-
diff --git a/media-gfx/openvdb/files/openvdb-5.2.0-use-gnuinstalldirs.patch b/media-gfx/openvdb/files/openvdb-5.2.0-use-gnuinstalldirs.patch
deleted file mode 100644
index d72f835adaa..00000000000
--- a/media-gfx/openvdb/files/openvdb-5.2.0-use-gnuinstalldirs.patch
+++ /dev/null
@@ -1,312 +0,0 @@
-diff -urN a/cmake/FindBlosc.cmake b/cmake/FindBlosc.cmake
---- a/cmake/FindBlosc.cmake 2018-08-13 16:33:07.000000000 +0100
-+++ b/cmake/FindBlosc.cmake 2018-08-28 12:20:33.331930720 +0100
-@@ -37,7 +37,7 @@
-
- FIND_PACKAGE ( PackageHandleStandardArgs )
-
--FIND_PATH( BLOSC_LOCATION include/blosc.h
-+FIND_PATH( BLOSC_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/blosc.h
- "$ENV{BLOSC_ROOT}"
- NO_DEFAULT_PATH
- NO_SYSTEM_ENVIRONMENT_PATH
-@@ -49,7 +49,7 @@
-
- IF ( BLOSC_FOUND )
-
-- SET ( BLOSC_LIBRARYDIR ${BLOSC_LOCATION}/lib
-+ SET ( BLOSC_LIBRARYDIR ${BLOSC_LOCATION}/${CMAKE_INSTALL_LIBDIR}
- CACHE STRING "Blosc library directories")
-
- SET ( _blosc_library_name "blosc" )
-@@ -75,6 +75,6 @@
- SET( CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_BACKUP} )
- ENDIF()
-
-- SET( BLOSC_INCLUDE_DIR "${BLOSC_LOCATION}/include" CACHE STRING "Blosc include directory" )
-+ SET( BLOSC_INCLUDE_DIR "${BLOSC_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "Blosc include directory" )
-
- ENDIF ( BLOSC_FOUND )
-diff -urN a/cmake/FindCPPUnit.cmake b/cmake/FindCPPUnit.cmake
---- a/cmake/FindCPPUnit.cmake 2018-08-13 16:33:07.000000000 +0100
-+++ b/cmake/FindCPPUnit.cmake 2018-08-28 12:20:33.333930718 +0100
-@@ -38,7 +38,7 @@
-
- FIND_PACKAGE ( PackageHandleStandardArgs )
-
--FIND_PATH( CPPUNIT_LOCATION include/cppunit/Test.h
-+FIND_PATH( CPPUNIT_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/cppunit/Test.h
- "$ENV{CPPUNIT_ROOT}"
- NO_DEFAULT_PATH
- NO_CMAKE_ENVIRONMENT_PATH
-@@ -53,13 +53,13 @@
-
- IF ( CPPUNIT_FOUND )
-
-- SET( CPPUNIT_INCLUDE_DIR "${CPPUNIT_LOCATION}/include" CACHE STRING "CPPUNIT include directory")
-+ SET( CPPUNIT_INCLUDE_DIR "${CPPUNIT_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "CPPUNIT include directory")
- IF (CPPUnit_USE_STATIC_LIBS)
- SET( CPPUNIT_LIBRARY_NAME libcppunit.a)
- ELSE ()
- SET( CPPUNIT_LIBRARY_NAME cppunit)
- ENDIF ()
- FIND_LIBRARY ( CPPUnit_cppunit_LIBRARY ${CPPUNIT_LIBRARY_NAME}
-- PATHS ${CPPUNIT_LOCATION}/lib )
-+ PATHS ${CPPUNIT_LOCATION}/${CMAKE_INSTALL_LIBDIR} )
-
- ENDIF ( CPPUNIT_FOUND )
-diff -urN a/cmake/FindGLEW.cmake b/cmake/FindGLEW.cmake
---- a/cmake/FindGLEW.cmake 2018-08-13 16:33:07.000000000 +0100
-+++ b/cmake/FindGLEW.cmake 2018-08-28 12:20:33.333930718 +0100
-@@ -39,7 +39,7 @@
-
- FIND_PACKAGE ( PackageHandleStandardArgs )
-
--FIND_PATH( GLEW_LOCATION include/GL/glew.h
-+FIND_PATH( GLEW_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/GL/glew.h
- "$ENV{GLEW_ROOT}"
- NO_DEFAULT_PATH
- NO_SYSTEM_ENVIRONMENT_PATH
-@@ -51,7 +51,7 @@
-
- IF ( GLEW_LOCATION )
-
-- SET( GLEW_INCLUDE_DIR "${GLEW_LOCATION}/include" CACHE STRING "GLEW include path")
-+ SET( GLEW_INCLUDE_DIR "${GLEW_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "GLEW include path")
-
- SET ( ORIGINAL_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
- IF (GLEW_USE_STATIC_LIBS)
-@@ -74,11 +74,11 @@
- FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEW32MXS PATHS ${GLEW_LOCATION}/lib )
- ELSE (APPLE)
- SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
-- FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW PATHS ${GLEW_LOCATION}/lib
-+ FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW PATHS ${GLEW_LOCATION}/${CMAKE_INSTALL_LIBDIR}
- NO_DEFAULT_PATH
- NO_SYSTEM_ENVIRONMENT_PATH
- )
-- FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEWmx PATHS ${GLEW_LOCATION}/lib
-+ FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEWmx PATHS ${GLEW_LOCATION}/${CMAKE_INSTALL_LIBDIR}
- NO_DEFAULT_PATH
- NO_SYSTEM_ENVIRONMENT_PATH
- )
-@@ -107,11 +107,11 @@
- )
- ELSE (APPLE)
- # Unices
-- FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW PATHS ${GLEW_LOCATION}/lib
-+ FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW PATHS ${GLEW_LOCATION}/${CMAKE_INSTALL_LIBDIR}
- NO_DEFAULT_PATH
- NO_SYSTEM_ENVIRONMENT_PATH
- )
-- FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEWmx PATHS ${GLEW_LOCATION}/lib
-+ FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEWmx PATHS ${GLEW_LOCATION}/${CMAKE_INSTALL_LIBDIR}
- NO_DEFAULT_PATH
- NO_SYSTEM_ENVIRONMENT_PATH
- )
-diff -urN a/cmake/FindGLFW3.cmake b/cmake/FindGLFW3.cmake
---- a/cmake/FindGLFW3.cmake 2018-08-13 16:33:07.000000000 +0100
-+++ b/cmake/FindGLFW3.cmake 2018-08-28 12:20:33.334930718 +0100
-@@ -39,7 +39,7 @@
-
- FIND_PACKAGE ( PackageHandleStandardArgs )
-
--FIND_PATH( GLFW3_LOCATION include/GLFW/glfw3.h
-+FIND_PATH( GLFW3_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/GLFW/glfw3.h
- "$ENV{GLFW3_ROOT}"
- NO_DEFAULT_PATH
- NO_SYSTEM_ENVIRONMENT_PATH
-@@ -50,11 +50,11 @@
- )
-
- IF (GLFW3_FOUND)
-- SET( GLFW3_INCLUDE_DIR "${GLFW3_LOCATION}/include" CACHE STRING "GLFW3 include path")
-+ SET( GLFW3_INCLUDE_DIR "${GLFW3_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "GLFW3 include path")
- SET (GLFW3_PATH_SUFFIXES x86_64-linux-gnu)
- IF (GLFW3_USE_STATIC_LIBS)
- FIND_LIBRARY ( GLFW3_glfw_LIBRARY glfw3
-- PATHS ${GLFW3_LOCATION}/lib
-+ PATHS ${GLFW3_LOCATION}/${CMAKE_INSTALL_LIBDIR}
- PATH_SUFFIXES ${GLFW3_PATH_SUFFIXES}
- NO_DEFAULT_PATH
- NO_CMAKE_ENVIRONMENT_PATH
-@@ -64,7 +64,7 @@
- )
- ELSE (GLFW3_USE_STATIC_LIBS)
- FIND_LIBRARY ( GLFW3_glfw_LIBRARY glfw
-- PATHS ${GLFW3_LOCATION}/lib
-+ PATHS ${GLFW3_LOCATION}/${CMAKE_INSTALL_LIBDIR}
- PATH_SUFFIXES ${GLFW3_PATH_SUFFIXES}
- NO_DEFAULT_PATH
- NO_CMAKE_ENVIRONMENT_PATH
-diff -urN a/cmake/FindGLFW.cmake b/cmake/FindGLFW.cmake
---- a/cmake/FindGLFW.cmake 2018-08-13 16:33:07.000000000 +0100
-+++ b/cmake/FindGLFW.cmake 2018-08-28 12:20:33.334930718 +0100
-@@ -38,12 +38,12 @@
-
- SET ( GLFW_FOUND FALSE )
-
--FIND_PATH( GLFW_LOCATION include/GL/glfw.h
-+FIND_PATH( GLFW_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/GL/glfw.h
- "$ENV{GLFW_ROOT}"
- NO_SYSTEM_ENVIRONMENT_PATH
- )
-
--SET( GLFW_INCLUDE_DIR "${GLFW_LOCATION}/include" CACHE STRING "GLFW include path")
-+SET( GLFW_INCLUDE_DIR "${GLFW_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "GLFW include path")
-
- SET ( ORIGINAL_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
- IF (GLFW_USE_STATIC_LIBS)
-@@ -61,7 +61,7 @@
- FIND_LIBRARY ( GLFW_LIBRARY_PATH GLFW32S PATHS ${GLFW_LOCATION}/lib )
- ELSE (APPLE)
- SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
-- FIND_LIBRARY ( GLFW_LIBRARY_PATH glfw PATHS ${GLFW_LOCATION}/lib ${GLFW_LOCATION}/lib64
-+ FIND_LIBRARY ( GLFW_LIBRARY_PATH glfw PATHS ${GLFW_LOCATION}/${CMAKE_INSTALL_LIBDIR}
- NO_DEFAULT_PATH
- NO_SYSTEM_ENVIRONMENT_PATH
- )
-@@ -84,7 +84,7 @@
- )
- ELSE (APPLE)
- # Unices
-- FIND_LIBRARY ( GLFW_LIBRARY_PATH glfw PATHS ${GLFW_LOCATION}/lib ${GLFW_LOCATION}/lib64
-+ FIND_LIBRARY ( GLFW_LIBRARY_PATH glfw PATHS ${GLFW_LOCATION}/${CMAKE_INSTALL_LIBDIR}
- NO_SYSTEM_ENVIRONMENT_PATH
- )
- ENDIF (APPLE)
-diff -urN a/cmake/FindOpenVDB.cmake b/cmake/FindOpenVDB.cmake
---- a/cmake/FindOpenVDB.cmake 2018-08-13 16:33:07.000000000 +0100
-+++ b/cmake/FindOpenVDB.cmake 2018-08-28 12:20:33.334930718 +0100
-@@ -45,7 +45,7 @@
-
- FIND_PACKAGE( PackageHandleStandardArgs )
-
--FIND_PATH( OPENVDB_LOCATION include/openvdb/version.h
-+FIND_PATH( OPENVDB_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/openvdb/version.h
- "$ENV{OPENVDB_ROOT}"
- NO_DEFAULT_PATH
- NO_SYSTEM_ENVIRONMENT_PATH
-@@ -56,10 +56,10 @@
- )
-
- IF( OpenVDB_FOUND )
-- SET( OpenVDB_INCLUDE_DIR ${OPENVDB_LOCATION}/include
-+ SET( OpenVDB_INCLUDE_DIR ${OPENVDB_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}
- CACHE PATH "OpenVDB include directory")
-
-- SET( OpenVDB_LIBRARY_DIR ${OPENVDB_LOCATION}/lib
-+ SET( OpenVDB_LIBRARY_DIR ${OPENVDB_LOCATION}/${CMAKE_INSTALL_LIBDIR}
- CACHE PATH "OpenVDB library directory" )
-
- FIND_LIBRARY( OpenVDB_OPENVDB_LIBRARY openvdb
-diff -urN a/cmake/FindTBB.cmake b/cmake/FindTBB.cmake
---- a/cmake/FindTBB.cmake 2018-08-13 16:33:07.000000000 +0100
-+++ b/cmake/FindTBB.cmake 2018-08-28 12:20:33.335930717 +0100
-@@ -42,7 +42,7 @@
-
- # SET ( TBB_FOUND FALSE )
-
--FIND_PATH( TBB_LOCATION include/tbb/tbb.h
-+FIND_PATH( TBB_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/tbb/tbb.h
- "$ENV{TBB_ROOT}"
- NO_DEFAULT_PATH
- NO_CMAKE_ENVIRONMENT_PATH
-@@ -57,7 +57,7 @@
-
- IF ( TBB_FOUND )
-
-- SET( TBB_INCLUDE_DIR "${TBB_LOCATION}/include" CACHE STRING "TBB include directory")
-+ SET( TBB_INCLUDE_DIR "${TBB_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "TBB include directory")
-
- IF (APPLE)
- IF (TBB_FOR_CLANG)
-@@ -86,7 +86,7 @@
- LIST ( APPEND TBB_LIBRARIES_LIST ${TBB_LIBRARY_PATH} ${TBBmx_LIBRARY_PATH} )
- ELSE (APPLE)
- # MESSAGE ( "CMAKE_COMPILER_IS_GNUCXX = ${CMAKE_COMPILER_IS_GNUCXX}")
-- SET ( TBB_LIBRARYDIR ${TBB_LOCATION}/lib CACHE STRING "TBB library directory")
-+ SET ( TBB_LIBRARYDIR ${TBB_LOCATION}/${CMAKE_INSTALL_LIBDIR} CACHE STRING "TBB library directory")
- IF (${CMAKE_COMPILER_IS_GNUCXX})
- IF ( TBB_MATCH_COMPILER_VERSION )
- STRING(REGEX MATCHALL "[0-9]+" GCC_VERSION_COMPONENTS ${CMAKE_CXX_COMPILER_VERSION})
-diff -urN a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt 2018-08-13 16:33:07.000000000 +0100
-+++ b/CMakeLists.txt 2018-08-28 12:20:33.335930717 +0100
-@@ -32,6 +32,8 @@
-
- ENABLE_TESTING()
-
-+INCLUDE ( GNUInstallDirs )
-+
- find_program(CCACHE_FOUND ccache)
- if(CCACHE_FOUND)
- set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
-diff -urN a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt
---- a/openvdb/CMakeLists.txt 2018-08-13 16:33:07.000000000 +0100
-+++ b/openvdb/CMakeLists.txt 2018-08-28 12:20:33.335930717 +0100
-@@ -414,7 +414,7 @@
- )
-
- INSTALL ( CODE "EXECUTE_PROCESS(COMMAND \"${CMAKE_COMMAND}\" --build \"${PROJECT_BINARY_DIR}\" --target doc)")
-- INSTALL ( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html DESTINATION docs)
-+ INSTALL ( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html DESTINATION ${CMAKE_INSTALL_DOCDIR})
-
- ENDIF ()
-
-@@ -423,37 +423,37 @@
- INSTALL ( TARGETS
- vdb_view
- DESTINATION
-- bin
-+ ${CMAKE_INSTALL_BINDIR}
- )
- ENDIF ()
- INSTALL ( TARGETS
- vdb_print
- vdb_render
- DESTINATION
-- bin
-+ ${CMAKE_INSTALL_BINDIR}
- )
-
- INSTALL ( TARGETS
- openvdb_static
- DESTINATION
-- lib
-+ ${CMAKE_INSTALL_LIBDIR}
- )
-
- IF (WIN32)
- INSTALL ( TARGETS
- openvdb_shared
-- RUNTIME DESTINATION bin COMPONENT Runtime
-- ARCHIVE DESTINATION lib COMPONENT Runtime
-+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Runtime
-+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Runtime
- )
- ELSE()
- INSTALL ( TARGETS
- openvdb_shared
- DESTINATION
-- lib
-+ ${CMAKE_INSTALL_LIBDIR}
- )
- ENDIF ()
-
--INSTALL ( DIRECTORY ${PROJECT_SOURCE_DIR} DESTINATION include
-+INSTALL ( DIRECTORY ${PROJECT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
- FILES_MATCHING PATTERN "*.h"
- PATTERN "python" EXCLUDE
- PATTERN "cmd" EXCLUDE
-diff -urN a/openvdb/python/CMakeLists.txt b/openvdb/python/CMakeLists.txt
---- a/openvdb/python/CMakeLists.txt 2018-08-13 16:33:07.000000000 +0100
-+++ b/openvdb/python/CMakeLists.txt 2018-08-28 12:20:33.336930716 +0100
-@@ -107,6 +107,6 @@
- ${PYOPENVDB_INSTALL_DIRECTORY}
- )
-
--INSTALL ( DIRECTORY ${PROJECT_SOURCE_DIR} DESTINATION include
-+INSTALL ( DIRECTORY ${PROJECT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
- FILES_MATCHING PATTERN "*.h"
- )
diff --git a/media-gfx/openvdb/files/openvdb-5.2.0-use-pkgconfig-for-ilmbase-and-openexr.patch b/media-gfx/openvdb/files/openvdb-5.2.0-use-pkgconfig-for-ilmbase-and-openexr.patch
deleted file mode 100644
index dd0b83540aa..00000000000
--- a/media-gfx/openvdb/files/openvdb-5.2.0-use-pkgconfig-for-ilmbase-and-openexr.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-This patch is an updated version of the patch created in dracwyrm's
-patchset for openvdb 4.0.2 which uses PkgConfig to ensure that the
-correct IlmBase and OpenEXR dependencies are found.
-
-In subsequent versions this functionality is taken over by
-altering the directory the header files are searched for in
-multilib-header-source patch by Bernd Waibel
-
-diff -urN a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt
---- a/openvdb/CMakeLists.txt 2018-08-28 12:20:33.000000000 +0100
-+++ b/openvdb/CMakeLists.txt 2018-08-28 12:25:19.807755722 +0100
-@@ -83,11 +83,12 @@
- ADD_DEFINITIONS ( -DBOOST_ALL_NO_LIB )
- ENDIF ()
-
-+FIND_PACKAGE ( PkgConfig REQUIRED )
- FIND_PACKAGE ( Blosc REQUIRED )
- FIND_PACKAGE ( TBB REQUIRED )
- FIND_PACKAGE ( ZLIB REQUIRED )
--FIND_PACKAGE ( ILMBase REQUIRED )
--FIND_PACKAGE ( OpenEXR REQUIRED )
-+PKG_CHECK_MODULES ( ILMBASE_LIBS REQUIRED IlmBase )
-+PKG_CHECK_MODULES ( OPENEXR_LIBS REQUIRED OpenEXR )
- FIND_PACKAGE ( OpenGL REQUIRED )
- IF (OPENVDB_BUILD_DOCS)
- FIND_PACKAGE ( Doxygen REQUIRED )
-@@ -111,8 +112,8 @@
- INCLUDE_DIRECTORIES ( SYSTEM ${ZLIB_INCLUDE_DIR} )
- ENDIF ()
-
--INCLUDE_DIRECTORIES ( SYSTEM ${ILMBASE_INCLUDE_DIRS} )
--INCLUDE_DIRECTORIES ( SYSTEM ${OPENEXR_INCLUDE_DIRS} )
-+INCLUDE_DIRECTORIES ( SYSTEM ${ILMBASE_LIBS_INCLUDE_DIRS} )
-+INCLUDE_DIRECTORIES ( SYSTEM ${OPENEXR_LIBS_INCLUDE_DIRS} )
- INCLUDE_DIRECTORIES ( SYSTEM ${GLFW_INCLUDE_DIRECTORY} )
-
- IF (WIN32)
-@@ -184,7 +185,7 @@
- ${Boost_IOSTREAMS_LIBRARY}
- ${Boost_SYSTEM_LIBRARY}
- ${Tbb_TBB_LIBRARY}
-- ${Ilmbase_HALF_LIBRARY}
-+ ${ILMBASE_LIBS_LDFLAGS}
- ${ZLIB_LIBRARY}
- ${BLOSC_blosc_LIBRARY}
- )
-@@ -192,7 +193,7 @@
- ${Boost_IOSTREAMS_LIBRARY}
- ${Boost_SYSTEM_LIBRARY}
- ${Tbb_TBB_LIBRARY}
-- ${Ilmbase_HALF_LIBRARY}
-+ ${ILMBASE_LIBS_LDFLAGS}
- ${ZLIB_LIBRARY}
- ${BLOSC_blosc_LIBRARY}
- )
-@@ -246,9 +247,8 @@
- openvdb_shared
- ${CMAKE_THREAD_LIBS_INIT}
- ${BLOSC_blosc_LIBRARY}
-- ${Openexr_ILMIMF_LIBRARY}
-- ${Ilmbase_ILMTHREAD_LIBRARY}
-- ${Ilmbase_IEX_LIBRARY}
-+ ${OPENEXR_LIBS_LDFLAGS}
-+ ${ILMBASE_LIBS_LDFLAGS}
- m
- stdc++
- )
-diff -urN a/openvdb/python/CMakeLists.txt b/openvdb/python/CMakeLists.txt
---- a/openvdb/python/CMakeLists.txt 2018-08-28 12:20:33.000000000 +0100
-+++ b/openvdb/python/CMakeLists.txt 2018-08-28 12:25:19.808755721 +0100
-@@ -9,8 +9,8 @@
- IF ( NOT OPENVDB_BUILD_CORE )
- FIND_PACKAGE ( OpenVDB REQUIRED )
-
-- FIND_PACKAGE ( ILMBase REQUIRED )
-- FIND_PACKAGE ( OpenEXR REQUIRED )
-+ PKG_CHECK_MODULES ( ILMBASE_LIBS REQUIRED IlmBase )
-+ PKG_CHECK_MODULES ( OPENEXR_LIBS REQUIRED OpenEXR )
- FIND_PACKAGE ( Blosc REQUIRED )
- FIND_PACKAGE ( TBB REQUIRED )
- FIND_PACKAGE ( ZLIB REQUIRED )
-@@ -29,8 +29,8 @@
- SET ( OPENVDB_LIB openvdb_shared)
- ENDIF ( NOT OPENVDB_BUILD_CORE )
-
--INCLUDE_DIRECTORIES ( SYSTEM ${ILMBASE_INCLUDE_DIRS} )
--INCLUDE_DIRECTORIES ( SYSTEM ${OPENEXR_INCLUDE_DIRS} )
-+INCLUDE_DIRECTORIES ( SYSTEM ${ILMBASE_LIBS_INCLUDE_DIRS} )
-+INCLUDE_DIRECTORIES ( SYSTEM ${OPENEXR_LIBS_INCLUDE_DIRS} )
- INCLUDE_DIRECTORIES ( SYSTEM ${Boost_INCLUDE_DIR} )
- INCLUDE_DIRECTORIES ( SYSTEM ${BLOSC_INCLUDE_DIR} )
- INCLUDE_DIRECTORIES ( SYSTEM ${TBB_INCLUDE_DIR} )
-@@ -91,7 +91,7 @@
- ${GLEW_GLEW_LIBRARY}
- ${Boost_PYTHON_LIBRARY}
- ${PYTHON_LIBRARY}
-- ${Ilmbase_HALF_LIBRARY}
-+ ${ILMBASE_LIBS_LDFLAGS}
- )
-
- SET_TARGET_PROPERTIES ( pyopenvdb PROPERTIES
diff --git a/media-gfx/openvdb/files/openvdb-6.2.1-fix-multilib-header-source.patch b/media-gfx/openvdb/files/openvdb-6.2.1-fix-multilib-header-source.patch
deleted file mode 100644
index e8cfac755d3..00000000000
--- a/media-gfx/openvdb/files/openvdb-6.2.1-fix-multilib-header-source.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-This patch changes the default location that the header files look for
-IlmBaseConfig.h as in Gentoo the version containg the ILMBASE_VERSION_MAJOR
-and ILMBASE_VERSION_MINOR is stored under /usr/include/chost.
-
-Without this patch, compilation fails as it is unable to identify the
-required IlmBase version.
-
-Based on the fix multilib header patch for 7.1.0 by Bernd Waibel
-
-diff -Naur a/cmake/FindIlmBase.cmake b/cmake/FindIlmBase.cmake
---- a/cmake/FindIlmBase.cmake 2020-02-02 01:03:55.000000000 +0800
-+++ b/cmake/FindIlmBase.cmake 2020-02-02 01:09:05.000000000 +0800
-@@ -168,9 +168,15 @@
- 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 @@
- )
- 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/media-gfx/openvdb/files/openvdb-6.2.1-use-gnuinstalldirs.patch b/media-gfx/openvdb/files/openvdb-6.2.1-use-gnuinstalldirs.patch
deleted file mode 100644
index ac73d82f9c3..00000000000
--- a/media-gfx/openvdb/files/openvdb-6.2.1-use-gnuinstalldirs.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -Naur a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt 2020-01-08 22:16:00.493079361 +0800
-+++ b/CMakeLists.txt 2020-01-08 22:16:44.790285583 +0800
-@@ -252,6 +252,8 @@
-
- enable_testing()
-
-+INCLUDE ( GNUInstallDirs )
-+
- # Add our cmake modules
-
- list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
-diff -Naur a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt
---- a/openvdb/CMakeLists.txt 2020-01-08 22:16:07.362646127 +0800
-+++ b/openvdb/CMakeLists.txt 2020-01-08 22:19:54.638308684 +0800
-@@ -492,7 +492,7 @@
- install(TARGETS
- openvdb_static
- DESTINATION
-- lib
-+ ${CMAKE_INSTALL_LIBDIR}
- )
- endif()
-
-@@ -500,14 +500,14 @@
- if(WIN32)
- install(TARGETS
- openvdb_shared
-- RUNTIME DESTINATION bin COMPONENT Runtime
-- ARCHIVE DESTINATION lib COMPONENT Runtime
-+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Runtime
-+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Runtime
- )
- else()
- install(TARGETS
- openvdb_shared
- DESTINATION
-- lib
-+ ${CMAKE_INSTALL_LIBDIR}
- )
- endif()
- endif()
-diff -Naur a/openvdb/python/CMakeLists.txt b/openvdb/python/CMakeLists.txt
---- a/openvdb/python/CMakeLists.txt 2020-01-08 22:16:14.452199013 +0800
-+++ b/openvdb/python/CMakeLists.txt 2020-01-08 22:21:45.311324663 +0800
-@@ -232,7 +232,7 @@
- ${PYOPENVDB_INSTALL_DIRECTORY}
- )
-
--install(FILES ${PYTHON_PUBLIC_INCLUDE_NAMES} DESTINATION include/openvdb/python)
-+install(FILES ${PYTHON_PUBLIC_INCLUDE_NAMES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/openvdb/python)
-
- # pytest
-
diff --git a/media-gfx/openvdb/metadata.xml b/media-gfx/openvdb/metadata.xml
index aac3bf03086..67265e42cc4 100644
--- a/media-gfx/openvdb/metadata.xml
+++ b/media-gfx/openvdb/metadata.xml
@@ -18,12 +18,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-6.0.0" name="abi3-compat">
- Disables newer features to maintain compatibility with ABI3.
- </flag>
- <flag restrict="<=media-gfx/openvdb-7.0.0" name="abi4-compat">
- Disables newer features to maintain compatibility with ABI4.
- </flag>
<flag restrict="<=media-gfx/openvdb-7.1.0" name="abi5-compat">
Disables newer features to maintain compatibility with ABI5.
</flag>
diff --git a/media-gfx/openvdb/openvdb-4.0.2-r4.ebuild b/media-gfx/openvdb/openvdb-4.0.2-r4.ebuild
deleted file mode 100644
index 841627eb807..00000000000
--- a/media-gfx/openvdb/openvdb-4.0.2-r4.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2020 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
- https://dev.gentoo.org/~dracwyrm/patches/${P}-patchset-02.tar.xz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="abi3-compat +abi4-compat doc python test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
- python? ( ${PYTHON_REQUIRED_USE} )
- ^^ ( abi3-compat abi4-compat )
-"
-
-RDEPEND="
- dev-cpp/tbb
- 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:=
- 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:=[python?,${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- ')
- )
-"
-
-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 )
-"
-
-PATCHES=(
- "${WORKDIR}/${P}-patchset-02/0001-use-gnuinstalldirs.patch"
- "${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() {
- use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
- local myprefix="${EPREFIX}/usr/"
-
- # To stay in sync with Boost
- append-cxxflags -std=c++14
-
- local version
- if use abi3-compat; then
- version=3
- elif use abi4-compat; then
- version=4
- else
- die "Openvdb abi version is not compatible"
- fi
-
- local mycmakeargs=(
- -DBLOSC_LOCATION="${myprefix}"
- -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
- -DGLFW3_LOCATION="${myprefix}"
- -DOPENVDB_BUILD_DOCS=$(usex doc)
- -DOPENVDB_BUILD_PYTHON_MODULE=$(usex python)
- -DOPENVDB_BUILD_UNITTESTS=$(usex test)
- -DOPENVDB_ENABLE_3_ABI_COMPATIBLE=$(usex abi3-compat)
- -DOPENVDB_ENABLE_RPATH=OFF
- -DTBB_LOCATION="${myprefix}"
- -DUSE_GLFW3=ON
- )
-
- use python && mycmakeargs+=( -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)" )
- use test && mycmakeargs+=( -DCPPUNIT_LOCATION="${myprefix}" )
-
- cmake_src_configure
-}
diff --git a/media-gfx/openvdb/openvdb-5.2.0-r2.ebuild b/media-gfx/openvdb/openvdb-5.2.0-r2.ebuild
deleted file mode 100644
index 30a8f69cbd0..00000000000
--- a/media-gfx/openvdb/openvdb-5.2.0-r2.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2020 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"
-KEYWORDS="~amd64 ~x86"
-IUSE="abi3-compat abi4-compat +abi5-compat doc python test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
- python? ( ${PYTHON_REQUIRED_USE} )
- ^^ ( abi3-compat abi4-compat abi5-compat )
-"
-
-RDEPEND="
- dev-cpp/tbb
- 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:=
- 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:=[python?,${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- ')
- )
-"
-
-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 )
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-use-gnuinstalldirs.patch"
- "${FILESDIR}/${P}-use-pkgconfig-for-ilmbase-and-openexr.patch"
- "${FILESDIR}/${PN}-4.0.2-fix-const-correctness-for-unittest.patch"
- "${FILESDIR}/${PN}-4.0.2-fix-build-docs.patch"
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
- local myprefix="${EPREFIX}/usr/"
-
- local version
- if use abi3-compat; then
- version=3
- elif use abi4-compat; then
- version=4
- elif use abi5-compat; then
- version=5
- else
- die "Openvdb ABI version not specified"
- fi
-
- local mycmakeargs=(
- -DBLOSC_LOCATION="${myprefix}"
- -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
- -DGLFW3_LOCATION="${myprefix}"
- -DOPENVDB_ABI_VERSION_NUMBER="${version}"
- -DOPENVDB_BUILD_DOCS=$(usex doc)
- -DOPENVDB_BUILD_PYTHON_MODULE=$(usex python)
- -DOPENVDB_BUILD_UNITTESTS=$(usex test)
- -DOPENVDB_ENABLE_RPATH=OFF
- -DTBB_LOCATION="${myprefix}"
- -DUSE_GLFW3=ON
- )
-
- use python && mycmakeargs+=( -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)" )
- use test && mycmakeargs+=( -DCPPUNIT_LOCATION="${myprefix}" )
-
- cmake_src_configure
-}
diff --git a/media-gfx/openvdb/openvdb-6.2.1-r1.ebuild b/media-gfx/openvdb/openvdb-6.2.1-r1.ebuild
deleted file mode 100644
index 5179dddc6da..00000000000
--- a/media-gfx/openvdb/openvdb-6.2.1-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 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"
-KEYWORDS="~amd64 ~x86"
-IUSE="abi4-compat abi5-compat +abi6-compat doc python test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
- python? ( ${PYTHON_REQUIRED_USE} )
- ^^ ( abi4-compat abi5-compat abi6-compat )
-"
-
-RDEPEND="
- dev-cpp/tbb
- 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:=
- 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:=[python?,${PYTHON_USEDEP}]
- 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}-fix-multilib-header-source.patch"
- "${FILESDIR}/${PN}-4.0.2-fix-const-correctness-for-unittest.patch"
- "${FILESDIR}/${P}-use-gnuinstalldirs.patch"
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
- local myprefix="${EPREFIX}/usr/"
-
- local version
- if use abi4-compat; then
- version=4
- elif use abi5-compat; then
- version=5
- elif use abi6-compat; then
- version=6
- else
- die "Openvdb ABI version not specified"
- fi
-
- local mycmakeargs=(
- -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
- -DOPENVDB_ABI_VERSION_NUMBER="${version}"
- -DOPENVDB_BUILD_DOCS=$(usex doc)
- -DOPENVDB_BUILD_PYTHON_MODULE=$(usex python)
- -DOPENVDB_BUILD_UNITTESTS=$(usex test)
- -DOPENVDB_ENABLE_RPATH=OFF
- -DCHOST="${CHOST}"
- )
-
- use python && mycmakeargs+=( -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)" )
- use test && mycmakeargs+=( -DCPPUNIT_LOCATION="${myprefix}" )
-
- cmake_src_configure
-}
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/, media-gfx/openvdb/files/
@ 2021-07-09 3:11 Ionen Wolkens
0 siblings, 0 replies; 21+ messages in thread
From: Ionen Wolkens @ 2021-07-09 3:11 UTC (permalink / raw
To: gentoo-commits
commit: 2757616782a8356b55f704e5e98d894c59a964d9
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 9 02:53:23 2021 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Jul 9 03:10:11 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27576167
media-gfx/openvdb: prevent using lib/ by default for glfw
Formerly benign because it'd find nothing and try $(get_libdir)
next, but glfw now has multilib support.
This simple fix should be safe enough for stable version as well.
Closes: https://bugs.gentoo.org/800200
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
media-gfx/openvdb/files/openvdb-8.0.1-glfw-libdir.patch | 12 ++++++++++++
media-gfx/openvdb/openvdb-7.0.0-r1.ebuild | 1 +
media-gfx/openvdb/openvdb-7.1.0-r1.ebuild | 1 +
media-gfx/openvdb/openvdb-8.0.1.ebuild | 1 +
4 files changed, 15 insertions(+)
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
new file mode 100644
index 00000000000..991c5a6a568
--- /dev/null
+++ b/media-gfx/openvdb/files/openvdb-8.0.1-glfw-libdir.patch
@@ -0,0 +1,12 @@
+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/openvdb-7.0.0-r1.ebuild b/media-gfx/openvdb/openvdb-7.0.0-r1.ebuild
index 21735fd515a..10868f647c6 100644
--- a/media-gfx/openvdb/openvdb-7.0.0-r1.ebuild
+++ b/media-gfx/openvdb/openvdb-7.0.0-r1.ebuild
@@ -66,6 +66,7 @@ BDEPEND="
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() {
diff --git a/media-gfx/openvdb/openvdb-7.1.0-r1.ebuild b/media-gfx/openvdb/openvdb-7.1.0-r1.ebuild
index 52e0454b175..ed2847345e4 100644
--- a/media-gfx/openvdb/openvdb-7.1.0-r1.ebuild
+++ b/media-gfx/openvdb/openvdb-7.1.0-r1.ebuild
@@ -66,6 +66,7 @@ BDEPEND="
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() {
diff --git a/media-gfx/openvdb/openvdb-8.0.1.ebuild b/media-gfx/openvdb/openvdb-8.0.1.ebuild
index 11350d22c91..f6827c2006e 100644
--- a/media-gfx/openvdb/openvdb-8.0.1.ebuild
+++ b/media-gfx/openvdb/openvdb-8.0.1.ebuild
@@ -65,6 +65,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/${PN}-7.1.0-0001-Fix-multilib-header-source.patch"
+ "${FILESDIR}/${P}-glfw-libdir.patch"
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/, media-gfx/openvdb/files/
@ 2021-10-31 2:19 Sam James
0 siblings, 0 replies; 21+ messages in thread
From: Sam James @ 2021-10-31 2:19 UTC (permalink / raw
To: gentoo-commits
commit: 71742398066123535d58a89f2fc2afda8176196a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 31 01:55:37 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 31 02:18:24 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71742398
media-gfx/openvdb: add 8.1.0
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-gfx/openvdb/Manifest | 1 +
.../openvdb/files/openvdb-8.1.0-glfw-libdir.patch | 21 ++++
media-gfx/openvdb/openvdb-8.1.0.ebuild | 128 +++++++++++++++++++++
3 files changed, 150 insertions(+)
diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest
index 6dea8aee2b9..0667d3371ff 100644
--- a/media-gfx/openvdb/Manifest
+++ b/media-gfx/openvdb/Manifest
@@ -1,3 +1,4 @@
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
diff --git a/media-gfx/openvdb/files/openvdb-8.1.0-glfw-libdir.patch b/media-gfx/openvdb/files/openvdb-8.1.0-glfw-libdir.patch
new file mode 100644
index 00000000000..412785fb0e1
--- /dev/null
+++ b/media-gfx/openvdb/files/openvdb-8.1.0-glfw-libdir.patch
@@ -0,0 +1,21 @@
+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
+[rebased by sam]
+--- a/cmake/OpenVDBGLFW3Setup.cmake
++++ b/cmake/OpenVDBGLFW3Setup.cmake
+@@ -83,10 +83,10 @@ endif()
+
+ 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
+-list(APPEND _GLFW3_PATH_SUFFIXES "lib/cmake/glfw" "cmake/glfw" "glfw")
++list(APPEND _GLFW3_PATH_SUFFIXES "cmake/glfw" "glfw")
+
+ find_path(GLFW3_CMAKE_LOCATION glfw3Config.cmake
+ ${_FIND_GLFW3_ADDITIONAL_OPTIONS}
+
diff --git a/media-gfx/openvdb/openvdb-8.1.0.ebuild b/media-gfx/openvdb/openvdb-8.1.0.ebuild
new file mode 100644
index 00000000000..72ac356edca
--- /dev/null
+++ b/media-gfx/openvdb/openvdb-8.1.0.ebuild
@@ -0,0 +1,128 @@
+# 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 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"
+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/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
+ 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.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
+ -DOPENVDB_USE_BLOSC=$(usex blosc)
+ -DOPENVDB_USE_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)
+ -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
+}
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/, media-gfx/openvdb/files/
@ 2021-10-31 2:19 Sam James
0 siblings, 0 replies; 21+ messages in thread
From: Sam James @ 2021-10-31 2:19 UTC (permalink / raw
To: gentoo-commits
commit: b44368f21076a1620b2bf87d0d358a41552fff05
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Thu Oct 28 10:14:27 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 31 02:18:26 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b44368f2
media-gfx/openvdb: patch to find numpy
- adds consistency in the find_package call for NumPy by adding the
same components like in the find_package call for Python
- additionally pass -DPython_INCLUDE_DIR to cmake
- add an option for python unittests when USE=test is set
- remove flag-o-matic inherit, which isn't needed according to pkgcheck
- change the negation on the utils USE flag to build the utilities if
the USE flag is set.
Bug: https://bugs.gentoo.org/788886
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>
...dd-consistency-for-NumPy-find_package-call.patch | 21 +++++++++++++++++++++
media-gfx/openvdb/openvdb-8.0.1-r2.ebuild | 11 +++++++----
2 files changed, 28 insertions(+), 4 deletions(-)
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
new file mode 100644
index 00000000000..87d1d24755b
--- /dev/null
+++ b/media-gfx/openvdb/files/openvdb-8.0.1-add-consistency-for-NumPy-find_package-call.patch
@@ -0,0 +1,21 @@
+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/openvdb-8.0.1-r2.ebuild b/media-gfx/openvdb/openvdb-8.0.1-r2.ebuild
index fc19c87ea4c..0afc20a97e0 100644
--- a/media-gfx/openvdb/openvdb-8.0.1-r2.ebuild
+++ b/media-gfx/openvdb/openvdb-8.0.1-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
PYTHON_COMPAT=( python3_{7,8,9} )
-inherit cmake flag-o-matic python-single-r1
+inherit cmake python-single-r1
DESCRIPTION="Library for the efficient manipulation of volumetric data"
HOMEPAGE="https://www.openvdb.org"
@@ -66,6 +66,7 @@ BDEPEND="
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() {
@@ -92,9 +93,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
@@ -108,8 +109,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] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/, media-gfx/openvdb/files/
@ 2021-12-02 2:34 Sam James
0 siblings, 0 replies; 21+ messages in thread
From: Sam James @ 2021-12-02 2:34 UTC (permalink / raw
To: gentoo-commits
commit: 8f69aea9c3a148dcc961957e8004eaa0dc45be8b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 2 02:33:57 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 2 02:34:21 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f69aea9
media-gfx/openvdb: tweak Python detection for 9.0.0
Let's try this. We might be able to drop the options we pass
in the ebuild entirely, but not wanting to mess too much
for a moment.
Bug: https://bugs.gentoo.org/790350
Signed-off-by: Sam James <sam <AT> gentoo.org>
...unconditionally-search-Python-interpreter.patch | 40 ++++++++++++++++++++++
media-gfx/openvdb/openvdb-9.0.0.ebuild | 1 +
2 files changed, 41 insertions(+)
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
new file mode 100644
index 000000000000..66c50b485d70
--- /dev/null
+++ b/media-gfx/openvdb/files/openvdb-9.0.0-unconditionally-search-Python-interpreter.patch
@@ -0,0 +1,40 @@
+From e9b193cc3481c4e157aa39e753ce49a0da69bb2b Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Thu, 2 Dec 2021 02:16:15 +0000
+Subject: [PATCH] cmake: unconditionally search for 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: Sam James <sam@gentoo.org>
+---
+ openvdb/openvdb/python/CMakeLists.txt | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/openvdb/openvdb/python/CMakeLists.txt b/openvdb/openvdb/python/CMakeLists.txt
+index 2821efb5..af93976a 100644
+--- a/openvdb/openvdb/python/CMakeLists.txt
++++ b/openvdb/openvdb/python/CMakeLists.txt
+@@ -98,9 +98,7 @@ endfunction()
+ # 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()
++list(APPEND OPENVDB_PYTHON_REQUIRED_COMPONENTS Interpreter)
+
+ if(USE_NUMPY)
+ list(APPEND OPENVDB_PYTHON_REQUIRED_COMPONENTS NumPy)
+--
+2.34.1
+
diff --git a/media-gfx/openvdb/openvdb-9.0.0.ebuild b/media-gfx/openvdb/openvdb-9.0.0.ebuild
index 898e80d496d6..60c18372ac5d 100644
--- a/media-gfx/openvdb/openvdb-9.0.0.ebuild
+++ b/media-gfx/openvdb/openvdb-9.0.0.ebuild
@@ -65,6 +65,7 @@ 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"
+ "${FILESDIR}/${PN}-9.0.0-unconditionally-search-Python-interpreter.patch"
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/, media-gfx/openvdb/files/
@ 2021-12-10 4:31 Sam James
0 siblings, 0 replies; 21+ messages in thread
From: Sam James @ 2021-12-10 4:31 UTC (permalink / raw
To: gentoo-commits
commit: 9d065d7d4ab901612eb897b36caa3e0d8a0e7820
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 10 04:29:46 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 10 04:29:46 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d065d7d
media-gfx/openvdb: use upstream patch for Python detection issue
Bug: https://bugs.gentoo.org/790350
Bug: https://github.com/AcademySoftwareFoundation/openvdb/pull/1275
Signed-off-by: Sam James <sam <AT> gentoo.org>
...unconditionally-search-Python-interpreter.patch | 57 ++++++++++------------
media-gfx/openvdb/openvdb-9.0.0.ebuild | 1 -
2 files changed, 26 insertions(+), 32 deletions(-)
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
index 66c50b485d70..1a24f4c535c3 100644
--- 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
@@ -1,40 +1,35 @@
-From e9b193cc3481c4e157aa39e753ce49a0da69bb2b Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Thu, 2 Dec 2021 02:16:15 +0000
-Subject: [PATCH] cmake: unconditionally search for Python interpreter
+https://bugs.gentoo.org/790350
+https://github.com/AcademySoftwareFoundation/openvdb/pull/1275
-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)
-```
+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
-It seems like we always need to search for the interpreter.
-
-Bug: https://bugs.gentoo.org/790350
-Signed-off-by: Sam James <sam@gentoo.org>
+Signed-off-by: Nick Avramoussis <4256455+Idclip@users.noreply.github.com>
---
- openvdb/openvdb/python/CMakeLists.txt | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
+ 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 2821efb5..af93976a 100644
+index 2821efb5d..179c0c57d 100644
--- a/openvdb/openvdb/python/CMakeLists.txt
+++ b/openvdb/openvdb/python/CMakeLists.txt
-@@ -98,9 +98,7 @@ endfunction()
+@@ -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)
--if(NOT DEFINED PYOPENVDB_INSTALL_DIRECTORY)
-- list(APPEND OPENVDB_PYTHON_REQUIRED_COMPONENTS Interpreter)
--endif()
-+list(APPEND OPENVDB_PYTHON_REQUIRED_COMPONENTS Interpreter)
-
- if(USE_NUMPY)
- list(APPEND OPENVDB_PYTHON_REQUIRED_COMPONENTS NumPy)
---
-2.34.1
-
+-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/openvdb-9.0.0.ebuild b/media-gfx/openvdb/openvdb-9.0.0.ebuild
index 60c18372ac5d..e40833eff061 100644
--- a/media-gfx/openvdb/openvdb-9.0.0.ebuild
+++ b/media-gfx/openvdb/openvdb-9.0.0.ebuild
@@ -121,7 +121,6 @@ src_configure() {
-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] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/, media-gfx/openvdb/files/
@ 2022-02-15 19:51 Sam James
0 siblings, 0 replies; 21+ messages in thread
From: Sam James @ 2022-02-15 19:51 UTC (permalink / raw
To: gentoo-commits
commit: b54e19ec3c5870b59d1e18f2d430e72ddaacb009
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 12 18:03:48 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 19:49:53 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b54e19ec
media-gfx/openvdb: adjust to unslotted OpenEXR
Bug: https://bugs.gentoo.org/833158
Bug: https://bugs.gentoo.org/831357
Bug: https://bugs.gentoo.org/832862
Bug: https://bugs.gentoo.org/821247
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../openvdb/files/openvdb-8.2.0-openexr-3-imath.patch | 16 ----------------
.../{openvdb-8.2.0-r1.ebuild => openvdb-8.2.0-r3.ebuild} | 7 ++-----
.../{openvdb-8.2.0-r2.ebuild => openvdb-8.2.0-r4.ebuild} | 3 +--
.../{openvdb-9.0.0.ebuild => openvdb-9.0.0-r1.ebuild} | 12 ++----------
4 files changed, 5 insertions(+), 33 deletions(-)
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
deleted file mode 100644
index 0a9dfe541f79..000000000000
--- a/media-gfx/openvdb/files/openvdb-8.2.0-openexr-3-imath.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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-r1.ebuild b/media-gfx/openvdb/openvdb-8.2.0-r3.ebuild
similarity index 93%
rename from media-gfx/openvdb/openvdb-8.2.0-r1.ebuild
rename to media-gfx/openvdb/openvdb-8.2.0-r3.ebuild
index 1a4d9c0e36e9..c77a66b4a5b2 100644
--- a/media-gfx/openvdb/openvdb-8.2.0-r1.ebuild
+++ b/media-gfx/openvdb/openvdb-8.2.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -22,8 +22,6 @@ REQUIRED_USE="
^^ ( abi6-compat abi7-compat abi8-compat )
python? ( ${PYTHON_REQUIRED_USE} )
"
-# 8.2.0 should support OpenEXR 3 / imath but it's going to cause issues with Blender AFAIK
-# so let's avoid it for now.
RDEPEND="
dev-cpp/tbb:=
dev-libs/boost:=
@@ -46,7 +44,7 @@ RDEPEND="
)
utils? (
media-libs/ilmbase:=
- media-libs/openexr:0=
+ media-libs/openexr:=
)
zlib? ( sys-libs/zlib )
"
@@ -106,7 +104,6 @@ src_configure() {
-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
)
diff --git a/media-gfx/openvdb/openvdb-8.2.0-r2.ebuild b/media-gfx/openvdb/openvdb-8.2.0-r4.ebuild
similarity index 97%
rename from media-gfx/openvdb/openvdb-8.2.0-r2.ebuild
rename to media-gfx/openvdb/openvdb-8.2.0-r4.ebuild
index ceb0d37949a9..edc5a635adc6 100644
--- a/media-gfx/openvdb/openvdb-8.2.0-r2.ebuild
+++ b/media-gfx/openvdb/openvdb-8.2.0-r4.ebuild
@@ -45,7 +45,7 @@ RDEPEND="
)
utils? (
dev-libs/imath:=
- media-libs/openexr:3=
+ media-libs/openexr:=
)
zlib? ( sys-libs/zlib )
"
@@ -72,7 +72,6 @@ PATCHES=(
"${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() {
diff --git a/media-gfx/openvdb/openvdb-9.0.0.ebuild b/media-gfx/openvdb/openvdb-9.0.0-r1.ebuild
similarity index 92%
rename from media-gfx/openvdb/openvdb-9.0.0.ebuild
rename to media-gfx/openvdb/openvdb-9.0.0-r1.ebuild
index e40833eff061..f7aaf0b3943e 100644
--- a/media-gfx/openvdb/openvdb-9.0.0.ebuild
+++ b/media-gfx/openvdb/openvdb-9.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -30,7 +30,7 @@ RDEPEND="
dev-libs/imath:=
media-libs/glfw
media-libs/glu
- media-libs/openexr:3=
+ media-libs/openexr:=
sys-libs/zlib:=
x11-libs/libXcursor
x11-libs/libXi
@@ -72,14 +72,6 @@ pkg_setup() {
use python && python-single-r1_pkg_setup
}
-src_prepare() {
- # Make sure we find our renamed Imath headers
- # bug #820929
- sed -i -e 's:#include <Imath/half.h>:#include <Imath-3/half.h>:' openvdb/openvdb/Types.h || die
-
- cmake_src_prepare
-}
-
src_configure() {
local myprefix="${EPREFIX}/usr/"
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/, media-gfx/openvdb/files/
@ 2022-02-18 22:23 Yixun Lan
0 siblings, 0 replies; 21+ messages in thread
From: Yixun Lan @ 2022-02-18 22:23 UTC (permalink / raw
To: gentoo-commits
commit: 64988e18d34d6d84629194aa767ef29ed5521881
Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 18 22:20:45 2022 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Fri Feb 18 22:20:45 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64988e18
media-gfx/openvdb: fix missing atomic lib
this happened on RISC-V platform, but may also
exist in other ARCH, see tracking bug #721344
Closes: https://bugs.gentoo.org/833372
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
.../openvdb/files/openvdb-9.0.0-fix-atomic.patch | 47 ++++++++++++++++++++++
media-gfx/openvdb/openvdb-9.0.0-r2.ebuild | 1 +
2 files changed, 48 insertions(+)
diff --git a/media-gfx/openvdb/files/openvdb-9.0.0-fix-atomic.patch b/media-gfx/openvdb/files/openvdb-9.0.0-fix-atomic.patch
new file mode 100644
index 000000000000..3885bb4ca453
--- /dev/null
+++ b/media-gfx/openvdb/files/openvdb-9.0.0-fix-atomic.patch
@@ -0,0 +1,47 @@
+From 7ca53e00b5f85b8842a2a846f0026d63791498cc Mon Sep 17 00:00:00 2001
+From: Yixun Lan <dlan@gentoo.org>
+Date: Wed, 16 Feb 2022 22:24:16 +0800
+Subject: [PATCH] openvdb: fix missing atomic lib
+
+explicitly pass -pthread to work around pthread builtin since glibc-2.34,
+as we need -pthread to pull in libatomic for machines like riscv
+
+Bug: https://bugs.gentoo.org/833372
+Original-from: Alex Fan <alex.fan.q@gmail.com>
+Signed-off-by: Yixun Lan <dlan@gentoo.org>
+---
+ nanovdb/nanovdb/CMakeLists.txt | 3 +++
+ openvdb/openvdb/CMakeLists.txt | 3 +++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/nanovdb/nanovdb/CMakeLists.txt b/nanovdb/nanovdb/CMakeLists.txt
+index 296dbb0..afc4f0c 100644
+--- a/nanovdb/nanovdb/CMakeLists.txt
++++ b/nanovdb/nanovdb/CMakeLists.txt
+@@ -69,6 +69,9 @@ if(UNIX)
+ # forces the compiler -pthread flag vs -lpthread
+ set(THREADS_PREFER_PTHREAD_FLAG TRUE)
+ find_package(Threads REQUIRED)
++ if(CMAKE_USE_PTHREADS_INIT)
++ target_link_libraries(Threads::Threads INTERFACE -pthread)
++ endif()
+ endif()
+
+ if(NANOVDB_BUILD_UNITTESTS OR NANOVDB_BUILD_BENCHMARK)
+diff --git a/openvdb/openvdb/CMakeLists.txt b/openvdb/openvdb/CMakeLists.txt
+index 1d5b75f..22988b7 100644
+--- a/openvdb/openvdb/CMakeLists.txt
++++ b/openvdb/openvdb/CMakeLists.txt
+@@ -202,6 +202,9 @@ endif()
+
+ if(UNIX)
+ find_package(Threads REQUIRED)
++ if(CMAKE_USE_PTHREADS_INIT)
++ target_link_libraries(Threads::Threads INTERFACE -pthread)
++ endif()
+ endif()
+
+ # Set deps. Note that the order here is important. If we're building against
+--
+2.35.1
+
diff --git a/media-gfx/openvdb/openvdb-9.0.0-r2.ebuild b/media-gfx/openvdb/openvdb-9.0.0-r2.ebuild
index 7708562fd8be..e1cc1a9a6192 100644
--- a/media-gfx/openvdb/openvdb-9.0.0-r2.ebuild
+++ b/media-gfx/openvdb/openvdb-9.0.0-r2.ebuild
@@ -64,6 +64,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-fix-atomic.patch"
"${FILESDIR}/${PN}-9.0.0-numpy.patch"
"${FILESDIR}/${PN}-9.0.0-unconditionally-search-Python-interpreter.patch"
)
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/, media-gfx/openvdb/files/
@ 2022-09-25 1:27 Sam James
0 siblings, 0 replies; 21+ messages in thread
From: Sam James @ 2022-09-25 1:27 UTC (permalink / raw
To: gentoo-commits
commit: d089d928deeb9d0ff8226f23ca9168058fecf337
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Wed Sep 14 06:56:47 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 25 01:27:15 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d089d928
media-gfx/openvdb: add 9.1.0
- Bump to EAPI 8, add support for Python 3.11
- Add support for OpenVDB AX
- Drop obsolete ABI 6 compatibility, add cmake options if deprecated ABIs are
requested
- Drop zlib USE flag, we depend on sys-libs/zlib anyway
- Improve dependecies: some deps are only needed for the vdb_render binary,
toggled by the utils USE flag
- Include changes from PR #27204
Additional notes:
- OpenVDB AX can be used for custom manipulation of VDB data via an expression language. It needs <llvm-14 and will fail to configure or build with llvm-14 and above.
- Lowest compatible ABI is 7, so I removed abi6-compat USE flag. Additionally the package needs an extra cmake option to actually build the deprecated ABIs
- Zlib is required by enabling blosc or building OpenVDB AX.
If it's found by NanoVDB or if blosc is enabled in addition to nanovdb (the ebuild default), nanovdb builds in support for zlib.
Other configurations don't look for zlib, although it's enabled by the default cmake configuration.
As we uncodtionally depend on it anyway, I think the USE flag has no real use.
- Dependency on OpenGL, glew, OpenEXR or libpng is only needed by the vdb_render binary, which is enabled through the utils USE flag.
So I moved the dependencies for this packages. I had no issues with this changed dependency settings.
Bug: https://bugs.gentoo.org/869629
Closes: https://bugs.gentoo.org/851855
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/27251
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-gfx/openvdb/Manifest | 1 +
.../openvdb-9.1.0-disable-failing-tests.patch | 111 +++++++++++++
media-gfx/openvdb/metadata.xml | 4 +
media-gfx/openvdb/openvdb-9.1.0.ebuild | 173 +++++++++++++++++++++
4 files changed, 289 insertions(+)
diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest
index e9238716b63b..5650986bf6ab 100644
--- a/media-gfx/openvdb/Manifest
+++ b/media-gfx/openvdb/Manifest
@@ -4,3 +4,4 @@ DIST openvdb-8.0.1.tar.gz 2299276 BLAKE2B e65bd4710ff65e20570013399d1e71a32e8f80
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-9.1.0-disable-failing-tests.patch b/media-gfx/openvdb/files/openvdb-9.1.0-disable-failing-tests.patch
new file mode 100644
index 000000000000..d60007981e59
--- /dev/null
+++ b/media-gfx/openvdb/files/openvdb-9.1.0-disable-failing-tests.patch
@@ -0,0 +1,111 @@
+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 50b4f6e0bbd9..af37d11b4eda 100644
--- a/media-gfx/openvdb/metadata.xml
+++ b/media-gfx/openvdb/metadata.xml
@@ -15,6 +15,10 @@
Chance of Meatballs2' and 'How to Train Your Dragon 2'.
</longdescription>
<use>
+ <flag name="ax">
+ Build the OpenVDB AX module to perform custom manipulation of
+ OpenVDB data via an expression language: AX.
+ </flag>
<flag name="blosc">
Allow using blosc compression via <pkg>dev-libs/c-blosc</pkg>
</flag>
diff --git a/media-gfx/openvdb/openvdb-9.1.0.ebuild b/media-gfx/openvdb/openvdb-9.1.0.ebuild
new file mode 100644
index 000000000000..752bb5b4afe0
--- /dev/null
+++ b/media-gfx/openvdb/openvdb-9.1.0.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit cmake cuda llvm 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="abi7-compat abi8-compat +abi9-compat ax +blosc cpu_flags_x86_avx cpu_flags_x86_sse4_2 cuda doc
+ +nanovdb numpy python static-libs test utils"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="^^ ( abi7-compat abi8-compat abi9-compat )
+ cuda? ( nanovdb )
+ numpy? ( python )
+ 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:=
+ sys-libs/zlib:=
+ x11-libs/libXcursor
+ x11-libs/libXi
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ ax? ( <sys-devel/llvm-14:= )
+ 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}] )
+ ')
+ )
+ utils? (
+ media-libs/glfw
+ media-libs/glu
+ media-libs/libpng:=
+ >=media-libs/openexr-3:=
+ virtual/opengl
+ )
+"
+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 )
+"
+
+LLVM_MAX_SLOT=13
+
+PATCHES=(
+ "${FILESDIR}/${PN}-8.1.0-glfw-libdir.patch"
+ "${FILESDIR}/${PN}-9.0.0-fix-atomic.patch"
+ "${FILESDIR}/${PN}-9.1.0-disable-failing-tests.patch"
+)
+
+pkg_setup() {
+ use ax && llvm_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_AX=$(usex ax)
+ -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_CCACHE=OFF
+ -DUSE_COLORED_OUTPUT=ON
+ # OpenEXR is only needed by the vdb_render tool and defaults to OFF
+ -DUSE_EXR=$(usex utils)
+ -DUSE_IMATH_HALF=ON
+ -DUSE_LOG4CPLUS=ON
+ -DUSE_NANOVDB=$(usex nanovdb)
+ # PNG is only needed by the vdb_render tool and defaults to OFF
+ -DUSE_PNG=$(usex utils)
+ -DUSE_ZLIB=$(usex ax ON $(usex blosc))
+ )
+
+ if use abi8-compat; then
+ mycmakeargs+=( -DOPENVDB_USE_DEPRECATED_ABI_8=ON )
+ elif use abi7-compat; then
+ mycmakeargs+=( -DOPENVDB_USE_DEPRECATED_ABI_7=ON )
+ fi
+
+ if use ax; then
+ mycmakeargs+=(
+ -DOPENVDB_AX_STATIC=OFF
+ -DOPENVDB_AX_TEST_CMD=OFF # fails
+ -DOPENVDB_BUILD_AX_UNITTESTS=$(usex test)
+ -DOPENVDB_BUILD_AX_BINARIES=$(usex utils)
+ )
+ fi
+
+ if use nanovdb; then
+ mycmakeargs+=(
+ -DNANOVDB_BUILD_UNITTESTS=$(usex test)
+ -DNANOVDB_USE_CUDA=$(usex cuda)
+ -DNANOVDB_USE_OPENVDB=ON
+ )
+ if use cpu_flags_x86_avx || use cpu_flags_x86_sse4_2; then
+ mycmakeargs+=( -DNANOVDB_USE_INTRINSICS=ON )
+ fi
+ 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] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/, media-gfx/openvdb/files/
@ 2023-01-12 13:08 Joonas Niilola
0 siblings, 0 replies; 21+ messages in thread
From: Joonas Niilola @ 2023-01-12 13:08 UTC (permalink / raw
To: gentoo-commits
commit: 1de8ebc4a82badad6d38c791a2d0033d9cbae3e6
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Sat Dec 3 23:39:36 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Jan 12 13:07:27 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1de8ebc4
media-gfx/openvdb: add 10.0.1
OpenVDBAx now can use llvm up to v14
Closes: https://bugs.gentoo.org/876163
Closes: https://bugs.gentoo.org/878517
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/28563
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-gfx/openvdb/Manifest | 1 +
.../files/openvdb-10.0.1-drop-failing-tests.patch | 44 +++++
....0.1-fix-linking-of-vdb_tool-with-OpenEXR.patch | 26 +++
media-gfx/openvdb/metadata.xml | 37 ++--
media-gfx/openvdb/openvdb-10.0.1.ebuild | 200 +++++++++++++++++++++
5 files changed, 291 insertions(+), 17 deletions(-)
diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest
index 56fc94e70097..3d50dea3c098 100644
--- a/media-gfx/openvdb/Manifest
+++ b/media-gfx/openvdb/Manifest
@@ -1,3 +1,4 @@
+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
DIST openvdb-9.1.0.tar.gz 3107285 BLAKE2B a30d000f14358935eadc9cad9a7904637ceb0b2e6cc53129614e3243b55748b973c29eedc09a6cc444fb754777f6ee752af22847690977eca7a84865fdbe445b SHA512 434be61b03efec5d0022594d81064dce5f67595c1e34934d79e13627e573d2819bf947ca5b433fdca134642975b83eda71b46cf802f57e135d1611dbe2e5757e
diff --git a/media-gfx/openvdb/files/openvdb-10.0.1-drop-failing-tests.patch b/media-gfx/openvdb/files/openvdb-10.0.1-drop-failing-tests.patch
new file mode 100644
index 000000000000..adc02e268a84
--- /dev/null
+++ b/media-gfx/openvdb/files/openvdb-10.0.1-drop-failing-tests.patch
@@ -0,0 +1,44 @@
+From b0b33e6e05317df8f930314cd866f7d46a7f1911 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Tue, 6 Dec 2022 07:26:09 +0100
+Subject: [PATCH] drop failing tests
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+--- a/openvdb/openvdb/unittest/TestLinearInterp.cc
++++ b/openvdb/openvdb/unittest/TestLinearInterp.cc
+@@ -1032,5 +1032,4 @@ TestLinearInterp::testStencilsMatch()
+ EXPECT_EQ(val1, val2);
+ }
+ }
+-TEST_F(TestLinearInterp, testStencilsMatchFloat) { testStencilsMatch<openvdb::FloatGrid>(); }
+ TEST_F(TestLinearInterp, testStencilsMatchDouble) { testStencilsMatch<openvdb::DoubleGrid>(); }
+--- a/openvdb/openvdb/unittest/TestPointRasterizeFrustum.cc
++++ b/openvdb/openvdb/unittest/TestPointRasterizeFrustum.cc
+@@ -222,8 +222,6 @@ 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[2], (*iterV)[2], tolerance);
+ #endif
+
+@@ -603,7 +601,6 @@ 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[2], (*iterV)[2], tolerance);
+
+ // explicitly specify Vec3f grid
+@@ -627,7 +624,6 @@ 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[2], (*iterV)[2], tolerance);
+
+ // rasterize float attribute into double grid
+--
+2.38.1
+
diff --git a/media-gfx/openvdb/files/openvdb-10.0.1-fix-linking-of-vdb_tool-with-OpenEXR.patch b/media-gfx/openvdb/files/openvdb-10.0.1-fix-linking-of-vdb_tool-with-OpenEXR.patch
new file mode 100644
index 000000000000..00b29db2e17c
--- /dev/null
+++ b/media-gfx/openvdb/files/openvdb-10.0.1-fix-linking-of-vdb_tool-with-OpenEXR.patch
@@ -0,0 +1,26 @@
+From 2b6195c6dc479692aa5b7b07356d788b3dd21596 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Mon, 5 Dec 2022 07:19:51 +0100
+Subject: [PATCH] fix linking of vdb_tool with OpenEXR
+
+This patch is Gentoo specific. Ideally it should respect the OpenEXR version
+being installed. Because we only support OpenEXR-3 for OpenVDB, the patch
+works on Gentoo, but not on setups where OpenEXR-2 is still being used to
+build OpenVDB.
+
+Bug: https://github.com/AcademySoftwareFoundation/openvdb/issues/1541
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+--- a/openvdb_cmd/vdb_tool/CMakeLists.txt
++++ b/openvdb_cmd/vdb_tool/CMakeLists.txt
+@@ -93,7 +93,7 @@ endif()
+ if(OPENVDB_TOOL_USE_EXR)
+ target_compile_definitions(vdb_tool_common INTERFACE "VDB_TOOL_USE_EXR")
+ find_package(OpenEXR REQUIRED)
+- target_link_libraries(vdb_tool_common INTERFACE OpenEXR::IlmImf)
++ target_link_libraries(vdb_tool_common INTERFACE OpenEXR::OpenEXR)
+ endif()
+
+ if(OPENVDB_TOOL_USE_ABC)
+--
+2.38.1
+
diff --git a/media-gfx/openvdb/metadata.xml b/media-gfx/openvdb/metadata.xml
index 87defec8f82a..8870bee20b73 100644
--- a/media-gfx/openvdb/metadata.xml
+++ b/media-gfx/openvdb/metadata.xml
@@ -15,35 +15,38 @@
Chance of Meatballs2' and 'How to Train Your Dragon 2'.
</longdescription>
<use>
+ <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>
+ <flag name="abi9-compat">
+ Disables newer features to maintain compatibility with ABI9
+ </flag>
<flag name="ax">
Build the OpenVDB AX module to perform custom manipulation of
- OpenVDB data via an expression language: AX.
+ OpenVDB data via an expression language: AX
</flag>
<flag name="blosc">
Allow using blosc compression via <pkg>dev-libs/c-blosc</pkg>
</flag>
<flag name="cuda">
- Enable support for CUDA in NanoVDB.
+ Enable support for CUDA in NanoVDB
</flag>
<flag name="nanovdb">
- A lightweight, header only, and GPU friendly version of VDB.
+ A lightweight, header only, and GPU friendly version of VDB
</flag>
- <flag restrict=">=media-gfx/openvdb-7.0.0" name="numpy">
+ <flag name="numpy">
Build pyopenvdb with support for <pkg>dev-python/numpy</pkg>
</flag>
- <flag restrict=">=media-gfx/openvdb-6.0.0" name="abi6-compat">
- Disables newer features to maintain compatibility with ABI6.
- </flag>
- <flag restrict=">=media-gfx/openvdb-7.0.0" name="abi7-compat">
- Disables newer features to maintain compatibility with ABI7.
- </flag>
- <flag restrict=">=media-gfx/openvdb-8.0.0" name="abi8-compat">
- Disables newer features to maintain compatibility with ABI8.
- </flag>
- <flag restrict=">=media-gfx/openvdb-9.0.0" name="abi9-compat">
- Disables newer features to maintain compatibility with ABI9.
- </flag>
- <flag restrict=">=media-gfx/openvdb-7.0.0" name="utils">
+ <flag name="utils">
Build utility binaries
</flag>
</use>
diff --git a/media-gfx/openvdb/openvdb-10.0.1.ebuild b/media-gfx/openvdb/openvdb-10.0.1.ebuild
new file mode 100644
index 000000000000..d9e485fd488d
--- /dev/null
+++ b/media-gfx/openvdb/openvdb-10.0.1.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit cmake cuda llvm 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/10.0.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+abi10-compat abi8-compat abi9-compat ax +blosc cpu_flags_x86_avx cpu_flags_x86_sse4_2
+ cuda doc +nanovdb numpy python static-libs test utils"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="^^ ( abi8-compat abi9-compat abi10-compat )
+ cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 )
+ cuda? ( nanovdb )
+ numpy? ( python )
+ python? ( ${PYTHON_REQUIRED_USE} )"
+
+# utils? media-gfx/alembic not yet keyworded on ppc64
+RDEPEND="
+ >=dev-cpp/tbb-2020.3:=
+ dev-libs/boost:=
+ dev-libs/jemalloc:=
+ dev-libs/log4cplus:=
+ >=dev-libs/imath-3.1.4-r2:=
+ sys-libs/zlib:=
+ x11-libs/libXcursor
+ x11-libs/libXi
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ ax? ( <sys-devel/llvm-15:= )
+ 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}] )
+ ')
+ )
+ utils? (
+ media-libs/glfw
+ media-libs/glu
+ media-libs/libjpeg-turbo:=
+ media-libs/libpng:=
+ >=media-libs/openexr-3:=
+ virtual/opengl
+ )
+"
+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-cpp/gtest
+ dev-util/cppunit
+ )
+"
+
+LLVM_MAX_SLOT=14
+
+PATCHES=(
+ "${FILESDIR}/${PN}-8.1.0-glfw-libdir.patch"
+ "${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"
+)
+
+pkg_setup() {
+ use ax && llvm_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
+
+ sed -e 's|/usr/local/bin/python|/usr/bin/python|' \
+ -i "${S}"/openvdb/openvdb/python/test/TestOpenVDB.py || die
+}
+
+src_configure() {
+ local myprefix="${EPREFIX}/usr/"
+
+ local version
+ if use abi8-compat; then
+ version=8
+ elif use abi9-compat; then
+ version=9
+ elif use abi10-compat; then
+ version=10
+ 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_TOOL=$(usex utils)
+ -DOPENVDB_BUILD_VDB_VIEW=$(usex utils)
+ -DOPENVDB_CORE_SHARED=ON
+ -DOPENVDB_CORE_STATIC=$(usex static-libs)
+ -DOPENVDB_ENABLE_RPATH=OFF
+ -DUSE_AX=$(usex ax)
+ -DUSE_BLOSC=$(usex blosc)
+ -DUSE_CCACHE=OFF
+ -DUSE_COLORED_OUTPUT=ON
+ # OpenEXR is only needed by the vdb_render tool and defaults to OFF
+ -DUSE_EXR=$(usex utils)
+ -DUSE_IMATH_HALF=ON
+ -DUSE_LOG4CPLUS=ON
+ -DUSE_NANOVDB=$(usex nanovdb)
+ -DUSE_PKGCONFIG=ON
+ # PNG is only needed by the vdb_render tool and defaults to OFF
+ -DUSE_PNG=$(usex utils)
+ -DUSE_TBB=ON
+ -DUSE_ZLIB=$(usex ax ON $(usex blosc))
+ )
+
+ if use abi9-compat; then
+ mycmakeargs+=( -DOPENVDB_USE_DEPRECATED_ABI_9=ON )
+ elif use abi8-compat; then
+ mycmakeargs+=( -DOPENVDB_USE_DEPRECATED_ABI_8=ON )
+ fi
+
+ if use ax; then
+ mycmakeargs+=(
+ -DOPENVDB_AX_STATIC=$(usex static-libs)
+ -DOPENVDB_BUILD_AX_UNITTESTS=OFF # FIXME: log4cplus init and other errors
+ -DOPENVDB_BUILD_VDB_AX=$(usex utils)
+ )
+ fi
+
+ if use nanovdb; then
+ mycmakeargs+=(
+ -DNANOVDB_BUILD_UNITTESTS=$(usex test)
+ -DNANOVDB_USE_CUDA=$(usex cuda)
+ -DNANOVDB_USE_OPENVDB=ON
+ )
+ if use cpu_flags_x86_avx || use cpu_flags_x86_sse4_2; then
+ mycmakeargs+=( -DNANOVDB_USE_INTRINSICS=ON )
+ fi
+ 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)"
+ )
+ use test && mycmakeargs+=( -DPython_EXECUTABLE=${PYTHON} )
+ fi
+
+ # options for the new vdb_tool binary
+ if use utils; then
+ mycmakeargs+=(
+ -DBUILD_TEST=$(usex test)
+ -DOPENVDB_BUILD_VDB_AX=$(usex ax)
+ -DOPENVDB_TOOL_NANO_USE_BLOSC=$(usex nanovdb $(usex blosc) OFF)
+ -DOPENVDB_TOOL_USE_ABC=OFF # media-gfx/alembic not yet keyworded on ppc64
+ -DOPENVDB_TOOL_USE_EXR=ON
+ -DOPENVDB_TOOL_USE_JPG=ON
+ -DOPENVDB_TOOL_USE_NANO=$(usex nanovdb)
+ -DOPENVDB_TOOL_USE_PNG=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] 21+ messages in thread
end of thread, other threads:[~2023-01-12 13:08 UTC | newest]
Thread overview: 21+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-12-10 4:31 [gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/, media-gfx/openvdb/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-01-12 13:08 Joonas Niilola
2022-09-25 1:27 Sam James
2022-02-18 22:23 Yixun Lan
2022-02-15 19:51 Sam James
2021-12-02 2:34 Sam James
2021-10-31 2:19 Sam James
2021-10-31 2:19 Sam James
2021-07-09 3:11 Ionen Wolkens
2021-03-14 0:25 Andreas Sturmlechner
2020-08-24 13:42 Sam James
2020-08-24 13:42 Sam James
2020-08-24 13:42 Sam James
2020-08-24 13:42 Sam James
2018-08-28 14:43 Jonathan Scruggs
2018-08-28 14:43 Jonathan Scruggs
2018-08-15 20:08 Jonathan Scruggs
2018-08-14 11:39 Jonathan Scruggs
2018-08-04 18:21 Jonathan Scruggs
2017-01-15 13:34 David Seifert
2016-10-27 18:34 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox