diff options
Diffstat (limited to 'package')
-rw-r--r-- | package/opencv/0002-CMakeLists.txt-Do-not-add-libdl-to-LINKER_LIBS-for-s.patch (renamed from package/opencv/0003-CMakeLists.txt-Do-not-add-libdl-to-LINKER_LIBS-for-s.patch) | 0 | ||||
-rw-r--r-- | package/opencv/0002-avoid-sysctl_h.patch | 61 | ||||
-rw-r--r-- | package/opencv/opencv.hash | 2 | ||||
-rw-r--r-- | package/opencv/opencv.mk | 3 |
4 files changed, 3 insertions, 63 deletions
diff --git a/package/opencv/0003-CMakeLists.txt-Do-not-add-libdl-to-LINKER_LIBS-for-s.patch b/package/opencv/0002-CMakeLists.txt-Do-not-add-libdl-to-LINKER_LIBS-for-s.patch index 6d63411b01..6d63411b01 100644 --- a/package/opencv/0003-CMakeLists.txt-Do-not-add-libdl-to-LINKER_LIBS-for-s.patch +++ b/package/opencv/0002-CMakeLists.txt-Do-not-add-libdl-to-LINKER_LIBS-for-s.patch diff --git a/package/opencv/0002-avoid-sysctl_h.patch b/package/opencv/0002-avoid-sysctl_h.patch deleted file mode 100644 index b63ba55ac1..0000000000 --- a/package/opencv/0002-avoid-sysctl_h.patch +++ /dev/null @@ -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 - diff --git a/package/opencv/opencv.hash b/package/opencv/opencv.hash index 2c1842bd56..85a3e0b8f4 100644 --- a/package/opencv/opencv.hash +++ b/package/opencv/opencv.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 4b00c110e6c54943cbbb7cf0d35c5bc148133ab2095ee4aaa0ac0a4f67c58080 opencv-2.4.13.2.tar.gz +sha256 fb4769d0119c35426c3754b7fb079b407911e863958db53bdec83c7794582e41 opencv-2.4.13.3.tar.gz diff --git a/package/opencv/opencv.mk b/package/opencv/opencv.mk index b5b1253f92..d170aec58f 100644 --- a/package/opencv/opencv.mk +++ b/package/opencv/opencv.mk @@ -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_INSTALL_STAGING = YES OPENCV_LICENSE = BSD-3-Clause OPENCV_LICENSE_FILES = LICENSE +OPENCV_SUPPORTS_IN_SOURCE_BUILD = NO # OpenCV component options OPENCV_CONF_OPTS += \ |