4.7.0

7 files changed, 158 insertions, 142 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f160d3d2905a..edb6437e002a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-opencv
 	pkgdesc = Open Source Computer Vision Library (mingw-w64)
-	pkgver = 4.6.0
+	pkgver = 4.7.0
 	pkgrel = 1
 	url = http://opencv.org/
 	arch = any
@@ -20,17 +20,15 @@ pkgbase = mingw-w64-opencv
 	options = !buildflags
 	options = staticlibs
 	options = !strip
-	source = opencv-4.6.0.tar.gz::https://github.com/opencv/opencv/archive/4.6.0.tar.gz
-	source = opencv_contrib-4.6.0.tar.gz::https://github.com/opencv/opencv_contrib/archive/4.6.0.tar.gz
-	source = 0105-wechat-iconv-dependency.patch
-	source = 0012-make-header-usable-with-C-compiler.patch
+	source = opencv-4.7.0.tar.gz::https://github.com/opencv/opencv/archive/4.7.0.tar.gz
+	source = opencv_contrib-4.7.0.tar.gz::https://github.com/opencv/opencv_contrib/archive/4.7.0.tar.gz
+	source = 0001-mingw-w64-cmake.patch
+	source = 0004-generate-proper-pkg-config-file.patch
 	source = 0008-mingw-w64-cmake-lib-path.patch
-	source = 0010-find-libpng-header.patch
-	sha256sums = 1ec1cba65f9f20fe5a41fda1586e01c70ea0c9a6d7b67c9e13edf0cfe2239277
-	sha256sums = 1777d5fd2b59029cf537e5fd6f8aa68d707075822f90bde683fcde086f85f7a7
-	sha256sums = 3cf6a17b234ddf4f20e042acce329823e970aa06873d63652fa132c46ee56739
-	sha256sums = 9f918a974e9d5227fce3702b1f38716a7fb79586dda9256b5df44dcc0f858c3b
+	sha256sums = 8df0079cdbe179748a18d44731af62a245a45ebf5085223dc03133954c662973
+	sha256sums = 42df840cf9055e59d0e22c249cfb19f04743e1bdad113d31b1573d3934d62584
+	sha256sums = 34e63a897024d41adeadcf593480ae4074ecaed5fc7b05ba5cc2469c7669a83e
+	sha256sums = 7fac6a7788638f8843f562381413ce13c59038d2fafc5dc05258195128e5caf5
 	sha256sums = 7398e66f80be37382bd427b5eb3a1201a23113c14e71435a44df8779ea1b8a34
-	sha256sums = d6ad5a0865eefe662ca4c7aceb6aa7b1fd5fcd27e1e65ca839d442f054095e69
 
 pkgname = mingw-w64-opencv
