diff options
| author | Giovanni Santini | 2017-05-17 15:13:55 +0200 |
|---|---|---|
| committer | Giovanni Santini | 2017-05-17 15:13:55 +0200 |
| commit | 359c8f3c006971de66abf10b7fd7439ff0fe3b1b (patch) | |
| tree | 7054253c7d6f33259a1e24a299e98e76c029e300 | |
| parent | 7408b53dfdcfe3fa734b0d4b0dc82980e97dccc5 (diff) | |
| download | aur-359c8f3c006971de66abf10b7fd7439ff0fe3b1b.tar.gz | |
upgpkg: opencv-java 3.2.0-2
- Adding additional modules during build
- Switching checksums to sha256
- Adding Java as runtime dependency
- Removing not used patches
| -rw-r--r-- | .SRCINFO | 9 | ||||
| -rw-r--r-- | 5852.patch | 39 | ||||
| -rwxr-xr-x | PKGBUILD | 17 | ||||
| -rw-r--r-- | gcc6.patch | 11 |
4 files changed, 17 insertions, 59 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Mon Feb 6 11:14:40 UTC 2017 +# Wed May 17 13:13:55 UTC 2017 pkgbase = opencv-java pkgdesc = Open Source Computer Vision Library - Java bindings pkgver = 3.2.0 - pkgrel = 1 + pkgrel = 2 url = http://opencv.org/ arch = i686 arch = x86_64 @@ -16,9 +16,12 @@ pkgbase = opencv-java makedepends = apache-ant makedepends = java-environment depends = opencv>=3.2.0 + depends = java-runtime optdepends = opencv-samples source = opencv-3.2.0.tar.gz::https://github.com/Itseez/opencv/archive/3.2.0.tar.gz - md5sums = a43b65488124ba33dde195fea9041b70 + source = opencv_contrib-3.2.0.tar.gz::https://github.com/Itseez/opencv_contrib/archive/3.2.0.tar.gz + sha256sums = b9d62dfffb8130d59d587627703d5f3e6252dce4a94c1955784998da7a39dd35 + sha256sums = 1e2bb6c9a41c602904cc7df3f8fb8f98363a88ea564f2a087240483426bf8cbe pkgname = opencv-java diff --git a/5852.patch b/5852.patch deleted file mode 100644 index e34dfad7e2c6..000000000000 --- a/5852.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 24dbb43c096691d0333cacf231e22f1369f8c826 Mon Sep 17 00:00:00 2001 -From: Alexander Alekhin <alexander.alekhin@itseez.com> -Date: Tue, 22 Dec 2015 17:10:33 +0300 -Subject: [PATCH] pkg-config: modules list contains only OpenCV modules (fixes - #5852) - ---- - cmake/OpenCVUtils.cmake | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git a/cmake/OpenCVUtils.cmake b/cmake/OpenCVUtils.cmake -index 3a23cd7..75412eb 100644 ---- a/cmake/OpenCVUtils.cmake -+++ b/cmake/OpenCVUtils.cmake -@@ -806,7 +806,13 @@ macro(ocv_get_all_libs _modules _extra _3rdparty) - else() - set(deps "") - endif() -- list(INSERT ${_modules} 0 ${deps} ${m}) -+ set(_rev_deps "${deps};${m}") -+ ocv_list_reverse(_rev_deps) -+ foreach (dep ${_rev_deps}) -+ if(DEFINED OPENCV_MODULE_${dep}_LOCATION) -+ list(INSERT ${_modules} 0 ${dep}) -+ endif() -+ endforeach() - foreach (dep ${deps} ${OPENCV_LINKER_LIBS}) - if (NOT DEFINED OPENCV_MODULE_${dep}_LOCATION) - if (TARGET ${dep}) -@@ -832,9 +838,6 @@ macro(ocv_get_all_libs _modules _extra _3rdparty) - endif() - endif() - -- # split 3rdparty libs and modules -- list(REMOVE_ITEM ${_modules} ${${_3rdparty}} ${${_extra}} non_empty_list) -- - ocv_list_filterout(${_modules} "^[\$]<") - ocv_list_filterout(${_3rdparty} "^[\$]<") - ocv_list_filterout(${_extra} "^[\$]<") @@ -7,13 +7,14 @@ pkgname=opencv-java _pkgbase=opencv pkgver=3.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="Open Source Computer Vision Library - Java bindings" arch=('i686' 'x86_64') license=('BSD') url="http://opencv.org/" depends=( "opencv>=$pkgver" + 'java-runtime' ) makedepends=( 'cmake' @@ -24,15 +25,17 @@ makedepends=( # Needed for the Java binding 'apache-ant' 'java-environment' - ) +) optdepends=( 'opencv-samples' - ) +) # Sources and checksums section source=( "${_pkgbase}-${pkgver}.tar.gz::https://github.com/Itseez/opencv/archive/$pkgver.tar.gz" - ) -md5sums=('a43b65488124ba33dde195fea9041b70') + "opencv_contrib-$pkgver.tar.gz::https://github.com/Itseez/opencv_contrib/archive/$pkgver.tar.gz" +) +sha256sums=('b9d62dfffb8130d59d587627703d5f3e6252dce4a94c1955784998da7a39dd35' + '1e2bb6c9a41c602904cc7df3f8fb8f98363a88ea564f2a087240483426bf8cbe') # CMake flags _cmakeopts=('-D WITH_OPENCL=ON' @@ -70,7 +73,9 @@ build() { mkdir -p "$srcdir/build" cd "$srcdir/build" - cmake ${_cmakeopts[@]} "$srcdir/$_pkgbase-$pkgver" + cmake ${_cmakeopts[@]} \ + -DOPENCV_EXTRA_MODULES_PATH="$srcdir/opencv_contrib-$pkgver/modules" \ + "$srcdir/$_pkgbase-$pkgver" # Build everything, we will fix things in package step make diff --git a/gcc6.patch b/gcc6.patch deleted file mode 100644 index 0c81ac76c9fb..000000000000 --- a/gcc6.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- opencv-2.4.12.3/cmake/OpenCVPCHSupport.cmake 2015-10-26 08:56:34.000000000 +0100 -+++ opencv-2.4.12.3-patched/cmake/OpenCVPCHSupport.cmake 2016-05-10 11:35:27.976148332 +0200 -@@ -24,7 +24,7 @@ - ENDIF() - - SET(_PCH_include_prefix "-I") -- SET(_PCH_isystem_prefix "-isystem") -+ SET(_PCH_isystem_prefix "-I") - SET(_PCH_define_prefix "-D") - - ELSEIF(CMAKE_GENERATOR MATCHES "^Visual.*$") |