r44974 - in /packages/opencv/trunk/debian/patches: 0005-build-static-libs.patch series

[iwamatsu at users.alioth.debian.org]

Author: iwamatsu
Date: Thu Jun  7 05:19:27 2012
New Revision: 44974

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44974
Log:
Update 0005-build-static-libs.patch to version 2.4.1.

Modified:
    packages/opencv/trunk/debian/patches/0005-build-static-libs.patch
    packages/opencv/trunk/debian/patches/series

Modified: packages/opencv/trunk/debian/patches/0005-build-static-libs.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/patches/0005-build-static-libs.patch?rev=44974&op=diff
==============================================================================
--- packages/opencv/trunk/debian/patches/0005-build-static-libs.patch (original)
+++ packages/opencv/trunk/debian/patches/0005-build-static-libs.patch Thu Jun  7 05:19:27 2012
@@ -1,33 +1,20 @@
-From 6501635a133fdf5b1f2ac17430d872efbafd84fa Mon Sep 17 00:00:00 2001
-From: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
-Date: Thu, 10 May 2012 05:45:12 +0900
-Subject: [PATCH] support static library
-
-Signed-off-by: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
----
- cmake/OpenCVModule.cmake |    2 ++
- 1 file changed, 2 insertions(+)
-
 diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake
-index 9c21c73..4447b03 100644
+index 8d37ffe..625ea3e 100644
 --- a/cmake/OpenCVModule.cmake
 +++ b/cmake/OpenCVModule.cmake
-@@ -89,6 +89,7 @@ macro(ocv_add_module _name)
+@@ -94,6 +94,7 @@ macro(ocv_add_module _name)
    string(TOLOWER "${_name}" name)
    string(REGEX REPLACE "^opencv_" "" ${name} "${name}")
    set(the_module opencv_${name})
-+  set(the_module_s opencv_${name}_s)
++  set(the_module_s opencv_${name}_s) 
  
    # the first pass - collect modules info, the second pass - create targets
    if(OPENCV_INITIAL_PASS)
-@@ -432,6 +433,7 @@ endmacro()
- # ocv_create_module(<extra link dependencies>)
+@@ -446,6 +447,7 @@ endmacro()
+ #   ocv_create_module(SKIP_LINK)
  macro(ocv_create_module)
    add_library(${the_module} ${OPENCV_MODULE_TYPE} ${OPENCV_MODULE_${the_module}_HEADERS} ${OPENCV_MODULE_${the_module}_SOURCES})
 +  add_library(${the_module_s} STATIC ${OPENCV_MODULE_TYPE} ${OPENCV_MODULE_${the_module}_HEADERS} ${OPENCV_MODULE_${the_module}_SOURCES})
-   target_link_libraries(${the_module} ${OPENCV_MODULE_${the_module}_DEPS} ${OPENCV_MODULE_${the_module}_DEPS_EXT} ${OPENCV_LINKER_LIBS} ${IPP_LIBS} ${ARGN})
-   add_dependencies(opencv_modules ${the_module})
- 
--- 
-1.7.10
-
+   if(NOT "${ARGN}" STREQUAL "SKIP_LINK")
+     target_link_libraries(${the_module} ${OPENCV_MODULE_${the_module}_DEPS} ${OPENCV_MODULE_${the_module}_DEPS_EXT} ${OPENCV_LINKER_LIBS} ${IPP_LIBS} ${ARGN})
+   endif()

Modified: packages/opencv/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/patches/series?rev=44974&op=diff
==============================================================================
--- packages/opencv/trunk/debian/patches/series (original)
+++ packages/opencv/trunk/debian/patches/series Thu Jun  7 05:19:27 2012
@@ -1,2 +1,2 @@
-#0005-build-static-libs.patch
-#0013_drop_asm_types_h_kfreebsd.patch
+0005-build-static-libs.patch
+0013_drop_asm_types_h_kfreebsd.patch