[SCM] blender/master: debian/: fix linking to OpenVDB library

[mfv at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d16771f0a1f788dec08a0026bfb795e00638cb9a
Author: Matteo F. Vescovi <mfv at debian.org>
Date:   Thu May 12 11:13:25 2016 +0200

    debian/: fix linking to OpenVDB library
    
    Former approach didn't consider that
    tbb library (b-dep for openvdb) does not
    build on a bunch of release architectures.
    
    I'm narrowing them to amd64 and i386 for now,
    hoping to see it building fine on the others
    very soon.
    
    Gbp-Dch: Short

diff --git a/debian/control b/debian/control
index acb1294..89f60e9 100644
--- a/debian/control
+++ b/debian/control
@@ -35,13 +35,13 @@ Build-Depends: autotools-dev,
                libopenexr-dev (>= 2.2.0),
                libopenimageio-dev,
                libopenjpeg-dev,
-               libopenvdb-dev,
+               libopenvdb-dev [amd64 i386],
                libpng-dev,
                libsdl-dev,
                libsndfile-dev,
                libspnav-dev,
                libswscale-dev,
-               libtbb-dev,
+               libtbb-dev [amd64 i386],
                libtiff-dev,
                libvorbis-dev,
                libxi-dev,
diff --git a/debian/rules b/debian/rules
index 4bcfdc4..2e6cdb7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,6 +12,12 @@ else
 	SETSSE = ON
 endif
 
+ifeq (,$(filter $(DEB_HOST_ARCH),amd64 i386))
+	SETVDB = ON
+else
+	SETVDB = OFF
+endif
+
 get-orig-source:
 	uscan --force-download --repack --compression xz
 	$(REPACK_SH) --upstream-version $(SRC_VER) ../blender_$(SRC_VER).orig.tar.xz
@@ -37,7 +43,7 @@ override_dh_auto_configure:
 		-DWITH_JACK=ON \
 		-DWITH_MOD_OCEANSIM=ON \
 		-DWITH_OPENCOLORIO=ON \
-		-DWITH_OPENVDB=ON \
+		-DWITH_OPENVDB=$(SETVDB) \
 		-DWITH_PLAYER=ON \
 		-DWITH_PYTHON_INSTALL=OFF \
 		-DWITH_SYSTEM_OPENJPEG=ON

-- 
blender packaging