Update to version 3.4.2

2 files changed, 56 insertions, 68 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 795e9ba2e0ae..e15b1adb24fd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,30 +1,26 @@
 pkgbase = lib32-opencv
 	pkgdesc = Open Source Computer Vision Library (32-bit)
-	pkgver = 3.4.0
+	pkgver = 3.4.2
 	pkgrel = 1
-	url = http://opencv.org/
+	url = https://opencv.org
 	arch = x86_64
 	license = BSD
 	makedepends = cmake
-	makedepends = lib32-mesa
 	makedepends = eigen
-	makedepends = lib32-hdf5
-	makedepends = lib32-jasper
-	makedepends = lib32-libgphoto2
 	depends = lib32-intel-tbb
 	depends = lib32-openexr
-	depends = lib32-xine-lib
+	depends = lib32-gst-plugins-base
 	depends = lib32-libdc1394
-	depends = lib32-gtkglext
+	depends = lib32-libgphoto2
+	depends = lib32-jasper
+	depends = lib32-tesseract
+	depends = lib32-ffmpeg
+	depends = lib32-gtk3
 	depends = opencv
-	optdepends = opencv-samples
-	optdepends = hdf5: support for HDF5 format
-	optdepends = opencl-icd-loader: For coding with OpenCL
-	options = staticlibs
-	source = opencv-3.4.0.tar.gz::https://github.com/opencv/opencv/archive/3.4.0.zip
-	source = opencv_contrib-3.4.0.tar.gz::https://github.com/opencv/opencv_contrib/archive/3.4.0.tar.gz
-	md5sums = ed60f8bbe7a448f325d0a0f58fcf2063
-	md5sums = 315c3725234ec02fb4f6e55383376d00
+	source = opencv-3.4.2.tar.gz::https://github.com/opencv/opencv/archive/3.4.2.zip
+	source = opencv_contrib-3.4.2.tar.gz::https://github.com/opencv/opencv_contrib/archive/3.4.2.tar.gz
+	sha256sums = 9405c5d7d8ab1696e98631d0c92125816356ec366a73c417bdcc4d74783b42aa
+	sha256sums = 45a52764ebd2558fa0b7fd8dc47379b37dd0956d912abbf7c786228374fdf60d
 
 pkgname = lib32-opencv
 
diff --git a/PKGBUILD b/PKGBUILD
index 859705e4c5ab..22c11c1be09a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,72 +1,64 @@
-# Maintainer: orumin <dev at orum.in>
+# Maintainer: Rodrigo Bezerra <rodrigobezerra21 at gmail dot com>
+# Contributor: orumin <dev at orum.in>
 # contributer: yannleretaille <yleretaille at gmail.com>
 
-pkgname=lib32-opencv
 _basename=opencv
-pkgver=3.4.0
+pkgname=lib32-opencv
+pkgver=3.4.2
 pkgrel=1
 pkgdesc="Open Source Computer Vision Library (32-bit)"
 arch=('x86_64')
 license=('BSD')
-url="http://opencv.org/"
-depends=('lib32-intel-tbb' 'lib32-openexr' 'lib32-xine-lib' 'lib32-libdc1394' 'lib32-gtkglext' 'opencv')
-makedepends=('cmake' 'lib32-mesa' 'eigen' 'lib32-hdf5' 'lib32-jasper' 'lib32-libgphoto2')
-options=('staticlibs')
-optdepends=('opencv-samples'
-            'hdf5: support for HDF5 format'
-            'opencl-icd-loader: For coding with OpenCL')
+url="https://opencv.org"
+depends=('lib32-intel-tbb' 'lib32-openexr' 'lib32-gst-plugins-base' 'lib32-libdc1394'
+         'lib32-libgphoto2' 'lib32-jasper' 'lib32-tesseract' 'lib32-ffmpeg' 'lib32-gtk3' 'opencv')
+makedepends=('cmake' 'eigen')
 source=("$_basename-$pkgver.tar.gz::https://github.com/opencv/opencv/archive/$pkgver.zip"
         "opencv_contrib-$pkgver.tar.gz::https://github.com/opencv/opencv_contrib/archive/$pkgver.tar.gz")
