r45121 - in /packages/opencv/trunk/debian/patches: pkg-config.patch series

[iwamatsu at users.alioth.debian.org]

Author: iwamatsu
Date: Tue Jun 26 07:17:20 2012
New Revision: 45121

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

This patch changed library specification method in pkgconfig file.

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

Added: packages/opencv/trunk/debian/patches/pkg-config.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/patches/pkg-config.patch?rev=45121&op=file
==============================================================================
--- packages/opencv/trunk/debian/patches/pkg-config.patch (added)
+++ packages/opencv/trunk/debian/patches/pkg-config.patch Tue Jun 26 07:17:20 2012
@@ -1,0 +1,20 @@
+Description: Change library specification method
+Forwarded: no
+Author: Nobuhiro Iwamatsu <iwamatsu at debian.org>
+Last-Update: 2012-06-26
+
+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})
+     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_}")
+ 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=45121&op=diff
==============================================================================
--- packages/opencv/trunk/debian/patches/series (original)
+++ packages/opencv/trunk/debian/patches/series Tue Jun 26 07:17:20 2012
@@ -1,3 +1,4 @@
 0005-build-static-libs.patch
 0013_drop_asm_types_h_kfreebsd.patch
 remove_path_nonfree_doc
+pkg-config.patch