r46376 - /packages/opencv/trunk/debian/patches/pkg-config

[iwamatsu at users.alioth.debian.org]

Author: iwamatsu
Date: Mon Nov 25 23:01:39 2013
New Revision: 46376

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46376
Log:
Update patches/pkg-config

Modified:
    packages/opencv/trunk/debian/patches/pkg-config

Modified: packages/opencv/trunk/debian/patches/pkg-config
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/patches/pkg-config?rev=46376&op=diff
==============================================================================
--- packages/opencv/trunk/debian/patches/pkg-config	(original)
+++ packages/opencv/trunk/debian/patches/pkg-config	Mon Nov 25 23:01:39 2013
@@ -2,11 +2,12 @@
 Bug: http://code.opencv.org/issues/1925
 Bug-Debian: http://bugs.debian.org/721894, http://bugs.debian.org/678222 
 Author: Ray Rashif
-Last-Update: 2013-08-06
+Last-Update: 2013-11-23
 
-diff -Nbaur OpenCV-2.4.3.orig/cmake/OpenCVGenPkgconfig.cmake OpenCV-2.4.3/cmake/OpenCVGenPkgconfig.cmake
---- OpenCV-2.4.3.orig/cmake/OpenCVGenPkgconfig.cmake	2012-11-04 08:40:14.243505926 +0000
-+++ OpenCV-2.4.3/cmake/OpenCVGenPkgconfig.cmake	2012-11-04 08:40:42.286649120 +0000
+diff --git a/cmake/OpenCVGenPkgconfig.cmake b/cmake/OpenCVGenPkgconfig.cmake
+index a36b70e..a3733bc 100644
+--- a/cmake/OpenCVGenPkgconfig.cmake
++++ b/cmake/OpenCVGenPkgconfig.cmake
 @@ -10,7 +10,7 @@
  # -------------------------------------------------------------------------------------------
  set(prefix      "${CMAKE_INSTALL_PREFIX}")
@@ -14,9 +15,9 @@
 -set(libdir      "") #TODO: need link paths for OpenCV_EXTRA_COMPONENTS
 +set(libdir      "\${prefix}/${OPENCV_LIB_INSTALL_PATH}")
  set(includedir  "\${prefix}/${OPENCV_INCLUDE_INSTALL_PATH}")
- set(VERSION     ${OPENCV_VERSION})
  
-@@ -36,10 +36,11 @@
+ if(CMAKE_BUILD_TYPE MATCHES "Release")
+@@ -35,10 +35,11 @@ ocv_list_reverse(OpenCV_LIB_COMPONENTS)
  ocv_list_reverse(OpenCV_EXTRA_COMPONENTS)
  
  #build the list of components
@@ -29,13 +30,21 @@
  
    if(INSTALL_TO_MANGLED_PATHS)
      set(libname "${libname}.${OPENCV_VERSION}")
-@@ -52,7 +53,8 @@
-     set(installDir "${OPENCV_LIB_INSTALL_PATH}")
+@@ -52,6 +53,8 @@ foreach(CVLib ${OpenCV_LIB_COMPONENTS})
    endif()
  
--  set(OpenCV_LIB_COMPONENTS_ "${OpenCV_LIB_COMPONENTS_} \${exec_prefix}/${installDir}/${libname}")
+   set(OpenCV_LIB_COMPONENTS_ "${OpenCV_LIB_COMPONENTS_} \${exec_prefix}/${installDir}/${libname}")
 +  string(REPLACE "libopencv" "-lopencv" lname "${lname}")
 +  set(OpenCV_LIB_COMPONENTS_ "${OpenCV_LIB_COMPONENTS_} ${lname}")
  endforeach()
  
  # add extra dependencies required for OpenCV
+@@ -67,6 +70,8 @@ if(OpenCV_EXTRA_COMPONENTS)
+ 
+     set(OpenCV_LIB_COMPONENTS "${OpenCV_LIB_COMPONENTS} ${maybe_l_prefix}${extra_component}")
+ 
++
++
+   endforeach()
+ endif()
+