[opencv] 01/11: Add x32 support, from unstable and use precompiled headers

[Gianfranco Costamagna]

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

locutusofborg pushed a commit to branch for-3.1.0
in repository opencv.

commit c1023de93371213ce1da0b3af7fad2e5828d1111
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Mon Jul 18 16:02:00 2016 +0200

    Add x32 support, from unstable and use precompiled headers
---
 debian/patches/series      |  1 +
 debian/patches/support_x32 | 40 ++++++++++++++++++++++++++++++++++++++++
 debian/rules               |  1 +
 3 files changed, 42 insertions(+)

diff --git a/debian/patches/series b/debian/patches/series
index 0a34a69..ce6714d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ support_multiarch
 #fix_path_of_opencl_headers
 #libav10.patch
 optimize_i586.patch
+support_x32
diff --git a/debian/patches/support_x32 b/debian/patches/support_x32
new file mode 100644
index 0000000..5dd3dad
--- /dev/null
+++ b/debian/patches/support_x32
@@ -0,0 +1,40 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -499,8 +499,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__
+         #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
+@@ -141,6 +141,10 @@
+     #include <sys/types.h>
+ #if defined __APPLE__
+     #include <sys/sysctl.h>
++#elif !defined __GNU__
++    #ifdef HAVE_SYS_SYSCTL_H
++        #include <sys/sysctl.h>
++    #endif
+ #endif
+ #endif
+ 
diff --git a/debian/rules b/debian/rules
index d77cab1..ca6a856 100755
--- a/debian/rules
+++ b/debian/rules
@@ -75,6 +75,7 @@ CMAKE_FLAGS = \
 	-DBUILD_TESTS=OFF \
 	-DCMAKE_SKIP_RPATH=ON \
 	-DWITH_CUDA=OFF \
+	-DENABLE_PRECOMPILED_HEADERS=OFF \
 	-DWITH_IPP=OFF \
 	-DOPENCL_INCLUDE_DIR:PATH="/usr/include/CL/" \
 	$(CMAKE_ARCH_FLAGS) 

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