diff options
| author | Bernd Kuhls <bernd.kuhls@t-online.de> | 2017-09-17 19:23:22 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2017-09-22 18:19:35 +0200 |
| commit | 9015b17ff3c9325d64d1558556241ed39088392c (patch) | |
| tree | 82efe7b1a8f6faa10e9fe16d0bb98b680f766196 /package/opencv/0002-avoid-sysctl_h.patch | |
| parent | 82cab1a9997a0f3d9e35c8c20ec65cdd5a6f8e74 (diff) | |
| download | buildroot-9015b17ff3c9325d64d1558556241ed39088392c.tar.gz buildroot-9015b17ff3c9325d64d1558556241ed39088392c.zip | |
package/opencv: bump version to 2.4.13.3
Removed 0002-avoid-sysctl_h.patch, applied upstream:
https://github.com/opencv/opencv/commit/61936eb1a43e732e4bc1c75b63e6cab85c6f9e94#diff-f3b4393df86251f502cee9ba1da034a5
This bump includes
https://github.com/opencv/opencv/commit/70489b1e2232ead1701519e35d151670b74c3f70#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:
https://github.com/opencv/opencv/commit/777a0080cbdb98761853519b3f45136727a855c2
Re-numbered remaining patches.
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/opencv/0002-avoid-sysctl_h.patch')
| -rw-r--r-- | package/opencv/0002-avoid-sysctl_h.patch | 61 |
1 files changed, 0 insertions, 61 deletions
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 - |
