| Message ID | 20220122214652.929263-4-alex@linutronix.de |
|---|---|
| State | New |
| Headers | show |
| Series | [1/4] minidlna: update 1.2.1 -> 1.3.0 | expand |
2022. 01. 22. 22:46 keltezéssel, Alexander Kanavin írta: > Drop backports. > > Disable ffmpeg, as opencv is not yet compatible with ffmpeg 5.0. Please backport the ffmpeg 5.0 support patch plus the supplemental memory leak fixes introduced by it from the upcoming opencv 4.6.0, then re-enable the ffmpeg packageconfig setting: https://github.com/opencv/opencv/pull/21754 https://github.com/opencv/opencv/pull/21819 > > Signed-off-by: Alexander Kanavin <alex@linutronix.de> > --- > ...gument-version-of-SetTotalBytesLimit.patch | 41 ----------------- > .../opencv/0001-sfm-link-with-Glog_LIBS.patch | 44 ------------------- > .../{opencv_4.5.2.bb => opencv_4.5.5.bb} | 6 +-- > 3 files changed, 2 insertions(+), 89 deletions(-) > delete mode 100644 meta-oe/recipes-support/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch > delete mode 100644 meta-oe/recipes-support/opencv/opencv/0001-sfm-link-with-Glog_LIBS.patch > rename meta-oe/recipes-support/opencv/{opencv_4.5.2.bb => opencv_4.5.5.bb} (97%) > > diff --git a/meta-oe/recipes-support/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch b/meta-oe/recipes-support/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch > deleted file mode 100644 > index 5d88d1a6a..000000000 > --- a/meta-oe/recipes-support/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch > +++ /dev/null > @@ -1,41 +0,0 @@ > -From 9cfa84313c5833d7295fcf57be93d5d2aaadfd88 Mon Sep 17 00:00:00 2001 > -From: Vincent Rabaud <vrabaud@google.com> > -Date: Sat, 10 Jul 2021 00:21:52 +0200 > -Subject: [PATCH] Use the one argument version of SetTotalBytesLimit. > - > -The two argument versions has been deprecated, cf > -https://developers.google.com/protocol-buffers/docs/reference/cpp/google.protobuf.io.coded_stream > - > -Upstream-Status: Backport [9cfa84313c5833d7295fcf57be93d5d2aaadfd88 - from master after 4.5.3 tag] > -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> > ---- > - modules/dnn/src/caffe/caffe_io.cpp | 5 +++++ > - 1 file changed, 5 insertions(+) > - > -diff --git a/modules/dnn/src/caffe/caffe_io.cpp b/modules/dnn/src/caffe/caffe_io.cpp > -index 2fc4d84f46..ebecf95eea 100644 > ---- a/modules/dnn/src/caffe/caffe_io.cpp > -+++ b/modules/dnn/src/caffe/caffe_io.cpp > -@@ -92,6 +92,7 @@ > - #ifdef HAVE_PROTOBUF > - #include <google/protobuf/io/coded_stream.h> > - #include <google/protobuf/io/zero_copy_stream_impl.h> > -+#include <google/protobuf/stubs/common.h> > - #include <google/protobuf/text_format.h> > - > - #include <opencv2/core.hpp> > -@@ -1111,7 +1112,11 @@ static const int kProtoReadBytesLimit = INT_MAX; // Max size of 2 GB minus 1 by > - > - bool ReadProtoFromBinary(ZeroCopyInputStream* input, Message *proto) { > - CodedInputStream coded_input(input); > -+#if GOOGLE_PROTOBUF_VERSION >= 3006000 > -+ coded_input.SetTotalBytesLimit(kProtoReadBytesLimit); > -+#else > - coded_input.SetTotalBytesLimit(kProtoReadBytesLimit, 536870912); > -+#endif > - > - return proto->ParseFromCodedStream(&coded_input); > - } > --- > -2.32.0 > - > diff --git a/meta-oe/recipes-support/opencv/opencv/0001-sfm-link-with-Glog_LIBS.patch b/meta-oe/recipes-support/opencv/opencv/0001-sfm-link-with-Glog_LIBS.patch > deleted file mode 100644 > index 7b2c4100a..000000000 > --- a/meta-oe/recipes-support/opencv/opencv/0001-sfm-link-with-Glog_LIBS.patch > +++ /dev/null > @@ -1,44 +0,0 @@ > -From ffe20fc4ec46c6b491eff29a38f90686d4d035f6 Mon Sep 17 00:00:00 2001 > -From: Martin Jansa <Martin.Jansa@gmail.com> > -Date: Mon, 12 Apr 2021 20:37:40 +0000 > -Subject: [PATCH] sfm: link with Glog_LIBS > - > -* in 4.5.0 there was explicit linkage with GLOG_LIBRARY, but since 4.5.1 with: > - https://github.com/opencv/opencv_contrib/commit/23ee62a19b7a3e50d6dbf295359d8b1aff2e03fd > - > - it's gone, probably because Glog_FOUND is already set from Ceres, > - but then GLOG_LIBRARIES is empty in LIBMV_LIGHT_LIBS and build with gold fails: > - > -FAILED: bin/example_tutorial_perspective_correction > -: && TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux/x86_64-oe-linux-g++ -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -ITOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/git/include -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot -O2 -pipe -g -feliminate-unused-debug-types -fmacro-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0=/usr/src/debug/opencv/4.5.2-r0 -fdebug-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0=/usr/src/debug/opencv/4.5.2-r0 -fdebug-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot= -fdebug-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot-native= -fvisibility-inlines-hidden -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -ITOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/git/include -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot -fsigned-char -W -Wall -Werror=return-type -Werror=non-virtual-dtor -Werror=address -Werror=sequence-point -Wformat -Werror=format-security -Wmissing-declarations -Wundef -Winit-self -Wpointer-arith -Wshadow -Wsign-promo -Wuninitialized -Wsuggest-override -Wno-delete-non-virtual-dtor -Wno-comment -Wimplicit-fallthrough=3 -Wno-strict-overflow -fdiagnostics-show-option -Wno-long-long -pthread -fomit-frame-pointer -ffunction-sections -fdata-sections -msse -msse2 -msse3 -mssse3 -DNDEBUG -DNDEBUG -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -ITOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/git/include -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot -O2 -pipe -g -feliminate-unused-debug-types -fmacro-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0=/usr/src/debug/opencv/4.5.2-r0 -fdebug-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0=/usr/src/debug/opencv/4.5.2-r0 -fdebug-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot= -fdebug-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot-native= -fvisibility-inlines-hidden -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -ITOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/git/include -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now -Wl,--gc-sections -Wl,--as-needed samples/cpp/CMakeFiles/example_tutorial_perspective_correction.dir/tutorial_code/features2D/Homography/perspective_correction.cpp.o -o bin/example_tutorial_perspective_correction -ldl -lm -lpthread -lrt lib/libopencv_gapi.so.4.5.2 lib/libopencv_stitching.so.4.5.2 lib/libopencv_ts.so.4.5.2 lib/libopencv_alphamat.so.4.5.2 lib/libopencv_aruco.so.4.5.2 lib/libopencv_bgsegm.so.4.5.2 lib/libopencv_bioinspired.so.4.5.2 lib/libopencv_ccalib.so.4.5.2 lib/libopencv_dnn_objdetect.so.4.5.2 lib/libopencv_dnn_superres.so.4.5.2 lib/libopencv_dpm.so.4.5.2 lib/libopencv_face.so.4.5.2 lib/libopencv_fuzzy.so.4.5.2 lib/libopencv_hfs.so.4.5.2 lib/libopencv_img_hash.so.4.5.2 lib/libopencv_intensity_transform.so.4.5.2 lib/libopencv_line_descriptor.so.4.5.2 lib/libopencv_mcc.so.4.5.2 lib/libopencv_quality.so.4.5.2 lib/libopencv_rapid.so.4.5.2 lib/libopencv_reg.so.4.5.2 lib/libopencv_rgbd.so.4.5.2 lib/libopencv_saliency.so.4.5.2 lib/libopencv_sfm.so.4.5.2 lib/libopencv_stereo.so.4.5.2 lib/libopencv_structured_light.so.4.5.2 lib/libopencv_superres.so.4.5.2 lib/libopencv_surface_matching.so.4.5.2 lib/libopencv_tracking.so.4.5.2 lib/libopencv_videostab.so.4.5.2 lib/libopencv_wechat_qrcode.so.4.5.2 lib/libopencv_xfeatures2d.so.4.5.2 lib/libopencv_xobjdetect.so.4.5.2 lib/libopencv_xphoto.so.4.5.2 lib/libopencv_shape.so.4.5.2 lib/libopencv_highgui.so.4.5.2 lib/libopencv_datasets.so.4.5.2 lib/libopencv_ml.so.4.5.2 lib/libopencv_plot.so.4.5.2 lib/libopencv_phase_unwrapping.so.4.5.2 lib/libopencv_optflow.so.4.5.2 lib/libopencv_ximgproc.so.4.5.2 lib/libopencv_videoio.so.4.5.2 lib/libopencv_video.so.4.5.2 lib/libopencv_dnn.so.4.5.2 lib/libopencv_imgcodecs.so.4.5.2 lib/libopencv_objdetect.so.4.5.2 lib/libopencv_calib3d.so.4.5.2 lib/libopencv_features2d.so.4.5.2 lib/libopencv_flann.so.4.5.2 lib/libopencv_photo.so.4.5.2 lib/libopencv_imgproc.so.4.5.2 lib/libopencv_core.so.4.5.2 -Wl,-rpath-link,TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/build/lib && : > -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::LogMessage::LogMessage(char const*, int)' > -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::LogMessage::stream()' > -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::LogMessage::~LogMessage()' > -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::kLogSiteUninitialized' > -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'fLI::FLAGS_v' > -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::InitVLOG3__(int**, int*, char const*, int)' > -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::LogMessageFatal::LogMessageFatal(char const*, int)' > -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::LogMessageFatal::~LogMessageFatal()' > -collect2: error: ld returned 1 exit status > - > - Add Glog_LIBS which is set to the same value as GLOG_LIBRARIES used to be. > - > -Upstream-Status: Submitted [https://github.com/opencv/opencv_contrib/pull/2923] > - > -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> > ---- > - modules/sfm/CMakeLists.txt | 1 + > - 1 file changed, 1 insertion(+) > - > -diff --git a/modules/sfm/CMakeLists.txt b/modules/sfm/CMakeLists.txt > -index 045a1fe6e..ee7cecdac 100644 > ---- a/modules/sfm/CMakeLists.txt > -+++ b/modules/sfm/CMakeLists.txt > -@@ -84,6 +84,7 @@ set(LIBMV_LIGHT_LIBS > - multiview > - numeric > - ${GLOG_LIBRARIES} > -+ ${Glog_LIBS} > - ${GFLAGS_LIBRARIES} > - ) > - > diff --git a/meta-oe/recipes-support/opencv/opencv_4.5.2.bb b/meta-oe/recipes-support/opencv/opencv_4.5.5.bb > similarity index 97% > rename from meta-oe/recipes-support/opencv/opencv_4.5.2.bb > rename to meta-oe/recipes-support/opencv/opencv_4.5.5.bb > index 2f2a505ed..ca50e80b0 100644 > --- a/meta-oe/recipes-support/opencv/opencv_4.5.2.bb > +++ b/meta-oe/recipes-support/opencv/opencv_4.5.5.bb > @@ -10,7 +10,7 @@ ARM_INSTRUCTION_SET:armv5 = "arm" > > DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" > > -SRCREV_opencv = "69357b1e88680658a07cffde7678a4d697469f03" > +SRCREV_opencv = "dad26339a975b49cfb6c7dbe4bd5276c9dcb36e2" > SRCREV_contrib = "f5d7f6712d4ff229ba4f45cf79dfd11c557d56fd" > SRCREV_ipp = "a56b6ac6f030c312b2dce17430eef13aed9af274" > SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" > @@ -51,8 +51,6 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv;branch=master;protocol > file://0001-Dont-use-isystem.patch \ > file://download.patch \ > file://0001-Make-ts-module-external.patch \ > - file://0001-sfm-link-with-Glog_LIBS.patch;patchdir=../contrib \ > - file://0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch \ > " > SRC_URI:append:riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=../contrib" > > @@ -105,7 +103,7 @@ EXTRA_OECMAKE:append:x86 = " -DX86=ON" > > PACKAGECONFIG ??= "gapi python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \ > ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \ > - ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libav", "", d)}" > + " > > # TBB does not build for powerpc so disable that package config > PACKAGECONFIG:remove:powerpc = "tbb" > > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#95011): https://lists.openembedded.org/g/openembedded-devel/message/95011 > Mute This Topic: https://lists.openembedded.org/mt/88614015/3617728 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [zboszor@pr.hu] > -=-=-=-=-=-=-=-=-=-=-=- >
Thanks for the heads up, I think the standard policy is to simply wait for 4.6.0. Alex On Thu, 19 May 2022 at 11:37, Böszörményi Zoltán <zboszor@pr.hu> wrote: > > 2022. 01. 22. 22:46 keltezéssel, Alexander Kanavin írta: > > Drop backports. > > > > Disable ffmpeg, as opencv is not yet compatible with ffmpeg 5.0. > > Please backport the ffmpeg 5.0 support patch plus > the supplemental memory leak fixes introduced by it > from the upcoming opencv 4.6.0, then re-enable the > ffmpeg packageconfig setting: > > https://github.com/opencv/opencv/pull/21754 > https://github.com/opencv/opencv/pull/21819 > > > > > Signed-off-by: Alexander Kanavin <alex@linutronix.de> > > --- > > ...gument-version-of-SetTotalBytesLimit.patch | 41 ----------------- > > .../opencv/0001-sfm-link-with-Glog_LIBS.patch | 44 ------------------- > > .../{opencv_4.5.2.bb => opencv_4.5.5.bb} | 6 +-- > > 3 files changed, 2 insertions(+), 89 deletions(-) > > delete mode 100644 meta-oe/recipes-support/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch > > delete mode 100644 meta-oe/recipes-support/opencv/opencv/0001-sfm-link-with-Glog_LIBS.patch > > rename meta-oe/recipes-support/opencv/{opencv_4.5.2.bb => opencv_4.5.5.bb} (97%) > > > > diff --git a/meta-oe/recipes-support/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch b/meta-oe/recipes-support/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch > > deleted file mode 100644 > > index 5d88d1a6a..000000000 > > --- a/meta-oe/recipes-support/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch > > +++ /dev/null > > @@ -1,41 +0,0 @@ > > -From 9cfa84313c5833d7295fcf57be93d5d2aaadfd88 Mon Sep 17 00:00:00 2001 > > -From: Vincent Rabaud <vrabaud@google.com> > > -Date: Sat, 10 Jul 2021 00:21:52 +0200 > > -Subject: [PATCH] Use the one argument version of SetTotalBytesLimit. > > - > > -The two argument versions has been deprecated, cf > > -https://developers.google.com/protocol-buffers/docs/reference/cpp/google.protobuf.io.coded_stream > > - > > -Upstream-Status: Backport [9cfa84313c5833d7295fcf57be93d5d2aaadfd88 - from master after 4.5.3 tag] > > -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> > > ---- > > - modules/dnn/src/caffe/caffe_io.cpp | 5 +++++ > > - 1 file changed, 5 insertions(+) > > - > > -diff --git a/modules/dnn/src/caffe/caffe_io.cpp b/modules/dnn/src/caffe/caffe_io.cpp > > -index 2fc4d84f46..ebecf95eea 100644 > > ---- a/modules/dnn/src/caffe/caffe_io.cpp > > -+++ b/modules/dnn/src/caffe/caffe_io.cpp > > -@@ -92,6 +92,7 @@ > > - #ifdef HAVE_PROTOBUF > > - #include <google/protobuf/io/coded_stream.h> > > - #include <google/protobuf/io/zero_copy_stream_impl.h> > > -+#include <google/protobuf/stubs/common.h> > > - #include <google/protobuf/text_format.h> > > - > > - #include <opencv2/core.hpp> > > -@@ -1111,7 +1112,11 @@ static const int kProtoReadBytesLimit = INT_MAX; // Max size of 2 GB minus 1 by > > - > > - bool ReadProtoFromBinary(ZeroCopyInputStream* input, Message *proto) { > > - CodedInputStream coded_input(input); > > -+#if GOOGLE_PROTOBUF_VERSION >= 3006000 > > -+ coded_input.SetTotalBytesLimit(kProtoReadBytesLimit); > > -+#else > > - coded_input.SetTotalBytesLimit(kProtoReadBytesLimit, 536870912); > > -+#endif > > - > > - return proto->ParseFromCodedStream(&coded_input); > > - } > > --- > > -2.32.0 > > - > > diff --git a/meta-oe/recipes-support/opencv/opencv/0001-sfm-link-with-Glog_LIBS.patch b/meta-oe/recipes-support/opencv/opencv/0001-sfm-link-with-Glog_LIBS.patch > > deleted file mode 100644 > > index 7b2c4100a..000000000 > > --- a/meta-oe/recipes-support/opencv/opencv/0001-sfm-link-with-Glog_LIBS.patch > > +++ /dev/null > > @@ -1,44 +0,0 @@ > > -From ffe20fc4ec46c6b491eff29a38f90686d4d035f6 Mon Sep 17 00:00:00 2001 > > -From: Martin Jansa <Martin.Jansa@gmail.com> > > -Date: Mon, 12 Apr 2021 20:37:40 +0000 > > -Subject: [PATCH] sfm: link with Glog_LIBS > > - > > -* in 4.5.0 there was explicit linkage with GLOG_LIBRARY, but since 4.5.1 with: > > - https://github.com/opencv/opencv_contrib/commit/23ee62a19b7a3e50d6dbf295359d8b1aff2e03fd > > - > > - it's gone, probably because Glog_FOUND is already set from Ceres, > > - but then GLOG_LIBRARIES is empty in LIBMV_LIGHT_LIBS and build with gold fails: > > - > > -FAILED: bin/example_tutorial_perspective_correction > > -: && TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux/x86_64-oe-linux-g++ -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -ITOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/git/include -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot -O2 -pipe -g -feliminate-unused-debug-types -fmacro-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0=/usr/src/debug/opencv/4.5.2-r0 -fdebug-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0=/usr/src/debug/opencv/4.5.2-r0 -fdebug-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot= -fdebug-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot-native= -fvisibility-inlines-hidden -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -ITOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/git/include -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot -fsigned-char -W -Wall -Werror=return-type -Werror=non-virtual-dtor -Werror=address -Werror=sequence-point -Wformat -Werror=format-security -Wmissing-declarations -Wundef -Winit-self -Wpointer-arith -Wshadow -Wsign-promo -Wuninitialized -Wsuggest-override -Wno-delete-non-virtual-dtor -Wno-comment -Wimplicit-fallthrough=3 -Wno-strict-overflow -fdiagnostics-show-option -Wno-long-long -pthread -fomit-frame-pointer -ffunction-sections -fdata-sections -msse -msse2 -msse3 -mssse3 -DNDEBUG -DNDEBUG -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -ITOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/git/include -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot -O2 -pipe -g -feliminate-unused-debug-types -fmacro-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0=/usr/src/debug/opencv/4.5.2-r0 -fdebug-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0=/usr/src/debug/opencv/4.5.2-r0 -fdebug-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot= -fdebug-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot-native= -fvisibility-inlines-hidden -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -ITOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/git/include -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now -Wl,--gc-sections -Wl,--as-needed samples/cpp/CMakeFiles/example_tutorial_perspective_correction.dir/tutorial_code/features2D/Homography/perspective_correction.cpp.o -o bin/example_tutorial_perspective_correction -ldl -lm -lpthread -lrt lib/libopencv_gapi.so.4.5.2 lib/libopencv_stitching.so.4.5.2 lib/libopencv_ts.so.4.5.2 lib/libopencv_alphamat.so.4.5.2 lib/libopencv_aruco.so.4.5.2 lib/libopencv_bgsegm.so.4.5.2 lib/libopencv_bioinspired.so.4.5.2 lib/libopencv_ccalib.so.4.5.2 lib/libopencv_dnn_objdetect.so.4.5.2 lib/libopencv_dnn_superres.so.4.5.2 lib/libopencv_dpm.so.4.5.2 lib/libopencv_face.so.4.5.2 lib/libopencv_fuzzy.so.4.5.2 lib/libopencv_hfs.so.4.5.2 lib/libopencv_img_hash.so.4.5.2 lib/libopencv_intensity_transform.so.4.5.2 lib/libopencv_line_descriptor.so.4.5.2 lib/libopencv_mcc.so.4.5.2 lib/libopencv_quality.so.4.5.2 lib/libopencv_rapid.so.4.5.2 lib/libopencv_reg.so.4.5.2 lib/libopencv_rgbd.so.4.5.2 lib/libopencv_saliency.so.4.5.2 lib/libopencv_sfm.so.4.5.2 lib/libopencv_stereo.so.4.5.2 lib/libopencv_structured_light.so.4.5.2 lib/libopencv_superres.so.4.5.2 lib/libopencv_surface_matching.so.4.5.2 lib/libopencv_tracking.so.4.5.2 lib/libopencv_videostab.so.4.5.2 lib/libopencv_wechat_qrcode.so.4.5.2 lib/libopencv_xfeatures2d.so.4.5.2 lib/libopencv_xobjdetect.so.4.5.2 lib/libopencv_xphoto.so.4.5.2 lib/libopencv_shape.so.4.5.2 lib/libopencv_highgui.so.4.5.2 lib/libopencv_datasets.so.4.5.2 lib/libopencv_ml.so.4.5.2 lib/libopencv_plot.so.4.5.2 lib/libopencv_phase_unwrapping.so.4.5.2 lib/libopencv_optflow.so.4.5.2 lib/libopencv_ximgproc.so.4.5.2 lib/libopencv_videoio.so.4.5.2 lib/libopencv_video.so.4.5.2 lib/libopencv_dnn.so.4.5.2 lib/libopencv_imgcodecs.so.4.5.2 lib/libopencv_objdetect.so.4.5.2 lib/libopencv_calib3d.so.4.5.2 lib/libopencv_features2d.so.4.5.2 lib/libopencv_flann.so.4.5.2 lib/libopencv_photo.so.4.5.2 lib/libopencv_imgproc.so.4.5.2 lib/libopencv_core.so.4.5.2 -Wl,-rpath-link,TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/build/lib && : > > -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::LogMessage::LogMessage(char const*, int)' > > -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::LogMessage::stream()' > > -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::LogMessage::~LogMessage()' > > -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::kLogSiteUninitialized' > > -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'fLI::FLAGS_v' > > -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::InitVLOG3__(int**, int*, char const*, int)' > > -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::LogMessageFatal::LogMessageFatal(char const*, int)' > > -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::LogMessageFatal::~LogMessageFatal()' > > -collect2: error: ld returned 1 exit status > > - > > - Add Glog_LIBS which is set to the same value as GLOG_LIBRARIES used to be. > > - > > -Upstream-Status: Submitted [https://github.com/opencv/opencv_contrib/pull/2923] > > - > > -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> > > ---- > > - modules/sfm/CMakeLists.txt | 1 + > > - 1 file changed, 1 insertion(+) > > - > > -diff --git a/modules/sfm/CMakeLists.txt b/modules/sfm/CMakeLists.txt > > -index 045a1fe6e..ee7cecdac 100644 > > ---- a/modules/sfm/CMakeLists.txt > > -+++ b/modules/sfm/CMakeLists.txt > > -@@ -84,6 +84,7 @@ set(LIBMV_LIGHT_LIBS > > - multiview > > - numeric > > - ${GLOG_LIBRARIES} > > -+ ${Glog_LIBS} > > - ${GFLAGS_LIBRARIES} > > - ) > > - > > diff --git a/meta-oe/recipes-support/opencv/opencv_4.5.2.bb b/meta-oe/recipes-support/opencv/opencv_4.5.5.bb > > similarity index 97% > > rename from meta-oe/recipes-support/opencv/opencv_4.5.2.bb > > rename to meta-oe/recipes-support/opencv/opencv_4.5.5.bb > > index 2f2a505ed..ca50e80b0 100644 > > --- a/meta-oe/recipes-support/opencv/opencv_4.5.2.bb > > +++ b/meta-oe/recipes-support/opencv/opencv_4.5.5.bb > > @@ -10,7 +10,7 @@ ARM_INSTRUCTION_SET:armv5 = "arm" > > > > DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" > > > > -SRCREV_opencv = "69357b1e88680658a07cffde7678a4d697469f03" > > +SRCREV_opencv = "dad26339a975b49cfb6c7dbe4bd5276c9dcb36e2" > > SRCREV_contrib = "f5d7f6712d4ff229ba4f45cf79dfd11c557d56fd" > > SRCREV_ipp = "a56b6ac6f030c312b2dce17430eef13aed9af274" > > SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" > > @@ -51,8 +51,6 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv;branch=master;protocol > > file://0001-Dont-use-isystem.patch \ > > file://download.patch \ > > file://0001-Make-ts-module-external.patch \ > > - file://0001-sfm-link-with-Glog_LIBS.patch;patchdir=../contrib \ > > - file://0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch \ > > " > > SRC_URI:append:riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=../contrib" > > > > @@ -105,7 +103,7 @@ EXTRA_OECMAKE:append:x86 = " -DX86=ON" > > > > PACKAGECONFIG ??= "gapi python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \ > > ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \ > > - ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libav", "", d)}" > > + " > > > > # TBB does not build for powerpc so disable that package config > > PACKAGECONFIG:remove:powerpc = "tbb" > > > > > > > > -=-=-=-=-=-=-=-=-=-=-=- > > Links: You receive all messages sent to this group. > > View/Reply Online (#95011): https://lists.openembedded.org/g/openembedded-devel/message/95011 > > Mute This Topic: https://lists.openembedded.org/mt/88614015/3617728 > > Group Owner: openembedded-devel+owner@lists.openembedded.org > > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [zboszor@pr.hu] > > -=-=-=-=-=-=-=-=-=-=-=- > > >
2022. 05. 19. 11:44 keltezéssel, Alexander Kanavin írta: > Thanks for the heads up, I think the standard policy is to simply wait > for 4.6.0. Then, since Kirkstone is LTS, I presume 4.6.0 will be in it, too. > > Alex > > On Thu, 19 May 2022 at 11:37, Böszörményi Zoltán <zboszor@pr.hu> wrote: >> >> 2022. 01. 22. 22:46 keltezéssel, Alexander Kanavin írta: >>> Drop backports. >>> >>> Disable ffmpeg, as opencv is not yet compatible with ffmpeg 5.0. >> >> Please backport the ffmpeg 5.0 support patch plus >> the supplemental memory leak fixes introduced by it >> from the upcoming opencv 4.6.0, then re-enable the >> ffmpeg packageconfig setting: >> >> https://github.com/opencv/opencv/pull/21754 >> https://github.com/opencv/opencv/pull/21819 >> >>> >>> Signed-off-by: Alexander Kanavin <alex@linutronix.de> >>> --- >>> ...gument-version-of-SetTotalBytesLimit.patch | 41 ----------------- >>> .../opencv/0001-sfm-link-with-Glog_LIBS.patch | 44 ------------------- >>> .../{opencv_4.5.2.bb => opencv_4.5.5.bb} | 6 +-- >>> 3 files changed, 2 insertions(+), 89 deletions(-) >>> delete mode 100644 meta-oe/recipes-support/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch >>> delete mode 100644 meta-oe/recipes-support/opencv/opencv/0001-sfm-link-with-Glog_LIBS.patch >>> rename meta-oe/recipes-support/opencv/{opencv_4.5.2.bb => opencv_4.5.5.bb} (97%) >>> >>> diff --git a/meta-oe/recipes-support/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch b/meta-oe/recipes-support/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch >>> deleted file mode 100644 >>> index 5d88d1a6a..000000000 >>> --- a/meta-oe/recipes-support/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch >>> +++ /dev/null >>> @@ -1,41 +0,0 @@ >>> -From 9cfa84313c5833d7295fcf57be93d5d2aaadfd88 Mon Sep 17 00:00:00 2001 >>> -From: Vincent Rabaud <vrabaud@google.com> >>> -Date: Sat, 10 Jul 2021 00:21:52 +0200 >>> -Subject: [PATCH] Use the one argument version of SetTotalBytesLimit. >>> - >>> -The two argument versions has been deprecated, cf >>> -https://developers.google.com/protocol-buffers/docs/reference/cpp/google.protobuf.io.coded_stream >>> - >>> -Upstream-Status: Backport [9cfa84313c5833d7295fcf57be93d5d2aaadfd88 - from master after 4.5.3 tag] >>> -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> >>> ---- >>> - modules/dnn/src/caffe/caffe_io.cpp | 5 +++++ >>> - 1 file changed, 5 insertions(+) >>> - >>> -diff --git a/modules/dnn/src/caffe/caffe_io.cpp b/modules/dnn/src/caffe/caffe_io.cpp >>> -index 2fc4d84f46..ebecf95eea 100644 >>> ---- a/modules/dnn/src/caffe/caffe_io.cpp >>> -+++ b/modules/dnn/src/caffe/caffe_io.cpp >>> -@@ -92,6 +92,7 @@ >>> - #ifdef HAVE_PROTOBUF >>> - #include <google/protobuf/io/coded_stream.h> >>> - #include <google/protobuf/io/zero_copy_stream_impl.h> >>> -+#include <google/protobuf/stubs/common.h> >>> - #include <google/protobuf/text_format.h> >>> - >>> - #include <opencv2/core.hpp> >>> -@@ -1111,7 +1112,11 @@ static const int kProtoReadBytesLimit = INT_MAX; // Max size of 2 GB minus 1 by >>> - >>> - bool ReadProtoFromBinary(ZeroCopyInputStream* input, Message *proto) { >>> - CodedInputStream coded_input(input); >>> -+#if GOOGLE_PROTOBUF_VERSION >= 3006000 >>> -+ coded_input.SetTotalBytesLimit(kProtoReadBytesLimit); >>> -+#else >>> - coded_input.SetTotalBytesLimit(kProtoReadBytesLimit, 536870912); >>> -+#endif >>> - >>> - return proto->ParseFromCodedStream(&coded_input); >>> - } >>> --- >>> -2.32.0 >>> - >>> diff --git a/meta-oe/recipes-support/opencv/opencv/0001-sfm-link-with-Glog_LIBS.patch b/meta-oe/recipes-support/opencv/opencv/0001-sfm-link-with-Glog_LIBS.patch >>> deleted file mode 100644 >>> index 7b2c4100a..000000000 >>> --- a/meta-oe/recipes-support/opencv/opencv/0001-sfm-link-with-Glog_LIBS.patch >>> +++ /dev/null >>> @@ -1,44 +0,0 @@ >>> -From ffe20fc4ec46c6b491eff29a38f90686d4d035f6 Mon Sep 17 00:00:00 2001 >>> -From: Martin Jansa <Martin.Jansa@gmail.com> >>> -Date: Mon, 12 Apr 2021 20:37:40 +0000 >>> -Subject: [PATCH] sfm: link with Glog_LIBS >>> - >>> -* in 4.5.0 there was explicit linkage with GLOG_LIBRARY, but since 4.5.1 with: >>> - https://github.com/opencv/opencv_contrib/commit/23ee62a19b7a3e50d6dbf295359d8b1aff2e03fd >>> - >>> - it's gone, probably because Glog_FOUND is already set from Ceres, >>> - but then GLOG_LIBRARIES is empty in LIBMV_LIGHT_LIBS and build with gold fails: >>> - >>> -FAILED: bin/example_tutorial_perspective_correction >>> -: && TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux/x86_64-oe-linux-g++ -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -ITOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/git/include -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot -O2 -pipe -g -feliminate-unused-debug-types -fmacro-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0=/usr/src/debug/opencv/4.5.2-r0 -fdebug-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0=/usr/src/debug/opencv/4.5.2-r0 -fdebug-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot= -fdebug-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot-native= -fvisibility-inlines-hidden -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -ITOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/git/include -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot -fsigned-char -W -Wall -Werror=return-type -Werror=non-virtual-dtor -Werror=address -Werror=sequence-point -Wformat -Werror=format-security -Wmissing-declarations -Wundef -Winit-self -Wpointer-arith -Wshadow -Wsign-promo -Wuninitialized -Wsuggest-override -Wno-delete-non-virtual-dtor -Wno-comment -Wimplicit-fallthrough=3 -Wno-strict-overflow -fdiagnostics-show-option -Wno-long-long -pthread -fomit-frame-pointer -ffunction-sections -fdata-sections -msse -msse2 -msse3 -mssse3 -DNDEBUG -DNDEBUG -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -ITOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/git/include -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot -O2 -pipe -g -feliminate-unused-debug-types -fmacro-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0=/usr/src/debug/opencv/4.5.2-r0 -fdebug-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0=/usr/src/debug/opencv/4.5.2-r0 -fdebug-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot= -fdebug-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot-native= -fvisibility-inlines-hidden -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -ITOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/git/include -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now -Wl,--gc-sections -Wl,--as-needed samples/cpp/CMakeFiles/example_tutorial_perspective_correction.dir/tutorial_code/features2D/Homography/perspective_correction.cpp.o -o bin/example_tutorial_perspective_correction -ldl -lm -lpthread -lrt lib/libopencv_gapi.so.4.5.2 lib/libopencv_stitching.so.4.5.2 lib/libopencv_ts.so.4.5.2 lib/libopencv_alphamat.so.4.5.2 lib/libopencv_aruco.so.4.5.2 lib/libopencv_bgsegm.so.4.5.2 lib/libopencv_bioinspired.so.4.5.2 lib/libopencv_ccalib.so.4.5.2 lib/libopencv_dnn_objdetect.so.4.5.2 lib/libopencv_dnn_superres.so.4.5.2 lib/libopencv_dpm.so.4.5.2 lib/libopencv_face.so.4.5.2 lib/libopencv_fuzzy.so.4.5.2 lib/libopencv_hfs.so.4.5.2 lib/libopencv_img_hash.so.4.5.2 lib/libopencv_intensity_transform.so.4.5.2 lib/libopencv_line_descriptor.so.4.5.2 lib/libopencv_mcc.so.4.5.2 lib/libopencv_quality.so.4.5.2 lib/libopencv_rapid.so.4.5.2 lib/libopencv_reg.so.4.5.2 lib/libopencv_rgbd.so.4.5.2 lib/libopencv_saliency.so.4.5.2 lib/libopencv_sfm.so.4.5.2 lib/libopencv_stereo.so.4.5.2 lib/libopencv_structured_light.so.4.5.2 lib/libopencv_superres.so.4.5.2 lib/libopencv_surface_matching.so.4.5.2 lib/libopencv_tracking.so.4.5.2 lib/libopencv_videostab.so.4.5.2 lib/libopencv_wechat_qrcode.so.4.5.2 lib/libopencv_xfeatures2d.so.4.5.2 lib/libopencv_xobjdetect.so.4.5.2 lib/libopencv_xphoto.so.4.5.2 lib/libopencv_shape.so.4.5.2 lib/libopencv_highgui.so.4.5.2 lib/libopencv_datasets.so.4.5.2 lib/libopencv_ml.so.4.5.2 lib/libopencv_plot.so.4.5.2 lib/libopencv_phase_unwrapping.so.4.5.2 lib/libopencv_optflow.so.4.5.2 lib/libopencv_ximgproc.so.4.5.2 lib/libopencv_videoio.so.4.5.2 lib/libopencv_video.so.4.5.2 lib/libopencv_dnn.so.4.5.2 lib/libopencv_imgcodecs.so.4.5.2 lib/libopencv_objdetect.so.4.5.2 lib/libopencv_calib3d.so.4.5.2 lib/libopencv_features2d.so.4.5.2 lib/libopencv_flann.so.4.5.2 lib/libopencv_photo.so.4.5.2 lib/libopencv_imgproc.so.4.5.2 lib/libopencv_core.so.4.5.2 -Wl,-rpath-link,TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/build/lib && : >>> -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::LogMessage::LogMessage(char const*, int)' >>> -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::LogMessage::stream()' >>> -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::LogMessage::~LogMessage()' >>> -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::kLogSiteUninitialized' >>> -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'fLI::FLAGS_v' >>> -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::InitVLOG3__(int**, int*, char const*, int)' >>> -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::LogMessageFatal::LogMessageFatal(char const*, int)' >>> -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::LogMessageFatal::~LogMessageFatal()' >>> -collect2: error: ld returned 1 exit status >>> - >>> - Add Glog_LIBS which is set to the same value as GLOG_LIBRARIES used to be. >>> - >>> -Upstream-Status: Submitted [https://github.com/opencv/opencv_contrib/pull/2923] >>> - >>> -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> >>> ---- >>> - modules/sfm/CMakeLists.txt | 1 + >>> - 1 file changed, 1 insertion(+) >>> - >>> -diff --git a/modules/sfm/CMakeLists.txt b/modules/sfm/CMakeLists.txt >>> -index 045a1fe6e..ee7cecdac 100644 >>> ---- a/modules/sfm/CMakeLists.txt >>> -+++ b/modules/sfm/CMakeLists.txt >>> -@@ -84,6 +84,7 @@ set(LIBMV_LIGHT_LIBS >>> - multiview >>> - numeric >>> - ${GLOG_LIBRARIES} >>> -+ ${Glog_LIBS} >>> - ${GFLAGS_LIBRARIES} >>> - ) >>> - >>> diff --git a/meta-oe/recipes-support/opencv/opencv_4.5.2.bb b/meta-oe/recipes-support/opencv/opencv_4.5.5.bb >>> similarity index 97% >>> rename from meta-oe/recipes-support/opencv/opencv_4.5.2.bb >>> rename to meta-oe/recipes-support/opencv/opencv_4.5.5.bb >>> index 2f2a505ed..ca50e80b0 100644 >>> --- a/meta-oe/recipes-support/opencv/opencv_4.5.2.bb >>> +++ b/meta-oe/recipes-support/opencv/opencv_4.5.5.bb >>> @@ -10,7 +10,7 @@ ARM_INSTRUCTION_SET:armv5 = "arm" >>> >>> DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" >>> >>> -SRCREV_opencv = "69357b1e88680658a07cffde7678a4d697469f03" >>> +SRCREV_opencv = "dad26339a975b49cfb6c7dbe4bd5276c9dcb36e2" >>> SRCREV_contrib = "f5d7f6712d4ff229ba4f45cf79dfd11c557d56fd" >>> SRCREV_ipp = "a56b6ac6f030c312b2dce17430eef13aed9af274" >>> SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" >>> @@ -51,8 +51,6 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv;branch=master;protocol >>> file://0001-Dont-use-isystem.patch \ >>> file://download.patch \ >>> file://0001-Make-ts-module-external.patch \ >>> - file://0001-sfm-link-with-Glog_LIBS.patch;patchdir=../contrib \ >>> - file://0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch \ >>> " >>> SRC_URI:append:riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=../contrib" >>> >>> @@ -105,7 +103,7 @@ EXTRA_OECMAKE:append:x86 = " -DX86=ON" >>> >>> PACKAGECONFIG ??= "gapi python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \ >>> ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \ >>> - ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libav", "", d)}" >>> + " >>> >>> # TBB does not build for powerpc so disable that package config >>> PACKAGECONFIG:remove:powerpc = "tbb" >>> >>> >>> >>> >>> >> >> >> >> -=-=-=-=-=-=-=-=-=-=-=- >> Links: You receive all messages sent to this group. >> View/Reply Online (#97184): https://lists.openembedded.org/g/openembedded-devel/message/97184 >> Mute This Topic: https://lists.openembedded.org/mt/88614015/3617728 >> Group Owner: openembedded-devel+owner@lists.openembedded.org >> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [zboszor@pr.hu] >> -=-=-=-=-=-=-=-=-=-=-=- >>
2022. 05. 19. 11:44 keltezéssel, Alexander Kanavin írta: > Thanks for the heads up, I think the standard policy is to simply wait > for 4.6.0. FYI, OpenCV 4.6.0 was released. https://github.com/opencv/opencv/releases/tag/4.6.0 > > Alex > > On Thu, 19 May 2022 at 11:37, Böszörményi Zoltán <zboszor@pr.hu> wrote: >> >> 2022. 01. 22. 22:46 keltezéssel, Alexander Kanavin írta: >>> Drop backports. >>> >>> Disable ffmpeg, as opencv is not yet compatible with ffmpeg 5.0. >> >> Please backport the ffmpeg 5.0 support patch plus >> the supplemental memory leak fixes introduced by it >> from the upcoming opencv 4.6.0, then re-enable the >> ffmpeg packageconfig setting: >> >> https://github.com/opencv/opencv/pull/21754 >> https://github.com/opencv/opencv/pull/21819 >> >>> >>> Signed-off-by: Alexander Kanavin <alex@linutronix.de> >>> --- >>> ...gument-version-of-SetTotalBytesLimit.patch | 41 ----------------- >>> .../opencv/0001-sfm-link-with-Glog_LIBS.patch | 44 ------------------- >>> .../{opencv_4.5.2.bb => opencv_4.5.5.bb} | 6 +-- >>> 3 files changed, 2 insertions(+), 89 deletions(-) >>> delete mode 100644 meta-oe/recipes-support/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch >>> delete mode 100644 meta-oe/recipes-support/opencv/opencv/0001-sfm-link-with-Glog_LIBS.patch >>> rename meta-oe/recipes-support/opencv/{opencv_4.5.2.bb => opencv_4.5.5.bb} (97%) >>> >>> diff --git a/meta-oe/recipes-support/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch b/meta-oe/recipes-support/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch >>> deleted file mode 100644 >>> index 5d88d1a6a..000000000 >>> --- a/meta-oe/recipes-support/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch >>> +++ /dev/null >>> @@ -1,41 +0,0 @@ >>> -From 9cfa84313c5833d7295fcf57be93d5d2aaadfd88 Mon Sep 17 00:00:00 2001 >>> -From: Vincent Rabaud <vrabaud@google.com> >>> -Date: Sat, 10 Jul 2021 00:21:52 +0200 >>> -Subject: [PATCH] Use the one argument version of SetTotalBytesLimit. >>> - >>> -The two argument versions has been deprecated, cf >>> -https://developers.google.com/protocol-buffers/docs/reference/cpp/google.protobuf.io.coded_stream >>> - >>> -Upstream-Status: Backport [9cfa84313c5833d7295fcf57be93d5d2aaadfd88 - from master after 4.5.3 tag] >>> -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> >>> ---- >>> - modules/dnn/src/caffe/caffe_io.cpp | 5 +++++ >>> - 1 file changed, 5 insertions(+) >>> - >>> -diff --git a/modules/dnn/src/caffe/caffe_io.cpp b/modules/dnn/src/caffe/caffe_io.cpp >>> -index 2fc4d84f46..ebecf95eea 100644 >>> ---- a/modules/dnn/src/caffe/caffe_io.cpp >>> -+++ b/modules/dnn/src/caffe/caffe_io.cpp >>> -@@ -92,6 +92,7 @@ >>> - #ifdef HAVE_PROTOBUF >>> - #include <google/protobuf/io/coded_stream.h> >>> - #include <google/protobuf/io/zero_copy_stream_impl.h> >>> -+#include <google/protobuf/stubs/common.h> >>> - #include <google/protobuf/text_format.h> >>> - >>> - #include <opencv2/core.hpp> >>> -@@ -1111,7 +1112,11 @@ static const int kProtoReadBytesLimit = INT_MAX; // Max size of 2 GB minus 1 by >>> - >>> - bool ReadProtoFromBinary(ZeroCopyInputStream* input, Message *proto) { >>> - CodedInputStream coded_input(input); >>> -+#if GOOGLE_PROTOBUF_VERSION >= 3006000 >>> -+ coded_input.SetTotalBytesLimit(kProtoReadBytesLimit); >>> -+#else >>> - coded_input.SetTotalBytesLimit(kProtoReadBytesLimit, 536870912); >>> -+#endif >>> - >>> - return proto->ParseFromCodedStream(&coded_input); >>> - } >>> --- >>> -2.32.0 >>> - >>> diff --git a/meta-oe/recipes-support/opencv/opencv/0001-sfm-link-with-Glog_LIBS.patch b/meta-oe/recipes-support/opencv/opencv/0001-sfm-link-with-Glog_LIBS.patch >>> deleted file mode 100644 >>> index 7b2c4100a..000000000 >>> --- a/meta-oe/recipes-support/opencv/opencv/0001-sfm-link-with-Glog_LIBS.patch >>> +++ /dev/null >>> @@ -1,44 +0,0 @@ >>> -From ffe20fc4ec46c6b491eff29a38f90686d4d035f6 Mon Sep 17 00:00:00 2001 >>> -From: Martin Jansa <Martin.Jansa@gmail.com> >>> -Date: Mon, 12 Apr 2021 20:37:40 +0000 >>> -Subject: [PATCH] sfm: link with Glog_LIBS >>> - >>> -* in 4.5.0 there was explicit linkage with GLOG_LIBRARY, but since 4.5.1 with: >>> - https://github.com/opencv/opencv_contrib/commit/23ee62a19b7a3e50d6dbf295359d8b1aff2e03fd >>> - >>> - it's gone, probably because Glog_FOUND is already set from Ceres, >>> - but then GLOG_LIBRARIES is empty in LIBMV_LIGHT_LIBS and build with gold fails: >>> - >>> -FAILED: bin/example_tutorial_perspective_correction >>> -: && TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux/x86_64-oe-linux-g++ -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -ITOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/git/include -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot -O2 -pipe -g -feliminate-unused-debug-types -fmacro-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0=/usr/src/debug/opencv/4.5.2-r0 -fdebug-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0=/usr/src/debug/opencv/4.5.2-r0 -fdebug-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot= -fdebug-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot-native= -fvisibility-inlines-hidden -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -ITOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/git/include -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot -fsigned-char -W -Wall -Werror=return-type -Werror=non-virtual-dtor -Werror=address -Werror=sequence-point -Wformat -Werror=format-security -Wmissing-declarations -Wundef -Winit-self -Wpointer-arith -Wshadow -Wsign-promo -Wuninitialized -Wsuggest-override -Wno-delete-non-virtual-dtor -Wno-comment -Wimplicit-fallthrough=3 -Wno-strict-overflow -fdiagnostics-show-option -Wno-long-long -pthread -fomit-frame-pointer -ffunction-sections -fdata-sections -msse -msse2 -msse3 -mssse3 -DNDEBUG -DNDEBUG -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -ITOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/git/include -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot -O2 -pipe -g -feliminate-unused-debug-types -fmacro-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0=/usr/src/debug/opencv/4.5.2-r0 -fdebug-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0=/usr/src/debug/opencv/4.5.2-r0 -fdebug-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot= -fdebug-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot-native= -fvisibility-inlines-hidden -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -ITOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/git/include -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now -Wl,--gc-sections -Wl,--as-needed samples/cpp/CMakeFiles/example_tutorial_perspective_correction.dir/tutorial_code/features2D/Homography/perspective_correction.cpp.o -o bin/example_tutorial_perspective_correction -ldl -lm -lpthread -lrt lib/libopencv_gapi.so.4.5.2 lib/libopencv_stitching.so.4.5.2 lib/libopencv_ts.so.4.5.2 lib/libopencv_alphamat.so.4.5.2 lib/libopencv_aruco.so.4.5.2 lib/libopencv_bgsegm.so.4.5.2 lib/libopencv_bioinspired.so.4.5.2 lib/libopencv_ccalib.so.4.5.2 lib/libopencv_dnn_objdetect.so.4.5.2 lib/libopencv_dnn_superres.so.4.5.2 lib/libopencv_dpm.so.4.5.2 lib/libopencv_face.so.4.5.2 lib/libopencv_fuzzy.so.4.5.2 lib/libopencv_hfs.so.4.5.2 lib/libopencv_img_hash.so.4.5.2 lib/libopencv_intensity_transform.so.4.5.2 lib/libopencv_line_descriptor.so.4.5.2 lib/libopencv_mcc.so.4.5.2 lib/libopencv_quality.so.4.5.2 lib/libopencv_rapid.so.4.5.2 lib/libopencv_reg.so.4.5.2 lib/libopencv_rgbd.so.4.5.2 lib/libopencv_saliency.so.4.5.2 lib/libopencv_sfm.so.4.5.2 lib/libopencv_stereo.so.4.5.2 lib/libopencv_structured_light.so.4.5.2 lib/libopencv_superres.so.4.5.2 lib/libopencv_surface_matching.so.4.5.2 lib/libopencv_tracking.so.4.5.2 lib/libopencv_videostab.so.4.5.2 lib/libopencv_wechat_qrcode.so.4.5.2 lib/libopencv_xfeatures2d.so.4.5.2 lib/libopencv_xobjdetect.so.4.5.2 lib/libopencv_xphoto.so.4.5.2 lib/libopencv_shape.so.4.5.2 lib/libopencv_highgui.so.4.5.2 lib/libopencv_datasets.so.4.5.2 lib/libopencv_ml.so.4.5.2 lib/libopencv_plot.so.4.5.2 lib/libopencv_phase_unwrapping.so.4.5.2 lib/libopencv_optflow.so.4.5.2 lib/libopencv_ximgproc.so.4.5.2 lib/libopencv_videoio.so.4.5.2 lib/libopencv_video.so.4.5.2 lib/libopencv_dnn.so.4.5.2 lib/libopencv_imgcodecs.so.4.5.2 lib/libopencv_objdetect.so.4.5.2 lib/libopencv_calib3d.so.4.5.2 lib/libopencv_features2d.so.4.5.2 lib/libopencv_flann.so.4.5.2 lib/libopencv_photo.so.4.5.2 lib/libopencv_imgproc.so.4.5.2 lib/libopencv_core.so.4.5.2 -Wl,-rpath-link,TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/build/lib && : >>> -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::LogMessage::LogMessage(char const*, int)' >>> -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::LogMessage::stream()' >>> -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::LogMessage::~LogMessage()' >>> -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::kLogSiteUninitialized' >>> -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'fLI::FLAGS_v' >>> -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::InitVLOG3__(int**, int*, char const*, int)' >>> -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::LogMessageFatal::LogMessageFatal(char const*, int)' >>> -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::LogMessageFatal::~LogMessageFatal()' >>> -collect2: error: ld returned 1 exit status >>> - >>> - Add Glog_LIBS which is set to the same value as GLOG_LIBRARIES used to be. >>> - >>> -Upstream-Status: Submitted [https://github.com/opencv/opencv_contrib/pull/2923] >>> - >>> -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> >>> ---- >>> - modules/sfm/CMakeLists.txt | 1 + >>> - 1 file changed, 1 insertion(+) >>> - >>> -diff --git a/modules/sfm/CMakeLists.txt b/modules/sfm/CMakeLists.txt >>> -index 045a1fe6e..ee7cecdac 100644 >>> ---- a/modules/sfm/CMakeLists.txt >>> -+++ b/modules/sfm/CMakeLists.txt >>> -@@ -84,6 +84,7 @@ set(LIBMV_LIGHT_LIBS >>> - multiview >>> - numeric >>> - ${GLOG_LIBRARIES} >>> -+ ${Glog_LIBS} >>> - ${GFLAGS_LIBRARIES} >>> - ) >>> - >>> diff --git a/meta-oe/recipes-support/opencv/opencv_4.5.2.bb b/meta-oe/recipes-support/opencv/opencv_4.5.5.bb >>> similarity index 97% >>> rename from meta-oe/recipes-support/opencv/opencv_4.5.2.bb >>> rename to meta-oe/recipes-support/opencv/opencv_4.5.5.bb >>> index 2f2a505ed..ca50e80b0 100644 >>> --- a/meta-oe/recipes-support/opencv/opencv_4.5.2.bb >>> +++ b/meta-oe/recipes-support/opencv/opencv_4.5.5.bb >>> @@ -10,7 +10,7 @@ ARM_INSTRUCTION_SET:armv5 = "arm" >>> >>> DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" >>> >>> -SRCREV_opencv = "69357b1e88680658a07cffde7678a4d697469f03" >>> +SRCREV_opencv = "dad26339a975b49cfb6c7dbe4bd5276c9dcb36e2" >>> SRCREV_contrib = "f5d7f6712d4ff229ba4f45cf79dfd11c557d56fd" >>> SRCREV_ipp = "a56b6ac6f030c312b2dce17430eef13aed9af274" >>> SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" >>> @@ -51,8 +51,6 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv;branch=master;protocol >>> file://0001-Dont-use-isystem.patch \ >>> file://download.patch \ >>> file://0001-Make-ts-module-external.patch \ >>> - file://0001-sfm-link-with-Glog_LIBS.patch;patchdir=../contrib \ >>> - file://0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch \ >>> " >>> SRC_URI:append:riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=../contrib" >>> >>> @@ -105,7 +103,7 @@ EXTRA_OECMAKE:append:x86 = " -DX86=ON" >>> >>> PACKAGECONFIG ??= "gapi python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \ >>> ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \ >>> - ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libav", "", d)}" >>> + " >>> >>> # TBB does not build for powerpc so disable that package config >>> PACKAGECONFIG:remove:powerpc = "tbb" >>> >>> >>> >>> -=-=-=-=-=-=-=-=-=-=-=- >>> Links: You receive all messages sent to this group. >>> View/Reply Online (#95011): https://lists.openembedded.org/g/openembedded-devel/message/95011 >>> Mute This Topic: https://lists.openembedded.org/mt/88614015/3617728 >>> Group Owner: openembedded-devel+owner@lists.openembedded.org >>> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [zboszor@pr.hu] >>> -=-=-=-=-=-=-=-=-=-=-=- >>> >>
Right, then patches to update to that version would be appreciated :) Alex On Fri, 17 Jun 2022 at 07:35, Böszörményi Zoltán <zboszor@pr.hu> wrote: > > 2022. 05. 19. 11:44 keltezéssel, Alexander Kanavin írta: > > Thanks for the heads up, I think the standard policy is to simply wait > > for 4.6.0. > > FYI, OpenCV 4.6.0 was released. > https://github.com/opencv/opencv/releases/tag/4.6.0 > > > > > Alex > > > > On Thu, 19 May 2022 at 11:37, Böszörményi Zoltán <zboszor@pr.hu> wrote: > >> > >> 2022. 01. 22. 22:46 keltezéssel, Alexander Kanavin írta: > >>> Drop backports. > >>> > >>> Disable ffmpeg, as opencv is not yet compatible with ffmpeg 5.0. > >> > >> Please backport the ffmpeg 5.0 support patch plus > >> the supplemental memory leak fixes introduced by it > >> from the upcoming opencv 4.6.0, then re-enable the > >> ffmpeg packageconfig setting: > >> > >> https://github.com/opencv/opencv/pull/21754 > >> https://github.com/opencv/opencv/pull/21819 > >> > >>> > >>> Signed-off-by: Alexander Kanavin <alex@linutronix.de> > >>> --- > >>> ...gument-version-of-SetTotalBytesLimit.patch | 41 ----------------- > >>> .../opencv/0001-sfm-link-with-Glog_LIBS.patch | 44 ------------------- > >>> .../{opencv_4.5.2.bb => opencv_4.5.5.bb} | 6 +-- > >>> 3 files changed, 2 insertions(+), 89 deletions(-) > >>> delete mode 100644 meta-oe/recipes-support/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch > >>> delete mode 100644 meta-oe/recipes-support/opencv/opencv/0001-sfm-link-with-Glog_LIBS.patch > >>> rename meta-oe/recipes-support/opencv/{opencv_4.5.2.bb => opencv_4.5.5.bb} (97%) > >>> > >>> diff --git a/meta-oe/recipes-support/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch b/meta-oe/recipes-support/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch > >>> deleted file mode 100644 > >>> index 5d88d1a6a..000000000 > >>> --- a/meta-oe/recipes-support/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch > >>> +++ /dev/null > >>> @@ -1,41 +0,0 @@ > >>> -From 9cfa84313c5833d7295fcf57be93d5d2aaadfd88 Mon Sep 17 00:00:00 2001 > >>> -From: Vincent Rabaud <vrabaud@google.com> > >>> -Date: Sat, 10 Jul 2021 00:21:52 +0200 > >>> -Subject: [PATCH] Use the one argument version of SetTotalBytesLimit. > >>> - > >>> -The two argument versions has been deprecated, cf > >>> -https://developers.google.com/protocol-buffers/docs/reference/cpp/google.protobuf.io.coded_stream > >>> - > >>> -Upstream-Status: Backport [9cfa84313c5833d7295fcf57be93d5d2aaadfd88 - from master after 4.5.3 tag] > >>> -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> > >>> ---- > >>> - modules/dnn/src/caffe/caffe_io.cpp | 5 +++++ > >>> - 1 file changed, 5 insertions(+) > >>> - > >>> -diff --git a/modules/dnn/src/caffe/caffe_io.cpp b/modules/dnn/src/caffe/caffe_io.cpp > >>> -index 2fc4d84f46..ebecf95eea 100644 > >>> ---- a/modules/dnn/src/caffe/caffe_io.cpp > >>> -+++ b/modules/dnn/src/caffe/caffe_io.cpp > >>> -@@ -92,6 +92,7 @@ > >>> - #ifdef HAVE_PROTOBUF > >>> - #include <google/protobuf/io/coded_stream.h> > >>> - #include <google/protobuf/io/zero_copy_stream_impl.h> > >>> -+#include <google/protobuf/stubs/common.h> > >>> - #include <google/protobuf/text_format.h> > >>> - > >>> - #include <opencv2/core.hpp> > >>> -@@ -1111,7 +1112,11 @@ static const int kProtoReadBytesLimit = INT_MAX; // Max size of 2 GB minus 1 by > >>> - > >>> - bool ReadProtoFromBinary(ZeroCopyInputStream* input, Message *proto) { > >>> - CodedInputStream coded_input(input); > >>> -+#if GOOGLE_PROTOBUF_VERSION >= 3006000 > >>> -+ coded_input.SetTotalBytesLimit(kProtoReadBytesLimit); > >>> -+#else > >>> - coded_input.SetTotalBytesLimit(kProtoReadBytesLimit, 536870912); > >>> -+#endif > >>> - > >>> - return proto->ParseFromCodedStream(&coded_input); > >>> - } > >>> --- > >>> -2.32.0 > >>> - > >>> diff --git a/meta-oe/recipes-support/opencv/opencv/0001-sfm-link-with-Glog_LIBS.patch b/meta-oe/recipes-support/opencv/opencv/0001-sfm-link-with-Glog_LIBS.patch > >>> deleted file mode 100644 > >>> index 7b2c4100a..000000000 > >>> --- a/meta-oe/recipes-support/opencv/opencv/0001-sfm-link-with-Glog_LIBS.patch > >>> +++ /dev/null > >>> @@ -1,44 +0,0 @@ > >>> -From ffe20fc4ec46c6b491eff29a38f90686d4d035f6 Mon Sep 17 00:00:00 2001 > >>> -From: Martin Jansa <Martin.Jansa@gmail.com> > >>> -Date: Mon, 12 Apr 2021 20:37:40 +0000 > >>> -Subject: [PATCH] sfm: link with Glog_LIBS > >>> - > >>> -* in 4.5.0 there was explicit linkage with GLOG_LIBRARY, but since 4.5.1 with: > >>> - https://github.com/opencv/opencv_contrib/commit/23ee62a19b7a3e50d6dbf295359d8b1aff2e03fd > >>> - > >>> - it's gone, probably because Glog_FOUND is already set from Ceres, > >>> - but then GLOG_LIBRARIES is empty in LIBMV_LIGHT_LIBS and build with gold fails: > >>> - > >>> -FAILED: bin/example_tutorial_perspective_correction > >>> -: && TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux/x86_64-oe-linux-g++ -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -ITOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/git/include -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot -O2 -pipe -g -feliminate-unused-debug-types -fmacro-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0=/usr/src/debug/opencv/4.5.2-r0 -fdebug-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0=/usr/src/debug/opencv/4.5.2-r0 -fdebug-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot= -fdebug-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot-native= -fvisibility-inlines-hidden -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -ITOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/git/include -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot -fsigned-char -W -Wall -Werror=return-type -Werror=non-virtual-dtor -Werror=address -Werror=sequence-point -Wformat -Werror=format-security -Wmissing-declarations -Wundef -Winit-self -Wpointer-arith -Wshadow -Wsign-promo -Wuninitialized -Wsuggest-override -Wno-delete-non-virtual-dtor -Wno-comment -Wimplicit-fallthrough=3 -Wno-strict-overflow -fdiagnostics-show-option -Wno-long-long -pthread -fomit-frame-pointer -ffunction-sections -fdata-sections -msse -msse2 -msse3 -mssse3 -DNDEBUG -DNDEBUG -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -ITOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/git/include -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot -O2 -pipe -g -feliminate-unused-debug-types -fmacro-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0=/usr/src/debug/opencv/4.5.2-r0 -fdebug-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0=/usr/src/debug/opencv/4.5.2-r0 -fdebug-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot= -fdebug-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot-native= -fvisibility-inlines-hidden -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -ITOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/git/include -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now -Wl,--gc-sections -Wl,--as-needed samples/cpp/CMakeFiles/example_tutorial_perspective_correction.dir/tutorial_code/features2D/Homography/perspective_correction.cpp.o -o bin/example_tutorial_perspective_correction -ldl -lm -lpthread -lrt lib/libopencv_gapi.so.4.5.2 lib/libopencv_stitching.so.4.5.2 lib/libopencv_ts.so.4.5.2 lib/libopencv_alphamat.so.4.5.2 lib/libopencv_aruco.so.4.5.2 lib/libopencv_bgsegm.so.4.5.2 lib/libopencv_bioinspired.so.4.5.2 lib/libopencv_ccalib.so.4.5.2 lib/libopencv_dnn_objdetect.so.4.5.2 lib/libopencv_dnn_superres.so.4.5.2 lib/libopencv_dpm.so.4.5.2 lib/libopencv_face.so.4.5.2 lib/libopencv_fuzzy.so.4.5.2 lib/libopencv_hfs.so.4.5.2 lib/libopencv_img_hash.so.4.5.2 lib/libopencv_intensity_transform.so.4.5.2 lib/libopencv_line_descriptor.so.4.5.2 lib/libopencv_mcc.so.4.5.2 lib/libopencv_quality.so.4.5.2 lib/libopencv_rapid.so.4.5.2 lib/libopencv_reg.so.4.5.2 lib/libopencv_rgbd.so.4.5.2 lib/libopencv_saliency.so.4.5.2 lib/libopencv_sfm.so.4.5.2 lib/libopencv_stereo.so.4.5.2 lib/libopencv_structured_light.so.4.5.2 lib/libopencv_superres.so.4.5.2 lib/libopencv_surface_matching.so.4.5.2 lib/libopencv_tracking.so.4.5.2 lib/libopencv_videostab.so.4.5.2 lib/libopencv_wechat_qrcode.so.4.5.2 lib/libopencv_xfeatures2d.so.4.5.2 lib/libopencv_xobjdetect.so.4.5.2 lib/libopencv_xphoto.so.4.5.2 lib/libopencv_shape.so.4.5.2 lib/libopencv_highgui.so.4.5.2 lib/libopencv_datasets.so.4.5.2 lib/libopencv_ml.so.4.5.2 lib/libopencv_plot.so.4.5.2 lib/libopencv_phase_unwrapping.so.4.5.2 lib/libopencv_optflow.so.4.5.2 lib/libopencv_ximgproc.so.4.5.2 lib/libopencv_videoio.so.4.5.2 lib/libopencv_video.so.4.5.2 lib/libopencv_dnn.so.4.5.2 lib/libopencv_imgcodecs.so.4.5.2 lib/libopencv_objdetect.so.4.5.2 lib/libopencv_calib3d.so.4.5.2 lib/libopencv_features2d.so.4.5.2 lib/libopencv_flann.so.4.5.2 lib/libopencv_photo.so.4.5.2 lib/libopencv_imgproc.so.4.5.2 lib/libopencv_core.so.4.5.2 -Wl,-rpath-link,TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/build/lib && : > >>> -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::LogMessage::LogMessage(char const*, int)' > >>> -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::LogMessage::stream()' > >>> -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::LogMessage::~LogMessage()' > >>> -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::kLogSiteUninitialized' > >>> -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'fLI::FLAGS_v' > >>> -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::InitVLOG3__(int**, int*, char const*, int)' > >>> -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::LogMessageFatal::LogMessageFatal(char const*, int)' > >>> -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::LogMessageFatal::~LogMessageFatal()' > >>> -collect2: error: ld returned 1 exit status > >>> - > >>> - Add Glog_LIBS which is set to the same value as GLOG_LIBRARIES used to be. > >>> - > >>> -Upstream-Status: Submitted [https://github.com/opencv/opencv_contrib/pull/2923] > >>> - > >>> -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> > >>> ---- > >>> - modules/sfm/CMakeLists.txt | 1 + > >>> - 1 file changed, 1 insertion(+) > >>> - > >>> -diff --git a/modules/sfm/CMakeLists.txt b/modules/sfm/CMakeLists.txt > >>> -index 045a1fe6e..ee7cecdac 100644 > >>> ---- a/modules/sfm/CMakeLists.txt > >>> -+++ b/modules/sfm/CMakeLists.txt > >>> -@@ -84,6 +84,7 @@ set(LIBMV_LIGHT_LIBS > >>> - multiview > >>> - numeric > >>> - ${GLOG_LIBRARIES} > >>> -+ ${Glog_LIBS} > >>> - ${GFLAGS_LIBRARIES} > >>> - ) > >>> - > >>> diff --git a/meta-oe/recipes-support/opencv/opencv_4.5.2.bb b/meta-oe/recipes-support/opencv/opencv_4.5.5.bb > >>> similarity index 97% > >>> rename from meta-oe/recipes-support/opencv/opencv_4.5.2.bb > >>> rename to meta-oe/recipes-support/opencv/opencv_4.5.5.bb > >>> index 2f2a505ed..ca50e80b0 100644 > >>> --- a/meta-oe/recipes-support/opencv/opencv_4.5.2.bb > >>> +++ b/meta-oe/recipes-support/opencv/opencv_4.5.5.bb > >>> @@ -10,7 +10,7 @@ ARM_INSTRUCTION_SET:armv5 = "arm" > >>> > >>> DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" > >>> > >>> -SRCREV_opencv = "69357b1e88680658a07cffde7678a4d697469f03" > >>> +SRCREV_opencv = "dad26339a975b49cfb6c7dbe4bd5276c9dcb36e2" > >>> SRCREV_contrib = "f5d7f6712d4ff229ba4f45cf79dfd11c557d56fd" > >>> SRCREV_ipp = "a56b6ac6f030c312b2dce17430eef13aed9af274" > >>> SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" > >>> @@ -51,8 +51,6 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv;branch=master;protocol > >>> file://0001-Dont-use-isystem.patch \ > >>> file://download.patch \ > >>> file://0001-Make-ts-module-external.patch \ > >>> - file://0001-sfm-link-with-Glog_LIBS.patch;patchdir=../contrib \ > >>> - file://0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch \ > >>> " > >>> SRC_URI:append:riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=../contrib" > >>> > >>> @@ -105,7 +103,7 @@ EXTRA_OECMAKE:append:x86 = " -DX86=ON" > >>> > >>> PACKAGECONFIG ??= "gapi python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \ > >>> ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \ > >>> - ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libav", "", d)}" > >>> + " > >>> > >>> # TBB does not build for powerpc so disable that package config > >>> PACKAGECONFIG:remove:powerpc = "tbb" > >>> > >>> > >>> > >>> -=-=-=-=-=-=-=-=-=-=-=- > >>> Links: You receive all messages sent to this group. > >>> View/Reply Online (#95011): https://lists.openembedded.org/g/openembedded-devel/message/95011 > >>> Mute This Topic: https://lists.openembedded.org/mt/88614015/3617728 > >>> Group Owner: openembedded-devel+owner@lists.openembedded.org > >>> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [zboszor@pr.hu] > >>> -=-=-=-=-=-=-=-=-=-=-=- > >>> > >> >
Hi, I just sent the patch. Please backport it to Kirkstone. 2022. 06. 17. 11:16 keltezéssel, Alexander Kanavin írta: > Right, then patches to update to that version would be appreciated :) > > Alex > > On Fri, 17 Jun 2022 at 07:35, Böszörményi Zoltán <zboszor@pr.hu> wrote: >> >> 2022. 05. 19. 11:44 keltezéssel, Alexander Kanavin írta: >>> Thanks for the heads up, I think the standard policy is to simply wait >>> for 4.6.0. >> >> FYI, OpenCV 4.6.0 was released. >> https://github.com/opencv/opencv/releases/tag/4.6.0 >> >>> >>> Alex >>> >>> On Thu, 19 May 2022 at 11:37, Böszörményi Zoltán <zboszor@pr.hu> wrote: >>>> >>>> 2022. 01. 22. 22:46 keltezéssel, Alexander Kanavin írta: >>>>> Drop backports. >>>>> >>>>> Disable ffmpeg, as opencv is not yet compatible with ffmpeg 5.0. >>>> >>>> Please backport the ffmpeg 5.0 support patch plus >>>> the supplemental memory leak fixes introduced by it >>>> from the upcoming opencv 4.6.0, then re-enable the >>>> ffmpeg packageconfig setting: >>>> >>>> https://github.com/opencv/opencv/pull/21754 >>>> https://github.com/opencv/opencv/pull/21819 >>>> >>>>> >>>>> Signed-off-by: Alexander Kanavin <alex@linutronix.de> >>>>> --- >>>>> ...gument-version-of-SetTotalBytesLimit.patch | 41 ----------------- >>>>> .../opencv/0001-sfm-link-with-Glog_LIBS.patch | 44 ------------------- >>>>> .../{opencv_4.5.2.bb => opencv_4.5.5.bb} | 6 +-- >>>>> 3 files changed, 2 insertions(+), 89 deletions(-) >>>>> delete mode 100644 meta-oe/recipes-support/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch >>>>> delete mode 100644 meta-oe/recipes-support/opencv/opencv/0001-sfm-link-with-Glog_LIBS.patch >>>>> rename meta-oe/recipes-support/opencv/{opencv_4.5.2.bb => opencv_4.5.5.bb} (97%) >>>>> >>>>> diff --git a/meta-oe/recipes-support/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch b/meta-oe/recipes-support/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch >>>>> deleted file mode 100644 >>>>> index 5d88d1a6a..000000000 >>>>> --- a/meta-oe/recipes-support/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch >>>>> +++ /dev/null >>>>> @@ -1,41 +0,0 @@ >>>>> -From 9cfa84313c5833d7295fcf57be93d5d2aaadfd88 Mon Sep 17 00:00:00 2001 >>>>> -From: Vincent Rabaud <vrabaud@google.com> >>>>> -Date: Sat, 10 Jul 2021 00:21:52 +0200 >>>>> -Subject: [PATCH] Use the one argument version of SetTotalBytesLimit. >>>>> - >>>>> -The two argument versions has been deprecated, cf >>>>> -https://developers.google.com/protocol-buffers/docs/reference/cpp/google.protobuf.io.coded_stream >>>>> - >>>>> -Upstream-Status: Backport [9cfa84313c5833d7295fcf57be93d5d2aaadfd88 - from master after 4.5.3 tag] >>>>> -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> >>>>> ---- >>>>> - modules/dnn/src/caffe/caffe_io.cpp | 5 +++++ >>>>> - 1 file changed, 5 insertions(+) >>>>> - >>>>> -diff --git a/modules/dnn/src/caffe/caffe_io.cpp b/modules/dnn/src/caffe/caffe_io.cpp >>>>> -index 2fc4d84f46..ebecf95eea 100644 >>>>> ---- a/modules/dnn/src/caffe/caffe_io.cpp >>>>> -+++ b/modules/dnn/src/caffe/caffe_io.cpp >>>>> -@@ -92,6 +92,7 @@ >>>>> - #ifdef HAVE_PROTOBUF >>>>> - #include <google/protobuf/io/coded_stream.h> >>>>> - #include <google/protobuf/io/zero_copy_stream_impl.h> >>>>> -+#include <google/protobuf/stubs/common.h> >>>>> - #include <google/protobuf/text_format.h> >>>>> - >>>>> - #include <opencv2/core.hpp> >>>>> -@@ -1111,7 +1112,11 @@ static const int kProtoReadBytesLimit = INT_MAX; // Max size of 2 GB minus 1 by >>>>> - >>>>> - bool ReadProtoFromBinary(ZeroCopyInputStream* input, Message *proto) { >>>>> - CodedInputStream coded_input(input); >>>>> -+#if GOOGLE_PROTOBUF_VERSION >= 3006000 >>>>> -+ coded_input.SetTotalBytesLimit(kProtoReadBytesLimit); >>>>> -+#else >>>>> - coded_input.SetTotalBytesLimit(kProtoReadBytesLimit, 536870912); >>>>> -+#endif >>>>> - >>>>> - return proto->ParseFromCodedStream(&coded_input); >>>>> - } >>>>> --- >>>>> -2.32.0 >>>>> - >>>>> diff --git a/meta-oe/recipes-support/opencv/opencv/0001-sfm-link-with-Glog_LIBS.patch b/meta-oe/recipes-support/opencv/opencv/0001-sfm-link-with-Glog_LIBS.patch >>>>> deleted file mode 100644 >>>>> index 7b2c4100a..000000000 >>>>> --- a/meta-oe/recipes-support/opencv/opencv/0001-sfm-link-with-Glog_LIBS.patch >>>>> +++ /dev/null >>>>> @@ -1,44 +0,0 @@ >>>>> -From ffe20fc4ec46c6b491eff29a38f90686d4d035f6 Mon Sep 17 00:00:00 2001 >>>>> -From: Martin Jansa <Martin.Jansa@gmail.com> >>>>> -Date: Mon, 12 Apr 2021 20:37:40 +0000 >>>>> -Subject: [PATCH] sfm: link with Glog_LIBS >>>>> - >>>>> -* in 4.5.0 there was explicit linkage with GLOG_LIBRARY, but since 4.5.1 with: >>>>> - https://github.com/opencv/opencv_contrib/commit/23ee62a19b7a3e50d6dbf295359d8b1aff2e03fd >>>>> - >>>>> - it's gone, probably because Glog_FOUND is already set from Ceres, >>>>> - but then GLOG_LIBRARIES is empty in LIBMV_LIGHT_LIBS and build with gold fails: >>>>> - >>>>> -FAILED: bin/example_tutorial_perspective_correction >>>>> -: && TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux/x86_64-oe-linux-g++ -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -ITOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/git/include -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot -O2 -pipe -g -feliminate-unused-debug-types -fmacro-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0=/usr/src/debug/opencv/4.5.2-r0 -fdebug-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0=/usr/src/debug/opencv/4.5.2-r0 -fdebug-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot= -fdebug-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot-native= -fvisibility-inlines-hidden -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -ITOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/git/include -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot -fsigned-char -W -Wall -Werror=return-type -Werror=non-virtual-dtor -Werror=address -Werror=sequence-point -Wformat -Werror=format-security -Wmissing-declarations -Wundef -Winit-self -Wpointer-arith -Wshadow -Wsign-promo -Wuninitialized -Wsuggest-override -Wno-delete-non-virtual-dtor -Wno-comment -Wimplicit-fallthrough=3 -Wno-strict-overflow -fdiagnostics-show-option -Wno-long-long -pthread -fomit-frame-pointer -ffunction-sections -fdata-sections -msse -msse2 -msse3 -mssse3 -DNDEBUG -DNDEBUG -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -ITOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/git/include -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot -O2 -pipe -g -feliminate-unused-debug-types -fmacro-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0=/usr/src/debug/opencv/4.5.2-r0 -fdebug-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0=/usr/src/debug/opencv/4.5.2-r0 -fdebug-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot= -fdebug-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot-native= -fvisibility-inlines-hidden -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -ITOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/git/include -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now -Wl,--gc-sections -Wl,--as-needed samples/cpp/CMakeFiles/example_tutorial_perspective_correction.dir/tutorial_code/features2D/Homography/perspective_correction.cpp.o -o bin/example_tutorial_perspective_correction -ldl -lm -lpthread -lrt lib/libopencv_gapi.so.4.5.2 lib/libopencv_stitching.so.4.5.2 lib/libopencv_ts.so.4.5.2 lib/libopencv_alphamat.so.4.5.2 lib/libopencv_aruco.so.4.5.2 lib/libopencv_bgsegm.so.4.5.2 lib/libopencv_bioinspired.so.4.5.2 lib/libopencv_ccalib.so.4.5.2 lib/libopencv_dnn_objdetect.so.4.5.2 lib/libopencv_dnn_superres.so.4.5.2 lib/libopencv_dpm.so.4.5.2 lib/libopencv_face.so.4.5.2 lib/libopencv_fuzzy.so.4.5.2 lib/libopencv_hfs.so.4.5.2 lib/libopencv_img_hash.so.4.5.2 lib/libopencv_intensity_transform.so.4.5.2 lib/libopencv_line_descriptor.so.4.5.2 lib/libopencv_mcc.so.4.5.2 lib/libopencv_quality.so.4.5.2 lib/libopencv_rapid.so.4.5.2 lib/libopencv_reg.so.4.5.2 lib/libopencv_rgbd.so.4.5.2 lib/libopencv_saliency.so.4.5.2 lib/libopencv_sfm.so.4.5.2 lib/libopencv_stereo.so.4.5.2 lib/libopencv_structured_light.so.4.5.2 lib/libopencv_superres.so.4.5.2 lib/libopencv_surface_matching.so.4.5.2 lib/libopencv_tracking.so.4.5.2 lib/libopencv_videostab.so.4.5.2 lib/libopencv_wechat_qrcode.so.4.5.2 lib/libopencv_xfeatures2d.so.4.5.2 lib/libopencv_xobjdetect.so.4.5.2 lib/libopencv_xphoto.so.4.5.2 lib/libopencv_shape.so.4.5.2 lib/libopencv_highgui.so.4.5.2 lib/libopencv_datasets.so.4.5.2 lib/libopencv_ml.so.4.5.2 lib/libopencv_plot.so.4.5.2 lib/libopencv_phase_unwrapping.so.4.5.2 lib/libopencv_optflow.so.4.5.2 lib/libopencv_ximgproc.so.4.5.2 lib/libopencv_videoio.so.4.5.2 lib/libopencv_video.so.4.5.2 lib/libopencv_dnn.so.4.5.2 lib/libopencv_imgcodecs.so.4.5.2 lib/libopencv_objdetect.so.4.5.2 lib/libopencv_calib3d.so.4.5.2 lib/libopencv_features2d.so.4.5.2 lib/libopencv_flann.so.4.5.2 lib/libopencv_photo.so.4.5.2 lib/libopencv_imgproc.so.4.5.2 lib/libopencv_core.so.4.5.2 -Wl,-rpath-link,TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/build/lib && : >>>>> -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::LogMessage::LogMessage(char const*, int)' >>>>> -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::LogMessage::stream()' >>>>> -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::LogMessage::~LogMessage()' >>>>> -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::kLogSiteUninitialized' >>>>> -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'fLI::FLAGS_v' >>>>> -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::InitVLOG3__(int**, int*, char const*, int)' >>>>> -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::LogMessageFatal::LogMessageFatal(char const*, int)' >>>>> -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::LogMessageFatal::~LogMessageFatal()' >>>>> -collect2: error: ld returned 1 exit status >>>>> - >>>>> - Add Glog_LIBS which is set to the same value as GLOG_LIBRARIES used to be. >>>>> - >>>>> -Upstream-Status: Submitted [https://github.com/opencv/opencv_contrib/pull/2923] >>>>> - >>>>> -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> >>>>> ---- >>>>> - modules/sfm/CMakeLists.txt | 1 + >>>>> - 1 file changed, 1 insertion(+) >>>>> - >>>>> -diff --git a/modules/sfm/CMakeLists.txt b/modules/sfm/CMakeLists.txt >>>>> -index 045a1fe6e..ee7cecdac 100644 >>>>> ---- a/modules/sfm/CMakeLists.txt >>>>> -+++ b/modules/sfm/CMakeLists.txt >>>>> -@@ -84,6 +84,7 @@ set(LIBMV_LIGHT_LIBS >>>>> - multiview >>>>> - numeric >>>>> - ${GLOG_LIBRARIES} >>>>> -+ ${Glog_LIBS} >>>>> - ${GFLAGS_LIBRARIES} >>>>> - ) >>>>> - >>>>> diff --git a/meta-oe/recipes-support/opencv/opencv_4.5.2.bb b/meta-oe/recipes-support/opencv/opencv_4.5.5.bb >>>>> similarity index 97% >>>>> rename from meta-oe/recipes-support/opencv/opencv_4.5.2.bb >>>>> rename to meta-oe/recipes-support/opencv/opencv_4.5.5.bb >>>>> index 2f2a505ed..ca50e80b0 100644 >>>>> --- a/meta-oe/recipes-support/opencv/opencv_4.5.2.bb >>>>> +++ b/meta-oe/recipes-support/opencv/opencv_4.5.5.bb >>>>> @@ -10,7 +10,7 @@ ARM_INSTRUCTION_SET:armv5 = "arm" >>>>> >>>>> DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" >>>>> >>>>> -SRCREV_opencv = "69357b1e88680658a07cffde7678a4d697469f03" >>>>> +SRCREV_opencv = "dad26339a975b49cfb6c7dbe4bd5276c9dcb36e2" >>>>> SRCREV_contrib = "f5d7f6712d4ff229ba4f45cf79dfd11c557d56fd" >>>>> SRCREV_ipp = "a56b6ac6f030c312b2dce17430eef13aed9af274" >>>>> SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" >>>>> @@ -51,8 +51,6 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv;branch=master;protocol >>>>> file://0001-Dont-use-isystem.patch \ >>>>> file://download.patch \ >>>>> file://0001-Make-ts-module-external.patch \ >>>>> - file://0001-sfm-link-with-Glog_LIBS.patch;patchdir=../contrib \ >>>>> - file://0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch \ >>>>> " >>>>> SRC_URI:append:riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=../contrib" >>>>> >>>>> @@ -105,7 +103,7 @@ EXTRA_OECMAKE:append:x86 = " -DX86=ON" >>>>> >>>>> PACKAGECONFIG ??= "gapi python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \ >>>>> ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \ >>>>> - ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libav", "", d)}" >>>>> + " >>>>> >>>>> # TBB does not build for powerpc so disable that package config >>>>> PACKAGECONFIG:remove:powerpc = "tbb" >>>>> >>>>> >>>>> >>>>> -=-=-=-=-=-=-=-=-=-=-=- >>>>> Links: You receive all messages sent to this group. >>>>> View/Reply Online (#95011): https://lists.openembedded.org/g/openembedded-devel/message/95011 >>>>> Mute This Topic: https://lists.openembedded.org/mt/88614015/3617728 >>>>> Group Owner: openembedded-devel+owner@lists.openembedded.org >>>>> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [zboszor@pr.hu] >>>>> -=-=-=-=-=-=-=-=-=-=-=- >>>>> >>>> >>
diff --git a/meta-oe/recipes-support/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch b/meta-oe/recipes-support/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch deleted file mode 100644 index 5d88d1a6a..000000000 --- a/meta-oe/recipes-support/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 9cfa84313c5833d7295fcf57be93d5d2aaadfd88 Mon Sep 17 00:00:00 2001 -From: Vincent Rabaud <vrabaud@google.com> -Date: Sat, 10 Jul 2021 00:21:52 +0200 -Subject: [PATCH] Use the one argument version of SetTotalBytesLimit. - -The two argument versions has been deprecated, cf -https://developers.google.com/protocol-buffers/docs/reference/cpp/google.protobuf.io.coded_stream - -Upstream-Status: Backport [9cfa84313c5833d7295fcf57be93d5d2aaadfd88 - from master after 4.5.3 tag] -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - modules/dnn/src/caffe/caffe_io.cpp | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/modules/dnn/src/caffe/caffe_io.cpp b/modules/dnn/src/caffe/caffe_io.cpp -index 2fc4d84f46..ebecf95eea 100644 ---- a/modules/dnn/src/caffe/caffe_io.cpp -+++ b/modules/dnn/src/caffe/caffe_io.cpp -@@ -92,6 +92,7 @@ - #ifdef HAVE_PROTOBUF - #include <google/protobuf/io/coded_stream.h> - #include <google/protobuf/io/zero_copy_stream_impl.h> -+#include <google/protobuf/stubs/common.h> - #include <google/protobuf/text_format.h> - - #include <opencv2/core.hpp> -@@ -1111,7 +1112,11 @@ static const int kProtoReadBytesLimit = INT_MAX; // Max size of 2 GB minus 1 by - - bool ReadProtoFromBinary(ZeroCopyInputStream* input, Message *proto) { - CodedInputStream coded_input(input); -+#if GOOGLE_PROTOBUF_VERSION >= 3006000 -+ coded_input.SetTotalBytesLimit(kProtoReadBytesLimit); -+#else - coded_input.SetTotalBytesLimit(kProtoReadBytesLimit, 536870912); -+#endif - - return proto->ParseFromCodedStream(&coded_input); - } --- -2.32.0 - diff --git a/meta-oe/recipes-support/opencv/opencv/0001-sfm-link-with-Glog_LIBS.patch b/meta-oe/recipes-support/opencv/opencv/0001-sfm-link-with-Glog_LIBS.patch deleted file mode 100644 index 7b2c4100a..000000000 --- a/meta-oe/recipes-support/opencv/opencv/0001-sfm-link-with-Glog_LIBS.patch +++ /dev/null @@ -1,44 +0,0 @@ -From ffe20fc4ec46c6b491eff29a38f90686d4d035f6 Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Mon, 12 Apr 2021 20:37:40 +0000 -Subject: [PATCH] sfm: link with Glog_LIBS - -* in 4.5.0 there was explicit linkage with GLOG_LIBRARY, but since 4.5.1 with: - https://github.com/opencv/opencv_contrib/commit/23ee62a19b7a3e50d6dbf295359d8b1aff2e03fd - - it's gone, probably because Glog_FOUND is already set from Ceres, - but then GLOG_LIBRARIES is empty in LIBMV_LIGHT_LIBS and build with gold fails: - -FAILED: bin/example_tutorial_perspective_correction -: && TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux/x86_64-oe-linux-g++ -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -ITOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/git/include -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot -O2 -pipe -g -feliminate-unused-debug-types -fmacro-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0=/usr/src/debug/opencv/4.5.2-r0 -fdebug-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0=/usr/src/debug/opencv/4.5.2-r0 -fdebug-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot= -fdebug-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot-native= -fvisibility-inlines-hidden -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -ITOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/git/include -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot -fsigned-char -W -Wall -Werror=return-type -Werror=non-virtual-dtor -Werror=address -Werror=sequence-point -Wformat -Werror=format-security -Wmissing-declarations -Wundef -Winit-self -Wpointer-arith -Wshadow -Wsign-promo -Wuninitialized -Wsuggest-override -Wno-delete-non-virtual-dtor -Wno-comment -Wimplicit-fallthrough=3 -Wno-strict-overflow -fdiagnostics-show-option -Wno-long-long -pthread -fomit-frame-pointer -ffunction-sections -fdata-sections -msse -msse2 -msse3 -mssse3 -DNDEBUG -DNDEBUG -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -ITOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/git/include -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot -O2 -pipe -g -feliminate-unused-debug-types -fmacro-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0=/usr/src/debug/opencv/4.5.2-r0 -fdebug-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0=/usr/src/debug/opencv/4.5.2-r0 -fdebug-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot= -fdebug-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot-native= -fvisibility-inlines-hidden -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -ITOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/git/include -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now -Wl,--gc-sections -Wl,--as-needed samples/cpp/CMakeFiles/example_tutorial_perspective_correction.dir/tutorial_code/features2D/Homography/perspective_correction.cpp.o -o bin/example_tutorial_perspective_correction -ldl -lm -lpthread -lrt lib/libopencv_gapi.so.4.5.2 lib/libopencv_stitching.so.4.5.2 lib/libopencv_ts.so.4.5.2 lib/libopencv_alphamat.so.4.5.2 lib/libopencv_aruco.so.4.5.2 lib/libopencv_bgsegm.so.4.5.2 lib/libopencv_bioinspired.so.4.5.2 lib/libopencv_ccalib.so.4.5.2 lib/libopencv_dnn_objdetect.so.4.5.2 lib/libopencv_dnn_superres.so.4.5.2 lib/libopencv_dpm.so.4.5.2 lib/libopencv_face.so.4.5.2 lib/libopencv_fuzzy.so.4.5.2 lib/libopencv_hfs.so.4.5.2 lib/libopencv_img_hash.so.4.5.2 lib/libopencv_intensity_transform.so.4.5.2 lib/libopencv_line_descriptor.so.4.5.2 lib/libopencv_mcc.so.4.5.2 lib/libopencv_quality.so.4.5.2 lib/libopencv_rapid.so.4.5.2 lib/libopencv_reg.so.4.5.2 lib/libopencv_rgbd.so.4.5.2 lib/libopencv_saliency.so.4.5.2 lib/libopencv_sfm.so.4.5.2 lib/libopencv_stereo.so.4.5.2 lib/libopencv_structured_light.so.4.5.2 lib/libopencv_superres.so.4.5.2 lib/libopencv_surface_matching.so.4.5.2 lib/libopencv_tracking.so.4.5.2 lib/libopencv_videostab.so.4.5.2 lib/libopencv_wechat_qrcode.so.4.5.2 lib/libopencv_xfeatures2d.so.4.5.2 lib/libopencv_xobjdetect.so.4.5.2 lib/libopencv_xphoto.so.4.5.2 lib/libopencv_shape.so.4.5.2 lib/libopencv_highgui.so.4.5.2 lib/libopencv_datasets.so.4.5.2 lib/libopencv_ml.so.4.5.2 lib/libopencv_plot.so.4.5.2 lib/libopencv_phase_unwrapping.so.4.5.2 lib/libopencv_optflow.so.4.5.2 lib/libopencv_ximgproc.so.4.5.2 lib/libopencv_videoio.so.4.5.2 lib/libopencv_video.so.4.5.2 lib/libopencv_dnn.so.4.5.2 lib/libopencv_imgcodecs.so.4.5.2 lib/libopencv_objdetect.so.4.5.2 lib/libopencv_calib3d.so.4.5.2 lib/libopencv_features2d.so.4.5.2 lib/libopencv_flann.so.4.5.2 lib/libopencv_photo.so.4.5.2 lib/libopencv_imgproc.so.4.5.2 lib/libopencv_core.so.4.5.2 -Wl,-rpath-link,TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/build/lib && : -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::LogMessage::LogMessage(char const*, int)' -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::LogMessage::stream()' -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::LogMessage::~LogMessage()' -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::kLogSiteUninitialized' -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'fLI::FLAGS_v' -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::InitVLOG3__(int**, int*, char const*, int)' -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::LogMessageFatal::LogMessageFatal(char const*, int)' -lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::LogMessageFatal::~LogMessageFatal()' -collect2: error: ld returned 1 exit status - - Add Glog_LIBS which is set to the same value as GLOG_LIBRARIES used to be. - -Upstream-Status: Submitted [https://github.com/opencv/opencv_contrib/pull/2923] - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - modules/sfm/CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/modules/sfm/CMakeLists.txt b/modules/sfm/CMakeLists.txt -index 045a1fe6e..ee7cecdac 100644 ---- a/modules/sfm/CMakeLists.txt -+++ b/modules/sfm/CMakeLists.txt -@@ -84,6 +84,7 @@ set(LIBMV_LIGHT_LIBS - multiview - numeric - ${GLOG_LIBRARIES} -+ ${Glog_LIBS} - ${GFLAGS_LIBRARIES} - ) - diff --git a/meta-oe/recipes-support/opencv/opencv_4.5.2.bb b/meta-oe/recipes-support/opencv/opencv_4.5.5.bb similarity index 97% rename from meta-oe/recipes-support/opencv/opencv_4.5.2.bb rename to meta-oe/recipes-support/opencv/opencv_4.5.5.bb index 2f2a505ed..ca50e80b0 100644 --- a/meta-oe/recipes-support/opencv/opencv_4.5.2.bb +++ b/meta-oe/recipes-support/opencv/opencv_4.5.5.bb @@ -10,7 +10,7 @@ ARM_INSTRUCTION_SET:armv5 = "arm" DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" -SRCREV_opencv = "69357b1e88680658a07cffde7678a4d697469f03" +SRCREV_opencv = "dad26339a975b49cfb6c7dbe4bd5276c9dcb36e2" SRCREV_contrib = "f5d7f6712d4ff229ba4f45cf79dfd11c557d56fd" SRCREV_ipp = "a56b6ac6f030c312b2dce17430eef13aed9af274" SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" @@ -51,8 +51,6 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv;branch=master;protocol file://0001-Dont-use-isystem.patch \ file://download.patch \ file://0001-Make-ts-module-external.patch \ - file://0001-sfm-link-with-Glog_LIBS.patch;patchdir=../contrib \ - file://0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch \ " SRC_URI:append:riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=../contrib" @@ -105,7 +103,7 @@ EXTRA_OECMAKE:append:x86 = " -DX86=ON" PACKAGECONFIG ??= "gapi python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \ - ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libav", "", d)}" + " # TBB does not build for powerpc so disable that package config PACKAGECONFIG:remove:powerpc = "tbb"
Drop backports. Disable ffmpeg, as opencv is not yet compatible with ffmpeg 5.0. Signed-off-by: Alexander Kanavin <alex@linutronix.de> --- ...gument-version-of-SetTotalBytesLimit.patch | 41 ----------------- .../opencv/0001-sfm-link-with-Glog_LIBS.patch | 44 ------------------- .../{opencv_4.5.2.bb => opencv_4.5.5.bb} | 6 +-- 3 files changed, 2 insertions(+), 89 deletions(-) delete mode 100644 meta-oe/recipes-support/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch delete mode 100644 meta-oe/recipes-support/opencv/opencv/0001-sfm-link-with-Glog_LIBS.patch rename meta-oe/recipes-support/opencv/{opencv_4.5.2.bb => opencv_4.5.5.bb} (97%)