3.4.1

1 files changed, 6 insertions, 21 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 00e659bd458a..9254177e3bff 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mingw-w64-opencv
-pkgver=3.2.0
-pkgrel=2
+pkgver=3.4.1
+pkgrel=1
 pkgdesc="Open Source Computer Vision Library (mingw-w64)"
 arch=('any')
 license=('BSD')
@@ -10,8 +10,8 @@ depends=('mingw-w64-crt' 'mingw-w64-jasper' 'mingw-w64-libpng' 'mingw-w64-libjpe
 makedepends=('mingw-w64-cmake' 'mingw-w64-eigen')
 source=("https://github.com/Itseez/opencv/archive/${pkgver}.tar.gz"
         "opencv_contrib-$pkgver.tar.gz::https://github.com/Itseez/opencv_contrib/archive/$pkgver.tar.gz")
-md5sums=('a43b65488124ba33dde195fea9041b70'
-         'd7d50c70c31df3b31310f548f31fd2a2')
+sha256sums=('f1b87684d75496a1054405ae3ee0b6573acaf3dad39eaf4f1d66fdd7e03dc852'
+            '298c69ee006d7675e1ff9d371ba8b0d9e7e88374bb7ba0f9d0789851d352ec6e')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
@@ -38,12 +38,6 @@ _cmakeopts=('-DCMAKE_SKIP_RPATH=ON'
 
 prepare() {
   cd "$srcdir/opencv-$pkgver"
-
-  # error: ‘DBL_EPSILON’ was not declared in this scope
-  grep -lr LDBL_EPSILON .| grep -v gch$ | xargs sed -i "s|LDBL_EPSILON|1.08420217248550443401e-19L|g"
-  grep -lr DBL_EPSILON . | grep -v gch$ | xargs sed -i "s|DBL_EPSILON|2.2204460492503131E-16|g"
-  grep -lr FLT_EPSILON . | grep -v gch$ | xargs sed -i "s|FLT_EPSILON|1.19209290E-07F|g"
-
 }
 
 build() {
@@ -52,28 +46,19 @@ build() {
     mkdir -p build-${_arch} && pushd build-${_arch}
     ${_arch}-cmake ${_cmakeopts[@]} \
       -DOPENCV_EXTRA_MODULES_PATH="$srcdir/opencv_contrib-$pkgver/modules" \
+      -DLAPACK_LIBRARIES="/usr/${_arch}/lib/liblapack.dll.a;/usr/${_arch}/lib/libblas.dll.a;/usr/${_arch}/lib/libcblas.dll.a" \
       ..
     make
     popd
-#     mkdir -p build-${_arch}-static && pushd build-${_arch}-static
-#     ${_arch}-cmake ${_cmakeopts[@]} \
-#       -DBUILD_SHARED_LIBS=OFF \
-#       ..
-#     make
-#     popd
   done
 }
 
 package() {
   for _arch in ${_architectures}; do
-#     cd "$srcdir/opencv-$pkgver/build-${_arch}-static"
-#     make DESTDIR="$pkgdir" install
     cd "$srcdir/opencv-$pkgver/build-${_arch}"
     make DESTDIR="$pkgdir" install
-    rm -r "$pkgdir"/usr/${_arch}/share/
     install -d "$pkgdir"/usr/${_arch}/lib/pkgconfig
-    install -m644 "$srcdir"/opencv-$pkgver/build-${_arch}/unix-install/opencv.pc \
-      "$pkgdir"/usr/${_arch}/lib/pkgconfig/
+    install -m644 ./unix-install/opencv.pc "$pkgdir"/usr/${_arch}/lib/pkgconfig/
     rm "$pkgdir"/usr/${_arch}/LICENSE
     ${_arch}-strip --strip-unneeded "$pkgdir"/usr/${_arch}/bin/*.dll
     ${_arch}-strip -g "$pkgdir"/usr/${_arch}/lib/*.a