upgpkg: opencv-java 3.1.0-1

2 files changed, 28 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8ffb5995ef1c..4b03f836e268 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,18 @@
 # Generated by mksrcinfo v8
-# Sun Feb 28 20:10:46 UTC 2016
+# Mon Apr 25 19:59:34 UTC 2016
 pkgbase = opencv-java
 	pkgdesc = Open Source Computer Vision Library - Java bindings
-	pkgver = 2.4.12.3
-	pkgrel = 3
+	pkgver = 3.1.0
+	pkgrel = 1
 	url = http://opencv.org/
 	arch = i686
 	arch = x86_64
 	license = BSD
 	makedepends = cmake
+	makedepends = python-numpy
 	makedepends = python2-numpy
 	makedepends = mesa
-	makedepends = eigen2
+	makedepends = eigen
 	makedepends = apache-ant
 	makedepends = java-environment
 	depends = intel-tbb
@@ -19,15 +20,12 @@ pkgbase = opencv-java
 	depends = xine-lib
 	depends = libdc1394
 	depends = gtkglext
-	depends = opencv=2.4.12.3
+	depends = opencv>=3.1.0
 	optdepends = opencv-samples
-	optdepends = eigen2
-	optdepends = libcl: For coding with OpenCL
-	optdepends = python2-numpy: Python 2.x interface
-	source = opencv-2.4.12.3.tar.gz::https://github.com/Itseez/opencv/archive/2.4.12.3.tar.gz
-	source = opencv-ffmpeg3.patch
-	md5sums = 2496a4a4caf8fecfbfc294fbe6a814b0
-	md5sums = c752f3e83ebb021171fdd04aa7fb2e5a
+	source = opencv-3.1.0.tar.gz::https://github.com/Itseez/opencv/archive/3.1.0.tar.gz
+	source = 5852.patch::https://projects.archlinux.org/svntogit/packages.git/plain/trunk/5852.patch?h=packages/opencv
+	md5sums = 70e1dd07f0aa06606f1bc0e3fa15abd3
+	md5sums = 5bd9cd736b171c15cedee3a32a0c47ff
 
 pkgname = opencv-java
 
diff --git a/PKGBUILD b/PKGBUILD
index 0908ff334a9c..3234564bc91f 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,8 +6,8 @@
 
 pkgname=opencv-java
 _pkgbase=opencv
-pkgver=2.4.12.3
-pkgrel=3
+pkgver=3.1.0
+pkgrel=1
 pkgdesc="Open Source Computer Vision Library - Java bindings"
 arch=('i686' 'x86_64')
 license=('BSD')
@@ -18,32 +18,28 @@ depends=(
 	'xine-lib'
 	'libdc1394'
 	'gtkglext'
-	"opencv=$pkgver"
+	"opencv>=$pkgver"
 	)
 makedepends=(
 	'cmake'
+	'python-numpy'
 	'python2-numpy'
 	'mesa'
-	'eigen2'
+	'eigen'
 	# Needed for the Java binding
 	'apache-ant'
 	'java-environment'
 	)
 optdepends=(
 	'opencv-samples'
-	'eigen2'
-	'libcl: For coding with OpenCL'
-	'python2-numpy: Python 2.x interface'
 	)
 # Sources and checksums section
 source=(
 	"${_pkgbase}-${pkgver}.tar.gz::https://github.com/Itseez/opencv/archive/$pkgver.tar.gz"
-	opencv-ffmpeg3.patch
-	)
-md5sums=(
-	'2496a4a4caf8fecfbfc294fbe6a814b0'
-	'c752f3e83ebb021171fdd04aa7fb2e5a'
+	"5852.patch::https://projects.archlinux.org/svntogit/packages.git/plain/trunk/5852.patch?h=packages/opencv"
 	)
+md5sums=('70e1dd07f0aa06606f1bc0e3fa15abd3'
+         '5bd9cd736b171c15cedee3a32a0c47ff')
 
 # CMake flags
 _cmakeopts=('-D WITH_OPENCL=ON'
@@ -78,17 +74,19 @@ prepare() {
 	# Setting JAVA_HOME
 	msg2 "Setting JAVA_HOME variable"
 	export JAVA_HOME="/usr/lib/jvm/default"
-	# Patching OpenCV to support FFMpeg 3.0
+	# Patches
 	cd $_pkgbase-$pkgver
-	patch -p1 -i ../opencv-ffmpeg3.patch
+	patch -p1 -i ../5852.patch
 }
 
 build() {
-	cd "$srcdir/$_pkgbase-$pkgver"
+	mkdir -p "$srcdir/build"
+	cd "$srcdir/build"
 
-	cmake ${_cmakeopts[@]} .
+	cmake ${_cmakeopts[@]} "$srcdir/$_pkgbase-$pkgver"
 
-	make opencv_java
+	# Build everything, we will fix things in package step
+	make
 }
 
 # Changed in order to save just Java files
@@ -96,7 +94,7 @@ build() {
 package() {
 
 	# Entering in the source directory
-	cd "$srcdir/$_pkgbase-$pkgver"
+	cd "$srcdir/build"
 
 	# Making a fake install
 	mkdir -p "$srcdir/temp"
@@ -110,10 +108,7 @@ package() {
 	# 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')
+	_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"
-
-	# Removing the junk
-	rm -r "$srcdir/temp"
 }