summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiotr Rogoża2017-09-25 20:08:51 +0200
committerPiotr Rogoża2017-09-25 20:08:51 +0200
commit892fc1f9d4eb47f8320677eee1cadea173e6056c (patch)
tree3a7f67ce028d6a17fef9f0ea78e9079b5e345b29
parentb7c38f8e3cc1699e3fc646ab45ee9172100d595a (diff)
downloadaur-892fc1f9d4eb47f8320677eee1cadea173e6056c.tar.gz
Version has been upgraded to 2.4.13.3
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD26
-rw-r--r--cmake.diff16
-rw-r--r--opencv_a0fdc91a14f07de25d858037940fcd3ba859b4e2.patch13
4 files changed, 40 insertions, 31 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 41bff7e918a..dc259aec642 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Wed Dec 14 20:10:04 UTC 2016
+# Mon Sep 25 18:08:21 UTC 2017
pkgbase = opencv2-opt
pkgdesc = Open Source Computer Vision Library (Legacy Version & /opt directory version)
- pkgver = 2.4.13
- pkgrel = 2
+ pkgver = 2.4.13.3
+ pkgrel = 1
url = http://opencv.org/
arch = i686
arch = x86_64
@@ -21,10 +21,10 @@ pkgbase = opencv2-opt
optdepends = eigen2
optdepends = libcl: For coding with OpenCL
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
- sha512sums = b5ccaa22deabfedd29b697296d265a32c7db959f2e94ca3643c1cde65fb84463809535f2e6bd49c4baa06958fa223a32bbfdd7234b8e160ec333fd9cd7800d3b
- sha512sums = 5f233ad26768253cbcda29cfd7a51709049790b1c909f0ee362e08811f7d9bd04bb47d1c280b561d18df163f4feb05e14fbf71773b5ffedf76bb9184359252f9
+ source = opencv-2.4.13.3.zip::https://github.com/Itseez/opencv/archive/2.4.13.3.zip
+ source = cmake.diff
+ sha512sums = 00e27853c93bfaa6a0f8334d38aff52bf02fb2c2ce26b36670ceac35284fe6ef1624ccf2b4eeeab075b57ed441e686c28b98cb446da6d7c400a576b4203b64fb
+ sha512sums = 3b9ec5a5445b605a392b7bf81912fe561c853ebe80feb7e5b5eb8333e783d8f4242d2028ce28f414fc00a18a59300bc4cc4faa101d459d8b4b5673de26e6b165
pkgname = opencv2-opt
provides = opencv2
@@ -32,6 +32,6 @@ pkgname = opencv2-opt
pkgname = opencv2-opt-samples
pkgdesc = Open Source Computer Vision Library (Legacy Version & /opt directory version) (samples)
- depends = opencv2-opt=2.4.13
+ depends = opencv2-opt=2.4.13.3
provides = opencv2-samples
diff --git a/PKGBUILD b/PKGBUILD
index 91f6134ccea..7c47e8992ce 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -39,8 +39,8 @@ _FORCE_AVX2=OFF
pkgbase=opencv2-opt
pkgname=('opencv2-opt' 'opencv2-opt-samples')
-pkgver=2.4.13
-pkgrel=2
+pkgver=2.4.13.3
+pkgrel=1
_pkgbase=opencv2
_pkgname=opencv
pkgdesc="Open Source Computer Vision Library (Legacy Version & /opt directory version)"
@@ -55,9 +55,11 @@ optdepends=('opencv2-opt-samples'
'python2-numpy: Python 2.x interface')
source=("$_pkgname-$pkgver.zip::https://github.com/Itseez/opencv/archive/$pkgver.zip"
- "opencv_a0fdc91a14f07de25d858037940fcd3ba859b4e2.patch")
-sha512sums=('b5ccaa22deabfedd29b697296d265a32c7db959f2e94ca3643c1cde65fb84463809535f2e6bd49c4baa06958fa223a32bbfdd7234b8e160ec333fd9cd7800d3b'
- '5f233ad26768253cbcda29cfd7a51709049790b1c909f0ee362e08811f7d9bd04bb47d1c280b561d18df163f4feb05e14fbf71773b5ffedf76bb9184359252f9')
+cmake.diff
+# "opencv_a0fdc91a14f07de25d858037940fcd3ba859b4e2.patch"
+ )
+sha512sums=('00e27853c93bfaa6a0f8334d38aff52bf02fb2c2ce26b36670ceac35284fe6ef1624ccf2b4eeeab075b57ed441e686c28b98cb446da6d7c400a576b4203b64fb'
+ '3b9ec5a5445b605a392b7bf81912fe561c853ebe80feb7e5b5eb8333e783d8f4242d2028ce28f414fc00a18a59300bc4cc4faa101d459d8b4b5673de26e6b165')
_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'
@@ -94,18 +96,22 @@ prepare() {
cd $_pkgname-$pkgver
# Patch for gcc 6
# See https://github.com/Itseez/opencv/issues/6517
- patch -p1 -i ../opencv_a0fdc91a14f07de25d858037940fcd3ba859b4e2.patch
+# patch -p1 -i ../opencv_a0fdc91a14f07de25d858037940fcd3ba859b4e2.patch
+# patch -p1 -i $srcdir/cmake.diff
}
build() {
cd "$srcdir/$_pkgname-$pkgver"
- cmake ${_cmakeopts[@]} .
+ mkdir -p build
+ cd build
+
+ cmake ${_cmakeopts[@]} ..
make
}
package_opencv2-opt() {
options=('staticlibs')
provides=(opencv2)
- cd "$srcdir/$_pkgname-$pkgver"
+ cd "$srcdir/$_pkgname-$pkgver/build"
make DESTDIR="$pkgdir" install
install -Dm644 "$srcdir/$_pkgname-$pkgver/LICENSE" \
@@ -131,11 +137,11 @@ package_opencv2-opt-samples() {
unset optdepends
provides=(opencv2-samples)
- cd "$srcdir/$_pkgname-$pkgver"
+ cd "$srcdir/$_pkgname-$pkgver/build"
install -dm755 "$pkgdir/opt/$_pkgbase"
cp -r samples "$pkgdir/opt/$_pkgbase"
# install license file
- install -Dm644 "LICENSE" \
+ install -Dm644 "../LICENSE" \
"$pkgdir/usr/share/licenses/$pkgname/LICENSE"
}
diff --git a/cmake.diff b/cmake.diff
new file mode 100644
index 00000000000..58fb9afa874
--- /dev/null
+++ b/cmake.diff
@@ -0,0 +1,16 @@
+diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake
+index 9b2a4e4..7b079c5 100644
+--- a/cmake/OpenCVCompilerOptions.cmake
++++ b/cmake/OpenCVCompilerOptions.cmake
+@@ -18,9 +18,9 @@ if(ENABLE_CCACHE AND NOT CMAKE_COMPILER_IS_CCACHE)
+ message(STATUS "Unable to compile program with enabled ccache, reverting...")
+ set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${__OLD_RULE_LAUNCH_COMPILE}")
+ endif()
+- else()
+- message(STATUS "Looking for ccache - not found")
+ endif()
++ else()
++ message(STATUS "Looking for ccache - not found")
+ endif()
+ endif()
+
diff --git a/opencv_a0fdc91a14f07de25d858037940fcd3ba859b4e2.patch b/opencv_a0fdc91a14f07de25d858037940fcd3ba859b4e2.patch
deleted file mode 100644
index e2a999ea1e1..00000000000
--- a/opencv_a0fdc91a14f07de25d858037940fcd3ba859b4e2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cmake/OpenCVPCHSupport.cmake b/cmake/OpenCVPCHSupport.cmake
-index 243fb4c..a2df014 100644
---- a/cmake/OpenCVPCHSupport.cmake
-+++ b/cmake/OpenCVPCHSupport.cmake
-@@ -19,7 +19,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
- ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
- OUTPUT_VARIABLE gcc_compiler_version)
- #MESSAGE("GCC Version: ${gcc_compiler_version}")
-- IF(gcc_compiler_version VERSION_GREATER "4.2.-1")
-+ IF(gcc_compiler_version VERSION_GREATER "4.2.-1" AND gcc_compiler_version VERSION_LESS "6.0.0")
- SET(PCHSupport_FOUND TRUE)
- ENDIF()
-