From 8eea936d62f4ebd9cd51f44e0aa6845d4effb591 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 22 May 2019 20:57:03 +0200 Subject: Fix blosc linkage in openvdb. issue #6561 --- ports/openvdb/CONTROL | 2 +- ports/openvdb/blosc.patch | 24 ++++++++++++++++++++++++ ports/openvdb/portfile.cmake | 1 + 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 ports/openvdb/blosc.patch diff --git a/ports/openvdb/CONTROL b/ports/openvdb/CONTROL index b2db99e4c..663e290b2 100644 --- a/ports/openvdb/CONTROL +++ b/ports/openvdb/CONTROL @@ -1,5 +1,5 @@ Source: openvdb -Version: 6.0.0-1 +Version: 6.0.0-2 Build-Depends: boost-ptr-container, openexr, tbb, blosc, boost-iostreams, boost-system, boost-thread, boost-date-time, boost-any, boost-uuid, boost-interprocess Description: Sparse volume data structure and tools diff --git a/ports/openvdb/blosc.patch b/ports/openvdb/blosc.patch new file mode 100644 index 000000000..2b9782a1b --- /dev/null +++ b/ports/openvdb/blosc.patch @@ -0,0 +1,24 @@ +diff --git a/cmake/FindBlosc.cmake b/cmake/FindBlosc.cmake +index 5ac3780c..61ba83bc 100644 +--- a/cmake/FindBlosc.cmake ++++ b/cmake/FindBlosc.cmake +@@ -45,8 +45,8 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS ( Blosc + + IF ( BLOSC_FOUND ) + +- SET ( BLOSC_LIBRARYDIR ${BLOSC_LOCATION}/lib +- CACHE STRING "Blosc library directories") ++# SET ( BLOSC_LIBRARYDIR ${BLOSC_LOCATION}/lib ++# CACHE STRING "Blosc library directories") + + SET ( _blosc_library_name "blosc" ) + +@@ -61,8 +61,6 @@ IF ( BLOSC_FOUND ) + ENDIF() + + FIND_LIBRARY ( BLOSC_blosc_LIBRARY ${_blosc_library_name} +- PATHS ${BLOSC_LIBRARYDIR} +- NO_DEFAULT_PATH + NO_SYSTEM_ENVIRONMENT_PATH + ) + diff --git a/ports/openvdb/portfile.cmake b/ports/openvdb/portfile.cmake index 5b24e7600..d1c4cb8ce 100644 --- a/ports/openvdb/portfile.cmake +++ b/ports/openvdb/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_from_github( 0002-add-custom-options.patch 0003-build-only-necessary-targets.patch 0004-add-necessary-head.patch + blosc.patch ) if (VCPKG_LIBRARY_LINKAGE STREQUAL static) -- cgit v1.2.3