mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-26 20:56:33 +00:00
package/opencv: bump version to 2.4.13.3
Removed 0002-avoid-sysctl_h.patch, applied upstream:61936eb1a4 (diff-f3b4393df86251f502cee9ba1da034a5)
This bump includes70489b1e22 (diff-9076fba682f6d51a018b6de8648e1cdb)
which fixes ffmpeg static linking http://autobuild.buildroot.net/results/544/5444b0c5556a42923e3fcdae782811a805e51b1f/ http://autobuild.buildroot.net/results/44d/44d53e4c5d4570507c7e8856fb9dd0a477dcdf63/ In-source-builds are not allowed anymore:777a0080cb
Re-numbered remaining patches. Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
parent
82cab1a999
commit
9015b17ff3
@ -1,61 +0,0 @@
|
|||||||
From e5e71c31d54562f9c67a8226f0bfc08ad24b81cf Mon Sep 17 00:00:00 2001
|
|
||||||
From: Waldemar Brodkorb <wbx@openadk.org>
|
|
||||||
Date: Tue, 1 Nov 2016 09:30:23 +0100
|
|
||||||
Subject: [PATCH 2/4] From upstream master branch:
|
|
||||||
https://github.com/Itseez/opencv/blob/master/modules/core/src/
|
|
||||||
|
|
||||||
Do not include sysctl.h targeting Linux systems.
|
|
||||||
|
|
||||||
Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
|
|
||||||
[Samuel Martin: convert patch to git diff, add cap_ffmpeg_impl.hpp fix]
|
|
||||||
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
|
|
||||||
---
|
|
||||||
modules/core/src/parallel.cpp | 2 +-
|
|
||||||
modules/core/src/system.cpp | 2 +-
|
|
||||||
modules/highgui/src/cap_ffmpeg_impl.hpp | 2 +-
|
|
||||||
3 files changed, 3 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/modules/core/src/parallel.cpp b/modules/core/src/parallel.cpp
|
|
||||||
index 4459a24..0374876 100644
|
|
||||||
--- a/modules/core/src/parallel.cpp
|
|
||||||
+++ b/modules/core/src/parallel.cpp
|
|
||||||
@@ -56,7 +56,7 @@
|
|
||||||
#include <sys/types.h>
|
|
||||||
#if defined ANDROID
|
|
||||||
#include <sys/sysconf.h>
|
|
||||||
- #else
|
|
||||||
+ #elif defined __APPLE__
|
|
||||||
#include <sys/sysctl.h>
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
diff --git a/modules/core/src/system.cpp b/modules/core/src/system.cpp
|
|
||||||
index 9a7b262..731f090 100644
|
|
||||||
--- a/modules/core/src/system.cpp
|
|
||||||
+++ b/modules/core/src/system.cpp
|
|
||||||
@@ -163,7 +163,7 @@ std::wstring GetTempFileNameWinRT(std::wstring prefix)
|
|
||||||
#include <sys/types.h>
|
|
||||||
#if defined ANDROID
|
|
||||||
#include <sys/sysconf.h>
|
|
||||||
-#else
|
|
||||||
+#elif defined __APPLE__
|
|
||||||
#include <sys/sysctl.h>
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
diff --git a/modules/highgui/src/cap_ffmpeg_impl.hpp b/modules/highgui/src/cap_ffmpeg_impl.hpp
|
|
||||||
index dc3e10d..23674ff 100644
|
|
||||||
--- a/modules/highgui/src/cap_ffmpeg_impl.hpp
|
|
||||||
+++ b/modules/highgui/src/cap_ffmpeg_impl.hpp
|
|
||||||
@@ -126,9 +126,9 @@ extern "C" {
|
|
||||||
#include <unistd.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <sys/types.h>
|
|
||||||
- #include <sys/sysctl.h>
|
|
||||||
#include <sys/time.h>
|
|
||||||
#if defined __APPLE__
|
|
||||||
+ #include <sys/sysctl.h>
|
|
||||||
#include <mach/clock.h>
|
|
||||||
#include <mach/mach.h>
|
|
||||||
#endif
|
|
||||||
--
|
|
||||||
2.10.2
|
|
||||||
|
|
@ -1,2 +1,2 @@
|
|||||||
# Locally calculated
|
# Locally calculated
|
||||||
sha256 4b00c110e6c54943cbbb7cf0d35c5bc148133ab2095ee4aaa0ac0a4f67c58080 opencv-2.4.13.2.tar.gz
|
sha256 fb4769d0119c35426c3754b7fb079b407911e863958db53bdec83c7794582e41 opencv-2.4.13.3.tar.gz
|
||||||
|
@ -4,11 +4,12 @@
|
|||||||
#
|
#
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
OPENCV_VERSION = 2.4.13.2
|
OPENCV_VERSION = 2.4.13.3
|
||||||
OPENCV_SITE = $(call github,itseez,opencv,$(OPENCV_VERSION))
|
OPENCV_SITE = $(call github,itseez,opencv,$(OPENCV_VERSION))
|
||||||
OPENCV_INSTALL_STAGING = YES
|
OPENCV_INSTALL_STAGING = YES
|
||||||
OPENCV_LICENSE = BSD-3-Clause
|
OPENCV_LICENSE = BSD-3-Clause
|
||||||
OPENCV_LICENSE_FILES = LICENSE
|
OPENCV_LICENSE_FILES = LICENSE
|
||||||
|
OPENCV_SUPPORTS_IN_SOURCE_BUILD = NO
|
||||||
|
|
||||||
# OpenCV component options
|
# OpenCV component options
|
||||||
OPENCV_CONF_OPTS += \
|
OPENCV_CONF_OPTS += \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user