[arch-commits] Commit in opencv/trunk (PKGBUILD opencv-legacy-headers.patch)

[Antonio Rojas]

    Date: Monday, December 24, 2018 @ 12:58:34
  Author: arojas
Revision: 342710

Update to 4.0.1

Modified:
  opencv/trunk/PKGBUILD
Deleted:
  opencv/trunk/opencv-legacy-headers.patch

-----------------------------+
 PKGBUILD                    |   14 ++++----------
 opencv-legacy-headers.patch |   12 ------------
 2 files changed, 4 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-12-24 08:25:19 UTC (rev 342709)
+++ PKGBUILD	2018-12-24 12:58:34 UTC (rev 342710)
@@ -3,8 +3,8 @@
 
 pkgbase=opencv
 pkgname=(opencv opencv-samples)
-pkgver=4.0.0
-pkgrel=4
+pkgver=4.0.1
+pkgrel=1
 pkgdesc="Open Source Computer Vision Library"
 arch=(x86_64)
 license=(BSD)
@@ -19,8 +19,8 @@
             'python-numpy: Python interface')
 source=("$pkgbase-$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")
-sha256sums=('86fd08fc02893e05e2944fa7b0daa7d02643232450f020b475e1b2f24587b99a'
-            '4fb0681414df4baedce6e3f4a01318d6f4fcde6ee14854d761fd4e397a397763')
+sha256sums=('b79ccdc4797a959c5ab17249a8a302c066248ae070e4d7010e2d77a625fdb30a'
+            '0d8acbad4b7074cfaafd906a7419c23629179d5e98894714402090b192ef8237')
 
 prepare() {
   mkdir -p build
@@ -65,12 +65,6 @@
   # separate samples package
   cd "$pkgdir"/usr/share
   mv opencv4/samples "$srcdir"/$pkgname-samples
-
-  # install missing headers https://github.com/opencv/opencv/issues/13201
-  for _module in imgcodecs videoio photo; do
-    cp -r "$srcdir"/$pkgname-$pkgver/modules/$_module/include/opencv2/$_module/legacy \
-      "$pkgdir"/usr/include/opencv4/opencv2/$_module
-  done
 }
 
 package_opencv-samples() {

Deleted: opencv-legacy-headers.patch
===================================================================
--- opencv-legacy-headers.patch	2018-12-24 08:25:19 UTC (rev 342709)
+++ opencv-legacy-headers.patch	2018-12-24 12:58:34 UTC (rev 342710)
@@ -1,12 +0,0 @@
-diff --git a/modules/imgcodecs/CMakeLists.txt b/modules/imgcodecs/CMakeLists.txt
-index d771224d4..dc9587927 100644
---- a/modules/imgcodecs/CMakeLists.txt
-+++ b/modules/imgcodecs/CMakeLists.txt
-@@ -102,6 +102,7 @@ file(GLOB imgcodecs_ext_hdrs
-      "${CMAKE_CURRENT_LIST_DIR}/include/opencv2/*.hpp"
-      "${CMAKE_CURRENT_LIST_DIR}/include/opencv2/${name}/*.hpp"
-      "${CMAKE_CURRENT_LIST_DIR}/include/opencv2/${name}/*.h"
-+     "${CMAKE_CURRENT_LIST_DIR}/include/opencv2/${name}/*/*.h"
-      )
- 
- if(IOS)