[neon/backports-noble/opencv-noble/Neon/unstable] debian/patches: refresh patches
Carlos De Maine
null at kde.org
Tue Apr 15 07:51:02 BST 2025
Git commit 7ffdc3b84b74db8f4c36879915deb704a3c2634d by Carlos De Maine.
Committed on 15/04/2025 at 06:50.
Pushed by carlosdem into branch 'Neon/unstable'.
refresh patches
M +2 -4 debian/patches/0006-Fix-LAPACK-finding-CMake-code.patch
M +8 -16 debian/patches/0008-Do-not-embed-build-directory-in-binaries.patch
M +4 -8 debian/patches/0009-Do-not-embed-build-directory-in-documentation.patch
M +2 -4 debian/patches/cmake-dont-install-inexistent-files.patch
M +2 -4 debian/patches/cmake-no-download.patch
https://invent.kde.org/neon/backports-noble/opencv-noble/-/commit/7ffdc3b84b74db8f4c36879915deb704a3c2634d
diff --git a/debian/patches/0006-Fix-LAPACK-finding-CMake-code.patch b/debian/patches/0006-Fix-LAPACK-finding-CMake-code.patch
index adb2141c5..72d817cc4 100644
--- a/debian/patches/0006-Fix-LAPACK-finding-CMake-code.patch
+++ b/debian/patches/0006-Fix-LAPACK-finding-CMake-code.patch
@@ -10,10 +10,8 @@ check_include_file function to do the check so it succeeds.
cmake/OpenCVFindLAPACK.cmake | 19 ++++---------------
1 file changed, 4 insertions(+), 15 deletions(-)
-Index: opencv/cmake/OpenCVFindLAPACK.cmake
-===================================================================
---- opencv.orig/cmake/OpenCVFindLAPACK.cmake 2024-12-11 01:59:53.067051076 +0000
-+++ opencv/cmake/OpenCVFindLAPACK.cmake 2024-12-11 01:59:53.063051188 +0000
+--- a/cmake/OpenCVFindLAPACK.cmake
++++ b/cmake/OpenCVFindLAPACK.cmake
@@ -24,22 +24,11 @@
macro(_find_header_file_in_dirs VAR NAME)
unset(${VAR})
diff --git a/debian/patches/0008-Do-not-embed-build-directory-in-binaries.patch b/debian/patches/0008-Do-not-embed-build-directory-in-binaries.patch
index 5ed0f8f2c..69c748be0 100644
--- a/debian/patches/0008-Do-not-embed-build-directory-in-binaries.patch
+++ b/debian/patches/0008-Do-not-embed-build-directory-in-binaries.patch
@@ -10,10 +10,8 @@ This makes the opencv core module build reproducibly.
modules/core/src/utils/datafile.cpp | 48 +--------------------------
4 files changed, 5 insertions(+), 61 deletions(-)
-Index: opencv/modules/core/CMakeLists.txt
-===================================================================
---- opencv.orig/modules/core/CMakeLists.txt 2024-12-11 01:59:53.187047726 +0000
-+++ opencv/modules/core/CMakeLists.txt 2024-12-11 01:59:53.183047838 +0000
+--- a/modules/core/CMakeLists.txt
++++ b/modules/core/CMakeLists.txt
@@ -215,16 +215,6 @@
")
endif()
@@ -31,10 +29,8 @@ Index: opencv/modules/core/CMakeLists.txt
if(WIN32)
file(RELATIVE_PATH INSTALL_DATA_DIR_RELATIVE "${CMAKE_INSTALL_PREFIX}/${OPENCV_BIN_INSTALL_PATH}" "${CMAKE_INSTALL_PREFIX}/${OPENCV_OTHER_INSTALL_PATH}")
else()
-Index: opencv/modules/core/include/opencv2/core/private.hpp
-===================================================================
---- opencv.orig/modules/core/include/opencv2/core/private.hpp 2024-12-11 01:59:53.187047726 +0000
-+++ opencv/modules/core/include/opencv2/core/private.hpp 2024-12-11 01:59:53.183047838 +0000
+--- a/modules/core/include/opencv2/core/private.hpp
++++ b/modules/core/include/opencv2/core/private.hpp
@@ -825,10 +825,10 @@
2. Check path specified by configuration parameter with "_HINT" suffix (name of environment variable).
3. Check path specified by configuration parameter (name of environment variable).
@@ -48,10 +44,8 @@ Index: opencv/modules/core/include/opencv2/core/private.hpp
6. Scan `<install>/share/OpenCV` directory if install directory is detected.
@param relative_path Relative path to data file
-Index: opencv/modules/core/include/opencv2/core/utility.hpp
-===================================================================
---- opencv.orig/modules/core/include/opencv2/core/utility.hpp 2024-12-11 01:59:53.187047726 +0000
-+++ opencv/modules/core/include/opencv2/core/utility.hpp 2024-12-11 01:59:53.183047838 +0000
+--- a/modules/core/include/opencv2/core/utility.hpp
++++ b/modules/core/include/opencv2/core/utility.hpp
@@ -1165,10 +1165,10 @@
2. OPENCV_SAMPLES_DATA_PATH_HINT environment variable
3. OPENCV_SAMPLES_DATA_PATH environment variable
@@ -65,10 +59,8 @@ Index: opencv/modules/core/include/opencv2/core/utility.hpp
6. Scan `<install>/share/OpenCV` directory if install directory is detected.
@see cv::utils::findDataFile
-Index: opencv/modules/core/src/utils/datafile.cpp
-===================================================================
---- opencv.orig/modules/core/src/utils/datafile.cpp 2024-12-11 01:59:53.187047726 +0000
-+++ opencv/modules/core/src/utils/datafile.cpp 2024-12-11 01:59:53.183047838 +0000
+--- a/modules/core/src/utils/datafile.cpp
++++ b/modules/core/src/utils/datafile.cpp
@@ -280,32 +280,8 @@
diff --git a/debian/patches/0009-Do-not-embed-build-directory-in-documentation.patch b/debian/patches/0009-Do-not-embed-build-directory-in-documentation.patch
index bc77b3fba..83f571e96 100644
--- a/debian/patches/0009-Do-not-embed-build-directory-in-documentation.patch
+++ b/debian/patches/0009-Do-not-embed-build-directory-in-documentation.patch
@@ -8,10 +8,8 @@ This makes the documentation build reproducibly.
doc/Doxyfile.in | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
-Index: opencv/doc/CMakeLists.txt
-===================================================================
---- opencv.orig/doc/CMakeLists.txt 2024-12-11 01:59:53.335043595 +0000
-+++ opencv/doc/CMakeLists.txt 2024-12-11 01:59:53.335043595 +0000
+--- a/doc/CMakeLists.txt
++++ b/doc/CMakeLists.txt
@@ -36,6 +36,7 @@
# gathering headers
@@ -37,10 +35,8 @@ Index: opencv/doc/CMakeLists.txt
set(CMAKE_DOXYGEN_LAYOUT "${CMAKE_CURRENT_BINARY_DIR}/DoxygenLayout.xml")
set(CMAKE_DOXYGEN_OUTPUT_PATH "doxygen")
set(CMAKE_DOXYGEN_MAIN_REFERENCE "${refs_main}")
-Index: opencv/doc/Doxyfile.in
-===================================================================
---- opencv.orig/doc/Doxyfile.in 2024-12-11 01:59:53.335043595 +0000
-+++ opencv/doc/Doxyfile.in 2024-12-11 01:59:53.335043595 +0000
+--- a/doc/Doxyfile.in
++++ b/doc/Doxyfile.in
@@ -25,7 +25,7 @@
ALWAYS_DETAILED_SEC = NO
INLINE_INHERITED_MEMB = NO
diff --git a/debian/patches/cmake-dont-install-inexistent-files.patch b/debian/patches/cmake-dont-install-inexistent-files.patch
index beebc2061..17ac53264 100644
--- a/debian/patches/cmake-dont-install-inexistent-files.patch
+++ b/debian/patches/cmake-dont-install-inexistent-files.patch
@@ -1,7 +1,5 @@
-Index: opencv/cmake/OpenCVDetectOpenCL.cmake
-===================================================================
---- opencv.orig/cmake/OpenCVDetectOpenCL.cmake 2024-12-11 01:59:52.939054649 +0000
-+++ opencv/cmake/OpenCVDetectOpenCL.cmake 2024-12-11 01:59:52.935054761 +0000
+--- a/cmake/OpenCVDetectOpenCL.cmake
++++ b/cmake/OpenCVDetectOpenCL.cmake
@@ -5,7 +5,6 @@
else()
set(OPENCL_LIBRARY "" CACHE STRING "OpenCL library")
diff --git a/debian/patches/cmake-no-download.patch b/debian/patches/cmake-no-download.patch
index 73ef50a51..b0afdcb9a 100644
--- a/debian/patches/cmake-no-download.patch
+++ b/debian/patches/cmake-no-download.patch
@@ -1,7 +1,5 @@
-Index: opencv/cmake/OpenCVDownload.cmake
-===================================================================
---- opencv.orig/cmake/OpenCVDownload.cmake 2024-12-11 01:59:53.471039798 +0000
-+++ opencv/cmake/OpenCVDownload.cmake 2024-12-11 01:59:53.471039798 +0000
+--- a/cmake/OpenCVDownload.cmake
++++ b/cmake/OpenCVDownload.cmake
@@ -40,263 +40,11 @@
ocv_check_environment_variables(OPENCV_DOWNLOAD_MIRROR_ID)
More information about the Neon-commits
mailing list