[gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/files/

["Miroslav Šulc" <fordfrog@gentoo.org>]

commit:     0b877136e3f52d5a7da9e05bf0d7258d97fc669b
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  5 11:11:17 2025 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Jan  5 11:11:17 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b877136

sci-libs/flann/files: scrubbed patches

Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 sci-libs/flann/files/flann-1.9.1-boost-1.87.patch      |  4 ----
 ....1-build-oct-rather-than-mex-files-for-octave.patch |  6 ------
 sci-libs/flann/files/flann-1.9.1-cmake-3.11-1.patch    |  4 ++--
 sci-libs/flann/files/flann-1.9.1-cmake-3.11.patch      | 11 -----------
 sci-libs/flann/files/flann-1.9.1-cuda-9.patch          |  6 ------
 sci-libs/flann/files/flann-1.9.1-system-lz4.patch      | 18 ------------------
 6 files changed, 2 insertions(+), 47 deletions(-)

diff --git a/sci-libs/flann/files/flann-1.9.1-boost-1.87.patch b/sci-libs/flann/files/flann-1.9.1-boost-1.87.patch
index e18604528684..a19b8a3f4183 100644
--- a/sci-libs/flann/files/flann-1.9.1-boost-1.87.patch
+++ b/sci-libs/flann/files/flann-1.9.1-boost-1.87.patch
@@ -1,5 +1,3 @@
-diff --git a/src/cpp/flann/mpi/client.h b/src/cpp/flann/mpi/client.h
-index 19a410c..b7df70e 100644
 --- a/src/cpp/flann/mpi/client.h
 +++ b/src/cpp/flann/mpi/client.h
 @@ -45,17 +45,16 @@ class Client
@@ -35,8 +33,6 @@ index 19a410c..b7df70e 100644
  };
  
  
-diff --git a/src/cpp/flann/mpi/server.h b/src/cpp/flann/mpi/server.h
-index 2caab43..a90538e 100644
 --- a/src/cpp/flann/mpi/server.h
 +++ b/src/cpp/flann/mpi/server.h
 @@ -119,18 +119,18 @@ public:

diff --git a/sci-libs/flann/files/flann-1.9.1-build-oct-rather-than-mex-files-for-octave.patch b/sci-libs/flann/files/flann-1.9.1-build-oct-rather-than-mex-files-for-octave.patch
index f29aef41977c..d0e9ea04bf09 100644
--- a/sci-libs/flann/files/flann-1.9.1-build-oct-rather-than-mex-files-for-octave.patch
+++ b/sci-libs/flann/files/flann-1.9.1-build-oct-rather-than-mex-files-for-octave.patch
@@ -9,12 +9,6 @@ Subject: [PATCH] build *.oct rather than *.mex files for octave
    LOCATION
 
 Signed-off-by: Alexander Golubev <fatzer2@gmail.com>
----
- src/matlab/CMakeLists.txt | 28 ++++++++++++++++++----------
- 1 file changed, 18 insertions(+), 10 deletions(-)
-
-diff --git a/src/matlab/CMakeLists.txt b/src/matlab/CMakeLists.txt
-index a89b6b8..ebacaea 100755
 --- a/src/matlab/CMakeLists.txt
 +++ b/src/matlab/CMakeLists.txt
 @@ -16,9 +16,6 @@ endif()

diff --git a/sci-libs/flann/files/flann-1.9.1-cmake-3.11-1.patch b/sci-libs/flann/files/flann-1.9.1-cmake-3.11-1.patch
index 4cf8f3a990fc..fccac407c1e6 100644
--- a/sci-libs/flann/files/flann-1.9.1-cmake-3.11-1.patch
+++ b/sci-libs/flann/files/flann-1.9.1-cmake-3.11-1.patch
@@ -1,5 +1,5 @@
---- a/src/cpp/CMakeLists.txt	2019-02-14 21:58:41.567625108 +0100
-+++ b/src/cpp/CMakeLists.txt	2019-02-14 21:59:04.017920926 +0100
+--- a/src/cpp/CMakeLists.txt
++++ b/src/cpp/CMakeLists.txt
 @@ -34,7 +34,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AN
      target_link_libraries(flann_cpp -Wl,-whole-archive flann_cpp_s -Wl,-no-whole-archive)
  

diff --git a/sci-libs/flann/files/flann-1.9.1-cmake-3.11.patch b/sci-libs/flann/files/flann-1.9.1-cmake-3.11.patch
index b37bedcf6d50..e199a511a48e 100644
--- a/sci-libs/flann/files/flann-1.9.1-cmake-3.11.patch
+++ b/sci-libs/flann/files/flann-1.9.1-cmake-3.11.patch
@@ -40,14 +40,6 @@ http://autobuild.buildroot.net/results/b2f/b2febfaf8c44ce477b3e4a5b9b976fd25e8d7
 [3] https://github.com/mariusmuja/flann/commit/0fd62b43be2fbb0b8d791ee36290791224dc030c
 
 Signed-off-by: Romain Naour <romain.naour@gmail.com>
