1 files changed, 11 insertions, 10 deletions

diff --git a/meta-oe/recipes-support/opencv/opencv/fixpkgconfig.patch b/meta-oe/recipes-support/opencv/opencv/fixpkgconfig.patch
index 3aeda7d44..3ed3468d5 100644
--- a/meta-oe/recipes-support/opencv/opencv/fixpkgconfig.patch
+++ b/meta-oe/recipes-support/opencv/opencv/fixpkgconfig.patch
@@ -1,24 +1,25 @@
-diff --git a/cmake/OpenCVGenPkgconfig.cmake b/cmake/OpenCVGenPkgconfig.cmake
-index b8cb8777c06b..75281ee964fd 100644
---- a/cmake/OpenCVGenPkgconfig.cmake
-+++ b/cmake/OpenCVGenPkgconfig.cmake
-@@ -27,7 +27,7 @@ macro(fix_prefix lst isown)
+Index: git/cmake/OpenCVGenPkgconfig.cmake
+===================================================================
+--- git.orig/cmake/OpenCVGenPkgconfig.cmake
++++ git/cmake/OpenCVGenPkgconfig.cmake
+@@ -31,7 +31,7 @@ macro(fix_prefix lst isown)
        get_filename_component(libdir "${item}" PATH)
-       get_filename_component(libname "${item}" NAME_WE)
-       string(REGEX REPLACE "^lib(.*)" "\\1" libname "${libname}")
+       get_filename_component(_libname "${item}" NAME)
+       ocv_get_libname(libname "${_libname}")
 -      list(APPEND _lst "-L${libdir}" "-l${libname}")
 +      list(APPEND _lst "-l${libname}")
      else()
        list(APPEND _lst "-l${item}")
      endif()
-@@ -66,10 +66,14 @@ ocv_list_unique(_3rdparty)
+@@ -124,11 +124,14 @@ ocv_list_unique(_extra)
+ ocv_list_unique(_3rdparty)
  
  set(OPENCV_PC_LIBS
-   "-L\${exec_prefix}/${OPENCV_LIB_INSTALL_PATH}"
+-  "-L\${exec_prefix}/${OPENCV_LIB_INSTALL_PATH}"
 +  "-L\${exec_prefix}/${OPENCV_3P_LIB_INSTALL_PATH}"
    "${_modules}"
  )
- if (BUILD_SHARED_LIBS)
+ if(BUILD_SHARED_LIBS)
 -  set(OPENCV_PC_LIBS_PRIVATE "${_extra}")
 +  set(OPENCV_PC_LIBS_PRIVATE
 +    "-L\${exec_prefix}/${OPENCV_LIB_INSTALL_PATH}"