Bump version to 2.4.11

2 files changed, 8 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index db09797f503a..5fc02801edc5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = opencv-java
 	pkgdesc = Open Source Computer Vision Library - Java bindings
-	pkgver = 2.4.10
-	pkgrel = 3
+	pkgver = 2.4.11
+	pkgrel = 1
 	url = http://opencv.org/
 	arch = i686
 	arch = x86_64
@@ -17,19 +17,13 @@ pkgbase = opencv-java
 	depends = xine-lib
 	depends = libdc1394
 	depends = gtkglext
-	depends = opencv=2.4.10
+	depends = opencv=2.4.11
 	optdepends = opencv-samples
 	optdepends = eigen2
 	optdepends = libcl: For coding with OpenCL
 	optdepends = python2-numpy: Python 2.x interface
-	source = http://downloads.sourceforge.net/opencvlibrary/opencv-2.4.10.zip
-	source = pkgconfig.patch
-	source = fsh.patch
-	source = x86_asmfix.patch
-	md5sums = ec63952d3a3dff965d5fdde765926821
-	md5sums = c7cea48ed7d4f729ebdb9673bac41bd3
-	md5sums = c597598d142dd34d0eb4af7d6e9779d8
-	md5sums = b937d3589a62666f17f6dc93e0109717
+	source = http://downloads.sourceforge.net/opencvlibrary/opencv-2.4.11.zip
+	md5sums = 32f498451bff1817a60e1aabc2939575
 
 pkgname = opencv-java
 
diff --git a/PKGBUILD b/PKGBUILD
index 988a9b861dd6..2f7be7965b42 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,8 +6,8 @@
 
 pkgname=opencv-java
 _pkgbase=opencv
-pkgver=2.4.10
-pkgrel=3
+pkgver=2.4.11
+pkgrel=1
 pkgdesc="Open Source Computer Vision Library - Java bindings"
 arch=('i686' 'x86_64')
 license=('BSD')
@@ -38,16 +38,8 @@ optdepends=(
 # Sources and checksums section
 source=(
 	"http://downloads.sourceforge.net/opencvlibrary/$_pkgbase-$pkgver.zip"
-	'pkgconfig.patch'
-	'fsh.patch'
-	'x86_asmfix.patch'
-	)
-md5sums=(
-	'ec63952d3a3dff965d5fdde765926821'
-	'c7cea48ed7d4f729ebdb9673bac41bd3'
-	'c597598d142dd34d0eb4af7d6e9779d8'
-	'b937d3589a62666f17f6dc93e0109717'
 	)
+md5sums=('32f498451bff1817a60e1aabc2939575')
 
 # CMake flags
 _cmakeopts=('-D WITH_OPENCL=ON'
@@ -79,27 +71,6 @@ _cmakeopts+=(
 
 # prepare() and build() are the official ones
 prepare() {
-	cd "$srcdir/$_pkgbase-$pkgver"
-
-	msg2 "Applying backported fix for x86 ASM breakage"
-	# see https://github.com/Itseez/opencv/pull/3331
-	patch -Np1 -i "$srcdir/x86_asmfix.patch"
-
-	msg2 "Fixing broken pkg-config (downstream)"
-	# see https://bugs.archlinux.org/task/32430
-	# and http://code.opencv.org/issues/1925
-	patch -Np1 -i "$srcdir/pkgconfig.patch"
-
-	# TODO: this is mostly upstream frei0r; they hardcode the path
-	#msg2 "Hack-fixing folder naming inconsistency (downstream)"
-	# see http://code.opencv.org/issues/2512
-	# and https://bugs.archlinux.org/task/32342
-	#patch -Np1 -i "$srcdir/fsh.patch"
-
-	# no longer including docs, see https://bugs.archlinux.org/task/34185
-	# python2 compatibility for generating (html) docs
-	#sed -i 's/sphinx-build/sphinx-build2/' cmake/OpenCVDetectPython.cmake
-
 	# Setting JAVA_HOME
 	msg2 "Setting JAVA_HOME variable"
 	export JAVA_HOME="/usr/lib/jvm/default"