r46244 - in /packages/opencv/trunk/debian/patches: pkg-config series

[iwamatsu at users.alioth.debian.org]

Author: iwamatsu
Date: Fri Sep  6 04:51:27 2013
New Revision: 46244

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46244
Log:
Update patches/pkg-confg. (Closes: #678222, #721894)

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

Modified: packages/opencv/trunk/debian/patches/pkg-config
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/patches/pkg-config?rev=46244&op=diff
==============================================================================
--- packages/opencv/trunk/debian/patches/pkg-config	(original)
+++ packages/opencv/trunk/debian/patches/pkg-config	Fri Sep  6 04:51:27 2013
@@ -1,20 +1,41 @@
-Description: Change library specification method
-Forwarded: no
-Author: Nobuhiro Iwamatsu <iwamatsu at debian.org>
-Last-Update: 2012-06-26
+Description: pkg-config is broken in OpenCV-2.4.x
+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
 
-diff --git a/cmake/OpenCVGenPkgconfig.cmake b/cmake/OpenCVGenPkgconfig.cmake
-index 045bbb4..65fc93d 100644
---- a/cmake/OpenCVGenPkgconfig.cmake
-+++ b/cmake/OpenCVGenPkgconfig.cmake
-@@ -52,7 +52,9 @@ foreach(CVLib ${OpenCV_LIB_COMPONENTS})
+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
+@@ -10,7 +10,7 @@
+ # -------------------------------------------------------------------------------------------
+ set(prefix      "${CMAKE_INSTALL_PREFIX}")
+ set(exec_prefix "\${prefix}")
+-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 @@
+ ocv_list_reverse(OpenCV_EXTRA_COMPONENTS)
+ 
+ #build the list of components
+-set(OpenCV_LIB_COMPONENTS_ "")
++set(OpenCV_LIB_COMPONENTS_ "-L\${libdir}")
+ foreach(CVLib ${OpenCV_LIB_COMPONENTS})
+   get_target_property(libpath ${CVLib} LOCATION_${CMAKE_BUILD_TYPE})
+   get_filename_component(libname "${libpath}" NAME)
++  get_filename_component(lname "${libpath}" NAME_WE)
+ 
+   if(INSTALL_TO_MANGLED_PATHS)
+     set(libname "${libname}.${OPENCV_VERSION}")
+@@ -52,7 +53,8 @@
      set(installDir "${OPENCV_LIB_INSTALL_PATH}")
    endif()
  
 -  set(OpenCV_LIB_COMPONENTS_ "${OpenCV_LIB_COMPONENTS_} \${exec_prefix}/${installDir}/${libname}")
-+  get_filename_component(libname_ "${libname}" NAME_WE)
-+  string(REGEX REPLACE "^lib" "-l" libname_ "${libname_}")
-+  set(OpenCV_LIB_COMPONENTS_ "${OpenCV_LIB_COMPONENTS_} ${libname_}")
++  string(REPLACE "libopencv" "-lopencv" lname "${lname}")
++  set(OpenCV_LIB_COMPONENTS_ "${OpenCV_LIB_COMPONENTS_} ${lname}")
  endforeach()
  
  # add extra dependencies required for OpenCV

Modified: packages/opencv/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/patches/series?rev=46244&op=diff
==============================================================================
--- packages/opencv/trunk/debian/patches/series	(original)
+++ packages/opencv/trunk/debian/patches/series	Fri Sep  6 04:51:27 2013
@@ -1,5 +1,5 @@
 build-static-libs
 drop_asm_types_h_kfreebsd
-#pkg-config
 support_multiarch
 fix_ftbfs_on_non_linux.patch
+pkg-config