[otb] 01/03: Add patch to fix detection of OpenCV on i386 architecture.

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository otb.

commit f4db5649ec97f942730e3abec8a67082e2d32f3a
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jun 2 15:12:35 2017 +0200

    Add patch to fix detection of OpenCV on i386 architecture.
---
 debian/changelog                 |  6 ++++++
 debian/patches/opencv-i386.patch | 24 ++++++++++++++++++++++++
 debian/patches/series            |  1 +
 3 files changed, 31 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 00ba41c..043ab23 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+otb (6.0.0+dfsg-1~exp2) UNRELEASED; urgency=medium
+
+  * Add patch to fix detection of OpenCV on i386 architecture.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Fri, 02 Jun 2017 15:12:15 +0200
+
 otb (6.0.0+dfsg-1~exp1) experimental; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/opencv-i386.patch b/debian/patches/opencv-i386.patch
new file mode 100644
index 0000000..5306081
--- /dev/null
+++ b/debian/patches/opencv-i386.patch
@@ -0,0 +1,24 @@
+Description: Fix detection of OpenCV on i386 architecture.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://bugs.orfeo-toolbox.org/view.php?id=1419
+
+--- a/CMake/FindOpenCV.cmake
++++ b/CMake/FindOpenCV.cmake
+@@ -116,7 +116,7 @@ find_library(
+   OPENCV_core_LIBRARY
+   NAMES ${opencv_core_NAMES}
+   PATHS ${OPENCV_SEARCH_PATH}
+-  PATH_SUFFIXES "lib" "lib64" "lib/x86_64-linux-gnu"
++  PATH_SUFFIXES "lib" "lib64" "lib/x86_64-linux-gnu" "lib/i386-linux-gnu"
+   NO_DEFAULT_PATH
+   DOC "Path to opencv_core library")
+ 
+@@ -124,7 +124,7 @@ find_library(
+   OPENCV_ml_LIBRARY
+   NAMES ${opencv_ml_NAMES}
+   PATHS ${OPENCV_SEARCH_PATH}
+-  PATH_SUFFIXES "lib" "lib64" "lib/x86_64-linux-gnu"
++  PATH_SUFFIXES "lib" "lib64" "lib/x86_64-linux-gnu" "lib/i386-linux-gnu"
+   NO_DEFAULT_PATH
+   DOC "Path to opencv_ml library")
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..851399f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+opencv-i386.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/otb.git