r45336 - in /packages/opencv/tags/2.3.1-12/debian/patches: 0015_switch_multiarch.patch series

[iwamatsu at users.alioth.debian.org]

Author: iwamatsu
Date: Mon Aug 27 22:20:08 2012
New Revision: 45336

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45336
Log:
Added patch of support multiarch

Added:
    packages/opencv/tags/2.3.1-12/debian/patches/0015_switch_multiarch.patch
Modified:
    packages/opencv/tags/2.3.1-12/debian/patches/series

Added: packages/opencv/tags/2.3.1-12/debian/patches/0015_switch_multiarch.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/tags/2.3.1-12/debian/patches/0015_switch_multiarch.patch?rev=45336&op=file
==============================================================================
--- packages/opencv/tags/2.3.1-12/debian/patches/0015_switch_multiarch.patch (added)
+++ packages/opencv/tags/2.3.1-12/debian/patches/0015_switch_multiarch.patch Mon Aug 27 22:20:08 2012
@@ -1,0 +1,30 @@
+Description: set CMAKE_LIBRARY_ARCHITECTURE and switch to multiarch support.
+Author: Nobuhiro Iwamatsu <iwamatsu at debian.org>
+Last-Update: 2012-08-08
+Forwarded: no
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -131,7 +131,7 @@ endif()
+ if(ANDROID)
+     set(OPENCV_LIB_INSTALL_PATH libs/${ARMEABI_NDK_NAME})
+ else()
+-    set(OPENCV_LIB_INSTALL_PATH lib${LIB_SUFFIX})
++    set(OPENCV_LIB_INSTALL_PATH lib/${CMAKE_LIBRARY_ARCHITECTURE})
+ endif()
+ 
+ set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${OPENCV_LIB_INSTALL_PATH}")
+--- a/OpenCVModule.cmake
++++ b/OpenCVModule.cmake
+@@ -111,6 +111,11 @@ macro(define_opencv_module name)
+         RUNTIME DESTINATION bin COMPONENT main
+         LIBRARY DESTINATION ${OPENCV_LIB_INSTALL_PATH} COMPONENT main
+         ARCHIVE DESTINATION ${OPENCV_LIB_INSTALL_PATH} COMPONENT main)
++ 
++	install(TARGETS ${the_target_s}
++        RUNTIME DESTINATION bin COMPONENT main
++        LIBRARY DESTINATION ${OPENCV_LIB_INSTALL_PATH} COMPONENT main
++        ARCHIVE DESTINATION ${OPENCV_LIB_INSTALL_PATH} COMPONENT main)
+ 
+     install(FILES ${lib_hdrs}
+         DESTINATION ${OPENCV_INCLUDE_PREFIX}/opencv2/${name}

Modified: packages/opencv/tags/2.3.1-12/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/tags/2.3.1-12/debian/patches/series?rev=45336&op=diff
==============================================================================
--- packages/opencv/tags/2.3.1-12/debian/patches/series (original)
+++ packages/opencv/tags/2.3.1-12/debian/patches/series Mon Aug 27 22:20:08 2012
@@ -4,3 +4,4 @@
 0012_cvcap_ffmpeg_fix_compile_against_libav0.7.patch
 0013_drop_asm_types_h_kfreebsd.patch
 0014_fix_ftbfs_libav0.8.patch
+0015_switch_multiarch.patch