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

[Antonio Rojas]

    Date: Tuesday, July 6, 2021 @ 06:31:40
  Author: arojas
Revision: 418958

Update to 4.5.3

Modified:
  opencv/trunk/PKGBUILD
Deleted:
  opencv/trunk/opencv-openexr3.patch

-----------------------+
 PKGBUILD              |   19 ++++++++-----------
 opencv-openexr3.patch |   31 -------------------------------
 2 files changed, 8 insertions(+), 42 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-07-05 20:40:29 UTC (rev 418957)
+++ PKGBUILD	2021-07-06 06:31:40 UTC (rev 418958)
@@ -4,12 +4,12 @@
 
 pkgbase=opencv
 pkgname=(opencv opencv-samples python-opencv)
-pkgver=4.5.2
-pkgrel=5
-pkgdesc="Open Source Computer Vision Library"
+pkgver=4.5.3
+pkgrel=1
+pkgdesc='Open Source Computer Vision Library'
 arch=(x86_64)
 license=(BSD)
-url="https://opencv.org/"
+url='https://opencv.org/'
 depends=(tbb openexr gst-plugins-base libdc1394 cblas lapack libgphoto2 openjpeg2 ffmpeg)
 makedepends=(cmake python-numpy python-setuptools mesa eigen hdf5 lapacke qt5-base vtk glew ant java-environment)
 optdepends=('opencv-samples: samples'
@@ -21,16 +21,13 @@
             'java-runtime: Java interface')
 source=(https://github.com/opencv/opencv/archive/$pkgver/$pkgname-$pkgver.tar.gz
         https://github.com/opencv/opencv_contrib/archive/$pkgver/opencv_contrib-$pkgver.tar.gz
-        opencv-lapack-3.10.patch
-        opencv-openexr3.patch)
-sha256sums=('ae258ed50aa039279c3d36afdea5c6ecf762515836b27871a8957c610d0424f8'
-            '9f52fd3114ac464cb4c9a2a6a485c729a223afb57b9c24848484e55cef0b5c2a'
-            'f83c64f2731a39910d0d4a48898dd04e4aca5c22f746b7b0ead003992ae11199'
-            'dcddc1dd30139ac3ace668e0d530798c5691dfd2ad1e5e717db6010d659229ba')
+        opencv-lapack-3.10.patch)
+sha256sums=('77f616ae4bea416674d8c373984b20c8bd55e7db887fd38c6df73463a0647bab'
+            '73da052fd10e73aaba2560eaff10cc5177e2dcc58b27f8aedf7c649e24c233bc'
+            'f83c64f2731a39910d0d4a48898dd04e4aca5c22f746b7b0ead003992ae11199')
 
 prepare() {
   patch -d $pkgname-$pkgver -p1 < opencv-lapack-3.10.patch # Fix build with LAPACK 3.10
-  patch -d $pkgname-$pkgver -p1 < opencv-openexr3.patch # Fix build with OpenEXR 3
 }
 
 build() {

Deleted: opencv-openexr3.patch
===================================================================
--- opencv-openexr3.patch	2021-07-05 20:40:29 UTC (rev 418957)
+++ opencv-openexr3.patch	2021-07-06 06:31:40 UTC (rev 418958)
@@ -1,31 +0,0 @@
-diff --git a/cmake/OpenCVFindOpenEXR.cmake b/cmake/OpenCVFindOpenEXR.cmake
-index ef633e853a..133468243a 100644
---- a/cmake/OpenCVFindOpenEXR.cmake
-+++ b/cmake/OpenCVFindOpenEXR.cmake
-@@ -9,6 +9,14 @@
- # OPENEXR_LIBRARIES = libraries that are needed to use OpenEXR.
- #
- 
-+find_package(OpenEXR 3.0 CONFIG QUIET)
-+if(TARGET OpenEXR::OpenEXR)
-+    SET(OPENEXR_FOUND TRUE)
-+    SET(OPENEXR_LIBRARIES OpenEXR::OpenEXR)
-+    SET(OPENEXR_VERSION ${OpenEXR_VERSION})
-+    return()
-+endif()
-+
- SET(OPENEXR_LIBRARIES "")
- SET(OPENEXR_LIBSEARCH_SUFFIXES "")
- file(TO_CMAKE_PATH "$ENV{ProgramFiles}" ProgramFiles_ENV_PATH)
-diff --git a/modules/imgcodecs/src/grfmt_exr.cpp b/modules/imgcodecs/src/grfmt_exr.cpp
-index 9242871f8d..aaf28eead6 100644
---- a/modules/imgcodecs/src/grfmt_exr.cpp
-+++ b/modules/imgcodecs/src/grfmt_exr.cpp
-@@ -56,6 +56,7 @@
- #include <iostream>
- #include <stdexcept>
- 
-+#include <ImfFrameBuffer.h>
- #include <ImfHeader.h>
- #include <ImfInputFile.h>
- #include <ImfOutputFile.h>