diff options
author | Nicola Murino | 2023-12-30 17:10:01 +0100 |
---|---|---|
committer | Nicola Murino | 2023-12-30 17:10:01 +0100 |
commit | 7ddc51e571c809c3152371869388d2d0abbf5f9b (patch) | |
tree | bc55839f4323b3f9fee7b4a9ce7ba7bd65b4eece | |
parent | bf77e066ed314f5494e180999056917a34bbe754 (diff) | |
download | aur-7ddc51e571c809c3152371869388d2d0abbf5f9b.tar.gz |
4.9.0
-rw-r--r-- | .SRCINFO | 12 | ||||
-rw-r--r-- | 0001-mingw-w64-cmake.patch | 110 | ||||
-rw-r--r-- | PKGBUILD | 8 |
3 files changed, 65 insertions, 65 deletions
@@ -1,6 +1,6 @@ pkgbase = mingw-w64-opencv pkgdesc = Open Source Computer Vision Library (mingw-w64) - pkgver = 4.8.1 + pkgver = 4.9.0 pkgrel = 1 url = http://opencv.org/ arch = any @@ -20,14 +20,14 @@ pkgbase = mingw-w64-opencv options = !buildflags options = staticlibs options = !strip - source = opencv-4.8.1.tar.gz::https://github.com/opencv/opencv/archive/4.8.1.tar.gz - source = opencv_contrib-4.8.1.tar.gz::https://github.com/opencv/opencv_contrib/archive/4.8.1.tar.gz + source = opencv-4.9.0.tar.gz::https://github.com/opencv/opencv/archive/4.9.0.tar.gz + source = opencv_contrib-4.9.0.tar.gz::https://github.com/opencv/opencv_contrib/archive/4.9.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 - sha256sums = 62f650467a60a38794d681ae7e66e3e8cfba38f445e0bf87867e2f2cdc8be9d5 - sha256sums = 0c082a0b29b3118f2a0a1856b403bb098643af7b994a0080f402a12159a99c6e - sha256sums = 34e63a897024d41adeadcf593480ae4074ecaed5fc7b05ba5cc2469c7669a83e + sha256sums = ddf76f9dffd322c7c3cb1f721d0887f62d747b82059342213138dc190f28bc6c + sha256sums = 8952c45a73b75676c522dd574229f563e43c271ae1d5bbbd26f8e2b6bc1a4dae + sha256sums = 1ec0c7d215068174a04a62b5655a94052b426b0c2ae3b94942d39b8b4978ef35 sha256sums = 7fac6a7788638f8843f562381413ce13c59038d2fafc5dc05258195128e5caf5 sha256sums = 7398e66f80be37382bd427b5eb3a1201a23113c14e71435a44df8779ea1b8a34 diff --git a/0001-mingw-w64-cmake.patch b/0001-mingw-w64-cmake.patch index 81c6107c3899..5534c76d2d74 100644 --- a/0001-mingw-w64-cmake.patch +++ b/0001-mingw-w64-cmake.patch @@ -14,67 +14,67 @@ Subject: [PATCH 1/8] mingw-w64-cmake 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) +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -202,20 +202,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 + # ---------------------------------------------------------------------------- +@@ -224,14 +210,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" +@@ -1007,7 +1093,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(NOT ANDROID AND NOT IOS AND NOT XROS) - if(CMAKE_HOST_UNIX) + if(CMAKE_HOST_UNIX OR MINGW) execute_process(COMMAND ${_executable} -c "from sysconfig import *; print(get_path('purelib'))" @@ -1,6 +1,6 @@ # Maintainer: drakkan <nicola.murino at gmail dot com> pkgname=mingw-w64-opencv -pkgver=4.8.1 +pkgver=4.9.0 pkgrel=1 pkgdesc="Open Source Computer Vision Library (mingw-w64)" arch=('any') @@ -14,9 +14,9 @@ source=("opencv-$pkgver.tar.gz::https://github.com/opencv/opencv/archive/$pkgver "0001-mingw-w64-cmake.patch" "0004-generate-proper-pkg-config-file.patch" "0008-mingw-w64-cmake-lib-path.patch") -sha256sums=('62f650467a60a38794d681ae7e66e3e8cfba38f445e0bf87867e2f2cdc8be9d5' - '0c082a0b29b3118f2a0a1856b403bb098643af7b994a0080f402a12159a99c6e' - '34e63a897024d41adeadcf593480ae4074ecaed5fc7b05ba5cc2469c7669a83e' +sha256sums=('ddf76f9dffd322c7c3cb1f721d0887f62d747b82059342213138dc190f28bc6c' + '8952c45a73b75676c522dd574229f563e43c271ae1d5bbbd26f8e2b6bc1a4dae' + '1ec0c7d215068174a04a62b5655a94052b426b0c2ae3b94942d39b8b4978ef35' '7fac6a7788638f8843f562381413ce13c59038d2fafc5dc05258195128e5caf5' '7398e66f80be37382bd427b5eb3a1201a23113c14e71435a44df8779ea1b8a34') |