summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiotr Rogoża2016-12-14 21:10:17 +0100
committerPiotr Rogoża2016-12-14 21:10:17 +0100
commitb7c38f8e3cc1699e3fc646ab45ee9172100d595a (patch)
tree8a82d0c8633351a8ca48b061f594d15d4e5298ef
parentc8eb956d81715da977d9cb8e35b76ae2b78c7030 (diff)
downloadaur-b7c38f8e3cc1699e3fc646ab45ee9172100d595a.tar.gz
Improved PKGBUILD
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD29
2 files changed, 19 insertions, 18 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 209e490f5cd..41bff7e918a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Sat Oct 22 23:25:02 UTC 2016
+# Wed Dec 14 20:10:04 UTC 2016
pkgbase = opencv2-opt
pkgdesc = Open Source Computer Vision Library (Legacy Version & /opt directory version)
pkgver = 2.4.13
- pkgrel = 1
+ pkgrel = 2
url = http://opencv.org/
arch = i686
arch = x86_64
@@ -23,8 +23,8 @@ pkgbase = opencv2-opt
optdepends = python2-numpy: Python 2.x interface
source = opencv-2.4.13.zip::https://github.com/Itseez/opencv/archive/2.4.13.zip
source = opencv_a0fdc91a14f07de25d858037940fcd3ba859b4e2.patch
- md5sums = 886b0c511209b2f3129649928135967c
- md5sums = aebe7878a572a2dc26a434bf08b8d851
+ sha512sums = b5ccaa22deabfedd29b697296d265a32c7db959f2e94ca3643c1cde65fb84463809535f2e6bd49c4baa06958fa223a32bbfdd7234b8e160ec333fd9cd7800d3b
+ sha512sums = 5f233ad26768253cbcda29cfd7a51709049790b1c909f0ee362e08811f7d9bd04bb47d1c280b561d18df163f4feb05e14fbf71773b5ffedf76bb9184359252f9
pkgname = opencv2-opt
provides = opencv2
diff --git a/PKGBUILD b/PKGBUILD
index 6a463fc7ea8..91f6134ccea 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,7 @@
# Maintainer: Joshua Schüler <joshua.schueler at gmail dotcom>
# Contributor: Ray Rashif <schiv@archlinux.org>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
+# Contributor: dracorp aka Piotr Rogoza <piotr.r.public at gmail.com>
############################################
@@ -36,12 +37,12 @@ _FORCE_AVX2=OFF
############################################
-
-_pkgbase=opencv
pkgbase=opencv2-opt
pkgname=('opencv2-opt' 'opencv2-opt-samples')
pkgver=2.4.13
-pkgrel=1
+pkgrel=2
+_pkgbase=opencv2
+_pkgname=opencv
pkgdesc="Open Source Computer Vision Library (Legacy Version & /opt directory version)"
arch=('i686' 'x86_64')
license=('BSD')
@@ -53,10 +54,10 @@ optdepends=('opencv2-opt-samples'
'libcl: For coding with OpenCL'
'python2-numpy: Python 2.x interface')
-source=("$_pkgbase-$pkgver.zip::https://github.com/Itseez/opencv/archive/$pkgver.zip"
+source=("$_pkgname-$pkgver.zip::https://github.com/Itseez/opencv/archive/$pkgver.zip"
"opencv_a0fdc91a14f07de25d858037940fcd3ba859b4e2.patch")
-md5sums=('886b0c511209b2f3129649928135967c'
- 'aebe7878a572a2dc26a434bf08b8d851')
+sha512sums=('b5ccaa22deabfedd29b697296d265a32c7db959f2e94ca3643c1cde65fb84463809535f2e6bd49c4baa06958fa223a32bbfdd7234b8e160ec333fd9cd7800d3b'
+ '5f233ad26768253cbcda29cfd7a51709049790b1c909f0ee362e08811f7d9bd04bb47d1c280b561d18df163f4feb05e14fbf71773b5ffedf76bb9184359252f9')
_cmakeopts=('-D WITH_CUDA=OFF' # Disable CUDA for now because GCC 6.1.1 and nvcc don't play along yet
'-D WITH_OPENCL=ON'
@@ -90,13 +91,13 @@ _cmakeopts=('-D WITH_CUDA=OFF' # Disable CUDA for now because GCC 6.1.1 and nvcc
"-D ENABLE_AVX2=$_FORCE_AVX2")
prepare() {
- cd $_pkgbase-$pkgver
+ cd $_pkgname-$pkgver
# Patch for gcc 6
# See https://github.com/Itseez/opencv/issues/6517
patch -p1 -i ../opencv_a0fdc91a14f07de25d858037940fcd3ba859b4e2.patch
}
build() {
- cd "$srcdir/$_pkgbase-$pkgver"
+ cd "$srcdir/$_pkgname-$pkgver"
cmake ${_cmakeopts[@]} .
make
}
@@ -104,18 +105,18 @@ package_opencv2-opt() {
options=('staticlibs')
provides=(opencv2)
- cd "$srcdir/$_pkgbase-$pkgver"
+ cd "$srcdir/$_pkgname-$pkgver"
make DESTDIR="$pkgdir" install
- install -Dm644 "$srcdir/$_pkgbase-$pkgver/LICENSE" \
+ install -Dm644 "$srcdir/$_pkgname-$pkgver/LICENSE" \
"$pkgdir/usr/share/licenses/$pkgname/LICENSE"
install -dm755 $pkgdir/usr/lib/pkgconfig
cd $pkgdir/usr/lib/pkgconfig
ln -s /opt/$_pkgbase/lib/pkgconfig/opencv.pc opencv2.pc
ln -s /opt/$_pkgbase/lib/pkgconfig/opencv.pc opencv2-opt.pc
- cd "$pkgdir/usr/share"
+ cd "$pkgdir/opt/$_pkgbase/share"
# separate samples package; also be -R friendly
if [[ -d OpenCV/samples ]]; then
mv OpenCV/samples "$srcdir/$_pkgbase-samples"
@@ -130,9 +131,9 @@ package_opencv2-opt-samples() {
unset optdepends
provides=(opencv2-samples)
- cd "$srcdir/$_pkgbase-$pkgver"
- install -dm755 "$pkgdir/opt/opencv2"
- cp -r samples "$pkgdir/opt/opencv2"
+ cd "$srcdir/$_pkgname-$pkgver"
+ install -dm755 "$pkgdir/opt/$_pkgbase"
+ cp -r samples "$pkgdir/opt/$_pkgbase"
# install license file
install -Dm644 "LICENSE" \