[opencv] 05/10: Refresh patches.
Mattia Rizzolo
mattia at debian.org
Mon Apr 3 20:46:13 UTC 2017
This is an automated email from the git hooks/post-receive script.
mattia pushed a commit to branch master
in repository opencv.
commit 843bc7e41034178d7c22b291d4563d05e0c6d838
Author: Mattia Rizzolo <mattia at debian.org>
Date: Mon Apr 3 22:01:46 2017 +0200
Refresh patches.
Signed-off-by: Mattia Rizzolo <mattia at debian.org>
---
debian/patches/change_jquery.js_path | 2 --
debian/patches/disable_opengl_test_build | 4 +---
debian/patches/fix_ftbfs_on_non_linux | 22 +++++++++-------------
debian/patches/mathjax | 4 +---
debian/patches/series | 2 +-
debian/patches/support_multiarch | 10 +++++-----
debian/patches/support_x32 | 6 +++---
7 files changed, 20 insertions(+), 30 deletions(-)
diff --git a/debian/patches/change_jquery.js_path b/debian/patches/change_jquery.js_path
index 13ec642..1208471 100644
--- a/debian/patches/change_jquery.js_path
+++ b/debian/patches/change_jquery.js_path
@@ -1,5 +1,3 @@
-diff --git a/doc/header.html b/doc/header.html
-index bbaf1d5..db083f4 100644
--- a/doc/header.html
+++ b/doc/header.html
@@ -9,7 +9,7 @@
diff --git a/debian/patches/disable_opengl_test_build b/debian/patches/disable_opengl_test_build
index cb54ffa..bf88e61 100644
--- a/debian/patches/disable_opengl_test_build
+++ b/debian/patches/disable_opengl_test_build
@@ -1,8 +1,6 @@
-diff --git a/samples/gpu/CMakeLists.txt b/samples/gpu/CMakeLists.txt
-index 6085cac..7d3622e 100644
--- a/samples/gpu/CMakeLists.txt
+++ b/samples/gpu/CMakeLists.txt
-@@ -96,9 +96,6 @@ endif()
+@@ -96,9 +96,6 @@
if(INSTALL_C_EXAMPLES AND NOT WIN32)
file(GLOB install_list *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
diff --git a/debian/patches/fix_ftbfs_on_non_linux b/debian/patches/fix_ftbfs_on_non_linux
index 9a0928b..9a4933e 100644
--- a/debian/patches/fix_ftbfs_on_non_linux
+++ b/debian/patches/fix_ftbfs_on_non_linux
@@ -3,8 +3,6 @@ Forwarded: not yet
Author: Pino Toscano <pino at debian.org>
Last-Update: 2015-04-27
-diff --git a/modules/core/src/parallel.cpp b/modules/core/src/parallel.cpp
-index 4459a24..d57c540 100644
--- a/modules/core/src/parallel.cpp
+++ b/modules/core/src/parallel.cpp
@@ -50,13 +50,13 @@
@@ -12,18 +10,18 @@ index 4459a24..d57c540 100644
#endif
-#if defined __linux__ || defined __APPLE__
-+#if defined __linux__ || defined __APPLE__ || defined __GLIBC__
++#if defined __linux__ || defined __APPLE__ || defined __GLIBC__
#include <unistd.h>
#include <stdio.h>
#include <sys/types.h>
#if defined ANDROID
#include <sys/sysconf.h>
-- #else
-+ #elif !defined __GNU__
+- #elif defined __APPLE__
++ #elif defined __APPLE__ || !defined __GNU__
#include <sys/sysctl.h>
#endif
#endif
-@@ -463,7 +463,7 @@ int cv::getNumberOfCPUs(void)
+@@ -514,7 +514,7 @@
#elif defined ANDROID
static int ncpus = getNumberOfCPUsImpl();
return ncpus;
@@ -32,23 +30,21 @@ index 4459a24..d57c540 100644
return (int)sysconf( _SC_NPROCESSORS_ONLN );
#elif defined __APPLE__
int numCPU=0;
-diff --git a/modules/core/src/system.cpp b/modules/core/src/system.cpp
-index 53ebd00..f845bc3 100644
--- a/modules/core/src/system.cpp
+++ b/modules/core/src/system.cpp
-@@ -157,13 +157,13 @@ std::wstring GetTempFileNameWinRT(std::wstring prefix)
+@@ -198,12 +198,14 @@
#include <stdarg.h>
--#if defined __linux__ || defined __APPLE__ || defined __EMSCRIPTEN__ || defined __QNX__
-+#if defined __linux__ || defined __APPLE__ || defined __EMSCRIPTEN__ || defined __QNX__ || defined __GLIBC__
+-#if defined __linux__ || defined __APPLE__ || defined __EMSCRIPTEN__
++#if defined __linux__ || defined __APPLE__ || defined __EMSCRIPTEN__ || defined __GLIBC__
#include <unistd.h>
#include <stdio.h>
#include <sys/types.h>
#if defined ANDROID
#include <sys/sysconf.h>
--#else
+#elif !defined __GNU__
- #include <sys/sysctl.h>
++#include <sys/sysctl.h>
#endif
#endif
+
diff --git a/debian/patches/mathjax b/debian/patches/mathjax
index a6ddcec..2067309 100644
--- a/debian/patches/mathjax
+++ b/debian/patches/mathjax
@@ -1,8 +1,6 @@
-diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
-index c4da726..47733cd 100644
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
-@@ -167,7 +167,7 @@ FORMULA_FONTSIZE = 14
+@@ -167,7 +167,7 @@
FORMULA_TRANSPARENT = YES
USE_MATHJAX = YES
MATHJAX_FORMAT = HTML-CSS
diff --git a/debian/patches/series b/debian/patches/series
index 2162c9a..8a4f9df 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
support_multiarch
-#fix_ftbfs_on_non_linux
+fix_ftbfs_on_non_linux
support_x32
disable_opengl_test_build
mathjax
diff --git a/debian/patches/support_multiarch b/debian/patches/support_multiarch
index 87f017d..33aa33c 100644
--- a/debian/patches/support_multiarch
+++ b/debian/patches/support_multiarch
@@ -1,6 +1,6 @@
---- 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 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -381,7 +381,7 @@
set(OPENCV_JAR_INSTALL_PATH java)
set(OPENCV_OTHER_INSTALL_PATH etc)
else()
@@ -9,7 +9,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 +18,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..3057d38 100644
--- a/debian/patches/support_x32
+++ b/debian/patches/support_x32
@@ -1,6 +1,6 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -499,8 +499,11 @@
+@@ -510,8 +510,11 @@
else()
set(HAVE_LIBPTHREAD YES)
endif()
@@ -16,7 +16,7 @@
+++ b/modules/core/src/parallel.cpp
@@ -58,6 +58,10 @@
#include <sys/sysconf.h>
- #elif defined __APPLE__
+ #elif defined __APPLE__ || !defined __GNU__
#include <sys/sysctl.h>
+ #elif !defined __GNU__
+ #ifdef HAVE_SYS_SYSCTL_H
@@ -27,7 +27,7 @@
--- a/modules/videoio/src/cap_ffmpeg_impl.hpp
+++ b/modules/videoio/src/cap_ffmpeg_impl.hpp
-@@ -141,6 +141,10 @@
+@@ -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
More information about the debian-science-commits
mailing list