diff --git a/blender-278c-openvdb3-abi.patch b/blender-278c-openvdb3-abi.patch new file mode 100644 index 0000000..593c75e --- /dev/null +++ b/blender-278c-openvdb3-abi.patch @@ -0,0 +1,14 @@ +diff -Naur blender-2.78c.old/CMakeLists.txt blender-2.78c/CMakeLists.txt +--- blender-2.78c.old/CMakeLists.txt 2017-04-24 09:21:40.471125097 +0200 ++++ blender-2.78c/CMakeLists.txt 2017-04-24 09:26:45.583477649 +0200 +@@ -250,6 +250,10 @@ + option(WITH_OPENVDB "Enable features relying on OpenVDB" OFF) + option(WITH_OPENVDB_BLOSC "Enable blosc compression for OpenVDB, only enable if OpenVDB was built with blosc support" OFF) + ++if(WITH_OPENVDB) ++ add_definitions(-DOPENVDB_3_ABI_COMPATIBLE) ++endif() ++ + # GHOST Windowing Library Options + option(WITH_GHOST_DEBUG "Enable debugging output for the GHOST library" OFF) + mark_as_advanced(WITH_GHOST_DEBUG) diff --git a/blender.spec b/blender.spec index d5222ad..8f803ec 100644 --- a/blender.spec +++ b/blender.spec @@ -48,6 +48,7 @@ Patch6: %{name}-2.78a-linux-definition-ppc64.patch # GPU: Consider latest Gallium driver an official ATI/AMD # https://developer.blender.org/rB927a168b077fa5182168068315c4fb0ea998edb6 Patch7: %{name}-2.78b-amd-gpu-support.patch +Patch8: %{name}-278c-openvdb3-abi.patch # Development stuff BuildRequires: boost-devel @@ -99,10 +100,8 @@ BuildRequires: OpenColorIO-devel BuildRequires: OpenEXR-devel BuildRequires: OpenImageIO-devel BuildRequires: openjpeg-devel -%{?_with_openvdb: BuildRequires: openvdb-devel BuildRequires: tbb-devel -} # Audio stuff BuildRequires: freealut-devel @@ -199,8 +198,8 @@ export CXXFLAGS="$CXXFLAGS -mno-altivec" -DWITH_MOD_OCEANSIM=ON \ -DWITH_OPENCOLLADA=ON \ -DWITH_OPENCOLORIO=ON \ - %{?_with_openvdb:-DWITH_OPENVDB=ON} \ - %{?_with_openvdb:-DWITH_OPENVDB_BLOSC=ON} \ + -DWITH_OPENVDB=ON \ + -DWITH_OPENVDB_BLOSC=ON \ -DWITH_PLAYER=ON \ -DWITH_PYTHON=ON \ -DWITH_PYTHON_INSTALL=OFF \ @@ -234,7 +233,6 @@ rm -rf %{buildroot}%{_docdir}/%{name}/* mkdir -p %{buildroot}%{macrosdir} sed -e 's/@VERSION@/%{blender_api}/g' %{SOURCE10} > %{buildroot}%{macrosdir}/macros.%{name} - # AppData install -p -m 644 -D %{SOURCE6} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml install -p -m 644 -D %{SOURCE2} %{buildroot}%{_datadir}/metainfo/%{name}-fonts.metainfo.xml @@ -303,8 +301,8 @@ fi %{_fontbasedir}/%{name}/ %changelog -* Sun Apr 23 2017 Simone Caronni - 1:2.78c-4 -- Enable rebuilding of the package with OpenVDB support enabled. +* Mon Apr 24 2017 Simone Caronni - 1:2.78c-4 +- Enable OpenVDB support. * Fri Apr 21 2017 Simone Caronni - 1:2.78c-3 - Remove redundant fonts directory in blender-fonts package.