diff options
author | bartus | 2017-09-30 13:49:22 +0200 |
---|---|---|
committer | bartus | 2017-09-30 13:49:22 +0200 |
commit | 4e9d44c7b0800c66fc743a58f9d50249d3789701 (patch) | |
tree | cbc833da0675725cf76ff5d9522063c5e6286cc8 | |
parent | 7c0479fd568bf8856b535915324be9b9b4336956 (diff) | |
download | aur-4e9d44c7b0800c66fc743a58f9d50249d3789701.tar.gz |
roll back upstream openvdb4 patch until arch openvdb package gets rebuild without openvdb3 compatibility flag
-rw-r--r-- | PKGBUILD | 9 | ||||
-rw-r--r-- | openvdb4.revert.patch | 16 |
2 files changed, 22 insertions, 3 deletions
@@ -2,7 +2,7 @@ pkgname=blender-2.8-git -pkgver=2.8_r71599.76444a13c36 +pkgver=2.8_r71697.18965905d0f pkgrel=1 pkgdesc="Development version of Blender 2.8 branch" arch=('i686' 'x86_64') @@ -27,14 +27,16 @@ source=('git://git.blender.org/blender.git#branch=blender2.8' \ 'blender-translations.git::git://git.blender.org/blender-translations.git' \ 'blender-dev-tools.git::git://git.blender.org/blender-dev-tools.git' \ blender-2.8.desktop \ - SelectCudaComputeArch.cmake.patch) + SelectCudaComputeArch.cmake.patch \ + openvdb4.revert.patch) md5sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'cd108dca1c77607c6a7cc45aa284ea97' - 'd1ee53ea71d0617c28caba2774eaf3e0') + 'd1ee53ea71d0617c28caba2774eaf3e0' + '449373d2fdf2af6b357101fc10e3d573') # determine whether we can precompile CUDA kernels _CUDA_PKG=`pacman -Qq cuda 2>/dev/null` || true @@ -55,6 +57,7 @@ prepare() { git submodule foreach git checkout master git submodule foreach git pull --rebase origin master patch -Np1 -i ../SelectCudaComputeArch.cmake.patch + patch -Np1 -i ../openvdb4.revert.patch } build() { diff --git a/openvdb4.revert.patch b/openvdb4.revert.patch new file mode 100644 index 000000000000..8c2818a9fc31 --- /dev/null +++ b/openvdb4.revert.patch @@ -0,0 +1,16 @@ +diff --git a/intern/openvdb/intern/openvdb_writer.cc b/intern/openvdb/intern/openvdb_writer.cc +index e886c5a76a8..923752909d9 100644 +--- a/intern/openvdb/intern/openvdb_writer.cc ++++ b/intern/openvdb/intern/openvdb_writer.cc +@@ -45,11 +45,7 @@ void OpenVDBWriter::insert(const openvdb::GridBase::Ptr &grid) + + 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) |