diff --git a/0001-mingw-w64-cmake.patch b/0001-mingw-w64-cmake.patch
new file mode 100644
index 000000000000..81c6107c3899
--- /dev/null
+++ b/0001-mingw-w64-cmake.patch
@@ -0,0 +1,112 @@
+From 82a6d2f0fcb6b0b2f153324fb4f14a52f6873a4f Mon Sep 17 00:00:00 2001
+From: "FeRD (Frank Dana)" <ferdnyc@gmail.com>
+Date: Wed, 21 Apr 2021 13:21:12 -0400
+Subject: [PATCH 1/8] mingw-w64-cmake
+
+---
+ CMakeLists.txt                  | 32 +++++++++-----------------------
+ cmake/OpenCVDetectPython.cmake  |  2 +-
+ cmake/OpenCVFindOpenEXR.cmake   |  4 +++-
+ cmake/OpenCVGenPkgconfig.cmake  |  2 +-
+ cmake/OpenCVInstallLayout.cmake |  2 +-
+ cmake/OpenCVModule.cmake        |  4 +++-
+ 6 files changed, 19 insertions(+), 28 deletions(-)
+
+ diff --git a/CMakeLists.txt b/CMakeLists.txt
+ index 5a0c62e..6c15139 100644
+ --- a/CMakeLists.txt
+ +++ b/CMakeLists.txt
+ @@ -189,20 +189,6 @@ if(UNIX AND NOT ANDROID)
+    endif()
+  endif()
+  
+ -# Add these standard paths to the search paths for FIND_PATH
+ -# to find include files from these locations first
+ -if(MINGW)
+ -  if(EXISTS /mingw)
+ -      list(APPEND CMAKE_INCLUDE_PATH /mingw)
+ -  endif()
+ -  if(EXISTS /mingw32)
+ -      list(APPEND CMAKE_INCLUDE_PATH /mingw32)
+ -  endif()
+ -  if(EXISTS /mingw64)
+ -      list(APPEND CMAKE_INCLUDE_PATH /mingw64)
+ -  endif()
+ -endif()
+ -
+  # ----------------------------------------------------------------------------
+  # OpenCV cmake options
+  # ----------------------------------------------------------------------------
+ @@ -211,14 +197,14 @@ OCV_OPTION(OPENCV_ENABLE_NONFREE "Enable non-free algorithms" OFF)
+  
+  # 3rd party libs
+  OCV_OPTION(OPENCV_FORCE_3RDPARTY_BUILD   "Force using 3rdparty code from source" OFF)
+ -OCV_OPTION(BUILD_ZLIB               "Build zlib from source"             (WIN32 OR APPLE OR OPENCV_FORCE_3RDPARTY_BUILD) )
+ -OCV_OPTION(BUILD_TIFF               "Build libtiff from source"          (WIN32 OR ANDROID OR APPLE OR OPENCV_FORCE_3RDPARTY_BUILD) )
+ -OCV_OPTION(BUILD_OPENJPEG           "Build OpenJPEG from source"         (WIN32 OR ANDROID OR APPLE OR OPENCV_FORCE_3RDPARTY_BUILD) )
+ -OCV_OPTION(BUILD_JASPER             "Build libjasper from source"        (WIN32 OR ANDROID OR APPLE OR OPENCV_FORCE_3RDPARTY_BUILD) )
+ -OCV_OPTION(BUILD_JPEG               "Build libjpeg from source"          (WIN32 OR ANDROID OR APPLE OR OPENCV_FORCE_3RDPARTY_BUILD) )
+ -OCV_OPTION(BUILD_PNG                "Build libpng from source"           (WIN32 OR ANDROID OR APPLE OR OPENCV_FORCE_3RDPARTY_BUILD) )
+ +OCV_OPTION(BUILD_ZLIB               "Build zlib from source"             (MSVC OR APPLE OR OPENCV_FORCE_3RDPARTY_BUILD) )
+ +OCV_OPTION(BUILD_TIFF               "Build libtiff from source"          (MSVC OR ANDROID OR APPLE OR OPENCV_FORCE_3RDPARTY_BUILD) )
+ +OCV_OPTION(BUILD_OPENJPEG           "Build OpenJPEG from source"         (MSVC OR ANDROID OR APPLE OR OPENCV_FORCE_3RDPARTY_BUILD) )
+ +OCV_OPTION(BUILD_JASPER             "Build libjasper from source"        (MSVC OR ANDROID OR APPLE OR OPENCV_FORCE_3RDPARTY_BUILD) )
+ +OCV_OPTION(BUILD_JPEG               "Build libjpeg from source"          (MSVC OR ANDROID OR APPLE OR OPENCV_FORCE_3RDPARTY_BUILD) )
+ +OCV_OPTION(BUILD_PNG                "Build libpng from source"           (MSVC OR ANDROID OR APPLE OR OPENCV_FORCE_3RDPARTY_BUILD) )
+  OCV_OPTION(BUILD_OPENEXR            "Build openexr from source"          (OPENCV_FORCE_3RDPARTY_BUILD) )
+ -OCV_OPTION(BUILD_WEBP               "Build WebP from source"             (((WIN32 OR ANDROID OR APPLE) AND NOT WINRT) OR OPENCV_FORCE_3RDPARTY_BUILD) )
+ +OCV_OPTION(BUILD_WEBP               "Build WebP from source"             (((WIN32 OR ANDROID OR APPLE) AND NOT WINRT AND NOT MINGW) OR OPENCV_FORCE_3RDPARTY_BUILD) )
+  OCV_OPTION(BUILD_TBB                "Download and build TBB from source" (ANDROID OR OPENCV_FORCE_3RDPARTY_BUILD) )
+  OCV_OPTION(BUILD_IPP_IW             "Build IPP IW from source"           (NOT MINGW OR OPENCV_FORCE_3RDPARTY_BUILD) IF (X86_64 OR X86) AND NOT WINRT )
+  OCV_OPTION(BUILD_ITT                "Build Intel ITT from source"
+ @@ -981,7 +967,7 @@ if(NOT OPENCV_LICENSE_FILE)
+  endif()
+  
+  # for UNIX it does not make sense as LICENSE and readme will be part of the package automatically
+ -if(ANDROID OR NOT UNIX)
+ +if((ANDROID OR NOT UNIX) AND NOT MINGW)
+    install(FILES ${OPENCV_LICENSE_FILE}
+          PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+          DESTINATION ./ COMPONENT libs)
+index 4ff02a7..e3bd127 100644
+--- a/cmake/OpenCVDetectPython.cmake
++++ b/cmake/OpenCVDetectPython.cmake
+@@ -176,7 +176,7 @@ if(NOT ${found})
+     endif()
+ 
+     if(NOT ANDROID AND NOT IOS)
+-      if(CMAKE_HOST_UNIX)
++      if(CMAKE_HOST_UNIX OR MINGW)
+         execute_process(COMMAND ${_executable} -c "from sysconfig import *; print(get_path('purelib'))"
+                         RESULT_VARIABLE _cvpy_process
+                         OUTPUT_VARIABLE _std_packages_path
+diff --git a/cmake/OpenCVFindOpenEXR.cmake b/cmake/OpenCVFindOpenEXR.cmake
+index ef633e8..02faa39 100644
+--- a/cmake/OpenCVFindOpenEXR.cmake
++++ b/cmake/OpenCVFindOpenEXR.cmake
+@@ -29,7 +29,9 @@ SET(OPENEXR_LIBRARIES "")
+ SET(OPENEXR_LIBSEARCH_SUFFIXES "")
+ file(TO_CMAKE_PATH "$ENV{ProgramFiles}" ProgramFiles_ENV_PATH)
+ 
+-if(WIN32)
++if(MINGW)
++    SET(OPENEXR_ROOT $ENV{OpenEXR_HOME} CACHE STRING "Path to the OpenEXR install folder")
++elseif(MSVC)
+     SET(OPENEXR_ROOT "C:/Deploy" CACHE STRING "Path to the OpenEXR \"Deploy\" folder")
+     if(X86_64)
+         SET(OPENEXR_LIBSEARCH_SUFFIXES x64/Release x64 x64/Debug)
+diff --git a/cmake/OpenCVInstallLayout.cmake b/cmake/OpenCVInstallLayout.cmake
+index d5f3579..4722de0 100644
+--- a/cmake/OpenCVInstallLayout.cmake
++++ b/cmake/OpenCVInstallLayout.cmake
+@@ -20,7 +20,7 @@ if(ANDROID)
+   ocv_update(OPENCV_JNI_INSTALL_PATH            "${OPENCV_LIB_INSTALL_PATH}")
+   ocv_update(OPENCV_JNI_BIN_INSTALL_PATH        "${OPENCV_JNI_INSTALL_PATH}")
+ 
+-elseif(WIN32 AND CMAKE_HOST_SYSTEM_NAME MATCHES Windows)
++elseif(MSVC AND CMAKE_HOST_SYSTEM_NAME MATCHES Windows)
+ 
+   if(DEFINED OpenCV_RUNTIME AND DEFINED OpenCV_ARCH)
+     ocv_update(OPENCV_INSTALL_BINARIES_PREFIX "${OpenCV_ARCH}/${OpenCV_RUNTIME}/")
+-- 
+2.31.1
diff --git a/0004-generate-proper-pkg-config-file.patch b/0004-generate-proper-pkg-config-file.patch
new file mode 100644
index 000000000000..9057ea77a951
--- /dev/null
+++ b/0004-generate-proper-pkg-config-file.patch
@@ -0,0 +1,25 @@
+From 3306722e9f5ffbfc44263eb9510a5adae7b4b1b2 Mon Sep 17 00:00:00 2001
+From: "FeRD (Frank Dana)" <ferdnyc@gmail.com>
+Date: Wed, 21 Apr 2021 13:23:36 -0400
+Subject: [PATCH 4/8] generate-proper-pkg-config-file
+
+---
+ cmake/OpenCVUtils.cmake | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/cmake/OpenCVUtils.cmake b/cmake/OpenCVUtils.cmake
+index f42ad0b..b81ebc0 100644
+--- a/cmake/OpenCVUtils.cmake
++++ b/cmake/OpenCVUtils.cmake
+@@ -1649,7 +1649,7 @@ endfunction()
+ macro(ocv_get_libname var_name)
+   get_filename_component(__libname "${ARGN}" NAME)
+   # libopencv_core.so.3.3 -> opencv_core
+-  string(REGEX REPLACE "^lib(.+)\\.(a|so|dll)(\\.[.0-9]+)?$" "\\1" __libname "${__libname}")
++  string(REGEX REPLACE "^lib(.+[^.0-9])(\\-[0-9]+)?\\.(a|so|dll)(\\.[.0-9]+)?$" "\\1" __libname "${__libname}")
+   # MacOSX: libopencv_core.3.3.1.dylib -> opencv_core
+   string(REGEX REPLACE "^lib(.+[^.0-9])\\.([.0-9]+\\.)?dylib$" "\\1" __libname "${__libname}")
+   set(${var_name} "${__libname}")
+-- 
+2.31.1
+
diff --git a/0010-find-libpng-header.patch b/0010-find-libpng-header.patch
deleted file mode 100644
index b862f7b53664..000000000000
--- a/0010-find-libpng-header.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 747e954047eee356d9874376127cd9e7486fdaee Mon Sep 17 00:00:00 2001
-From: "FeRD (Frank Dana)" <ferdnyc@gmail.com>
-Date: Wed, 21 Apr 2021 13:30:10 -0400
-Subject: [PATCH 5/8] find-libpng-header
-
----
- cmake/OpenCVFindLibsGrfmt.cmake     | 4 ++--
- modules/imgcodecs/src/grfmt_png.cpp | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake
-index 23a6ca6..a4e3cee 100644
---- a/cmake/OpenCVFindLibsGrfmt.cmake
-+++ b/cmake/OpenCVFindLibsGrfmt.cmake
-@@ -228,9 +228,9 @@ if(WITH_PNG)
-     include(FindPNG)
-     if(PNG_FOUND)
-       include(CheckIncludeFile)
--      check_include_file("${PNG_PNG_INCLUDE_DIR}/libpng/png.h" HAVE_LIBPNG_PNG_H)
-+      check_include_file("${PNG_PNG_INCLUDE_DIR}/libpng16/png.h" HAVE_LIBPNG_PNG_H)
-       if(HAVE_LIBPNG_PNG_H)
--        ocv_parse_header("${PNG_PNG_INCLUDE_DIR}/libpng/png.h" PNG_VERSION_LINES PNG_LIBPNG_VER_MAJOR PNG_LIBPNG_VER_MINOR PNG_LIBPNG_VER_RELEASE)
-+        ocv_parse_header("${PNG_PNG_INCLUDE_DIR}/libpng16/png.h" PNG_VERSION_LINES PNG_LIBPNG_VER_MAJOR PNG_LIBPNG_VER_MINOR PNG_LIBPNG_VER_RELEASE)
-       else()
-         ocv_parse_header("${PNG_PNG_INCLUDE_DIR}/png.h" PNG_VERSION_LINES PNG_LIBPNG_VER_MAJOR PNG_LIBPNG_VER_MINOR PNG_LIBPNG_VER_RELEASE)
-       endif()
-diff --git a/modules/imgcodecs/src/grfmt_png.cpp b/modules/imgcodecs/src/grfmt_png.cpp
-index 9e1a2d4..bfb23d1 100644
---- a/modules/imgcodecs/src/grfmt_png.cpp
-+++ b/modules/imgcodecs/src/grfmt_png.cpp
-@@ -59,7 +59,7 @@
- #endif
- 
- #ifdef HAVE_LIBPNG_PNG_H
--#include <libpng/png.h>
-+#include <libpng16/png.h>
- #else
- #include <png.h>
- #endif
--- 
-2.31.1
-
diff --git a/0012-make-header-usable-with-C-compiler.patch b/0012-make-header-usable-with-C-compiler.patch
deleted file mode 100644
index cbe8cac111e9..000000000000
--- a/0012-make-header-usable-with-C-compiler.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 5cb842feac81067785877392b2fa33eed2e621bc Mon Sep 17 00:00:00 2001
-From: "FeRD (Frank Dana)" <ferdnyc@gmail.com>
-Date: Wed, 21 Apr 2021 13:31:08 -0400
-Subject: [PATCH 6/8] make-header-usable-with-C-compiler
-
----
- modules/core/include/opencv2/core/cvdef.h | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/modules/core/include/opencv2/core/cvdef.h b/modules/core/include/opencv2/core/cvdef.h
-index 535883e..0ab8447 100644
---- a/modules/core/include/opencv2/core/cvdef.h
-+++ b/modules/core/include/opencv2/core/cvdef.h
-@@ -766,6 +766,7 @@ __CV_ENUM_FLAGS_BITWISE_XOR_EQ   (EnumType, EnumType)
- #endif
- 
- // Integer types portatibility
-+#if defined __cplusplus
- #ifdef OPENCV_STDINT_HEADER
- #include OPENCV_STDINT_HEADER
- #elif defined(__cplusplus)
-@@ -808,6 +809,9 @@ typedef ::uint64_t uint64_t;
- #else // pure C
- #include <stdint.h>
- #endif
-+#else
-+#include <stdint.h>
-+#endif
- 
- #ifdef __cplusplus
- namespace cv
--- 
-2.31.1
-
diff --git a/0105-wechat-iconv-dependency.patch b/0105-wechat-iconv-dependency.patch
deleted file mode 100644
index b4984fd06098..000000000000
--- a/0105-wechat-iconv-dependency.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From bc8c8f75b784fb62e2db0c28178a1e767be92021 Mon Sep 17 00:00:00 2001
-From: "FeRD (Frank Dana)" <ferdnyc@gmail.com>
-Date: Fri, 23 Apr 2021 21:54:26 -0400
-Subject: [PATCH] Fix wechat iconv dependency
-
----
- modules/wechat_qrcode/CMakeLists.txt | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/modules/wechat_qrcode/CMakeLists.txt b/modules/wechat_qrcode/CMakeLists.txt
-index 210f4a0d..3d02c7bb 100644
---- a/modules/wechat_qrcode/CMakeLists.txt
-+++ b/modules/wechat_qrcode/CMakeLists.txt
-@@ -1,6 +1,16 @@
- set(the_description "WeChat QR code Detector")
- ocv_define_module(wechat_qrcode opencv_core opencv_imgproc opencv_dnn WRAP java objc python js)
- 
-+# iconv support isn't automatic on some systems
-+if(CMAKE_VERSION VERSION_GREATER 3.11)
-+  find_package(Iconv QUIET)
-+  if(Iconv_FOUND)
-+    ocv_target_link_libraries(${the_module} Iconv::Iconv)
-+  else()
-+    ocv_target_compile_definitions(${the_module} PRIVATE "NO_ICONV=1")
-+  endif()
-+endif()
-+
- # need to change
- set(wechat_qrcode_commit_hash "a8b69ccc738421293254aec5ddb38bd523503252")
- set(hash_detect_caffemodel "238e2b2d6f3c18d6c3a30de0c31e23cf")
--- 
-2.30.2
-
diff --git a/PKGBUILD b/PKGBUILD
index 2e62596790ca..9c2f0f7bb4f7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: drakkan <nicola.murino at gmail dot com>
 pkgname=mingw-w64-opencv
-pkgver=4.6.0
+pkgver=4.7.0
 pkgrel=1
 pkgdesc="Open Source Computer Vision Library (mingw-w64)"
 arch=('any')
@@ -11,16 +11,14 @@ depends=('mingw-w64-crt' 'mingw-w64-libpng' 'mingw-w64-libjpeg-turbo' 'mingw-w64
 makedepends=('mingw-w64-cmake' 'mingw-w64-eigen' 'mingw-w64-lapacke')
 source=("opencv-$pkgver.tar.gz::https://github.com/opencv/opencv/archive/$pkgver.tar.gz"
   "opencv_contrib-$pkgver.tar.gz::https://github.com/opencv/opencv_contrib/archive/$pkgver.tar.gz"
-  "0105-wechat-iconv-dependency.patch"
-  "0012-make-header-usable-with-C-compiler.patch"
-  "0008-mingw-w64-cmake-lib-path.patch"
-  "0010-find-libpng-header.patch")
-sha256sums=('1ec1cba65f9f20fe5a41fda1586e01c70ea0c9a6d7b67c9e13edf0cfe2239277'
-  '1777d5fd2b59029cf537e5fd6f8aa68d707075822f90bde683fcde086f85f7a7'
-  '3cf6a17b234ddf4f20e042acce329823e970aa06873d63652fa132c46ee56739'
-  '9f918a974e9d5227fce3702b1f38716a7fb79586dda9256b5df44dcc0f858c3b'
-  '7398e66f80be37382bd427b5eb3a1201a23113c14e71435a44df8779ea1b8a34'
-  'd6ad5a0865eefe662ca4c7aceb6aa7b1fd5fcd27e1e65ca839d442f054095e69')
+  "0001-mingw-w64-cmake.patch"
+  "0004-generate-proper-pkg-config-file.patch"
+  "0008-mingw-w64-cmake-lib-path.patch")
+sha256sums=('8df0079cdbe179748a18d44731af62a245a45ebf5085223dc03133954c662973'
+  '42df840cf9055e59d0e22c249cfb19f04743e1bdad113d31b1573d3934d62584'
+  '34e63a897024d41adeadcf593480ae4074ecaed5fc7b05ba5cc2469c7669a83e'
+  '7fac6a7788638f8843f562381413ce13c59038d2fafc5dc05258195128e5caf5'
+  '7398e66f80be37382bd427b5eb3a1201a23113c14e71435a44df8779ea1b8a34')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
@@ -51,10 +49,9 @@ _cmakeopts=('-DCMAKE_SKIP_RPATH=ON'
             '-DOPENCV_GENERATE_SETUPVARS=OFF')
 
 prepare() {
+  patch -d $srcdir/opencv-$pkgver -p1 < 0001-mingw-w64-cmake.patch
+  patch -d $srcdir/opencv-$pkgver -p1 < 0004-generate-proper-pkg-config-file.patch
   patch -d $srcdir/opencv-$pkgver -p1 < 0008-mingw-w64-cmake-lib-path.patch
-  patch -d $srcdir/opencv-$pkgver -p1 < 0010-find-libpng-header.patch 
-  patch -d $srcdir/opencv-$pkgver -p1 < 0012-make-header-usable-with-C-compiler.patch 
-  patch -d $srcdir/opencv_contrib-$pkgver -p1 < 0105-wechat-iconv-dependency.patch 
 }
 
 build() {
@@ -95,18 +92,11 @@ package() {
     mv "$pkgdir/static/usr/${_arch}/lib/"*.a "$pkgdir/usr/${_arch}/lib/"
  
     install -d "$pkgdir"/usr/${_arch}/lib/pkgconfig
-    install -d "$pkgdir"/usr/${_arch}/lib/cmake/opencv4
-    install -m644 ./unix-install/opencv4.pc "$pkgdir"/usr/${_arch}/lib/pkgconfig/
-    # fix paths
-    sed -i "s/\/\/usr\/${_arch}\/lib/\/lib/g" ./unix-install/opencv4.pc
     # fix static builds. To be able to static build lapack.pc should be fixed too
     # adding Libs.private: -lgfortran -lquadmath
     sed -i "s/^Libs.private.*/& -lgdi32 -lcomdlg32/" ./unix-install/opencv4.pc
     echo "Requires.private: libjpeg libtiff-4 libpng libwebp lapack cblas" >> ./unix-install/opencv4.pc
-    rm "$pkgdir"/usr/${_arch}/LICENSE
-    # fix cmake INSTALL_PATH
-    sed -i "s/^get_filename_component(OpenCV_INSTALL_PATH.*/get_filename_component(OpenCV_INSTALL_PATH \"\$\{OpenCV_CONFIG_PATH\}\/..\/..\/..\/\" REALPATH)/g" ./unix-install/OpenCVConfig.cmake
-    install -m644 ./unix-install/OpenCVConfig.cmake "$pkgdir"/usr/${_arch}/lib/cmake/opencv4
+    install -m644 ./unix-install/opencv4.pc "$pkgdir"/usr/${_arch}/lib/pkgconfig/
     ${_arch}-strip --strip-unneeded "$pkgdir"/usr/${_arch}/bin/*.dll
     ${_arch}-strip -g "$pkgdir"/usr/${_arch}/lib/*.a
     rm -r "$pkgdir/static"