From 33ac096855f1513beab996efb7654db7925a4f4f Mon Sep 17 00:00:00 2001 From: Antonio Rojas Date: Thu, 5 Jan 2023 20:38:43 +0000 Subject: [PATCH] opencv 4.7 rebuild --- PKGBUILD | 6 +++--- iomanip.patch | 6 +++--- isnormal.patch | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index c0294207e4cb..eaa07e446721 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: bartus pkgname=('alice-vision' 'alice-vision-cuda') pkgver=2.4.0 -pkgrel=13 +pkgrel=14 pkgdesc="Photogrammetric Computer Vision Framework which provides a 3D Reconstruction and Camera Tracking algorithms" arch=('x86_64') url="https://alicevision.github.io/" @@ -25,8 +25,8 @@ sha256sums=('SKIP' 'SKIP' 'caf2bf06bd7c6a2387f01f312d94b649ef3e4363b18fcdf95986cd71a0d6c275' 'de9def936b143b6a95d8afc93e4673e8f8b0e434785b65c557353549efd95c1b' - '8403ad7fc41c86dc771f0b1c986d22831ed7c4fee8520f8aa96171f20387bc2d' - '29440da035b36e3b0e4b94645551ae1bb6041c31b337136894a158217946135f') + '3daa4788b181f2f92b31531c24c2ccff6d1546d7824addcd8058c415138346ea' + '91b2942041511044c6d486f3ed0f29ce9d498906be7a2230703a706ea6a92743') prepare() { cd AliceVision diff --git a/iomanip.patch b/iomanip.patch index 9f7157fa2974..371ff4c5499a 100644 --- a/iomanip.patch +++ b/iomanip.patch @@ -10,7 +10,7 @@ Subject: [PATCH] [all] iomanip include missing on vs2022 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/aliceVision/keyframe/KeyframeSelector.cpp b/src/aliceVision/keyframe/KeyframeSelector.cpp -index bfe2dccc66..2243ab5c3e 100644 +index bfe2dccc6..2243ab5c3 100644 --- a/src/aliceVision/keyframe/KeyframeSelector.cpp +++ b/src/aliceVision/keyframe/KeyframeSelector.cpp @@ -16,7 +16,7 @@ @@ -23,7 +23,7 @@ index bfe2dccc66..2243ab5c3e 100644 namespace aliceVision { diff --git a/src/software/pipeline/main_LdrToHdrMerge.cpp b/src/software/pipeline/main_LdrToHdrMerge.cpp -index b3dc72c3e5..da87d7e379 100644 +index b3dc72c3e..da87d7e37 100644 --- a/src/software/pipeline/main_LdrToHdrMerge.cpp +++ b/src/software/pipeline/main_LdrToHdrMerge.cpp @@ -24,6 +24,7 @@ @@ -35,7 +35,7 @@ index b3dc72c3e5..da87d7e379 100644 // These constants define the current software version. // They must be updated when the command line is changed. diff --git a/src/software/pipeline/main_featureExtraction.cpp b/src/software/pipeline/main_featureExtraction.cpp -index 70b49fbee8..5d59dfabb5 100644 +index 70b49fbee..5d59dfabb 100644 --- a/src/software/pipeline/main_featureExtraction.cpp +++ b/src/software/pipeline/main_featureExtraction.cpp @@ -34,6 +34,7 @@ diff --git a/isnormal.patch b/isnormal.patch index d0a2b9c3c9f3..917612b86814 100644 --- a/isnormal.patch +++ b/isnormal.patch @@ -10,7 +10,7 @@ global namespace. 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/aliceVision/fuseCut/DelaunayGraphCut.cpp b/src/aliceVision/fuseCut/DelaunayGraphCut.cpp -index 95e705fbfe..38b8f93054 100644 +index 95e705fbf..38b8f9305 100644 --- a/src/aliceVision/fuseCut/DelaunayGraphCut.cpp +++ b/src/aliceVision/fuseCut/DelaunayGraphCut.cpp @@ -29,6 +29,7 @@