Date: Friday, March 11, 2016 @ 07:55:20 Author: bpiotrowski Revision: 261317
upgpkg: opencv 3.1.0-3 backport patch fixing pkgconfig files for contrib modules Added: opencv/trunk/5852.patch Modified: opencv/trunk/PKGBUILD ------------+ 5852.patch | 39 +++++++++++++++++++++++++++++++++++++++ PKGBUILD | 17 +++++++++++++---- 2 files changed, 52 insertions(+), 4 deletions(-) Added: 5852.patch =================================================================== --- 5852.patch (rev 0) +++ 5852.patch 2016-03-11 06:55:20 UTC (rev 261317) @@ -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} "^[\$]<") Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-03-11 04:42:41 UTC (rev 261316) +++ PKGBUILD 2016-03-11 06:55:20 UTC (rev 261317) @@ -5,7 +5,7 @@ pkgbase=opencv pkgname=('opencv' 'opencv-samples') pkgver=3.1.0 -pkgrel=2 +pkgrel=3 pkgdesc="Open Source Computer Vision Library" arch=('i686' 'x86_64') license=('BSD') @@ -18,9 +18,11 @@ 'python-numpy: Python 3 interface' 'python2-numpy: Python 2 interface') source=("$pkgbase-$pkgver.tar.gz::https://github.com/Itseez/opencv/archive/$pkgver.zip"; - "opencv_contrib-$pkgver.tar.gz::https://github.com/Itseez/opencv_contrib/archive/$pkgver.tar.gz";) + "opencv_contrib-$pkgver.tar.gz::https://github.com/Itseez/opencv_contrib/archive/$pkgver.tar.gz"; + '5852.patch') md5sums=('6082ee2124d4066581a7386972bfd52a' - 'a822839ad3ab79ff837c16785ea9dd10') + 'a822839ad3ab79ff837c16785ea9dd10' + '5bd9cd736b171c15cedee3a32a0c47ff') _cmakeopts=('-D WITH_OPENCL=ON' '-D WITH_OPENGL=ON' @@ -36,7 +38,9 @@ '-D CMAKE_BUILD_TYPE=Release' '-D CMAKE_INSTALL_PREFIX=/usr' '-D CMAKE_SKIP_RPATH=ON' - '-D BUILD_NEW_PYTHON_SUPPORT=ON') + #'-D WITH_IPP=ON' + #'-D INSTALL_CREATE_DISTRIB=ON' + ) # SSE only available from Pentium 3 onwards (i686 is way older) [[ "$CARCH" = 'i686' ]] && \ @@ -44,6 +48,11 @@ '-D ENABLE_SSE2=OFF' '-D ENABLE_SSE3=OFF') +prepare() { + cd "$srcdir/$pkgname-$pkgver" + patch -p1 -i "$srcdir/5852.patch" +} + build() { cd "$srcdir/$pkgname-$pkgver"
