From c2222682ea94b2f686c6359cab3ced90fb276e15 Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Thu, 13 Dec 2018 13:00:34 -0500 Subject: opencv-4.0.0-4.par1: updating version --- libre/opencv/PKGBUILD | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) (limited to 'libre/opencv/PKGBUILD') diff --git a/libre/opencv/PKGBUILD b/libre/opencv/PKGBUILD index ab03a9aae..240143378 100644 --- a/libre/opencv/PKGBUILD +++ b/libre/opencv/PKGBUILD @@ -1,4 +1,3 @@ -# $Id: PKGBUILD 287727 2017-01-29 17:55:00Z arojas $ # Maintainer (Arch): Ray Rashif # Contributor (Arch): Tobias Powalowski # Contributor (Hyperbola): André Silva @@ -7,7 +6,7 @@ pkgbase=opencv pkgname=opencv -pkgver=3.4.3 +pkgver=4.0.0 pkgrel=4 pkgrel+=.par1 pkgdesc="Free Computer Vision Library, without nonfree SIFT and SURF algorithms, nonfree Milky icons and lena images" @@ -16,20 +15,19 @@ arch+=(i686 armv7h) license=(BSD) url="http://opencv.org/" depends=(intel-tbb openexr gst-plugins-base libdc1394 cblas lapack libgphoto2 jasper ffmpeg) -makedepends=(cmake python-numpy python2-numpy mesa eigen hdf5 lapacke gtk3 vtk glew) +makedepends=(cmake python-numpy python-setuptools mesa eigen hdf5 lapacke gtk3 vtk glew) optdepends=('opencv-samples: samples' 'gtk3: for the HighGUI module' 'vtk: for the viz module' 'hdf5: support for HDF5 format' 'opencl-icd-loader: For coding with OpenCL' - 'python-numpy: Python 3 interface' - 'python2-numpy: Python 2 interface') + 'python-numpy: Python 3 interface') mksource=("$pkgbase-$pkgver.zip::https://github.com/opencv/opencv/archive/$pkgver.zip" "opencv_contrib-$pkgver.tar.gz::https://github.com/opencv/opencv_contrib/archive/$pkgver.tar.gz") -source=("https://repo.parabola.nu/other/${pkgname}-libre/${pkgname}-libre-${pkgver}.zip") -mksha256sums=('37c7d8c3b9807902ad11b9181bbde61dcb3898a78a563130494752f46fe8cc5f' - '6dfb51326f3dfeb659128df952edecd45683626a965aa4a8e1e9c970c40fb636') -sha256sums=('310956f831a6596a69211507cb0989fb814e96a1a235abc0b54603b5e05a6d49') +source=("https://repo.parabola.nu/other/$pkgname-libre/$pkgname-libre-$pkgver.zip") +mksha256sums=('86fd08fc02893e05e2944fa7b0daa7d02643232450f020b475e1b2f24587b99a' + '4fb0681414df4baedce6e3f4a01318d6f4fcde6ee14854d761fd4e397a397763') +sha256sums=('71fd849ccbf648876bb8288f05591a5314082761a4028a4953b4cccc81f325e3') mksource() { cd "$srcdir/opencv_contrib-$pkgver" @@ -67,6 +65,7 @@ build() { esac # cmake's FindLAPACK doesn't add cblas to LAPACK_LIBRARIES, so we need to specify them manually + _pythonpath=`python -c "from sysconfig import get_path; print(get_path('platlib'))"` cmake ../$pkgname-$pkgver \ -DWITH_OPENCL=ON \ -DWITH_OPENGL=ON \ @@ -82,27 +81,30 @@ build() { -DCMAKE_INSTALL_LIBDIR=lib \ $extra \ -DOPENCV_EXTRA_MODULES_PATH="$srcdir/opencv_contrib-$pkgver/modules" \ + -DOPENCV_SKIP_PYTHON_LOADER=ON \ + -DOPENCV_PYTHON3_INSTALL_PATH=$_pythonpath \ -DLAPACK_LIBRARIES="/usr/lib/liblapack.so;/usr/lib/libblas.so;/usr/lib/libcblas.so" \ -DLAPACK_CBLAS_H="/usr/include/cblas.h" \ - -DLAPACK_LAPACKE_H="/usr/include/lapacke.h" + -DLAPACK_LAPACKE_H="/usr/include/lapacke.h" \ + -DOPENCV_GENERATE_PKGCONFIG=ON # -DWITH_IPP=OFF make } package_opencv() { - options=(staticlibs) - cd build make DESTDIR="$pkgdir" install # install license file install -Dm644 "$srcdir"/$pkgname-$pkgver/LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname + # separate samples package cd "$pkgdir"/usr/share + rm -r opencv4/samples - # separate samples package - rm -r OpenCV/samples - mv OpenCV $pkgname # otherwise folder naming is inconsistent + # install missing headers https://github.com/opencv/opencv/issues/13201 + for _module in imgcodecs videoio photo; do + cp -r "$srcdir"/$pkgname-$pkgver/modules/$_module/include/opencv2/$_module/legacy \ + "$pkgdir"/usr/include/opencv4/opencv2/$_module + done } - -# vim:set ts=2 sw=2 et: -- cgit v1.2.3