From: Bernd Kuhls Date: Sun, 17 Sep 2017 17:23:22 +0000 (+0200) Subject: package/opencv: bump version to 2.4.13.3 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9015b17ff3c9325d64d1558556241ed39088392c;p=buildroot.git 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 Signed-off-by: Peter Korsgaard --- diff --git a/package/opencv/0002-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 new file mode 100644 index 0000000000..6d63411b01 --- /dev/null +++ b/package/opencv/0002-CMakeLists.txt-Do-not-add-libdl-to-LINKER_LIBS-for-s.patch @@ -0,0 +1,39 @@ +From 22e03ef8a9e3adcbc6b2f16c3cc98e4e14443eed Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sat, 24 Sep 2016 17:51:22 +0200 +Subject: [PATCH 1/1] CMakeLists.txt: Do not add libdl to LINKER_LIBS for + static builds + +Without this patch -ldl is present in opencv.pc which breaks OpenCV +detection by ffmpeg, detected by buildroot autobuilders: + +http://autobuild.buildroot.net/results/765/7657e01481995a4f0d725467e935a83928a59a04//ffmpeg-3.1.3/config.log + +/home/peko/autobuild/instance-1/output/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/4.9.4/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: cannot find -ldl + +Patch sent upstream: https://github.com/opencv/opencv/pull/7337 + +Signed-off-by: Bernd Kuhls +--- + CMakeLists.txt | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 007b80d..99b047d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -457,7 +457,10 @@ if(UNIX) + elseif(${CMAKE_SYSTEM_NAME} MATCHES "QNX") + set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} m) + else() +- set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} dl m pthread rt) ++ if(BUILD_SHARED_LIBS) ++ set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} dl) ++ endif() ++ set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} m pthread rt) + endif() + else() + set(HAVE_LIBPTHREAD YES) +-- +2.9.3 + 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 -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 -[Samuel Martin: convert patch to git diff, add cap_ffmpeg_impl.hpp fix] -Signed-off-by: Samuel Martin ---- - 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 - #if defined ANDROID - #include -- #else -+ #elif defined __APPLE__ - #include - #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 - #if defined ANDROID - #include --#else -+#elif defined __APPLE__ - #include - #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 - #include - #include -- #include - #include - #if defined __APPLE__ -+ #include - #include - #include - #endif --- -2.10.2 - diff --git a/package/opencv/0003-CMakeLists.txt-Do-not-add-libdl-to-LINKER_LIBS-for-s.patch b/package/opencv/0003-CMakeLists.txt-Do-not-add-libdl-to-LINKER_LIBS-for-s.patch deleted file mode 100644 index 6d63411b01..0000000000 --- a/package/opencv/0003-CMakeLists.txt-Do-not-add-libdl-to-LINKER_LIBS-for-s.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 22e03ef8a9e3adcbc6b2f16c3cc98e4e14443eed Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sat, 24 Sep 2016 17:51:22 +0200 -Subject: [PATCH 1/1] CMakeLists.txt: Do not add libdl to LINKER_LIBS for - static builds - -Without this patch -ldl is present in opencv.pc which breaks OpenCV -detection by ffmpeg, detected by buildroot autobuilders: - -http://autobuild.buildroot.net/results/765/7657e01481995a4f0d725467e935a83928a59a04//ffmpeg-3.1.3/config.log - -/home/peko/autobuild/instance-1/output/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/4.9.4/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: cannot find -ldl - -Patch sent upstream: https://github.com/opencv/opencv/pull/7337 - -Signed-off-by: Bernd Kuhls ---- - CMakeLists.txt | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 007b80d..99b047d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -457,7 +457,10 @@ if(UNIX) - elseif(${CMAKE_SYSTEM_NAME} MATCHES "QNX") - set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} m) - else() -- set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} dl m pthread rt) -+ if(BUILD_SHARED_LIBS) -+ set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} dl) -+ endif() -+ set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} m pthread rt) - endif() - else() - set(HAVE_LIBPTHREAD YES) --- -2.9.3 - 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 += \