upgpkg: opencv-java 3.4.0-1

- Replacing tabs with whitespaces
- Version bump

2 files changed, 66 insertions, 64 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b31baeb0f104..d6228565bd9b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Wed Dec  6 12:43:21 UTC 2017
 pkgbase = opencv-java
 	pkgdesc = Open Source Computer Vision Library - Java bindings
-	pkgver = 3.3.1
+	pkgver = 3.4.0
 	pkgrel = 1
 	url = http://opencv.org/
 	arch = i686
@@ -15,13 +13,13 @@ pkgbase = opencv-java
 	makedepends = eigen
 	makedepends = apache-ant
 	makedepends = java-environment
-	depends = opencv>=3.3.1
+	depends = opencv>=3.4.0
 	depends = java-runtime
 	optdepends = opencv-samples
-	source = opencv-3.3.1.tar.gz::https://github.com/opencv/opencv/archive/3.3.1.tar.gz
-	source = opencv_contrib-3.3.1.tar.gz::https://github.com/opencv/opencv_contrib/archive/3.3.1.tar.gz
-	sha256sums = 5dca3bb0d661af311e25a72b04a7e4c22c47c1aa86eb73e70063cd378a2aa6ee
-	sha256sums = 6f3ce148dc6e147496f0dbec1c99e917e13bf138f5a8ccfc3765f5c2372bd331
+	source = opencv-3.4.0.tar.gz::https://github.com/opencv/opencv/archive/3.4.0.tar.gz
+	source = opencv_contrib-3.4.0.tar.gz::https://github.com/opencv/opencv_contrib/archive/3.4.0.tar.gz
+	sha256sums = 678cc3d2d1b3464b512b084a8cca1fad7de207c7abdf2caa1fed636c13e916da
+	sha256sums = 699ab3eee7922fbd3e8f98c68e6d16a1d453b20ef364e76172e56466dc9c16cd
 
 pkgname = opencv-java
 
diff --git a/PKGBUILD b/PKGBUILD
index 8b81ba8816a1..844ce165e39a 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,53 +6,54 @@
 
 pkgname=opencv-java
 _pkgbase=opencv
-pkgver=3.3.1
+pkgver=3.4.0
 pkgrel=1
 pkgdesc="Open Source Computer Vision Library - Java bindings"
 arch=('i686' 'x86_64')
 license=('BSD')
 url="http://opencv.org/"
 depends=(
-	"opencv>=$pkgver"
-	'java-runtime'
-	)
+    "opencv>=$pkgver"
+    'java-runtime'
+    )
 makedepends=(
-	'cmake'
-	'python-numpy'
-	'python2-numpy'
-	'mesa'
-	'eigen'
-	# Needed for the Java binding
-	'apache-ant'
-	'java-environment'
+    'cmake'
+    'python-numpy'
+    'python2-numpy'
+    'mesa'
+    'eigen'
+    # Needed for the Java binding
+    'apache-ant'
+    'java-environment'
 )
 optdepends=(
-	'opencv-samples'
+    'opencv-samples'
 )
 # Sources and checksums section
 source=(
-	"${_pkgbase}-${pkgver}.tar.gz::https://github.com/opencv/opencv/archive/$pkgver.tar.gz"
-	"opencv_contrib-$pkgver.tar.gz::https://github.com/opencv/opencv_contrib/archive/$pkgver.tar.gz"
+    "${_pkgbase}-${pkgver}.tar.gz::https://github.com/opencv/opencv/archive/$pkgver.tar.gz"
+    "opencv_contrib-$pkgver.tar.gz::https://github.com/opencv/opencv_contrib/archive/$pkgver.tar.gz"
 )
