[packages/opencv] - un-debianize no-sysctl patch
baggins
baggins at pld-linux.org
Mon Mar 9 13:41:25 CET 2015
commit a60ff91d297b4cc022e019691b0256bf208f4b54
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Mon Mar 9 13:41:08 2015 +0100
- un-debianize no-sysctl patch
no-sysctl.patch | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/no-sysctl.patch b/no-sysctl.patch
index dd37a32..8488f79 100644
--- a/no-sysctl.patch
+++ b/no-sysctl.patch
@@ -9,24 +9,22 @@ Author: Adam Borowski <kilobyte at angband.pl>
--- opencv-2.4.9.1+dfsg.orig/modules/core/src/parallel.cpp
+++ opencv-2.4.9.1+dfsg/modules/core/src/parallel.cpp
-@@ -56,8 +56,8 @@
+@@ -56,7 +56,7 @@
#include <sys/types.h>
#if defined ANDROID
#include <sys/sysconf.h>
-- #elif !defined __GNU__
-- #include <sys/sysctl.h>
-+ #elif defined __APPLE__
-+ #include <sys/sysctl.h>
+- #else
++ #elif defined __APPLE__
+ #include <sys/sysctl.h>
#endif
#endif
-
--- opencv-2.4.9.1+dfsg.orig/modules/core/src/system.cpp
+++ opencv-2.4.9.1+dfsg/modules/core/src/system.cpp
@@ -163,8 +163,6 @@ std::wstring GetTempFileNameWinRT(std::w
#include <sys/types.h>
#if defined ANDROID
#include <sys/sysconf.h>
--#elif !defined __GNU__
+-#else
-#include <sys/sysctl.h>
#endif
#endif
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/opencv.git/commitdiff/a60ff91d297b4cc022e019691b0256bf208f4b54
More information about the pld-cvs-commit
mailing list