Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kde5.git;a=commitdiff;h=9cfee81074b08d973286ba8aff680000095fb3d0
commit 9cfee81074b08d973286ba8aff680000095fb3d0 Author: DeX77 <[email protected]> Date: Fri Mar 18 13:19:14 2016 +0100 opencv-3.1.0-5-x86_64 * rebuild with patch to show components diff --git a/source/xmultimedia-extra/opencv/5852.patch b/source/xmultimedia-extra/opencv/5852.patch new file mode 100644 index 0000000..e34dfad --- /dev/null +++ b/source/xmultimedia-extra/opencv/5852.patch @@ -0,0 +1,39 @@ +From 24dbb43c096691d0333cacf231e22f1369f8c826 Mon Sep 17 00:00:00 2001 +From: Alexander Alekhin <[email protected]> +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} "^[\$]<") diff --git a/source/xmultimedia-extra/opencv/FrugalBuild b/source/xmultimedia-extra/opencv/FrugalBuild index f6af97e..bce1cd2 100644 --- a/source/xmultimedia-extra/opencv/FrugalBuild +++ b/source/xmultimedia-extra/opencv/FrugalBuild @@ -3,7 +3,7 @@ pkgname=opencv pkgver=3.1.0 -pkgrel=4 +pkgrel=5 pkgdesc="Intel(R) Open Source Computer Vision Library" url="http://opencv.org/"; depends=('jasper' 'gst1-plugins-base' 'openexr>=2.2.0' 'ffmpeg>=2.5.1' \ @@ -32,7 +32,10 @@ groups=('xmultimedia-extra') archs=('i686' 'x86_64') #source=("${source[@]}" "${source[0]/opencv/opencv_contrib}") #TODO: stupid same filename -sha1sums=('6bbe804d2b5de17cff73a5f56aa025e8b1e7f1fd') +source=("${source[@]}" "5852.patch") + +sha1sums=('6bbe804d2b5de17cff73a5f56aa025e8b1e7f1fd' \ + '430c776bbf66a69dbe590ceb58df22c0207e56a9') build() { Fcd _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
