Version bump.

2 files changed, 27 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2f1ae66a8741..ba3a5284f92a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,41 +1,37 @@
 # Generated by mksrcinfo v8
-# Fri Sep 22 23:55:34 UTC 2017
+# Sat Nov 18 23:56:19 UTC 2017
 pkgbase = ros-kinetic-opencv3
 	pkgdesc = ROS - OpenCV 3.x.
-	pkgver = 3.2.0
-	pkgrel = 8
+	pkgver = 3.3.1
+	pkgrel = 1
 	url = http://opencv.org
 	arch = any
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = python2-numpy
+	makedepends = v4l-utils
 	makedepends = ffmpeg
-	makedepends = libtiff
 	makedepends = libjpeg-turbo
 	makedepends = vtk
 	makedepends = zlib
-	makedepends = v4l-utils
-	makedepends = jasper
+	makedepends = python2-numpy
+	makedepends = python2
+	makedepends = libtiff
 	makedepends = protobuf
 	makedepends = libpng
-	makedepends = python2
+	makedepends = jasper
 	depends = ros-kinetic-catkin
-	depends = python2-numpy
 	depends = protobuf
 	depends = libjpeg-turbo
 	depends = vtk
 	depends = zlib
+	depends = python2-numpy
+	depends = python2
 	depends = jasper
-	depends = ffmpeg
 	depends = libpng
-	depends = python2
-	depends = qt5-base
-	depends = libxt
-	source = ros-kinetic-opencv3-3.2.0-4.tar.gz::https://github.com/ros-gbp/opencv3-release/archive/release/kinetic/opencv3/3.2.0-4.tar.gz
-	source = cmake_fix.patch
-	sha256sums = e8360d978bc0d0c878877e2748e5da219018b19a69b920649ea96a54ce05824d
-	sha256sums = 1549289a92fff0464bfa343756f15b087e625bdd3e6ac74674a5a75b7a15bfaf
+	depends = ffmpeg
+	source = ros-kinetic-opencv3-3.3.1-0.tar.gz::https://github.com/ros-gbp/opencv3-release/archive/release/kinetic/opencv3/3.3.1-0.tar.gz
+	sha256sums = 103f28d76c6451d2371a09fb693f0c466da6dfaf374a4fa92f7dac2ad5a7f4ab
 
 pkgname = ros-kinetic-opencv3
 
diff --git a/PKGBUILD b/PKGBUILD
index 16d715e0d118..9d3da542e405 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,40 +4,38 @@ pkgdesc="ROS - OpenCV 3.x."
 url='http://opencv.org'
 
 pkgname='ros-kinetic-opencv3'
-pkgver='3.2.0'
-_pkgver_patch=4
+pkgver='3.3.1'
+_pkgver_patch=0
 arch=('any')
-pkgrel=8
+pkgrel=1
 license=('BSD')
 
 ros_makedepends=()
 makedepends=('cmake' 'ros-build-tools'
   ${ros_makedepends[@]}
-  python2-numpy
+  v4l-utils
   ffmpeg
-  libtiff
   libjpeg-turbo
   vtk
   zlib
-  v4l-utils
-  jasper
+  python2-numpy
+  python2
+  libtiff
   protobuf
   libpng
-  python2)
+  jasper)
 
 ros_depends=(ros-kinetic-catkin)
 depends=(${ros_depends[@]}
-  python2-numpy
   protobuf
   libjpeg-turbo
   vtk
   zlib
+  python2-numpy
+  python2
   jasper
-  ffmpeg
   libpng
-  python2
-  qt5-base
-  libxt)
+  ffmpeg)
 
 # Git version (e.g. for debugging)
 # _tag=release/kinetic/opencv3/${pkgver}-${_pkgver_patch}
@@ -47,15 +45,8 @@ depends=(${ros_depends[@]}
 
 # Tarball version (faster download)
 _dir="opencv3-release-release-kinetic-opencv3-${pkgver}-${_pkgver_patch}"
-source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/opencv3-release/archive/release/kinetic/opencv3/${pkgver}-${_pkgver_patch}.tar.gz"
-		cmake_fix.patch)
-sha256sums=('e8360d978bc0d0c878877e2748e5da219018b19a69b920649ea96a54ce05824d'
-            '1549289a92fff0464bfa343756f15b087e625bdd3e6ac74674a5a75b7a15bfaf')
-
-prepare() {
-  cd ${srcdir}
-  patch -p1 < cmake_fix.patch
-}
+source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/opencv3-release/archive/release/kinetic/opencv3/${pkgver}-${_pkgver_patch}.tar.gz")
+sha256sums=('103f28d76c6451d2371a09fb693f0c466da6dfaf374a4fa92f7dac2ad5a7f4ab')
 
 build() {
   # Use ROS environment variables
@@ -78,8 +69,7 @@ build() {
         -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \
         -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \
         -DPYTHON_BASENAME=-python2.7 \
-        -DSETUPTOOLS_DEB_LAYOUT=OFF \
-        -DENABLE_PRECOMPILED_HEADERS=OFF
+        -DSETUPTOOLS_DEB_LAYOUT=OFF
   make
 }