r44453 - in /packages/opencv/trunk/debian: changelog control rules

[iwamatsu at users.alioth.debian.org]

Author: iwamatsu
Date: Sun Feb  5 08:05:00 2012
New Revision: 44453

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44453
Log:
Add support TBB and fix getting value of dpkg-architecture.

Modified:
    packages/opencv/trunk/debian/changelog
    packages/opencv/trunk/debian/control
    packages/opencv/trunk/debian/rules

Modified: packages/opencv/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/changelog?rev=44453&op=diff
==============================================================================
--- packages/opencv/trunk/debian/changelog (original)
+++ packages/opencv/trunk/debian/changelog Sun Feb  5 08:05:00 2012
@@ -1,3 +1,9 @@
+opencv (2.3.1-8) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+
+ -- Nobuhiro Iwamatsu <iwamatsu at debian.org>  Thu, 02 Feb 2012 12:40:01 +0900
+
 opencv (2.3.1-7) unstable; urgency=low
 
   * Update debian/libopencv-core-dev.install.

Modified: packages/opencv/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/control?rev=44453&op=diff
==============================================================================
--- packages/opencv/trunk/debian/control (original)
+++ packages/opencv/trunk/debian/control Sun Feb  5 08:05:00 2012
@@ -17,6 +17,7 @@
  libv4l-dev [linux-any],
  zlib1g-dev (>= 1.2.5),
  liblapack-dev (>= 3.2.1),
+ libtbb-dev [i386 amd64 ia64],
  python-dev, swig,
  python-support (>= 0.4.1),
  python-numpy,

Modified: packages/opencv/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/rules?rev=44453&op=diff
==============================================================================
--- packages/opencv/trunk/debian/rules (original)
+++ packages/opencv/trunk/debian/rules Sun Feb  5 08:05:00 2012
@@ -4,7 +4,8 @@
 CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS)
 LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 
-DEB_BUILD_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
+DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_HOST_CPU)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 # These don't need to be exported and if they are we'll get the flags
 # duplicated in the command line.
@@ -12,10 +13,18 @@
 unexport CXXFLAGS
 unexport LDFLAGS
 
-ifeq ($(DEB_BUILD_ARCH_CPU),amd64)
-CMAKE_ARCH_FLAGS = -DENABLE_SSE=ON -DENABLE_SSE2=ON -DENABLE_SSSE3=OFF
+# SSE options
+ifeq ($(DEB_HOST_ARCH_CPU),amd64)
+CMAKE_ARCH_FLAGS = -DENABLE_SSE=ON -DENABLE_SSE2=ON -DENABLE_SSSE3=OFF 
 else
-CMAKE_ARCH_FLAGS = -DENABLE_SSE=OFF -DENABLE_SSE2=OFF -DENABLE_SSSE3=OFF
+CMAKE_ARCH_FLAGS = -DENABLE_SSE=OFF -DENABLE_SSE2=OFF -DENABLE_SSSE3=OFF 
+endif
+
+# TBB support
+ifneq (,$(findstring $(DEB_HOST_ARCH), amd64 i386 ia64))
+CMAKE_ARCH_FLAGS += -DWITH_TBB=ON
+else
+CMAKE_ARCH_FLAGS += -DWITH_TBB=OFF
 endif
 
 CMAKE_FLAGS = \
@@ -41,7 +50,6 @@
 	-DWITH_TIFF=ON	\
 	-DWITH_OPENEXR=ON \
 	-DWITH_PVAPI=ON	\
-	-DWITH_TBB=OFF	\
 	-DWITH_UNICAP=OFF	\
 	-DWITH_1394=ON	\
 	-DWITH_V4L=ON	\