[SCM] blender/master: debian/: Cycles support added to all architectures

[mfv-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 08e3c4650e1ac764455c891fa3bbe72bf3ebb920
Author: Matteo F. Vescovi <mfv.debian at gmail.com>
Date:   Thu May 23 14:41:24 2013 +0200

    debian/: Cycles support added to all architectures
    
    - debian/control: libopenimageio-dev versioning dropped
    - debian/rules: arch-parsing for Cycles dropped

diff --git a/debian/control b/debian/control
index 09deb8a..f33733d 100644
--- a/debian/control
+++ b/debian/control
@@ -28,7 +28,7 @@ Build-Depends: autotools-dev,
                liblzo2-dev,
                libopenal-dev,
                libopenexr-dev,
-               libopenimageio-dev (>= 1.1.0) [any-amd64 any-i386],
+               libopenimageio-dev,
                libopenjpeg-dev,
                libpng-dev,
                libsdl-dev,
diff --git a/debian/rules b/debian/rules
index 56de511..8f481a1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,6 @@
 #!/usr/bin/make -f
 
 INSTDIR = debian/tmp
-DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
-
-ifneq (,$(filter $(DEB_HOST_ARCH_CPU),amd64 i386))
-        confflags += -DWITH_CYCLES=ON
-else
-        confflags += -DWITH_CYCLES=OFF
-endif
 
 # Adapted from http://wiki.debian.org/SandroTosi/Svn_get-orig-source
 PACKAGE = blender
@@ -42,7 +35,7 @@ override_dh_auto_configure:
 		-DWITH_CODEC_SNDFILE=ON \
 		-DWITH_FONTCONFIG=ON \
 		-DWITH_MOD_OCEANSIM=ON \
-		$(confflags)
+		-DWITH_CYCLES=ON
 
 override_dh_auto_install:
 	dh_auto_install --buildsystem=cmake

-- 
blender packaging