-sha256sums=('5dca3bb0d661af311e25a72b04a7e4c22c47c1aa86eb73e70063cd378a2aa6ee'
-            '6f3ce148dc6e147496f0dbec1c99e917e13bf138f5a8ccfc3765f5c2372bd331')
+sha256sums=('678cc3d2d1b3464b512b084a8cca1fad7de207c7abdf2caa1fed636c13e916da'
+            '699ab3eee7922fbd3e8f98c68e6d16a1d453b20ef364e76172e56466dc9c16cd')
 
 # CMake flags
 _cmakeopts=('-D WITH_OPENCL=ON'
-	'-D WITH_OPENGL=ON'
-	'-D WITH_TBB=ON'
-	'-D WITH_XINE=ON'
-	'-D WITH_GSTREAMER=OFF'
-	'-D BUILD_WITH_DEBUG_INFO=OFF'
-	'-D BUILD_TESTS=OFF'
-	'-D BUILD_PERF_TESTS=OFF'
-	'-D BUILD_EXAMPLES=ON'
-	'-D INSTALL_C_EXAMPLES=ON'
-	'-D INSTALL_PYTHON_EXAMPLES=ON'
-	'-D CMAKE_BUILD_TYPE=Release'
-	'-D CMAKE_INSTALL_PREFIX=/usr'
-	'-D CMAKE_SKIP_RPATH=ON'
-	)
+            '-D WITH_OPENGL=ON'
+            '-D WITH_TBB=ON'
+            '-D WITH_XINE=ON'
+            '-D WITH_GSTREAMER=OFF'
+            '-D BUILD_WITH_DEBUG_INFO=OFF'
+            '-D BUILD_TESTS=OFF'
+            '-D BUILD_PERF_TESTS=OFF'
+            '-D BUILD_EXAMPLES=ON'
+            '-D INSTALL_C_EXAMPLES=ON'
+            '-D INSTALL_PYTHON_EXAMPLES=ON'
+            '-D CMAKE_BUILD_TYPE=Release'
+            '-D CMAKE_INSTALL_PREFIX=/usr'
+            '-D CMAKE_INSTALL_LIBDIR=lib'
+            '-D CMAKE_SKIP_RPATH=ON'
+            )
 
 # SSE only available from Pentium 3 onwards (i686 is way older)
 [[ "$CARCH" = 'i686' ]] && _cmakeopts+=('-D CPU_BASELINE_DISABLE=SSE2')
@@ -60,43 +61,46 @@ _cmakeopts=('-D WITH_OPENCL=ON'
 
 # prepare() and build() are the official ones
 prepare() {
-	# Setting JAVA_HOME
-	msg2 "Setting JAVA_HOME variable"
-	export JAVA_HOME="/usr/lib/jvm/default"
+    # Setting JAVA_HOME
+    msg2 "Setting JAVA_HOME variable"
+    export JAVA_HOME="/usr/lib/jvm/default"
 }
 
 build() {
-	mkdir -p "$srcdir/build"
-	cd "$srcdir/build"
+    mkdir -p "$srcdir/build"
+    cd "$srcdir/build"
 
-	cmake ${_cmakeopts[@]} \
-		-DOPENCV_EXTRA_MODULES_PATH="$srcdir/opencv_contrib-$pkgver/modules" \
-		"$srcdir/$_pkgbase-$pkgver"
+    cmake ${_cmakeopts[@]} \
+        -DOPENCV_EXTRA_MODULES_PATH="$srcdir/opencv_contrib-$pkgver/modules" \
+        -DLAPACK_LIBRARIES="/usr/lib/liblapack.so;/usr/lib/libblas.so;/usr/lib/libcblas.so" \
+        -DLAPACK_CBLAS_H="/usr/include/cblas.h" \
+        -DLAPACK_LAPACKE_H="/usr/include/lapacke.h" \
+    ../$_pkgbase-$pkgver
 
-	# Build everything, we will fix things in package step
-	make
+    # Build everything, we will fix things in package step
+    make
 }
 
 # Changed in order to save just Java files
 # It's a bit dirty, but it works
 package() {
 
-	# Entering in the source directory
-	cd "$srcdir/build"
+    # Entering in the source directory
+    cd "$srcdir/build"
 
-	# Making a fake install
-	mkdir -p "$srcdir/temp"
-	make DESTDIR="$srcdir/temp" install
+    # Making a fake install
+    mkdir -p "$srcdir/temp"
+    make DESTDIR="$srcdir/temp" install
 
-	# Creating the package structure
-	mkdir -p "$pkgdir/usr/share/opencv/java"
-	# Installing the built files
-	cp -r "$srcdir/temp/usr/share/OpenCV/java" "$pkgdir/usr/share/opencv"
+    # Creating the package structure
+    mkdir -p "$pkgdir/usr/share/opencv/java"
+    # Installing the built files
+    cp -r "$srcdir/temp/usr/share/OpenCV/java" "$pkgdir/usr/share/opencv"
 
-	# Create a symbolic link in /usr/share/java as Java apps written for Ubuntu may be looking there
-	mkdir -p "$pkgdir/usr/share/java/"
-	# Get the number in the Jar filename
-	_number=$(echo $pkgver | sed 's/\.//g')
-	#_number=$(echo $pkgver | sed 's/\.[0-9]$//' | sed 's/\.//g')
-	ln -s "/usr/share/opencv/java/opencv-$_number.jar" "$pkgdir/usr/share/java/opencv.jar"
+    # Create a symbolic link in /usr/share/java as Java apps written for Ubuntu may be looking there
+    mkdir -p "$pkgdir/usr/share/java/"
+    # Get the number in the Jar filename
+    _number=$(echo $pkgver | sed 's/\.//g')
+    #_number=$(echo $pkgver | sed 's/\.[0-9]$//' | sed 's/\.//g')
+    ln -s "/usr/share/opencv/java/opencv-$_number.jar" "$pkgdir/usr/share/java/opencv.jar"
 }