commit: cdb48fb7dff718b541d13aefafdf53d5cd4fccbc Author: Adrian Grigo <agrigo2001 <AT> yahoo <DOT> com <DOT> au> AuthorDate: Tue Aug 18 02:36:18 2020 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Aug 24 13:41:49 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdb48fb7
media-gfx/openvdb: Fix build failure with newer c-blosc and doc The c-blosc 1.19 function blosc_compcode_to_compname now expects a const char** rather than char**. This patch uses const_cast to fix the compiler error. When building with doc USE flag enabled, the doc target is not built by default and the missing docs cause an install failure. This patch ensures that when the doc target is defined, it will be built. With these two patches, openvdb builds with all USE flags enabled. Signed-off-by: Adrian Grigo <agrigo2001 <AT> yahoo.com.au> Closes: https://bugs.gentoo.org/734102 Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Sam James <sam <AT> gentoo.org> media-gfx/openvdb/files/openvdb-4.0.2-fix-build-docs.patch | 12 ++++++++++++ .../openvdb-4.0.2-fix-const-correctness-for-unittest.patch | 12 ++++++++++++ media-gfx/openvdb/openvdb-4.0.2-r3.ebuild | 6 ++++-- media-gfx/openvdb/openvdb-5.2.0-r1.ebuild | 4 ++-- 4 files changed, 30 insertions(+), 4 deletions(-) diff --git a/media-gfx/openvdb/files/openvdb-4.0.2-fix-build-docs.patch b/media-gfx/openvdb/files/openvdb-4.0.2-fix-build-docs.patch new file mode 100644 index 00000000000..25597ec381d --- /dev/null +++ b/media-gfx/openvdb/files/openvdb-4.0.2-fix-build-docs.patch @@ -0,0 +1,12 @@ +diff -Naur a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt +--- a/openvdb/CMakeLists.txt 2020-08-18 12:17:15.261321103 +1000 ++++ b/openvdb/CMakeLists.txt 2020-08-18 12:17:37.101397373 +1000 +@@ -394,7 +394,7 @@ + FILE ( WRITE ${CMAKE_CURRENT_BINARY_DIR}/cmake-doxygen-config ${DOXYGEN_CONFIG_CONTENT} ) + FILE ( APPEND ${CMAKE_CURRENT_BINARY_DIR}/cmake-doxygen-config "OUTPUT_DIRECTORY=${CMAKE_CURRENT_BINARY_DIR}/doc\n" ) + +- ADD_CUSTOM_TARGET ( doc ++ ADD_CUSTOM_TARGET ( doc ALL + ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/cmake-doxygen-config + WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} + COMMENT "Generating API documentation with Doxygen" VERBATIM diff --git a/media-gfx/openvdb/files/openvdb-4.0.2-fix-const-correctness-for-unittest.patch b/media-gfx/openvdb/files/openvdb-4.0.2-fix-const-correctness-for-unittest.patch new file mode 100644 index 00000000000..8d3ef59e3ab --- /dev/null +++ b/media-gfx/openvdb/files/openvdb-4.0.2-fix-const-correctness-for-unittest.patch @@ -0,0 +1,12 @@ +diff -Naur a/openvdb/unittest/TestFile.cc b/openvdb/unittest/TestFile.cc +--- a/openvdb/unittest/TestFile.cc 2019-09-15 01:05:30.716633230 +0800 ++++ b/openvdb/unittest/TestFile.cc 2019-09-15 01:06:16.126633668 +0800 +@@ -2552,7 +2552,7 @@ + + for (int compcode = 0; compcode <= BLOSC_ZLIB; ++compcode) { + char* compname = nullptr; +- if (0 > blosc_compcode_to_compname(compcode, &compname)) continue; ++ if (0 > blosc_compcode_to_compname(compcode, const_cast<const char **>(&compname))) continue; + /// @todo This changes the compressor setting globally. + if (blosc_set_compressor(compname) < 0) continue; + diff --git a/media-gfx/openvdb/openvdb-4.0.2-r3.ebuild b/media-gfx/openvdb/openvdb-4.0.2-r3.ebuild index 1996c6be2df..2205bebd492 100644 --- a/media-gfx/openvdb/openvdb-4.0.2-r3.ebuild +++ b/media-gfx/openvdb/openvdb-4.0.2-r3.ebuild @@ -7,9 +7,9 @@ PYTHON_COMPAT=( python3_6 ) inherit cmake flag-o-matic python-single-r1 -DESCRIPTION="Libs for the efficient manipulation of volumetric data" +DESCRIPTION="Library for the efficient manipulation of volumetric data" HOMEPAGE="https://www.openvdb.org"; -SRC_URI="https://github.com/dreamworksanimation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz +SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz https://dev.gentoo.org/~dracwyrm/patches/${P}-patchset-02.tar.xz"; LICENSE="MPL-2.0" @@ -57,6 +57,8 @@ PATCHES=( "${WORKDIR}/${P}-patchset-02/0002-use-pkgconfig-for-ilmbase-and-openexr.patch" "${WORKDIR}/${P}-patchset-02/0003-boost-1.65-numpy-support.patch" "${FILESDIR}/${P}-findboost-fix.patch" + "${FILESDIR}/${P}-fix-const-correctness-for-unittest.patch" + "${FILESDIR}/${P}-fix-build-docs.patch" ) pkg_setup() { diff --git a/media-gfx/openvdb/openvdb-5.2.0-r1.ebuild b/media-gfx/openvdb/openvdb-5.2.0-r1.ebuild index 3955290220b..ef955f2c6ca 100644 --- a/media-gfx/openvdb/openvdb-5.2.0-r1.ebuild +++ b/media-gfx/openvdb/openvdb-5.2.0-r1.ebuild @@ -7,9 +7,9 @@ PYTHON_COMPAT=( python3_6 ) inherit cmake flag-o-matic python-single-r1 -DESCRIPTION="Libs for the efficient manipulation of volumetric data" +DESCRIPTION="Library for the efficient manipulation of volumetric data" HOMEPAGE="https://www.openvdb.org"; -SRC_URI="https://github.com/dreamworksanimation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MPL-2.0" SLOT="0"
