[opencv] 01/02: Fix jasper removal and i686 build

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script.

locutusofborg pushed a commit to branch experimental/master
in repository opencv.

commit 89df9e8f538b639de171653d631e1e1c3c516de1
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Sat Jul 9 21:53:03 2016 +0200

    Fix jasper removal and i686 build
---
 debian/changelog      |  3 ++-
 debian/patches/series |  2 +-
 debian/rules          | 10 +++++-----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1295ba5..d05deb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-opencv (3.0.0+dfsg-1~exp3) UNRELEASED; urgency=medium
+opencv (3.0.0+dfsg-1~exp3) experimental; urgency=medium
 
   [ Andreas Cadhalpun ]
   * Fix build with ffmpeg 3.0. (Closes: #803847)
@@ -7,6 +7,7 @@ opencv (3.0.0+dfsg-1~exp3) UNRELEASED; urgency=medium
   * Team upload
   * merge unstable NMUs
   * rebase ffmpeg patch
+  * Disable optimize i586 patch, now Debian has i686
 
   [ Tobias Frost ]
   * Do not use precompiled headers (Closes: #818450)
diff --git a/debian/patches/series b/debian/patches/series
index 54ee2f3..1d7b6f9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,6 +7,6 @@ support_multiarch
 #revert-Make-ts-always-static
 #fix_path_of_opencl_headers
 #libav10.patch
-optimize_i586.patch
+#optimize_i586.patch
 support_x32
 ffmpeg_2.9.patch
diff --git a/debian/rules b/debian/rules
index 715ab99..d354406 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,11 +6,11 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
 # for i386 arch
-ifeq ($(DEB_HOST_ARCH),i386)
-BUILDDIR_ARCH = i586-linux-gnu
-else
+#ifeq ($(DEB_HOST_ARCH),i386)
+#BUILDDIR_ARCH = i586-linux-gnu
+#else
 BUILDDIR_ARCH = $(DEB_HOST_MULTIARCH)
-endif
+#endif
 
 # SSE options
 ifeq ($(DEB_HOST_ARCH),amd64)
@@ -60,7 +60,7 @@ CMAKE_FLAGS = \
 	-DWITH_FFMPEG=ON	\
 	-DWITH_GSTREAMER=OFF	\
 	-DWITH_GTK=ON	\
-	-DWITH_JASPER=ON	\
+	-DWITH_JASPER=OFF	\
 	-DWITH_JPEG=ON	\
 	-DWITH_PNG=ON	\
 	-DWITH_TIFF=ON	\

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git