* [PATCH 1/4] minidlna: update 1.2.1 -> 1.3.0
@ 2022-01-22 21:46 Alexander Kanavin
2022-01-22 21:46 ` [PATCH 2/4] mpd: update 0.22.9 -> 0.23.5 Alexander Kanavin
` (2 more replies)
0 siblings, 3 replies; 10+ messages in thread
From: Alexander Kanavin @ 2022-01-22 21:46 UTC (permalink / raw)
To: openembedded-devel; +Cc: Alexander Kanavin, Khem Raj
Drop unneeded patch.
This addresses build failures with ffmpeg 5.0
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
.../recipes-multimedia/minidlna/minidlna.inc | 2 +-
...ark-setjmp_buffer-extern-declaration.patch | 29 ---------------
...for-clock_gettime-seprately-from-__N.patch | 19 ++++------
...onfigure.ac-drop-non-standard-checks.patch | 37 +++++++++++++++++++
.../{minidlna_1.2.1.bb => minidlna_1.3.0.bb} | 2 +-
5 files changed, 46 insertions(+), 43 deletions(-)
delete mode 100644 meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Mark-setjmp_buffer-extern-declaration.patch
create mode 100644 meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-configure.ac-drop-non-standard-checks.patch
rename meta-multimedia/recipes-multimedia/minidlna/{minidlna_1.2.1.bb => minidlna_1.3.0.bb} (66%)
diff --git a/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc b/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc
index da2607fcf..7f916b2be 100644
--- a/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc
+++ b/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc
@@ -13,7 +13,7 @@ SRC_URI = "git://git.code.sf.net/p/minidlna/git;branch=master;module=git \
file://minidlna.service \
file://0001-Update-Gettext-version.patch \
file://0001-configure-Check-for-clock_gettime-seprately-from-__N.patch \
- file://0001-Mark-setjmp_buffer-extern-declaration.patch \
+ file://0001-configure.ac-drop-non-standard-checks.patch \
"
S = "${WORKDIR}/git"
diff --git a/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Mark-setjmp_buffer-extern-declaration.patch b/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Mark-setjmp_buffer-extern-declaration.patch
deleted file mode 100644
index 0a1e800c8..000000000
--- a/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Mark-setjmp_buffer-extern-declaration.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 1c6028f5f8bbfd3fd7327a43e1bb762c2c166167 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 12 Aug 2020 18:10:54 -0700
-Subject: [PATCH] Mark setjmp_buffer extern declaration
-
-Fixes build with -fno-common
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- metadata.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/metadata.c b/metadata.c
-index 8a10c77..c114091 100644
---- a/metadata.c
-+++ b/metadata.c
-@@ -484,7 +484,7 @@ GetAudioMetadata(const char *path, const char *name)
- }
-
- /* For libjpeg error handling */
--jmp_buf setjmp_buffer;
-+extern jmp_buf setjmp_buffer;
- static void
- libjpeg_error_handler(j_common_ptr cinfo)
- {
---
-2.28.0
-
diff --git a/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-configure-Check-for-clock_gettime-seprately-from-__N.patch b/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-configure-Check-for-clock_gettime-seprately-from-__N.patch
index 24a307db1..dd29797a6 100644
--- a/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-configure-Check-for-clock_gettime-seprately-from-__N.patch
+++ b/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-configure-Check-for-clock_gettime-seprately-from-__N.patch
@@ -1,4 +1,4 @@
-From 1118b1912916924bbfa3fd4dced9dfed01fbf0e0 Mon Sep 17 00:00:00 2001
+From 93e7e25a10c890b8c8cd06cbfd78175c30999d31 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 9 Mar 2020 09:44:33 -0700
Subject: [PATCH] configure: Check for clock_gettime seprately from
@@ -9,13 +9,16 @@ since direct use of __NR_clock_gettime is not time64-safe
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
---
- configure.ac | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
+ configure.ac | 4 ++++
+ 1 file changed, 4 insertions(+)
+diff --git a/configure.ac b/configure.ac
+index 3d218ea..aa7dd1c 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -125,6 +125,10 @@ case $host in
+@@ -127,6 +127,10 @@ case $host in
esac
AC_CHECK_HEADERS(syscall.h sys/syscall.h mach/mach_time.h)
@@ -26,11 +29,3 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
AC_MSG_CHECKING([for __NR_clock_gettime syscall])
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM(
-@@ -143,7 +147,6 @@ AC_COMPILE_IFELSE(
- ],
- [
- AC_MSG_RESULT([no])
-- AC_SEARCH_LIBS([clock_gettime], [rt], [AC_DEFINE([HAVE_CLOCK_GETTIME], [1], [use clock_gettime])],)
- ])
-
- AC_CHECK_HEADER(linux/netlink.h,
diff --git a/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-configure.ac-drop-non-standard-checks.patch b/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-configure.ac-drop-non-standard-checks.patch
new file mode 100644
index 000000000..93334b7da
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-configure.ac-drop-non-standard-checks.patch
@@ -0,0 +1,37 @@
+From 83425344b2d7339e8f5b0ad230c51278d330d613 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Sat, 22 Jan 2022 11:41:50 +0100
+Subject: [PATCH] configure.ac: drop non-standard checks
+
+Not sure what upstream is trying to do here but it does not work
+with the latest autoconf.
+
+Upstream-Status: Inactive-Upstream
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ configure.ac | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index aa7dd1c..858db52 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -418,7 +418,6 @@ for dir in "" /usr/local $SEARCH_DIR; do
+ AC_CHECK_LIB([id3tag -lz], [id3_file_open], [LIBID3TAG_LIBS="-lid3tag -lz"], [unset ac_cv_lib_id3tag_id3_file_open; LDFLAGS="$LDFLAGS_SAVE"; continue])
+ break
+ done
+-test x"$ac_cv_lib_id3tag__lz___id3_file_open" = x"yes" || AC_MSG_ERROR([Could not find libid3tag])
+ AC_SUBST(LIBID3TAG_LIBS)
+
+ LDFLAGS_SAVE="$LDFLAGS"
+@@ -444,10 +443,6 @@ for dir in "" /usr/local $SEARCH_DIR; do
+ [unset ac_cv_lib_avformat_av_open_input_file; unset ac_cv_lib_avformat_avformat_open_input; LDFLAGS="$LDFLAGS_SAVE"; continue])])
+ break
+ done
+-if test x"$ac_cv_lib_avformat__lavcodec__lavutil__lz___av_open_input_file" != x"yes" &&
+- test x"$ac_cv_lib_avformat__lavcodec__lavutil__lz___avformat_open_input" != x"yes"; then
+- AC_MSG_ERROR([Could not find libavformat - part of ffmpeg])
+-fi
+ AC_SUBST(LIBAVFORMAT_LIBS)
+
+ AC_CHECK_LIB(pthread, pthread_create)
diff --git a/meta-multimedia/recipes-multimedia/minidlna/minidlna_1.2.1.bb b/meta-multimedia/recipes-multimedia/minidlna/minidlna_1.3.0.bb
similarity index 66%
rename from meta-multimedia/recipes-multimedia/minidlna/minidlna_1.2.1.bb
rename to meta-multimedia/recipes-multimedia/minidlna/minidlna_1.3.0.bb
index 999d85ce7..4238918c9 100644
--- a/meta-multimedia/recipes-multimedia/minidlna/minidlna_1.2.1.bb
+++ b/meta-multimedia/recipes-multimedia/minidlna/minidlna_1.3.0.bb
@@ -1,4 +1,4 @@
require ${BPN}.inc
-SRCREV = "c760a338e07ebd11d62fef701e3de824a91f8625"
+SRCREV = "109d63cb11ac207c18a784556834eb054b34b00b"
LIC_FILES_CHKSUM = "file://LICENCE.miniupnpd;md5=b0dabf9d8e0f871554e309d62ead8d2b"
--
2.20.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 2/4] mpd: update 0.22.9 -> 0.23.5
2022-01-22 21:46 [PATCH 1/4] minidlna: update 1.2.1 -> 1.3.0 Alexander Kanavin
@ 2022-01-22 21:46 ` Alexander Kanavin
2022-01-22 21:46 ` [PATCH 3/4] libvncserver: disable ffmpeg support due to incompatiblility with ffmpeg 5.0 Alexander Kanavin
2022-01-22 21:46 ` [PATCH 4/4] opencv: update 4.5.2 -> 4.5.5 Alexander Kanavin
2 siblings, 0 replies; 10+ messages in thread
From: Alexander Kanavin @ 2022-01-22 21:46 UTC (permalink / raw)
To: openembedded-devel; +Cc: Alexander Kanavin, Khem Raj
This resolves ffmpeg 5.0 issues.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
...0001-include-utility-for-std-forward.patch | 43 -------------------
.../musicpd/{mpd_0.22.9.bb => mpd_0.23.5.bb} | 13 +++---
2 files changed, 6 insertions(+), 50 deletions(-)
delete mode 100644 meta-multimedia/recipes-multimedia/musicpd/mpd/0001-include-utility-for-std-forward.patch
rename meta-multimedia/recipes-multimedia/musicpd/{mpd_0.22.9.bb => mpd_0.23.5.bb} (93%)
diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-include-utility-for-std-forward.patch b/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-include-utility-for-std-forward.patch
deleted file mode 100644
index 68ccb6583..000000000
--- a/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-include-utility-for-std-forward.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 9bb962148672a3c20fb0119d7f71789b8ef3dc02 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 29 Jun 2021 19:31:34 -0700
-Subject: [PATCH] include <utility> for std::forward
-
-Fixes
-../git/src/Log.hxx:121:42: error: no member named 'forward' in namespace 'std'
- LogFormat(LogLevel::ERROR, e, fmt, std::forward<Args>(args)...);
-
-Upstream-Status: Submitted [https://github.com/MusicPlayerDaemon/MPD/pull/1201]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/Log.hxx | 1 +
- src/lib/expat/ExpatParser.hxx | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/src/Log.hxx b/src/Log.hxx
-index a295ed9f6..87097b086 100644
---- a/src/Log.hxx
-+++ b/src/Log.hxx
-@@ -24,6 +24,7 @@
- #include "util/Compiler.h"
-
- #include <exception>
-+#include <utility>
-
- class Domain;
-
-diff --git a/src/lib/expat/ExpatParser.hxx b/src/lib/expat/ExpatParser.hxx
-index e1723d109..4b5221e89 100644
---- a/src/lib/expat/ExpatParser.hxx
-+++ b/src/lib/expat/ExpatParser.hxx
-@@ -25,6 +25,7 @@
- #include <expat.h>
-
- #include <stdexcept>
-+#include <utility>
-
- class InputStream;
-
---
-2.32.0
-
diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.22.9.bb b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.5.bb
similarity index 93%
rename from meta-multimedia/recipes-multimedia/musicpd/mpd_0.22.9.bb
rename to meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.5.bb
index 4eac25674..3c6f3e41c 100644
--- a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.22.9.bb
+++ b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.5.bb
@@ -15,14 +15,13 @@ DEPENDS += " \
icu \
dbus \
expat \
+ fmt \
"
-SRC_URI = " \
- git://github.com/MusicPlayerDaemon/MPD;branch=v0.22.x;protocol=https \
- file://0001-include-utility-for-std-forward.patch \
- file://mpd.conf.in \
-"
-SRCREV = "18628bf89ebfa5a806971479a71cf9b5764e500e"
+SRC_URI = "git://github.com/MusicPlayerDaemon/MPD;branch=v0.23.x;protocol=https \
+ file://mpd.conf.in \
+ "
+SRCREV = "df4b6b92f2c4bba1b55fe0a5559b19808abb28ff"
S = "${WORKDIR}/git"
EXTRA_OEMESON += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-Dsystemd=enabled -Dsystemd_system_unit_dir=${systemd_system_unitdir} -Dsystemd_user_unit_dir=${systemd_system_unitdir}', '-Dsystemd=disabled', d)}"
@@ -63,7 +62,7 @@ PACKAGECONFIG[oss] = "-Doss=enabled,-Doss=disabled,"
PACKAGECONFIG[recorder] = "-Drecorder=true,-Drecorder=false"
PACKAGECONFIG[smb] = "-Dsmbclient=enabled,-Dsmbclient=disabled,samba"
PACKAGECONFIG[sndfile] = "-Dsndfile=enabled,-Dsndfile=disabled,libsndfile1"
-PACKAGECONFIG[upnp] = "-Dupnp=enabled,-Dupnp=disabled,libupnp"
+PACKAGECONFIG[upnp] = "-Dupnp=pupnp,-Dupnp=disabled,libupnp"
PACKAGECONFIG[vorbis] = "-Dvorbis=enabled,-Dvorbis=disabled,libvorbis libogg"
PACKAGECONFIG[wavpack] = "-Dwavpack=enabled,-Dwavpack=disabled,wavpack"
PACKAGECONFIG[zlib] = "-Dzlib=enabled,-Dzlib=disabled,zlib"
--
2.20.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 3/4] libvncserver: disable ffmpeg support due to incompatiblility with ffmpeg 5.0
2022-01-22 21:46 [PATCH 1/4] minidlna: update 1.2.1 -> 1.3.0 Alexander Kanavin
2022-01-22 21:46 ` [PATCH 2/4] mpd: update 0.22.9 -> 0.23.5 Alexander Kanavin
@ 2022-01-22 21:46 ` Alexander Kanavin
2022-01-22 21:46 ` [PATCH 4/4] opencv: update 4.5.2 -> 4.5.5 Alexander Kanavin
2 siblings, 0 replies; 10+ messages in thread
From: Alexander Kanavin @ 2022-01-22 21:46 UTC (permalink / raw)
To: openembedded-devel; +Cc: Alexander Kanavin
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.13.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.13.bb b/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.13.bb
index c3b664599..e3f2dafec 100644
--- a/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.13.bb
+++ b/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.13.bb
@@ -5,10 +5,10 @@ PRIORITY = "optional"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f"
+# ffmpeg support is not currently compatible with ffmpeg 5.0
PACKAGECONFIG ??= " \
24bpp \
filetransfer \
- ${@bb.utils.contains('LICENSE_FLAGS_WHITELIST','commercial','ffmpeg','',d)} \
gcrypt \
gnutls \
jpeg \
--
2.20.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 4/4] opencv: update 4.5.2 -> 4.5.5
2022-01-22 21:46 [PATCH 1/4] minidlna: update 1.2.1 -> 1.3.0 Alexander Kanavin
2022-01-22 21:46 ` [PATCH 2/4] mpd: update 0.22.9 -> 0.23.5 Alexander Kanavin
2022-01-22 21:46 ` [PATCH 3/4] libvncserver: disable ffmpeg support due to incompatiblility with ffmpeg 5.0 Alexander Kanavin
@ 2022-01-22 21:46 ` Alexander Kanavin
2022-05-19 9:37 ` [oe] " Böszörményi Zoltán
2 siblings, 1 reply; 10+ messages in thread
From: Alexander Kanavin @ 2022-01-22 21:46 UTC (permalink / raw)
To: openembedded-devel; +Cc: Alexander Kanavin, Martin Jansa
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%)
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"
--
2.20.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [oe] [PATCH 4/4] opencv: update 4.5.2 -> 4.5.5
2022-01-22 21:46 ` [PATCH 4/4] opencv: update 4.5.2 -> 4.5.5 Alexander Kanavin
@ 2022-05-19 9:37 ` Böszörményi Zoltán
2022-05-19 9:44 ` Alexander Kanavin
0 siblings, 1 reply; 10+ messages in thread
From: Böszörményi Zoltán @ 2022-05-19 9:37 UTC (permalink / raw)
To: Alexander Kanavin, openembedded-devel; +Cc: Alexander Kanavin, Martin Jansa
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]
> -=-=-=-=-=-=-=-=-=-=-=-
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [oe] [PATCH 4/4] opencv: update 4.5.2 -> 4.5.5
2022-05-19 9:37 ` [oe] " Böszörményi Zoltán
@ 2022-05-19 9:44 ` Alexander Kanavin
2022-05-19 9:53 ` Böszörményi Zoltán
2022-06-17 5:35 ` Böszörményi Zoltán
0 siblings, 2 replies; 10+ messages in thread
From: Alexander Kanavin @ 2022-05-19 9:44 UTC (permalink / raw)
To: Böszörményi Zoltán
Cc: OpenEmbedded Devel List, Alexander Kanavin, Martin Jansa
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]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [oe] [PATCH 4/4] opencv: update 4.5.2 -> 4.5.5
2022-05-19 9:44 ` Alexander Kanavin
@ 2022-05-19 9:53 ` Böszörményi Zoltán
2022-06-17 5:35 ` Böszörményi Zoltán
1 sibling, 0 replies; 10+ messages in thread
From: Böszörményi Zoltán @ 2022-05-19 9:53 UTC (permalink / raw)
To: Alexander Kanavin
Cc: OpenEmbedded Devel List, Alexander Kanavin, Martin Jansa
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]
>> -=-=-=-=-=-=-=-=-=-=-=-
>>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [oe] [PATCH 4/4] opencv: update 4.5.2 -> 4.5.5
2022-05-19 9:44 ` Alexander Kanavin
2022-05-19 9:53 ` Böszörményi Zoltán
@ 2022-06-17 5:35 ` Böszörményi Zoltán
2022-06-17 9:16 ` Alexander Kanavin
1 sibling, 1 reply; 10+ messages in thread
From: Böszörményi Zoltán @ 2022-06-17 5:35 UTC (permalink / raw)
To: Alexander Kanavin
Cc: OpenEmbedded Devel List, Alexander Kanavin, Martin Jansa
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]
>>> -=-=-=-=-=-=-=-=-=-=-=-
>>>
>>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [oe] [PATCH 4/4] opencv: update 4.5.2 -> 4.5.5
2022-06-17 5:35 ` Böszörményi Zoltán
@ 2022-06-17 9:16 ` Alexander Kanavin
2022-06-17 14:44 ` Böszörményi Zoltán
0 siblings, 1 reply; 10+ messages in thread
From: Alexander Kanavin @ 2022-06-17 9:16 UTC (permalink / raw)
To: Böszörményi Zoltán
Cc: OpenEmbedded Devel List, Alexander Kanavin, Martin Jansa
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]
> >>> -=-=-=-=-=-=-=-=-=-=-=-
> >>>
> >>
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [oe] [PATCH 4/4] opencv: update 4.5.2 -> 4.5.5
2022-06-17 9:16 ` Alexander Kanavin
@ 2022-06-17 14:44 ` Böszörményi Zoltán
0 siblings, 0 replies; 10+ messages in thread
From: Böszörményi Zoltán @ 2022-06-17 14:44 UTC (permalink / raw)
To: Alexander Kanavin
Cc: OpenEmbedded Devel List, Alexander Kanavin, Martin Jansa
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]
>>>>> -=-=-=-=-=-=-=-=-=-=-=-
>>>>>
>>>>
>>
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2022-06-17 14:45 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-22 21:46 [PATCH 1/4] minidlna: update 1.2.1 -> 1.3.0 Alexander Kanavin
2022-01-22 21:46 ` [PATCH 2/4] mpd: update 0.22.9 -> 0.23.5 Alexander Kanavin
2022-01-22 21:46 ` [PATCH 3/4] libvncserver: disable ffmpeg support due to incompatiblility with ffmpeg 5.0 Alexander Kanavin
2022-01-22 21:46 ` [PATCH 4/4] opencv: update 4.5.2 -> 4.5.5 Alexander Kanavin
2022-05-19 9:37 ` [oe] " Böszörményi Zoltán
2022-05-19 9:44 ` Alexander Kanavin
2022-05-19 9:53 ` Böszörményi Zoltán
2022-06-17 5:35 ` Böszörményi Zoltán
2022-06-17 9:16 ` Alexander Kanavin
2022-06-17 14:44 ` Böszörményi Zoltán
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.