[opencv] 07/11: Patch refresh

[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 4bda91b3aa49cb3ef2c5eb30790282d1ec6cc2ba
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Mon Jul 18 16:03:49 2016 +0200

    Patch refresh
---
 debian/patches/optimize_i586.patch | 10 +++++-----
 debian/patches/support_multiarch   | 12 +++++++-----
 debian/patches/support_x32         | 22 ++++++++++++++--------
 3 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/debian/patches/optimize_i586.patch b/debian/patches/optimize_i586.patch
index c12759c..2e64587 100644
--- a/debian/patches/optimize_i586.patch
+++ b/debian/patches/optimize_i586.patch
@@ -7,11 +7,11 @@ Bug-Debian: https://bugs.debian.org/784647
 Origin: other, https://sources.debian.net/src/opencv/2.3.1-11%2Bdeb7u1/debian/patches/0011_optimize_i486.patch/
 Last-Update: 2016-01-07
 
-diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake
-index 6c235eb..5ddf867 100644
---- a/cmake/OpenCVCompilerOptions.cmake
-+++ b/cmake/OpenCVCompilerOptions.cmake
-@@ -107,7 +107,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+Index: opencv/cmake/OpenCVCompilerOptions.cmake
+===================================================================
+--- opencv.orig/cmake/OpenCVCompilerOptions.cmake
++++ opencv/cmake/OpenCVCompilerOptions.cmake
+@@ -119,7 +119,7 @@
    endif()
  
    if(X86 AND NOT MINGW64 AND NOT X86_64 AND NOT APPLE)
diff --git a/debian/patches/support_multiarch b/debian/patches/support_multiarch
index 87f017d..64aabfd 100644
--- a/debian/patches/support_multiarch
+++ b/debian/patches/support_multiarch
@@ -1,6 +1,8 @@
---- a/CMakeLists.txt	2015-06-04 02:21:34.000000000 +0900
-+++ b/CMakeLists.txt	2015-08-27 13:21:10.739071547 +0900
-@@ -370,7 +370,7 @@
+Index: opencv/CMakeLists.txt
+===================================================================
+--- opencv.orig/CMakeLists.txt
++++ opencv/CMakeLists.txt
+@@ -381,7 +381,7 @@
      set(OPENCV_JAR_INSTALL_PATH java)
      set(OPENCV_OTHER_INSTALL_PATH   etc)
    else()
@@ -9,7 +11,7 @@
      set(OPENCV_3P_LIB_INSTALL_PATH  share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH})
      set(OPENCV_SAMPLES_SRC_INSTALL_PATH    share/OpenCV/samples)
      set(OPENCV_JAR_INSTALL_PATH share/OpenCV/java)
-@@ -380,7 +380,7 @@
+@@ -391,7 +391,7 @@
  
    math(EXPR SIZEOF_VOID_P_BITS "8 * ${CMAKE_SIZEOF_VOID_P}")
    if(LIB_SUFFIX AND NOT SIZEOF_VOID_P_BITS EQUAL LIB_SUFFIX)
@@ -18,7 +20,7 @@
    else()
      set(OPENCV_CONFIG_INSTALL_PATH share/OpenCV)
    endif()
-@@ -483,6 +483,7 @@
+@@ -494,6 +494,7 @@
    find_package(PkgConfig QUIET)
    include(CheckFunctionExists)
    include(CheckIncludeFile)
diff --git a/debian/patches/support_x32 b/debian/patches/support_x32
index 5dd3dad..0b53255 100644
--- a/debian/patches/support_x32
+++ b/debian/patches/support_x32
@@ -1,6 +1,8 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -499,8 +499,11 @@
+Index: opencv/CMakeLists.txt
+===================================================================
+--- opencv.orig/CMakeLists.txt
++++ opencv/CMakeLists.txt
+@@ -510,8 +510,11 @@
    else()
      set(HAVE_LIBPTHREAD YES)
    endif()
@@ -12,8 +14,10 @@
  include(cmake/OpenCVPCHSupport.cmake)
  include(cmake/OpenCVModule.cmake)
  
---- a/modules/core/src/parallel.cpp
-+++ b/modules/core/src/parallel.cpp
+Index: opencv/modules/core/src/parallel.cpp
+===================================================================
+--- opencv.orig/modules/core/src/parallel.cpp
++++ opencv/modules/core/src/parallel.cpp
 @@ -58,6 +58,10 @@
          #include <sys/sysconf.h>
      #elif defined __APPLE__
@@ -25,9 +29,11 @@
      #endif
  #endif
  
---- a/modules/videoio/src/cap_ffmpeg_impl.hpp
-+++ b/modules/videoio/src/cap_ffmpeg_impl.hpp
-@@ -141,6 +141,10 @@
+Index: opencv/modules/videoio/src/cap_ffmpeg_impl.hpp
+===================================================================
+--- opencv.orig/modules/videoio/src/cap_ffmpeg_impl.hpp
++++ opencv/modules/videoio/src/cap_ffmpeg_impl.hpp
+@@ -135,6 +135,10 @@
      #include <sys/types.h>
  #if defined __APPLE__
      #include <sys/sysctl.h>

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