commit:     8e0ff6b62675f28528bcd8882fd4c44ad317c655
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 25 18:02:21 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 25 18:02:45 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e0ff6b6

media-gfx/openvdb: add missing dependencies

Add in missing dependencies:
* media-libs/glu (subject of the bug)
* media-libs/ilmbase (though it is a transient dep via OpenEXR)

We also include dev-cpp/tbb in ${RDEPEND} rather than only
${DEPEND}, given we link against it.

Closes: https://bugs.gentoo.org/673798
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James <sam <AT> gentoo.org>

 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 +++++++++++++++++++++++++
 media-gfx/openvdb/openvdb-7.0.0-r1.ebuild | 123 ++++++++++++++++++++++++++++++
 media-gfx/openvdb/openvdb-7.1.0-r1.ebuild | 121 +++++++++++++++++++++++++++++
 5 files changed, 561 insertions(+)

diff --git a/media-gfx/openvdb/openvdb-4.0.2-r4.ebuild 
b/media-gfx/openvdb/openvdb-4.0.2-r4.ebuild
new file mode 100644
index 00000000000..ab2d24826d9
--- /dev/null
+++ b/media-gfx/openvdb/openvdb-4.0.2-r4.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,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
new file mode 100644
index 00000000000..e7e00d1db24
--- /dev/null
+++ b/media-gfx/openvdb/openvdb-5.2.0-r2.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,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
new file mode 100644
index 00000000000..43345499ba5
--- /dev/null
+++ b/media-gfx/openvdb/openvdb-6.2.1-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,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
+}

diff --git a/media-gfx/openvdb/openvdb-7.0.0-r1.ebuild 
b/media-gfx/openvdb/openvdb-7.0.0-r1.ebuild
new file mode 100644
index 00000000000..2e79cc7f27c
--- /dev/null
+++ b/media-gfx/openvdb/openvdb-7.0.0-r1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,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="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-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:=[numpy?,python?,${PYTHON_USEDEP}]
+                       numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
+               ')
+       )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+       >=dev-util/cmake-3.16.2-r1
+       virtual/pkgconfig
+       doc? (
+               app-doc/doxygen
+               dev-texlive/texlive-bibtexextra
+               dev-texlive/texlive-fontsextra
+               dev-texlive/texlive-fontutils
+               dev-texlive/texlive-latex
+               dev-texlive/texlive-latexextra
+       )
+       test? ( dev-util/cppunit )
+"
+
+PATCHES=(
+       "${FILESDIR}/${PN}-7.1.0-0001-Fix-multilib-header-source.patch"
+       "${FILESDIR}/${PN}-7.1.0-0002-Fix-doc-install-dir.patch"
+)
+
+pkg_setup() {
+       use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+       local myprefix="${EPREFIX}/usr/"
+
+       local version
+       if use abi5-compat; then
+               version=5
+       elif use abi6-compat; then
+               version=6
+       elif use abi7-compat; then
+               version=7
+       else
+               die "Openvdb abi version is not compatible"
+       fi
+
+       local mycmakeargs=(
+               -DCHOST="${CHOST}"
+               -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}/"
+               -DOPENVDB_ABI_VERSION_NUMBER="${version}"
+               -DOPENVDB_BUILD_DOCS=$(usex doc)
+               -DOPENVDB_BUILD_UNITTESTS=$(usex test)
+               -DOPENVDB_BUILD_VDB_LOD=$(usex !utils)
+               -DOPENVDB_BUILD_VDB_RENDER=$(usex !utils)
+               -DOPENVDB_BUILD_VDB_VIEW=$(usex !utils)
+               -DOPENVDB_CORE_SHARED=ON
+               -DOPENVDB_CORE_STATIC=$(usex static-libs)
+               -DOPENVDB_ENABLE_RPATH=OFF
+               -DUSE_CCACHE=OFF
+               -DUSE_COLORED_OUTPUT=ON
+               -DUSE_EXR=ON
+               -DUSE_LOG4CPLUS=ON
+       )
+
+       if use python; then
+               mycmakeargs+=(
+                       -DOPENVDB_BUILD_PYTHON_MODULE=ON
+                       -DUSE_NUMPY=$(usex numpy)
+                       -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)"
+                       -DPython_EXECUTABLE="${EPYTHON}"
+               )
+       fi
+
+       if use cpu_flags_x86_avx; then
+               mycmakeargs+=( -DOPENVDB_SIMD=AVX )
+       elif use cpu_flags_x86_sse4_2; then
+               mycmakeargs+=( -DOPENVDB_SIMD=SSE42 )
+       fi
+
+       cmake_src_configure
+}

diff --git a/media-gfx/openvdb/openvdb-7.1.0-r1.ebuild 
b/media-gfx/openvdb/openvdb-7.1.0-r1.ebuild
new file mode 100644
index 00000000000..4ad1b89c2ce
--- /dev/null
+++ b/media-gfx/openvdb/openvdb-7.1.0-r1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,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="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-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:=[numpy?,python?,${PYTHON_USEDEP}]
+                       numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
+               ')
+       )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+       >=dev-util/cmake-3.16.2-r1
+       virtual/pkgconfig
+       doc? (
+               app-doc/doxygen
+               dev-texlive/texlive-bibtexextra
+               dev-texlive/texlive-fontsextra
+               dev-texlive/texlive-fontutils
+               dev-texlive/texlive-latex
+               dev-texlive/texlive-latexextra
+       )
+       test? ( dev-util/cppunit )
+"
+
+PATCHES=(
+       "${FILESDIR}/${P}-0001-Fix-multilib-header-source.patch"
+       "${FILESDIR}/${P}-0002-Fix-doc-install-dir.patch"
+)
+
+pkg_setup() {
+       use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+       local myprefix="${EPREFIX}/usr/"
+
+       local version
+       if use abi6-compat; then
+               version=6
+       elif use abi7-compat; then
+               version=7
+       else
+               die "Openvdb abi version is not compatible"
+       fi
+
+       local mycmakeargs=(
+               -DCHOST="${CHOST}"
+               -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}/"
+               -DOPENVDB_ABI_VERSION_NUMBER="${version}"
+               -DOPENVDB_BUILD_DOCS=$(usex doc)
+               -DOPENVDB_BUILD_UNITTESTS=$(usex test)
+               -DOPENVDB_BUILD_VDB_LOD=$(usex !utils)
+               -DOPENVDB_BUILD_VDB_RENDER=$(usex !utils)
+               -DOPENVDB_BUILD_VDB_VIEW=$(usex !utils)
+               -DOPENVDB_CORE_SHARED=ON
+               -DOPENVDB_CORE_STATIC=$(usex static-libs)
+               -DOPENVDB_ENABLE_RPATH=OFF
+               -DUSE_CCACHE=OFF
+               -DUSE_COLORED_OUTPUT=ON
+               -DUSE_EXR=ON
+               -DUSE_LOG4CPLUS=ON
+       )
+
+       if use python; then
+               mycmakeargs+=(
+                       -DOPENVDB_BUILD_PYTHON_MODULE=ON
+                       -DUSE_NUMPY=$(usex numpy)
+                       -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)"
+                       -DPython_EXECUTABLE="${EPYTHON}"
+               )
+       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
+}

Reply via email to