From fa2a2f679791487b79c37b4fd6a13206b80b9f8b Mon Sep 17 00:00:00 2001
From: "coadde [Márcio Alexandre Silva Delgado]" <coadde@parabola.nu>
Date: Mon, 25 Apr 2016 21:15:20 -0300
Subject: opencv: update package and needs more changes to fix it

---
 libre/opencv/5852.patch | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 libre/opencv/5852.patch

(limited to 'libre/opencv/5852.patch')

diff --git a/libre/opencv/5852.patch b/libre/opencv/5852.patch
new file mode 100644
index 000000000..e34dfad7e
--- /dev/null
+++ b/libre/opencv/5852.patch
@@ -0,0 +1,39 @@
+From 24dbb43c096691d0333cacf231e22f1369f8c826 Mon Sep 17 00:00:00 2001
+From: Alexander Alekhin <alexander.alekhin@itseez.com>
+Date: Tue, 22 Dec 2015 17:10:33 +0300
+Subject: [PATCH] pkg-config: modules list contains only OpenCV modules (fixes
+ #5852)
+
+---
+ cmake/OpenCVUtils.cmake | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/cmake/OpenCVUtils.cmake b/cmake/OpenCVUtils.cmake
+index 3a23cd7..75412eb 100644
+--- a/cmake/OpenCVUtils.cmake
++++ b/cmake/OpenCVUtils.cmake
+@@ -806,7 +806,13 @@ macro(ocv_get_all_libs _modules _extra _3rdparty)
+     else()
+       set(deps "")
+     endif()
+-    list(INSERT ${_modules} 0 ${deps} ${m})
++    set(_rev_deps "${deps};${m}")
++    ocv_list_reverse(_rev_deps)
++    foreach (dep ${_rev_deps})
++      if(DEFINED OPENCV_MODULE_${dep}_LOCATION)
++        list(INSERT ${_modules} 0 ${dep})
++      endif()
++    endforeach()
+     foreach (dep ${deps} ${OPENCV_LINKER_LIBS})
+       if (NOT DEFINED OPENCV_MODULE_${dep}_LOCATION)
+         if (TARGET ${dep})
+@@ -832,9 +838,6 @@ macro(ocv_get_all_libs _modules _extra _3rdparty)
+     endif()
+   endif()
+ 
+-  # split 3rdparty libs and modules
+-  list(REMOVE_ITEM ${_modules} ${${_3rdparty}} ${${_extra}} non_empty_list)
+-
+   ocv_list_filterout(${_modules} "^[\$]<")
+   ocv_list_filterout(${_3rdparty} "^[\$]<")
+   ocv_list_filterout(${_extra} "^[\$]<")
-- 
cgit v1.2.3