summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorandrewSC2017-05-12 11:34:15 -0400
committerandrewSC2017-05-12 11:34:15 -0400
commite338b4b629410246e5adfcfbb6bc99f9e152f24f (patch)
treefe0d109c959cb97b1f21b6ff231dbf6320df416a
parentbf21908c599490d946ac22c8abcebc915634dd95 (diff)
downloadaur-e338b4b629410246e5adfcfbb6bc99f9e152f24f.tar.gz
PKGBUILD: Updating cmake to use parent dir for builds
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD10
2 files changed, 5 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8c3a0db3a09c..72c0bdee627f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = opencv-git
pkgdesc = Open Source Computer Vision Library
- pkgver = 3.2.0.r516.ga740a4ca3
+ pkgver = 3.2.0.r576.g2055bcc80
pkgrel = 1
url = http://opencv.org/
arch = i686
@@ -22,7 +22,7 @@ pkgbase = opencv-git
optdepends = opencl-icd-loader: For coding with OpenCL
optdepends = python-numpy: Python 3 interface
optdepends = python2-numpy: Python 2 interface
- provides = opencv=3.2.0.r516.ga740a4ca3
+ provides = opencv=3.2.0.r576.g2055bcc80
conflicts = opencv
conflicts = opencv-git
source = git+https://github.com/opencv/opencv.git
diff --git a/PKGBUILD b/PKGBUILD
index 233a3501842d..97373833a9ed 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@
_name=opencv
pkgname="${_name}-git"
-pkgver=3.2.0.r516.ga740a4ca3
+pkgver=3.2.0.r576.g2055bcc80
pkgrel=1
pkgdesc="Open Source Computer Vision Library"
url="http://opencv.org/"
@@ -58,11 +58,9 @@ pkgver() {
}
build() {
- cd "${srcdir}/${_name}"
-
cmake ${_cmakeopts[@]} \
- -DOPENCV_EXTRA_MODULES_PATH="${srcdir}/opencv_contrib/modules" \
- .
+ -DOPENCV_EXTRA_MODULES_PATH="${srcdir}/opencv_contrib/modules" \
+ ${_name}
make
}
@@ -70,8 +68,6 @@ build() {
package() {
options=('staticlibs')
- cd "${srcdir}/${_name}"
-
make DESTDIR="${pkgdir}" install
# install LICENSE file