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 ------- .../openvdb-6.2.1-fix-multilib-header-source.patch | 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 -}
