r44890 - /packages/opencv/trunk/debian/patches/0005-build-static-libs.patch

[iwamatsu at users.alioth.debian.org]

Author: iwamatsu
Date: Wed May 23 03:40:20 2012
New Revision: 44890

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

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

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=44890&op=diff
==============================================================================
--- packages/opencv/trunk/debian/patches/0005-build-static-libs.patch (original)
+++ packages/opencv/trunk/debian/patches/0005-build-static-libs.patch Wed May 23 03:40:20 2012
@@ -1,74 +1,33 @@
-From 8cc03516da0b5c93079d5184a73bce438c77d18a Mon Sep 17 00:00:00 2001
-From: Nobuhiro Iwamatsu <iwamatsu at debian.org>
-Date: Wed, 24 Aug 2011 12:06:56 +0900
-Subject: Support static library.
+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 debian.org>
+Signed-off-by: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
 ---
- OpenCVModule.cmake             |    4 +++-
- modules/gpu/CMakeLists.txt     |    2 ++
- modules/highgui/CMakeLists.txt |    2 ++
- 3 files changed, 7 insertions(+), 1 deletions(-)
+ cmake/OpenCVModule.cmake |    2 ++
+ 1 file changed, 2 insertions(+)
 
-diff --git a/OpenCVModule.cmake b/OpenCVModule.cmake
-index 53a24bd..be077f7 100644
---- a/OpenCVModule.cmake
-+++ b/OpenCVModule.cmake
-@@ -47,11 +47,13 @@ macro(define_opencv_module name)
-     file(GLOB lib_hdrs "include/opencv2/${name}/*.h*")
-     source_group("Include" FILES ${lib_hdrs})
+diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake
+index 9c21c73..4447b03 100644
+--- a/cmake/OpenCVModule.cmake
++++ b/cmake/OpenCVModule.cmake
+@@ -89,6 +89,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_target "opencv_${name}")
-+	set(the_target "opencv_${name}")
-+	set(the_target_s "opencv_${name}_s")
-     if (${name} MATCHES "ts" AND MINGW)
-         add_library(${the_target} STATIC ${lib_srcs} ${lib_hdrs} ${lib_int_hdrs})
-     else()
-         add_library(${the_target} ${lib_srcs} ${lib_hdrs} ${lib_int_hdrs})
-+        add_library(${the_target_s} STATIC ${lib_srcs} ${lib_hdrs} ${lib_int_hdrs})
-     endif()
+   # 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>)
+ 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})
  
-     # For dynamic link numbering convenions
-diff --git a/modules/gpu/CMakeLists.txt b/modules/gpu/CMakeLists.txt
-index b9f3666..8de8ecf 100644
---- a/modules/gpu/CMakeLists.txt
-+++ b/modules/gpu/CMakeLists.txt
-@@ -1,6 +1,7 @@
- set(name "gpu")
- 
- set(the_target "opencv_${name}")
-+set(the_target_s "opencv_${name}_s")
- project(${the_target})
- 
- set(DEPS "opencv_core" "opencv_imgproc" "opencv_objdetect" "opencv_features2d" "opencv_flann" "opencv_calib3d") #"opencv_features2d" "opencv_flann" "opencv_objdetect" - only headers needed 
-@@ -86,6 +87,7 @@ foreach(d ${DEPS})
- endforeach()
- 
- add_library(${the_target} ${lib_srcs} ${lib_hdrs} ${lib_int_hdrs} ${lib_cuda} ${lib_cuda_hdrs} ${lib_device_hdrs} ${lib_device_hdrs_detail} ${ncv_srcs} ${ncv_hdrs} ${ncv_cuda} ${cuda_objs})
-+add_library(${the_target_s} STATIC ${lib_srcs} ${lib_hdrs} ${lib_int_hdrs} ${lib_cuda} ${lib_cuda_hdrs} ${lib_device_hdrs} ${lib_device_hdrs_detail} ${ncv_srcs} ${ncv_hdrs} ${ncv_cuda} ${cuda_objs})
- 
- # For dynamic link numbering convenions
- set_target_properties(${the_target} PROPERTIES
-diff --git a/modules/highgui/CMakeLists.txt b/modules/highgui/CMakeLists.txt
-index b0975d7..e5c3341 100644
---- a/modules/highgui/CMakeLists.txt
-+++ b/modules/highgui/CMakeLists.txt
-@@ -254,6 +254,7 @@ set(lib_srcs ${highgui_srcs} ${grfmt_srcs})
- #               Define the library target:
- # ----------------------------------------------------------------------------------
- set(the_target "opencv_highgui")
-+set(the_target_s "opencv_highgui_s")
- 
- include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include"
-                     "${CMAKE_CURRENT_SOURCE_DIR}/../core/include"
-@@ -266,6 +267,7 @@ if(WIN32)
- endif()
- 
- add_library(${the_target} ${lib_srcs} ${highgui_hdrs} ${grfmt_hdrs} ${highgui_ext_hdrs})
-+add_library(${the_target_s} STATIC ${lib_srcs} ${highgui_hdrs} ${grfmt_hdrs} ${highgui_ext_hdrs})
- 
- if (BUILD_SHARED_LIBS)
- 	add_definitions(-DHIGHGUI_EXPORTS)
 -- 
-1.7.5.4
+1.7.10