media-gfx/openvdb: bump to version 5.2.0

Closes: #9720
gentoo · Aug 28, 2018 · 9c2ee61 · 9c2ee61
1 parent 1d07f16
commit 9c2ee61
Show file tree

Hide file tree

Showing 5 changed files with 480 additions and 4 deletions.
diff --git 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
@@ -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"
+   )