diff options
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/opencv/5852.patch | 39 | ||||
| -rw-r--r-- | libre/opencv/PKGBUILD | 24 |
2 files changed, 7 insertions, 56 deletions
diff --git a/libre/opencv/5852.patch b/libre/opencv/5852.patch deleted file mode 100644 index e34dfad7e..000000000 --- a/libre/opencv/5852.patch +++ /dev/null @@ -1,39 +0,0 @@ -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} "^[\$]<") diff --git a/libre/opencv/PKGBUILD b/libre/opencv/PKGBUILD index ed852b307..72ff49611 100644 --- a/libre/opencv/PKGBUILD +++ b/libre/opencv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 284748 2016-12-25 17:41:59Z bpiotrowski $ +# $Id: PKGBUILD 287727 2017-01-29 17:55:00Z arojas $ # Maintainer (Arch): Ray Rashif <schiv@archlinux.org> # Contributor (Arch): Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> @@ -7,8 +7,8 @@ pkgbase=opencv pkgname=opencv -pkgver=3.1.0 -pkgrel=7.parabola1 +pkgver=3.2.0 +pkgrel=1.parabola1 pkgdesc="Free Computer Vision Library, without nonfree SIFT and SURF algorithms, nonfree Milky icons and lena images" arch=('i686' 'x86_64' 'armv7h') license=('BSD') @@ -22,13 +22,10 @@ optdepends=('opencv-samples' 'python2-numpy: Python 2 interface') mksource=("$pkgbase-$pkgver.zip::https://github.com/Itseez/opencv/archive/$pkgver.zip" "opencv_contrib-$pkgver.tar.gz::https://github.com/Itseez/opencv_contrib/archive/$pkgver.tar.gz") -source=("https://repo.parabola.nu/other/${pkgname}-libre/${pkgname}-libre-${pkgver}.zip" - "opencv-gcc6.patch::https://github.com/mshabunin/opencv/commit/a0fdc91a.patch" '5852.patch') -mkmd5sums=('6082ee2124d4066581a7386972bfd52a' - 'a822839ad3ab79ff837c16785ea9dd10') -md5sums=('5e3c409fa9f1beeda5ba5edfcf02a921' - '4dacea7866d28014939a652f268cc7c1' - '5bd9cd736b171c15cedee3a32a0c47ff') +source=("https://repo.parabola.nu/other/${pkgname}-libre/${pkgname}-libre-${pkgver}.zip") +mkmd5sums=('bfc6a261eb069b709bcfe7e363ef5899' + 'd7d50c70c31df3b31310f548f31fd2a2') +md5sums=('020b142fa33a668f23eb3c2391e4b374') _cmakeopts=('-D WITH_OPENCL=ON' '-D WITH_OPENGL=ON' @@ -75,13 +72,6 @@ prepare() { # remove nonfree SIFT and SURF references rm -rv modules/xfeatures2d - - cd "$srcdir/$pkgname-$pkgver" - - patch -p1 -i "$srcdir/5852.patch" - - # fix build with GCC 6 - patch -p1 -i "$srcdir/opencv-gcc6.patch" } build() { |