[arch-commits] Commit in opencv/trunk (PKGBUILD)

[Bartłomiej Piotrowski]

    Date: Tuesday, March 8, 2016 @ 18:42:32
  Author: bpiotrowski
Revision: 261218

upgpkg: opencv 3.1.0-1

new upstream release

Modified:
  opencv/trunk/PKGBUILD

----------+
 PKGBUILD |   26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-03-08 11:52:25 UTC (rev 261217)
+++ PKGBUILD	2016-03-08 17:42:32 UTC (rev 261218)
@@ -4,7 +4,7 @@
 
 pkgbase=opencv
 pkgname=('opencv' 'opencv-samples')
-pkgver=2.4.12.3
+pkgver=3.1.0
 pkgrel=1
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64')
@@ -11,15 +11,15 @@
 license=('BSD')
 url="http://opencv.org/"
 depends=('intel-tbb' 'openexr' 'xine-lib' 'libdc1394' 'gtkglext')
-makedepends=('cmake' 'python2-numpy' 'mesa' 'eigen2')
+makedepends=('cmake' 'python-numpy' 'python2-numpy' 'mesa' 'eigen')
 optdepends=('opencv-samples'
-            'eigen2'
+            'eigen'
             'libcl: For coding with OpenCL'
-            'python2-numpy: Python 2.x interface')
+            'python-numpy: Python 3 interface'
+            'python2-numpy: Python 2 interface')
 #source=("http://downloads.sourceforge.net/opencvlibrary/$pkgname-$pkgver.zip")
-source=("$pkgbase-$pkgver::https://github.com/Itseez/opencv/archive/$pkgver.zip" opencv-ffmpeg3.patch)
-md5sums=('eaede6500e9c2d56683196b0576db1f7'
-         'c752f3e83ebb021171fdd04aa7fb2e5a')
+source=("$pkgbase-$pkgver::https://github.com/Itseez/opencv/archive/$pkgver.zip")
+md5sums=('6082ee2124d4066581a7386972bfd52a')
 
 _cmakeopts=('-D WITH_OPENCL=ON'
             '-D WITH_OPENGL=ON'
@@ -34,7 +34,8 @@
             '-D INSTALL_PYTHON_EXAMPLES=ON'
             '-D CMAKE_BUILD_TYPE=Release'
             '-D CMAKE_INSTALL_PREFIX=/usr'
-            '-D CMAKE_SKIP_RPATH=ON')
+            '-D CMAKE_SKIP_RPATH=ON'
+            '-D BUILD_NEW_PYTHON_SUPPORT=ON')
 
 # SSE only available from Pentium 3 onwards (i686 is way older)
 [[ "$CARCH" = 'i686' ]] && \
@@ -42,15 +43,6 @@
                '-D ENABLE_SSE2=OFF'
                '-D ENABLE_SSE3=OFF')
 
-# all x64 CPUs support SSE2 but not SSE3
-[[ "$CARCH" = 'x86_64' ]] && _cmakeopts+=('-D ENABLE_SSE3=OFF')
-
-prepare() {
-  cd $pkgname-$pkgver
-# Fix build with ffmpeg 3.0 (Debian)
-  patch -p1 -i ../opencv-ffmpeg3.patch
-}
-
 build() {
   cd "$srcdir/$pkgname-$pkgver"