----
- src/cpp/CMakeLists.txt | 4 ++--
- src/cpp/empty.cpp      | 1 +
- 2 files changed, 3 insertions(+), 2 deletions(-)
- create mode 100644 src/cpp/empty.cpp
-
-diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
-index b44a735..a816863 100644
 --- a/src/cpp/CMakeLists.txt
 +++ b/src/cpp/CMakeLists.txt
 @@ -29,7 +29,7 @@ if (BUILD_CUDA_LIB)
@@ -68,9 +60,6 @@ index b44a735..a816863 100644
          set_target_properties(flann PROPERTIES LINKER_LANGUAGE CXX)
          target_link_libraries(flann -Wl,-whole-archive flann_s -Wl,-no-whole-archive)
      else()
-diff --git a/src/cpp/empty.cpp b/src/cpp/empty.cpp
-new file mode 100644
-index 0000000..40a8c17
 --- /dev/null
 +++ b/src/cpp/empty.cpp
 @@ -0,0 +1 @@

diff --git a/sci-libs/flann/files/flann-1.9.1-cuda-9.patch b/sci-libs/flann/files/flann-1.9.1-cuda-9.patch
index 561c379af9ae..5f3483ea6756 100644
--- a/sci-libs/flann/files/flann-1.9.1-cuda-9.patch
+++ b/sci-libs/flann/files/flann-1.9.1-cuda-9.patch
@@ -4,12 +4,6 @@ Date: Fri, 4 May 2018 07:50:24 +0000
 Subject: [PATCH] fix compilation via gcc and cuda 9.1 add missing #include
  <thrust/gather> to kdtree_cuda_3d_index.cu
 
----
- src/cpp/flann/algorithms/kdtree_cuda_3d_index.cu | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/cpp/flann/algorithms/kdtree_cuda_3d_index.cu b/src/cpp/flann/algorithms/kdtree_cuda_3d_index.cu
-index e9b05080..8465322e 100644
 --- a/src/cpp/flann/algorithms/kdtree_cuda_3d_index.cu
 +++ b/src/cpp/flann/algorithms/kdtree_cuda_3d_index.cu
 @@ -32,6 +32,7 @@

diff --git a/sci-libs/flann/files/flann-1.9.1-system-lz4.patch b/sci-libs/flann/files/flann-1.9.1-system-lz4.patch
index dcc9fedd4a97..04ef15939284 100644
--- a/sci-libs/flann/files/flann-1.9.1-system-lz4.patch
+++ b/sci-libs/flann/files/flann-1.9.1-system-lz4.patch
@@ -3,16 +3,6 @@ Date: Sun, 14 Oct 2018 00:25:05 +0200
 Subject: Use system version of liblz4
 
 Also make sure that flann_cpp is linked against LZ4.
----
- CMakeLists.txt                     | 3 +++
- cmake/flann.pc.in                  | 2 +-
- examples/CMakeLists.txt            | 3 +++
- src/cpp/CMakeLists.txt             | 8 ++++++--
- src/cpp/flann/util/serialization.h | 4 ++--
- 5 files changed, 15 insertions(+), 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a01fb7a..995e54e 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -142,6 +142,9 @@ if (BUILD_CUDA_LIB)
@@ -25,8 +15,6 @@ index a01fb7a..995e54e 100644
  #set the C/C++ include path to the "include" directory
  include_directories(BEFORE ${PROJECT_SOURCE_DIR}/src/cpp)
  
-diff --git a/cmake/flann.pc.in b/cmake/flann.pc.in
-index 82eee5e..07b8d64 100644
 --- a/cmake/flann.pc.in
 +++ b/cmake/flann.pc.in
 @@ -8,6 +8,6 @@ Name: @PROJECT_NAME@
@@ -37,8 +25,6 @@ index 82eee5e..07b8d64 100644
 +Libs: -L${libdir} @LZ4_STATIC_LDFLAGS@ -lflann -lflann_cpp
  Cflags: -I${includedir}
  
-diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
-index e9fef04..2b2bb9d 100644
 --- a/examples/CMakeLists.txt
 +++ b/examples/CMakeLists.txt
 @@ -3,6 +3,7 @@ add_custom_target(examples ALL)
@@ -65,8 +51,6 @@ index e9fef04..2b2bb9d 100644
          target_link_libraries(flann_example_mpi flann_cpp ${HDF5_LIBRARIES} ${MPI_LIBRARIES} ${Boost_LIBRARIES})
  
          add_dependencies(examples flann_example_mpi)
-diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
-index b453b27..5c4f693 100644
 --- a/src/cpp/CMakeLists.txt
 +++ b/src/cpp/CMakeLists.txt
 @@ -4,11 +4,12 @@ add_definitions(-D_FLANN_VERSION=${FLANN_VERSION})
@@ -108,8 +92,6 @@ index b453b27..5c4f693 100644
  
          if(MINGW AND OPENMP_FOUND)
            target_link_libraries(flann gomp)
-diff --git a/src/cpp/flann/util/serialization.h b/src/cpp/flann/util/serialization.h
-index d731021..cdc2e5e 100644
 --- a/src/cpp/flann/util/serialization.h
 +++ b/src/cpp/flann/util/serialization.h
 @@ -6,8 +6,8 @@