[opencv] 04/13: Update patches/support_multiarch

[Nobuhiro Iwamatsu]

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

iwamatsu pushed a commit to branch master
in repository opencv.

commit dbe228738b80ed2301e8b22df3c0e8af9035d4a3
Author: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
Date:   Tue May 9 03:54:42 2017 +0900

    Update patches/support_multiarch
    
    Signed-off-by: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
---
 debian/patches/support_multiarch | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/debian/patches/support_multiarch b/debian/patches/support_multiarch
index 6e76a62..08af6bd 100644
--- a/debian/patches/support_multiarch
+++ b/debian/patches/support_multiarch
@@ -1,26 +1,28 @@
 Description: Install the libraries in the multiarch path
 
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cc45f6f394..9c55e09538 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -381,7 +381,7 @@
-     set(OPENCV_JAR_INSTALL_PATH java)
-     set(OPENCV_OTHER_INSTALL_PATH   etc)
+@@ -395,7 +395,7 @@ else()
+     ocv_update(OPENCV_OTHER_INSTALL_PATH   etc)
+     ocv_update(OPENCV_CONFIG_INSTALL_PATH  ".")
    else()
--    set(OPENCV_LIB_INSTALL_PATH     lib${LIB_SUFFIX})
+-    ocv_update(OPENCV_LIB_INSTALL_PATH     lib${LIB_SUFFIX})
 +    set(OPENCV_LIB_INSTALL_PATH     ${CMAKE_INSTALL_LIBDIR}${LIB_SUFFIX})
-     set(OPENCV_3P_LIB_INSTALL_PATH  share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH})
-     set(OPENCV_SAMPLES_SRC_INSTALL_PATH    share/OpenCV/samples)
-     set(OPENCV_JAR_INSTALL_PATH share/OpenCV/java)
-@@ -391,7 +391,7 @@
- 
-   math(EXPR SIZEOF_VOID_P_BITS "8 * ${CMAKE_SIZEOF_VOID_P}")
-   if(LIB_SUFFIX AND NOT SIZEOF_VOID_P_BITS EQUAL LIB_SUFFIX)
--    set(OPENCV_CONFIG_INSTALL_PATH lib${LIB_SUFFIX}/cmake/opencv)
-+    set(OPENCV_CONFIG_INSTALL_PATH ${CMAKE_INSTALL_LIBDIR}${LIB_SUFFIX}/cmake/opencv)
-   else()
-     set(OPENCV_CONFIG_INSTALL_PATH share/OpenCV)
-   endif()
-@@ -494,6 +494,7 @@
+     ocv_update(OPENCV_3P_LIB_INSTALL_PATH  share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH})
+     ocv_update(OPENCV_SAMPLES_SRC_INSTALL_PATH    share/OpenCV/samples)
+     ocv_update(OPENCV_JAR_INSTALL_PATH share/OpenCV/java)
+@@ -404,7 +404,7 @@ else()
+     if(NOT DEFINED OPENCV_CONFIG_INSTALL_PATH)
+       math(EXPR SIZEOF_VOID_P_BITS "8 * ${CMAKE_SIZEOF_VOID_P}")
+       if(LIB_SUFFIX AND NOT SIZEOF_VOID_P_BITS EQUAL LIB_SUFFIX)
+-        ocv_update(OPENCV_CONFIG_INSTALL_PATH lib${LIB_SUFFIX}/cmake/opencv)
++        ocv_update(OPENCV_CONFIG_INSTALL_PATH ${CMAKE_INSTALL_LIBDIR}${LIB_SUFFIX}/cmake/opencv)
+       else()
+         ocv_update(OPENCV_CONFIG_INSTALL_PATH share/OpenCV)
+       endif()
+@@ -515,6 +515,7 @@ if(UNIX)
    find_package(PkgConfig QUIET)
    include(CheckFunctionExists)
    include(CheckIncludeFile)

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