summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbartus2021-07-01 12:04:37 +0200
committerbartus2021-07-01 12:07:47 +0200
commit878e2a8503f396e1fe8851d5e6c1d98060155f69 (patch)
treed1e2dd608f442b7e07efdf7b303ff49662a6eee8
parente47e9650764e763de091eafbc89c1ddfab70e231 (diff)
downloadaur-878e2a8503f396e1fe8851d5e6c1d98060155f69.tar.gz
Drop gcc92.patch
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD5
-rw-r--r--gcc92.patch12
3 files changed, 1 insertions, 20 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c8ec30827fdb..e82dbd457764 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -35,22 +35,18 @@ pkgbase = openmvg-git
source = git+https://github.com/openMVG-thirdparty/osi_clp.git
source = git+https://github.com/openMVG-thirdparty/cereal.git
source = findflann-v0.1.patch
- source = gcc92.patch
source = ld_ceres.patch::https://github.com/openMVG/openMVG/pull/1831.patch
sha256sums = SKIP
sha256sums = SKIP
sha256sums = SKIP
sha256sums = SKIP
sha256sums = 13b1f0195b5e97c17eec737e63f4da69c501bb4ced28c4c14517440009139043
- sha256sums = 212589acc8a657b1096d15da9a96518b91181d9f53a1c5a7735846e964629c8c
sha256sums = 06697257b4c5484bc48cf8683b3984e5d26035113e84f5eabb8fb15ce46b2577
b2sums = SKIP
b2sums = SKIP
b2sums = SKIP
b2sums = SKIP
b2sums = f70e6c4d3368d170d8c182511e1b2ee9aa76ff6495fee6f50fcfbcc432f2c330d4c84868a536df605e0c630b81d024ac0bdd48124d7ad1c4f8ff9114a1850854
- b2sums = be317b1259e869fdb2aa89406871956289e1c0b2cc1bebe999a4a6a8ea37e86cbead941640bc150a529bf955b019e7c4b00197bf2afe50bb48ab7622a9dfb386
b2sums = 27dcb7b842cb8bf775297bc5a7daf347c87509e146b0d1d2d142be90f5bd723a5aefb3412297aca5123b0712eae764b8bb742726f930d01e8378e25fdae8f8b4
pkgname = openmvg-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 023968f724e0..6df2fbdf4b11 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -19,7 +19,6 @@ source=("git+https://github.com/${_gitname}/${_gitname}.git${_fragment}"
'git+https://github.com/openMVG-thirdparty/osi_clp.git'
'git+https://github.com/openMVG-thirdparty/cereal.git'
'findflann-v0.1.patch'
- 'gcc92.patch'
'ld_ceres.patch::https://github.com/openMVG/openMVG/pull/1831.patch'
)
sha256sums=('SKIP'
@@ -27,14 +26,12 @@ sha256sums=('SKIP'
'SKIP'
'SKIP'
'13b1f0195b5e97c17eec737e63f4da69c501bb4ced28c4c14517440009139043'
- '212589acc8a657b1096d15da9a96518b91181d9f53a1c5a7735846e964629c8c'
'06697257b4c5484bc48cf8683b3984e5d26035113e84f5eabb8fb15ce46b2577')
b2sums=('SKIP'
'SKIP'
'SKIP'
'SKIP'
'f70e6c4d3368d170d8c182511e1b2ee9aa76ff6495fee6f50fcfbcc432f2c330d4c84868a536df605e0c630b81d024ac0bdd48124d7ad1c4f8ff9114a1850854'
- 'be317b1259e869fdb2aa89406871956289e1c0b2cc1bebe999a4a6a8ea37e86cbead941640bc150a529bf955b019e7c4b00197bf2afe50bb48ab7622a9dfb386'
'27dcb7b842cb8bf775297bc5a7daf347c87509e146b0d1d2d142be90f5bd723a5aefb3412297aca5123b0712eae764b8bb742726f930d01e8378e25fdae8f8b4')
pkgver() {
@@ -48,7 +45,7 @@ prepare() {
git config 'submodule.src/dependencies/osi_clp.url' "${srcdir}/osi_clp"
git config 'submodule.src/dependencies/cereal.url' "${srcdir}/cereal"
git submodule update --init --remote
- git apply ${srcdir}/{findflann-v0.1,gcc92,ld_ceres}.patch
+ git apply ${srcdir}/{findflann-v0.1,ld_ceres}.patch
}
build() {
diff --git a/gcc92.patch b/gcc92.patch
deleted file mode 100644
index 6bc64246fe33..000000000000
--- a/gcc92.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/software/VO/Monocular_VO.hpp b/src/software/VO/Monocular_VO.hpp
-index c68d91a6..53448883 100644
---- a/src/software/VO/Monocular_VO.hpp
-+++ b/src/software/VO/Monocular_VO.hpp
-@@ -20,6 +20,7 @@
- #include "openMVG/sfm/sfm_landmark.hpp"
-
- #include "software/VO/Abstract_Tracker.hpp"
-+#include <iostream>
-
- namespace openMVG {
- namespace VO {