.gitignore

@@ -16,6 +16,3 @@
 /openvdb-8.1.0.tar.gz
 /openvdb-9.0.0.tar.gz
 /openvdb-9.1.0.tar.gz
-/openvdb-10.0.1.tar.gz
-/openvdb-10.1.0.tar.gz
-/openvdb-11.0.0.tar.gz

openvdb.spec

@@ -2,32 +2,22 @@
 %undefine __cmake_in_source_build
 
 # Use soversion
-%global soversion 11.0
+%global soversion 9.1
 
 # Set to 1 to enable testsuite. Fails everywhere with GCC 8+.
 %global with_tests 0
 
-# Optional supports
-%global with_openexr 1
-%global with_ax      0
-%global with_nanovdb 1
-
-# ax currently incompatible with newer llvm versions
-%if 0%{?fedora} >= 38 || 0%{?rhel} >= 8
-%global llvm_compat 15
-%endif
+# Optional OpenEXR support
+%global with_openexr 0
 
 Name:           openvdb
-Version:        11.0.0
+Version:        9.1.0
 Release:        %autorelease
 Summary:        C++ library for sparse volumetric data discretized on three-dimensional grids
-License:        MPL-2.0
+License:        MPLv2.0
 URL:            http://www.openvdb.org/
 
-Source0:        https://github.com/AcademySoftwareFoundation/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
-
-# OpenVDB no longer builds on 32bits with latest TBB due to OOM.
-ExcludeArch:    i686
+Source0:        https://github.com/AcademySoftwareFoundation/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
 BuildRequires:  boost-devel >= 1.61
 # boost-python3-devel merged in boost-devel for Fedora 33+
@@ -41,10 +31,6 @@ BuildRequires:  doxygen >= 1.8.11
 BuildRequires:  gcc-c++
 BuildRequires:  ghostscript >= 8.70
 BuildRequires:  libstdc++-devel
-%if 0%{?with_ax}
-BuildRequires:  llvm%{?llvm_compat}-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
@@ -57,13 +43,10 @@ BuildRequires:  pkgconfig(glfw3) >= 2.7
 %endif
 BuildRequires:  pkgconfig(jemalloc)
 BuildRequires:  pkgconfig(log4cplus) >= 1.0
-BuildRequires:  cmake(pybind11)
 %if 0%{?with_openexr}
 BuildRequires:  pkgconfig(OpenEXR) >= 3.0
 %endif
-# Requires v2020.3 in adherence to VFX Reference Platform guideline
-# https://vfxplatform.com/
-BuildRequires:  cmake(tbb) = 2020.3
+BuildRequires:  pkgconfig(tbb) >= 3.0
 BuildRequires:  pkgconfig(xi)
 BuildRequires:  pkgconfig(zlib) > 1.2.7
 
@@ -90,10 +73,6 @@ volumetric applications typically encountered in feature film production.
 Summary:        Development files for %{name}
 BuildRequires:  texlive-latex
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
-# Requires v2020.3 in adherence to VFX Reference Platform guideline
-# https://vfxplatform.com/
-Requires:       cmake(tbb) >= 2020.3
-Requires:       pkgconfig(zlib) > 1.2.7
 Obsoletes:      %{name}-doc < 6.1.0-1
 Provides:       %{name}-doc = %{version}-%{release}
 
@@ -133,14 +112,9 @@ sed -i \
 # https://bugzilla.redhat.com/show_bug.cgi?id=2021376
 %global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
 %endif
-%ifarch ppc64le
-%undefine _smp_mflags
-%endif 
 export CXXFLAGS="%{build_cxxflags} -Wl,--as-needed"
 
 # Ignore versions (python 3, etc.)
-# Set ABI version to address blender compatibility for
-# Fedora 40 and onward
 %cmake \
     -DCMAKE_NO_SYSTEM_FROM_IMPORTED=TRUE \
     -DDISABLE_DEPENDENCY_VERSION_CHECKS=ON \
@@ -153,24 +127,13 @@ export CXXFLAGS="%{build_cxxflags} -Wl,--as-needed"
 %endif
     -DOPENVDB_BUILD_UNITTESTS=OFF \
     -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 \
-    -DLLVM_STATIC=0 \
-    -DLLVM_CONFIG=$(which llvm-config%{?llvm_compat:-%{llvm_compat}}) \
-    -DLLVM=%{_bindir} \
-%endif
 %if 0%{?with_openexr}
     -DUSE_EXR=ON \
 %endif
-%if 0%{?with_nanovdb}
-    -DUSE_NANOVDB=ON \
-    -DNANOVDB_USE_OPENVDB=ON
-%endif
-# Increase memory reserve to 12GB per build thread for a successful build on
-# ppc64le and s390x.
-%cmake_build %limit_build -m 12288
+    -DUSE_NANOVDB=ON
+%cmake_build
 
 %if 0%{?with_tests}
 %check
@@ -188,7 +151,7 @@ find %{buildroot} -name '*.a' -delete
 
 %files
 %{_bindir}/vdb_print
-%{_bindir}/nanovdb_{convert,print,validate}
+%{_bindir}/nanovdb_{print,validate}
 
 %files libs
 %license LICENSE
@@ -198,14 +161,13 @@ find %{buildroot} -name '*.a' -delete
 
 %if 0%{?fedora}
 %files -n python3-%{name}
-%{python3_sitearch}/py%{name}.cpython-*.so
+%{python3_sitearch}/py%{name}.so
 %endif
 
 %files devel
 %doc html
 %{_includedir}/*
 %{_libdir}/lib%{name}.so
-%{_libdir}/cmake/OpenVDB/
 
 %changelog
 %autochangelog

sources

@@ -1 +1 @@
-SHA512 (openvdb-11.0.0.tar.gz) = f2c90ca8435ecbacefda429341000ecb555385c746a3e0233220cd78540cee2a26cc17df7b560fdfe2dc03f2b2e960a2fa226a85980189c3e018164ccc037bd4
+SHA512 (openvdb-9.1.0.tar.gz) = 434be61b03efec5d0022594d81064dce5f67595c1e34934d79e13627e573d2819bf947ca5b433fdca134642975b83eda71b46cf802f57e135d1611dbe2e5757e