[opencv] 08/17: Update patches/support_x32

[Nobuhiro Iwamatsu]

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

iwamatsu pushed a commit to branch master
in repository opencv.

commit 3a44e81e92ed4aa5837acd2a9d4eac6e4492a9c2
Author: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
Date:   Tue Aug 29 12:41:59 2017 +0900

    Update patches/support_x32
    
    Signed-off-by: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
---
 debian/patches/support_x32 | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/debian/patches/support_x32 b/debian/patches/support_x32
index 366a0ca..cf092c6 100644
--- a/debian/patches/support_x32
+++ b/debian/patches/support_x32
@@ -1,22 +1,33 @@
-Description: Support x32 architecture
+From 82584c7cd285c133d8a8519e0fc73a94ffceefdd Mon Sep 17 00:00:00 2001
+From: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
+Date: Tue, 29 Aug 2017 12:27:57 +0900
+Subject: [PATCH 1/4] Add support x32
 
+Signed-off-by: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
+---
+ CMakeLists.txt                          | 2 ++
+ modules/core/src/parallel.cpp           | 4 ++++
+ modules/videoio/src/cap_ffmpeg_impl.hpp | 4 ++++
+ 3 files changed, 10 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f5a403079d..e5c65297e7 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -510,8 +510,11 @@
-   else()
-     set(HAVE_LIBPTHREAD YES)
+@@ -574,6 +574,8 @@ if(UNIX)
+   if(HAVE_MALLOC_H)
+     CHECK_SYMBOL_EXISTS(memalign malloc.h HAVE_MEMALIGN)
    endif()
 +
 +  CHECK_INCLUDE_FILE(sys/sysctl.h HAVE_SYS_SYSCTL_H)
  endif()
  
-+
  include(cmake/OpenCVPCHSupport.cmake)
- include(cmake/OpenCVModule.cmake)
- 
+diff --git a/modules/core/src/parallel.cpp b/modules/core/src/parallel.cpp
+index 0edef5b30e..928418d18e 100644
 --- a/modules/core/src/parallel.cpp
 +++ b/modules/core/src/parallel.cpp
-@@ -58,6 +58,10 @@
+@@ -60,6 +60,10 @@
          #include <sys/sysconf.h>
      #elif defined __APPLE__ || !defined __GNU__
          #include <sys/sysctl.h>
@@ -27,6 +38,8 @@ Description: Support x32 architecture
      #endif
  #endif
  
+diff --git a/modules/videoio/src/cap_ffmpeg_impl.hpp b/modules/videoio/src/cap_ffmpeg_impl.hpp
+index 5a9b10f075..c5c57ae223 100644
 --- a/modules/videoio/src/cap_ffmpeg_impl.hpp
 +++ b/modules/videoio/src/cap_ffmpeg_impl.hpp
 @@ -110,6 +110,10 @@ extern "C" {
@@ -40,3 +53,6 @@ Description: Support x32 architecture
  #endif
  #endif
  
+-- 
+2.14.1
+

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