From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3C216138359 for ; Mon, 24 Aug 2020 13:42:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A2185E0882; Mon, 24 Aug 2020 13:42:42 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7E67DE087F for ; Mon, 24 Aug 2020 13:42:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6CC0C340D4D for ; Mon, 24 Aug 2020 13:42:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3F27333F for ; Mon, 24 Aug 2020 13:42:37 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1598276514.3edc65ba9bca251aadcd5469e5c1f0f60df9feb3.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/, media-gfx/openvdb/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/openvdb/files/openvdb-5.2.0-use-pkgconfig-for-ilmbase-and-openexr.patch media-gfx/openvdb/files/openvdb-6.2.1-fix-multilib-header-source.patch media-gfx/openvdb/openvdb-4.0.2-r3.ebuild media-gfx/openvdb/openvdb-5.2.0-r1.ebuild media-gfx/openvdb/openvdb-6.2.1.ebuild media-gfx/openvdb/openvdb-7.0.0.ebuild media-gfx/openvdb/openvdb-7.1.0.ebuild X-VCS-Directories: media-gfx/openvdb/files/ media-gfx/openvdb/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 3edc65ba9bca251aadcd5469e5c1f0f60df9feb3 X-VCS-Branch: master Date: Mon, 24 Aug 2020 13:42:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 744ed2c9-d06a-4197-9851-d5d960eece74 X-Archives-Hash: 60d67c38633995dc40d41d4d2c681a77 commit: 3edc65ba9bca251aadcd5469e5c1f0f60df9feb3 Author: Adrian Grigo yahoo com au> AuthorDate: Thu Aug 20 02:40:52 2020 +0000 Commit: Sam James gentoo 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 yahoo.com.au> Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Sam James gentoo.org> ...2.0-use-pkgconfig-for-ilmbase-and-openexr.patch | 8 ++++++++ .../openvdb-6.2.1-fix-multilib-header-source.patch | 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 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 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