From e7c23d3fe6be3c9cc556841eb681394a70af7dfb Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Mon, 12 Dec 2022 00:14:02 -0800 Subject: [PATCH] Update to 10.0.1 (#2095665) * This update brings compatibity with macros from 9.1 series * Support of AX disabled by default due to incompatibilty with llvm 15 and up --- .gitignore | 1 + openvdb.spec | 19 +++++++++++++++---- sources | 2 +- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index a9978e1..8ca674e 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /openvdb-8.1.0.tar.gz /openvdb-9.0.0.tar.gz /openvdb-9.1.0.tar.gz +/openvdb-10.0.1.tar.gz diff --git a/openvdb.spec b/openvdb.spec index 4848113..86e1699 100644 --- a/openvdb.spec +++ b/openvdb.spec @@ -2,19 +2,20 @@ %undefine __cmake_in_source_build # Use soversion -%global soversion 9.1 +%global soversion 10.0 # Set to 1 to enable testsuite. Fails everywhere with GCC 8+. %global with_tests 0 # Optional OpenEXR support -%global with_openexr 0 +%global with_openexr 1 +%global with_ax 0 Name: openvdb -Version: 9.1.0 +Version: 10.0.1 Release: %autorelease Summary: C++ library for sparse volumetric data discretized on three-dimensional grids -License: MPLv2.0 +License: MPL-2.0 URL: http://www.openvdb.org/ Source0: https://github.com/AcademySoftwareFoundation/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -31,6 +32,10 @@ BuildRequires: doxygen >= 1.8.11 BuildRequires: gcc-c++ BuildRequires: ghostscript >= 8.70 BuildRequires: libstdc++-devel +%if 0%{?with_ax} +BuildRequires: llvm-devel +BuildRequires: pkgconfig(libffi) +%endif BuildRequires: pkgconfig(blosc) >= 1.5.0 BuildRequires: pkgconfig(cppunit) >= 1.10 # RHEL and CentOS only have that build requirement for x86_64 @@ -118,6 +123,8 @@ export CXXFLAGS="%{build_cxxflags} -Wl,--as-needed" %cmake \ -DCMAKE_NO_SYSTEM_FROM_IMPORTED=TRUE \ -DDISABLE_DEPENDENCY_VERSION_CHECKS=ON \ + -DOPENVDB_ABI_VERSION_NUMBER=9 \ + -DOPENVDB_USE_DEPRECATED_ABI_9=ON \ -DOPENVDB_BUILD_DOCS=ON \ %if 0%{?fedora} -DOPENVDB_BUILD_PYTHON_MODULE=ON \ @@ -129,6 +136,10 @@ export CXXFLAGS="%{build_cxxflags} -Wl,--as-needed" -DOPENVDB_ENABLE_RPATH=OFF \ -DOPENVDB_INSTALL_CMAKE_MODULES=OFF \ -DPYOPENVDB_INSTALL_DIRECTORY=%{python3_sitearch} \ +%if 0%{?with_ax} + -DHAVE_FFI_CALL=ON \ + -DUSE_AX=ON \ +%endif %if 0%{?with_openexr} -DUSE_EXR=ON \ %endif diff --git a/sources b/sources index 0c974fd..28ab210 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (openvdb-9.1.0.tar.gz) = 434be61b03efec5d0022594d81064dce5f67595c1e34934d79e13627e573d2819bf947ca5b433fdca134642975b83eda71b46cf802f57e135d1611dbe2e5757e +SHA512 (openvdb-10.0.1.tar.gz) = 361cef8932b69b19ee94c47fe78f665a1acabfabc3f45ff9f490e830f73ff092c42f56ce698677476a8ccf062c89e3e4dc6d4c550aa6842438cbd4d404ee83bb