[opencv] 01/11: Drop support_x32 patch: it actually did nothing useful

[Mattia Rizzolo]

This is an automated email from the git hooks/post-receive script.

mattia pushed a commit to branch master
in repository opencv.

commit 73c5597615fb40bfc9abb175f7c51a14dcb8de15
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Mon Oct 16 19:06:45 2017 +0200

    Drop support_x32 patch: it actually did nothing useful
    
    Signed-off-by: Mattia Rizzolo <mattia at debian.org>
---
 debian/patches/series      |  1 -
 debian/patches/support_x32 | 42 ------------------------------------------
 2 files changed, 43 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index d702194..1b1bf53 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 support_multiarch
 fix_ftbfs_on_non_linux
-support_x32
 disable_opengl_test_build
 mathjax
 change_jquery.js_path
diff --git a/debian/patches/support_x32 b/debian/patches/support_x32
deleted file mode 100644
index 366a0ca..0000000
--- a/debian/patches/support_x32
+++ /dev/null
@@ -1,42 +0,0 @@
-Description: Support x32 architecture
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -510,8 +510,11 @@
-   else()
-     set(HAVE_LIBPTHREAD YES)
-   endif()
-+
-+  CHECK_INCLUDE_FILE(sys/sysctl.h HAVE_SYS_SYSCTL_H)
- endif()
- 
-+
- include(cmake/OpenCVPCHSupport.cmake)
- include(cmake/OpenCVModule.cmake)
- 
---- a/modules/core/src/parallel.cpp
-+++ b/modules/core/src/parallel.cpp
-@@ -58,6 +58,10 @@
-         #include <sys/sysconf.h>
-     #elif defined __APPLE__ || !defined __GNU__
-         #include <sys/sysctl.h>
-+    #elif !defined __GNU__
-+      #ifdef HAVE_SYS_SYSCTL_H
-+         #include <sys/sysctl.h>
-+      #endif
-     #endif
- #endif
- 
---- a/modules/videoio/src/cap_ffmpeg_impl.hpp
-+++ b/modules/videoio/src/cap_ffmpeg_impl.hpp
-@@ -110,6 +110,10 @@ extern "C" {
-     #include <sys/sysctl.h>
-     #include <mach/clock.h>
-     #include <mach/mach.h>
-+#elif !defined __GNU__
-+    #ifdef HAVE_SYS_SYSCTL_H
-+        #include <sys/sysctl.h>
-+    #endif
- #endif
- #endif
- 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git