Drop redundant patch: cuda11_gcc11.patch

3 files changed, 0 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 003f02302f82..25046a7fc8f5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -28,12 +28,10 @@ pkgbase = colmap-git
 	depends = flann
 	optdepends = libcudart.so: for cuda sfm/mvs acceleration
 	source = colmap-git::git+https://github.com/colmap/colmap.git#branch=main
-	source = cuda11_gcc11.patch
 	source = vocabulary-tree-32K.bin::https://demuc.de/colmap/vocab_tree_flickr100K_words32K.bin
 	source = vocabulary-tree-256K.bin::https://demuc.de/colmap/vocab_tree_flickr100K_words256K.bin
 	source = vocabulary-tree-1M.bin::https://demuc.de/colmap/vocab_tree_flickr100K_words1M.bin
 	sha256sums = SKIP
-	sha256sums = d98b4edeb142c7aaf056777955f8313458563439e15c4b659332189f5ea652aa
 	sha256sums = d37d8f19ee0a49705c4c0b06967a08cedfed5cf86519eada3271497256732bc2
 	sha256sums = d2055600452a531b5b0a62aa5943e1a07195273dc4eeebcf23d3a924d881d53a
 	sha256sums = fb60f7ba8081ee5c278f03c62329a374d1b24136b374a49393b453db1529a8c6
diff --git a/PKGBUILD b/PKGBUILD
index d14951bebf06..6a15f0a2044a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -25,13 +25,11 @@ if [ "$_BUILD_CUDA" == "ON" ] ; then
   optdepends+=('libcudart.so: for cuda sfm/mvs acceleration')
 fi
 source=("${pkgname}::git+https://github.com/colmap/colmap.git${_fragment}"
-        "cuda11_gcc11.patch"
         "vocabulary-tree-32K.bin::https://demuc.de/colmap/vocab_tree_flickr100K_words32K.bin"
         "vocabulary-tree-256K.bin::https://demuc.de/colmap/vocab_tree_flickr100K_words256K.bin"
         "vocabulary-tree-1M.bin::https://demuc.de/colmap/vocab_tree_flickr100K_words1M.bin"
         )
 sha256sums=('SKIP'
-            'd98b4edeb142c7aaf056777955f8313458563439e15c4b659332189f5ea652aa'
             'd37d8f19ee0a49705c4c0b06967a08cedfed5cf86519eada3271497256732bc2'
             'd2055600452a531b5b0a62aa5943e1a07195273dc4eeebcf23d3a924d881d53a'
             'fb60f7ba8081ee5c278f03c62329a374d1b24136b374a49393b453db1529a8c6')
diff --git a/cuda11_gcc11.patch b/cuda11_gcc11.patch
deleted file mode 100644
index 9820e62376b9..000000000000
--- a/cuda11_gcc11.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 3c60c055..bd76a7f7 100755
---- a/src/colmap/CMakeLists.txt
-+++ b/src/colmap/CMakeLists.txt
-@@ -43,7 +43,7 @@ elseif(IS_GNU OR IS_CLANG)
-        IS_GNU AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6)
-         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-     else()
--        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
-+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
-     endif()
- endif()
-