diff --git a/abi_used_libs b/abi_used_libs --- a/abi_used_libs +++ b/abi_used_libs @@ -1,11 +1,10 @@ UNKNOWN ld-linux-x86-64.so.2 -libHalf-2_5.so.25 +libImath-3_0.so.28 libblosc.so.1 libboost_iostreams.so.1.72.0 libc.so.6 libgcc_s.so.1 -libjemalloc.so.2 libm.so.6 libpthread.so.0 libstdc++.so.6 diff --git a/abi_used_symbols b/abi_used_symbols --- a/abi_used_symbols +++ b/abi_used_symbols @@ -1,8 +1,8 @@ UNKNOWN:_ZTIN3tbb4taskE ld-linux-x86-64.so.2:__tls_get_addr -libHalf-2_5.so.25:_ZN4half5_eLutE -libHalf-2_5.so.25:_ZN4half7convertEi -libHalf-2_5.so.25:_ZN4half8_toFloatE +libImath-3_0.so.28:_ZN9Imath_3_04half5_eLutE +libImath-3_0.so.28:_ZN9Imath_3_04half7convertEi +libImath-3_0.so.28:_ZN9Imath_3_04half8_toFloatE libblosc.so.1:blosc_cbuffer_sizes libblosc.so.1:blosc_compress_ctx libblosc.so.1:blosc_decompress_ctx @@ -46,10 +46,6 @@ libc.so.6:unlink libc.so.6:vsnprintf libgcc_s.so.1:_Unwind_Resume -libjemalloc.so.2:_ZdaPv -libjemalloc.so.2:_ZdlPvm -libjemalloc.so.2:_Znam -libjemalloc.so.2:_Znwm libm.so.6:pow libm.so.6:sincos libm.so.6:sqrt @@ -217,8 +213,11 @@ libstdc++.so.6:_ZTVSt14basic_ofstreamIcSt11char_traitsIcEE libstdc++.so.6:_ZTVSt15basic_streambufIcSt11char_traitsIcEE libstdc++.so.6:_ZTVSt9basic_iosIcSt11char_traitsIcEE +libstdc++.so.6:_ZdaPv libstdc++.so.6:_ZdaPvm +libstdc++.so.6:_ZdlPvm libstdc++.so.6:_Znam +libstdc++.so.6:_Znwm libstdc++.so.6:__cxa_allocate_exception libstdc++.so.6:__cxa_begin_catch libstdc++.so.6:__cxa_end_catch diff --git a/files/Imath-instead-of-ilmbase.patch b/files/Imath-instead-of-ilmbase.patch new file mode 100644 --- /dev/null +++ b/files/Imath-instead-of-ilmbase.patch @@ -0,0 +1,56 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -341,9 +341,7 @@ if(OPENVDB_INSTALL_CMAKE_MODULES) + set(OPENVDB_CMAKE_MODULES + cmake/FindBlosc.cmake + cmake/FindJemalloc.cmake +- cmake/FindIlmBase.cmake + cmake/FindLog4cplus.cmake +- cmake/FindOpenEXR.cmake + cmake/FindOpenVDB.cmake + cmake/FindTBB.cmake + cmake/OpenVDBGLFW3Setup.cmake +--- a/openvdb/openvdb/CMakeLists.txt ++++ b/openvdb/openvdb/CMakeLists.txt +@@ -46,7 +46,6 @@ message(STATUS "------------------------ + # Collect and configure lib dependencies + + if(USE_EXR) +- find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED) + find_package(OpenEXR ${MINIMUM_OPENEXR_VERSION} REQUIRED) + if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_OPENEXR_VERSION) + if(${OpenEXR_VERSION} VERSION_LESS FUTURE_MINIMUM_OPENEXR_VERSION) +@@ -129,7 +128,7 @@ endif() + set(OPENVDB_CORE_DEPENDENT_LIBS + Boost::iostreams + Boost::system +- IlmBase::Half ++ Imath::Imath + ) + + if(WIN32) +@@ -147,10 +146,9 @@ endif() + + if(USE_EXR) + list(APPEND OPENVDB_CORE_DEPENDENT_LIBS +- IlmBase::IlmThread +- IlmBase::Iex +- IlmBase::Imath +- OpenEXR::IlmImf ++ OpenEXR::IlmThread ++ OpenEXR::Iex ++ Imath::Imath + ) + endif() + +--- a/openvdb/openvdb/Types.h ++++ b/openvdb/openvdb/Types.h +@@ -7,7 +7,7 @@ + #include "version.h" + #include "Platform.h" + #include "TypeList.h" // backwards compat +-#include ++#include + #include + #include + #include diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,8 +1,8 @@ name : openvdb -version : 8.0.0 -release : 2 +version : 8.0.1 +release : 3 source : - - https://github.com/AcademySoftwareFoundation/openvdb/archive/v8.0.0.tar.gz : 04a28dc24a744f8ac8bbc5636a949628edb02b7c84db24ad795429c8c739a9ee + - https://github.com/AcademySoftwareFoundation/openvdb/archive/refs/tags/v8.0.1.tar.gz : a6845da7c604d2c72e4141c898930ac8a2375521e535f696c2cd92bebbe43c4f license : MPL-2.0 component : multimedia.library homepage : https://www.openvdb.org/ @@ -11,14 +11,17 @@ OpenVDB is an open source C++ library comprising a novel hierarchical data structure and a large suite of tools for the efficient storage and manipulation of sparse volumetric data discretized on three-dimensional grids. It was developed by DreamWorks Animation for use in volumetric applications typically encountered in feature film production. avx2 : yes builddeps : - - pkgconfig(IlmBase) - pkgconfig(OpenEXR) - pkgconfig(blosc) - - pkgconfig(jemalloc) - intel-tbb-devel - libboost-devel setup : | - %cmake_ninja -DOPENVDB_CORE_STATIC=0 + %patch -p1 < $pkgfiles/Imath-instead-of-ilmbase.patch + rm cmake/FindOpenEXR.cmake + %cmake_ninja \ + -DOPENVDB_CORE_STATIC=OFF \ + -DUSE_EXR=ON \ + -DDISABLE_DEPENDENCY_VERSION_CHECKS=ON build : | %ninja_build install : | diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -22,9 +22,9 @@ /usr/bin/vdb_print /usr/lib64/haswell/libopenvdb.so.8.0 - /usr/lib64/haswell/libopenvdb.so.8.0.0 + /usr/lib64/haswell/libopenvdb.so.8.0.1 /usr/lib64/libopenvdb.so.8.0 - /usr/lib64/libopenvdb.so.8.0.0 + /usr/lib64/libopenvdb.so.8.0.1 @@ -34,7 +34,7 @@ programming.devel - openvdb + openvdb /usr/include/openvdb/Exceptions.h @@ -168,10 +168,8 @@ /usr/include/openvdb/util/logging.h /usr/include/openvdb/version.h /usr/lib64/cmake/OpenVDB/FindBlosc.cmake - /usr/lib64/cmake/OpenVDB/FindIlmBase.cmake /usr/lib64/cmake/OpenVDB/FindJemalloc.cmake /usr/lib64/cmake/OpenVDB/FindLog4cplus.cmake - /usr/lib64/cmake/OpenVDB/FindOpenEXR.cmake /usr/lib64/cmake/OpenVDB/FindOpenVDB.cmake /usr/lib64/cmake/OpenVDB/FindTBB.cmake /usr/lib64/cmake/OpenVDB/OpenVDBGLFW3Setup.cmake @@ -182,12 +180,12 @@ - - 2021-01-11 - 8.0.0 + + 2021-05-30 + 8.0.1 Packaging update Martin Reboredo yakoyoku@gmail.com \ No newline at end of file