-md5sums=('ed60f8bbe7a448f325d0a0f58fcf2063'
-         '315c3725234ec02fb4f6e55383376d00')
+sha256sums=('9405c5d7d8ab1696e98631d0c92125816356ec366a73c417bdcc4d74783b42aa'
+            '45a52764ebd2558fa0b7fd8dc47379b37dd0956d912abbf7c786228374fdf60d')
 
-_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=OFF'
-            '-D BUILD_opencv_python2=OFF'
-            '-D BUILD_opencv_python3=OFF'
-            '-D INSTALL_C_EXAMPLES=OFF'
-            '-D INSTALL_PYTHON_EXAMPLES=OFF'
-            '-D CMAKE_BUILD_TYPE=Release'
-            '-D CMAKE_INSTALL_PREFIX=/usr'
-            '-D CMAKE_SKIP_RPATH=ON'
-            '-D CMAKE_INSTALL_LIBDIR=lib32'
-            '-D CMAKE_C_FLAGS=-m32'
-            '-D CMAKE_CXX_FLAGS=-m32'
-            '-D CMAKE_LINKER_FLAGS=-m32'
-            #'-D WITH_IPP=ON'
-            #'-D INSTALL_CREATE_DISTRIB=ON'
-            )
+prepare() {
+    mkdir -p build
+}
 
 build() {
-  mkdir "$srcdir/$_basename-$pkgver/build"
-  cd "$srcdir/$_basename-$pkgver/build"
+    cd build
 
-  export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
-  export PYTHON='/usr/bin/python2-32'
-  export PYTHON_CONFIG='/usr/bin/python2-32-config'
+    export CC='gcc -m32'
+    export CXX='g++ -m32'
+    export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
 
-  cmake ${_cmakeopts[@]} \
-    -DOPENCV_EXTRA_MODULES_PATH="$srcdir/opencv_contrib-$pkgver/modules" \
-    ..
+    cmake ../$_basename-$pkgver \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_INSTALL_LIBDIR=lib32 \
+        -DWITH_OPENCL=ON \
+        -DWITH_OPENGL=ON \
+        -DWITH_TBB=ON \
+        -DOpenGL_GL_PREFERENCE=GLVND \
+        -DBUILD_WITH_DEBUG_INFO=OFF \
+        -DBUILD_TESTS=OFF \
+        -DBUILD_PERF_TESTS=OFF \
+        -DBUILD_EXAMPLES=OFF \
+        -DINSTALL_C_EXAMPLES=OFF \
+        -DBUILD_opencv_python2=OFF \
+        -DBUILD_opencv_python3=OFF \
+        -DINSTALL_PYTHON_EXAMPLES=OFF \
+        -DCPU_BASELINE_DISABLE=SSE3 \
+        -DCPU_BASELINE_REQUIRE=SSE2 \
+        -DOPENCV_EXTRA_MODULES_PATH="$srcdir/opencv_contrib-$pkgver/modules"
 
-  make
+    make
 }
 
 package() {
-  cd "$srcdir/$_basename-$pkgver/build"
+    cd build
 
-  make DESTDIR="$pkgdir" install
-  mv "$pkgdir"/usr/lib "$pkgdir"/usr/lib32
-  rm -r "$pkgdir"/usr/bin
-  rm -r "$pkgdir"/usr/include
-  rm -r "$pkgdir"/usr/share
-}
+    make DESTDIR="$pkgdir" install
+
+    rm -r "$pkgdir/usr/bin"
+    rm -r "$pkgdir/usr/include"
+    rm -r "$pkgdir/usr/share"
 
-# vim:set ts=2 sw=2 et:
+    install -Dm644 "$srcdir/$_basename-$pkgver/LICENSE" -t "$pkgdir/usr/share/licenses/$pkgname"
+}