r45906 - in /packages/opencv/trunk/debian/patches: series support_multiarch

[iwamatsu at users.alioth.debian.org]

Author: iwamatsu
Date: Fri May 17 01:29:07 2013
New Revision: 45906

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45906
Log:
Change to multiarch support

Added:
    packages/opencv/trunk/debian/patches/support_multiarch
Modified:
    packages/opencv/trunk/debian/patches/series

Modified: packages/opencv/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/patches/series?rev=45906&op=diff
==============================================================================
--- packages/opencv/trunk/debian/patches/series (original)
+++ packages/opencv/trunk/debian/patches/series Fri May 17 01:29:07 2013
@@ -1,3 +1,4 @@
 build-static-libs
 drop_asm_types_h_kfreebsd
 pkg-config
+support_multiarch

Added: packages/opencv/trunk/debian/patches/support_multiarch
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/patches/support_multiarch?rev=45906&op=file
==============================================================================
--- packages/opencv/trunk/debian/patches/support_multiarch (added)
+++ packages/opencv/trunk/debian/patches/support_multiarch Fri May 17 01:29:07 2013
@@ -1,0 +1,31 @@
+Description: Support multiarch
+Author: Nobuhiro Iwamatsu <iwamatsu at debian.org>
+Forwarded: no
+Last-Update: <2013-05-16>
+
+--- opencv-2.4.5+dfsg.orig/CMakeLists.txt
++++ opencv-2.4.5+dfsg/CMakeLists.txt
+@@ -241,13 +241,13 @@ if(ANDROID)
+ else()
+   set(LIBRARY_OUTPUT_PATH         "${OpenCV_BINARY_DIR}/lib")
+   set(3P_LIBRARY_OUTPUT_PATH      "${OpenCV_BINARY_DIR}/3rdparty/lib${LIB_SUFFIX}")
+-  set(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_INCLUDE_INSTALL_PATH include)
+ 
+   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()
+@@ -351,6 +351,7 @@ if(UNIX)
+   include(cmake/OpenCVFindPkgConfig.cmake OPTIONAL)
+   include(CheckFunctionExists)
+   include(CheckIncludeFile)
++  INCLUDE(GNUInstallDirs)
+ 
+   if(NOT APPLE)
+     CHECK_INCLUDE_FILE(alloca.h HAVE_ALLOCA_H)