[SCM] blender/master: debian/patches/: patchset updated

[mfv at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 26b80883660f5e2d8fce60e849deffdaf8dcc2d5
Author: Matteo F. Vescovi <mfv at debian.org>
Date:   Mon Sep 25 14:39:07 2017 +0200

    debian/patches/: patchset updated
    
    - 0008-fix_FTBFS_with_OpenVDB4.patch added
    
    Thanks: Sergey Sharybin (upstream) for the patch.

diff --git a/debian/patches/0008-fix_FTBFS_with_OpenVDB4.patch b/debian/patches/0008-fix_FTBFS_with_OpenVDB4.patch
new file mode 100644
index 0000000..b1ca593
--- /dev/null
+++ b/debian/patches/0008-fix_FTBFS_with_OpenVDB4.patch
@@ -0,0 +1,20 @@
+Author: Sergey Sharybin <sergey at blender.org>
+Origin: upstream, https://developer.blender.org/rB0d4e519b748c
+Bug-Debian: https://bugs.debian.org/876490
+Reviewed-By: Matteo F. Vescovi <mfv at debian.org>
+Last-Update: 2017-09-25
+
+--- blender-2.79+dfsg0.orig/intern/openvdb/intern/openvdb_writer.cc
++++ blender-2.79+dfsg0/intern/openvdb/intern/openvdb_writer.cc
+@@ -45,7 +45,11 @@ void OpenVDBWriter::insert(const openvdb
+ 
+ void OpenVDBWriter::insert(const openvdb::GridBase &grid)
+ {
++#if (OPENVDB_LIBRARY_MAJOR_VERSION_NUMBER == 3)
+ 	m_grids->push_back(grid.copyGrid());
++#else
++	m_grids->push_back(grid.copyGridWithNewTree());
++#endif
+ }
+ 
+ void OpenVDBWriter::insertFloatMeta(const openvdb::Name &name, const float value)
diff --git a/debian/patches/series b/debian/patches/series
index 0c67f45..8e9fcc4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 0005-do_not_use_version_number_in_system_path.patch
 0006-look_for_dejavu_ttf_with_fontconfig.patch
 0007-fix_OpenJPEG2_build.patch
+0008-fix_FTBFS_with_OpenVDB4.patch

-- 
blender packaging