diff --git a/mingw-w64-opencv/0018-aarch64-fp16-mingw.patch b/mingw-w64-opencv/0018-aarch64-fp16-mingw.patch new file mode 100644 index 0000000000..786a8f25ff --- /dev/null +++ b/mingw-w64-opencv/0018-aarch64-fp16-mingw.patch @@ -0,0 +1,12 @@ +diff -bur opencv-4.5.5-c/modules/core/src/system.cpp opencv-4.5.5/modules/core/src/system.cpp +--- opencv-4.5.5-c/modules/core/src/system.cpp 2021-12-24 20:53:27.000000000 -0700 ++++ opencv-4.5.5/modules/core/src/system.cpp 2022-08-10 01:11:19.072482300 -0600 +@@ -605,7 +605,7 @@ + #if (defined __ARM_NEON__ || (defined __ARM_NEON && defined __aarch64__)) + have[CV_CPU_NEON] = true; + #endif +- #if (defined __ARM_FP && (((__ARM_FP & 0x2) != 0) && defined __ARM_NEON__)) ++ #if (defined __ARM_FP && (((__ARM_FP & 0x2) != 0) && (defined __ARM_NEON__ || defined __aarch64__))) + have[CV_CPU_FP16] = true; + #endif + #endif diff --git a/mingw-w64-opencv/PKGBUILD b/mingw-w64-opencv/PKGBUILD index 8f04d5b341..3813a8ed69 100644 --- a/mingw-w64-opencv/PKGBUILD +++ b/mingw-w64-opencv/PKGBUILD @@ -4,10 +4,10 @@ _realname=opencv pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=4.5.5 -pkgrel=3 +pkgrel=4 pkgdesc="Open Source Computer Vision Library (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') url="https://opencv.org/" license=("BSD") depends=(#"${MINGW_PACKAGE_PREFIX}-gst-plugins-base @@ -62,6 +62,7 @@ source=("${_realname}-${pkgver}.tar.gz"::https://github.com/opencv/opencv/archiv '0015-windres-cant-handle-spaces-in-defines.patch' '0016-use-pkgconfig-and-link-pthread.patch' '0017-fix-highgui-qt-opengl-linking.patch' + '0018-aarch64-fp16-mingw.patch' '0101-somehow-uint-not-detected.patch' '0102-mingw-w64-have-sincos.patch' '0103-sfm-module-linking.patch' @@ -80,6 +81,7 @@ sha256sums=('a1cfdcf6619387ca9e232687504da996aaa9f7b5689986b8331ec02cb61d28ad' '11522ffedb22980ba8d09ff715a25327fe14806e55588bffa761e39e1d035ea5' '4b0b9ee5f93e3c26397badf6b296a674b8f115129520a845d9f50d77d2c086d7' 'f02b92aef58fcad8233a5041dfde7dacefa55efeb8266f58d1f6ba6ffc5301fc' + 'cedb7593a377eb9e40c72762e79b2af56415ec410309ae8ff698557fe3f953f5' '7d2ff25f97c84b59793502786dd64e25c8ca991b0523ffea56b45ce031e80c3f' '2001804c5245af1894a308d6521f9cd044fb6dbd713b6e2e45106399a409c14d' '0422317096007b72ab4928b48762da4252addf3e4f8066ba94e29344f5975ab8' @@ -118,7 +120,8 @@ prepare() { 0014-python-install-path.patch \ 0015-windres-cant-handle-spaces-in-defines.patch \ 0016-use-pkgconfig-and-link-pthread.patch \ - 0017-fix-highgui-qt-opengl-linking.patch + 0017-fix-highgui-qt-opengl-linking.patch \ + 0018-aarch64-fp16-mingw.patch cd "${srcdir}/${_realname}_contrib-${pkgver}" apply_patch_with_msg \