diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2017-01-11 16:53:12 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2017-01-12 01:27:36 -0300 |
| commit | ceab049a1f640d72a95eb4b14161a9a6d945960b (patch) | |
| tree | 4883625b4a81d549502ce18e3f42600ee0602eb4 | |
| parent | bc58b3a44f57d2c85211a301261f8439de9eb8a6 (diff) | |
| download | abslibre-ceab049a1f640d72a95eb4b14161a9a6d945960b.tar.gz abslibre-ceab049a1f640d72a95eb4b14161a9a6d945960b.tar.bz2 abslibre-ceab049a1f640d72a95eb4b14161a9a6d945960b.zip | |
Revert "opencv-2.4.12.3-6.parabola1: jasper 1.900.31 rebuild and move from libcl to opencl-icd-loader"
This reverts commit 8960f8499a9ed5edf4c9d0cf7c4b483c1c5f43bb.
| -rw-r--r-- | libre/opencv/PKGBUILD | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/libre/opencv/PKGBUILD b/libre/opencv/PKGBUILD index f1a4fb1af..6d77971e4 100644 --- a/libre/opencv/PKGBUILD +++ b/libre/opencv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 282836 2016-12-05 09:59:13Z lcarlier $ +# $Id: PKGBUILD 261317 2016-03-11 06:55:20Z bpiotrowski $ # Maintainer (Arch): Ray Rashif <schiv@archlinux.org> # Contributor (Arch): Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> @@ -8,7 +8,7 @@ pkgbase=opencv pkgname=opencv pkgver=3.1.0 -pkgrel=6.parabola1 +pkgrel=3.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') @@ -17,17 +17,16 @@ depends=('intel-tbb' 'openexr' 'xine-lib' 'libdc1394' 'gtkglext') makedepends=('cmake' 'python-numpy' 'python2-numpy' 'mesa' 'eigen') optdepends=('opencv-samples' 'eigen' - 'opencl-icd-loader: For coding with OpenCL' + 'libcl: For coding with OpenCL' 'python-numpy: Python 3 interface' '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') + '5852.patch') mkmd5sums=('6082ee2124d4066581a7386972bfd52a' 'a822839ad3ab79ff837c16785ea9dd10') md5sums=('5e3c409fa9f1beeda5ba5edfcf02a921' - '4dacea7866d28014939a652f268cc7c1' '5bd9cd736b171c15cedee3a32a0c47ff') _cmakeopts=('-D WITH_OPENCL=ON' @@ -79,9 +78,6 @@ prepare() { cd "$srcdir/$pkgname-$pkgver" patch -p1 -i "$srcdir/5852.patch" - - # fix build with GCC 6 - patch -p1 -i "$srcdir/opencv-gcc6.patch" } build() { |