summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2024-05-28 18:15:34 -0500
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2024-08-07 09:58:10 -0500
commit6afd0778a05bbf9c16caa964f7d63e6e611300af (patch)
treefa168bb3ac2408e6ae9d4dd61bc9f3f5eccd2324
parentaee1631ad9e70d0c4565e4e9fe0d24aebb6e1bf9 (diff)
downloadpackages-6afd0778a05bbf9c16caa964f7d63e6e611300af.tar.gz
packages-6afd0778a05bbf9c16caa964f7d63e6e611300af.tar.bz2
packages-6afd0778a05bbf9c16caa964f7d63e6e611300af.tar.xz
packages-6afd0778a05bbf9c16caa964f7d63e6e611300af.zip
user/opencv: Fix GCC 10+ compile issue
We have to patch after CMake because it's in the 3rdparty zip.
-rw-r--r--user/opencv/APKBUILD9
-rw-r--r--user/opencv/fix-headers.manual-patch12
2 files changed, 18 insertions, 3 deletions
diff --git a/user/opencv/APKBUILD b/user/opencv/APKBUILD
index 759f20e0b..9bd859b92 100644
--- a/user/opencv/APKBUILD
+++ b/user/opencv/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer:
pkgname=opencv
pkgver=4.6.0
-pkgrel=0
+pkgrel=1
pkgdesc="Computer vision and machine learning software library"
url="https://opencv.org"
arch="all"
@@ -17,6 +17,7 @@ subpackages="$pkgname-dev $pkgname-libs"
source="opencv-$pkgver.tar.gz::https://github.com/opencv/opencv/archive/$pkgver.tar.gz
ade-0.1.1f.zip::https://github.com/opencv/ade/archive/v0.1.1f.zip
cmake-license.patch
+ fix-headers.manual-patch
"
# secfixes:
@@ -24,13 +25,13 @@ source="opencv-$pkgver.tar.gz::https://github.com/opencv/opencv/archive/$pkgver.
# - CVE-2019-16249
prepare() {
- default_prepare
# purge 3rd party except carotene
for i in 3rdparty/*; do
case $i in
*/carotene*) continue;;
*/ittnotify) continue;; # Else FTBFS on x86_64
*/quirc) continue;;
+ */include) continue;;
esac
rm -rf "$i"
done
@@ -65,6 +66,7 @@ build() {
-DWITH_IPP=OFF \
$_sse \
-Bbuild
+ patch -Np1 < "$srcdir"/fix-headers.manual-patch
make -C build
}
@@ -74,4 +76,5 @@ package() {
sha512sums="93d7807794682990b6a1d1de1851986ae3c5d1afe6605f3f8cace03ba5e3390bee2568bc0f335af34d3fc974df64cbce0ce685261ec2abd693d259b97b15bc46 opencv-4.6.0.tar.gz
f2994d5e92a2ae05cee6e153943afe151ce734ced6e06dcdb02dee9fed9336a7f1ea69661d9e033f1412fbb5e2a44a6e641662c85be5ba0604d0446abeabe836 ade-0.1.1f.zip
-ffa6930086051c545a44d28b8e428de7faaeecf961cdee6eef007b2b01db7e5897c6f184b1059df9763c1bcd90f88b9ead710dc13b51a608f21d683f55f39bd6 cmake-license.patch"
+ffa6930086051c545a44d28b8e428de7faaeecf961cdee6eef007b2b01db7e5897c6f184b1059df9763c1bcd90f88b9ead710dc13b51a608f21d683f55f39bd6 cmake-license.patch
+c1ba6c7b66edc747a2bddd622787f75eb5edd9ef65a2da9a1bbf432fad97fdfe293f0b16631085006299e7e74468d601b942ecdc389997e9e64dee16c082648f fix-headers.manual-patch"
diff --git a/user/opencv/fix-headers.manual-patch b/user/opencv/fix-headers.manual-patch
new file mode 100644
index 000000000..9a3eb8542
--- /dev/null
+++ b/user/opencv/fix-headers.manual-patch
@@ -0,0 +1,12 @@
+Required header for GCC 13.
+
+--- opencv-4.6.0/build/3rdparty/ade/ade-0.1.1f/sources/ade/include/ade/typed_graph.hpp.old 2019-08-07 03:55:16.000000000 -0500
++++ opencv-4.6.0/build/3rdparty/ade/ade-0.1.1f/sources/ade/include/ade/typed_graph.hpp 2024-05-28 16:39:53.217246004 -0500
+@@ -11,6 +11,7 @@
+
+ #include <unordered_set>
+ #include <string>
++#include <cstdint>
+
+ #include <array>
+