From patchwork Sat Jan 22 21:46:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 2824 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 501DCC433EF for ; Sat, 22 Jan 2022 21:47:00 +0000 (UTC) Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mx.groups.io with SMTP id smtpd.web10.2050.1642888019532317684 for ; Sat, 22 Jan 2022 13:46:59 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=F2bssAdn; spf=pass (domain: gmail.com, ip: 209.85.221.51, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f51.google.com with SMTP id u15so6440247wrt.3 for ; Sat, 22 Jan 2022 13:46:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=VYTKsNllLbbZrbSUk3080Rf9RU5BNb6QHRhsJT+11dI=; b=F2bssAdn6G51Tk2O6fliZASMWsV3bMo1iy2o9UKl5T5IOz7RxuMJpWpwoTmCuBERFD bescEY6x4P8u7oI3FbnBRNqSCqGerY72OFS1Jyj/H3s+9x0TyBn6GsmhXVklE+auvYcG cujNZG4EU3W9K1ApK95zUyk8BkAn1f+8uKvZ8Qu70x04uCIpQwjfG/7UiCj3SJl3p9UM SfB28WrE3cHiw0/nJBS++GC+TvoY0r13Uk7H54d6OdT3JagauwS1Y9YWfHA/hQhW+f5C AayCr5pmaCdIIVBPoarMM3TbVzC1gzAaAszXTUGSWZlZ7u6ivyRv5evzRoCSqtJQUJhC U0Yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=VYTKsNllLbbZrbSUk3080Rf9RU5BNb6QHRhsJT+11dI=; b=GgbMD2K/wcgVT+gA6r6asAXafgtHD32Wa6hA9+7Ju5haTLfsb+xiZQTF4E4rs1zN1m QCZJHWe0UCUlSMUv6BqdfkNam7aFL7KCAKAewld5U4XE+mnmTLR+tLXVdIZufnJs96jl F44WoggaruYjmqQpNmmZxTgR+m502wiOoBSo0hvA1rJK4werO2oozjrp6FsmjghTC0ZM quBoGsQIkKsCUrqNhgpPqNHCx6IgoJ2Gw+a9e7NGA1flouUmb/wofWPglUG9H2FJnLNd lyEbIv+PvtRLEE8gNmWiCWkuK9r4OdANIrw/T89wkWwBrpBD9EMtETDCkbIAHQdKRd8B EixQ== X-Gm-Message-State: AOAM532lLu9uyDgk1G2g7sL8MxYRWEvqPtX4G8dLRc0BL5QU7IFKsgUI 2i2JAWlb12Sy8eDgaZahxRGTSAcQwtw= X-Google-Smtp-Source: ABdhPJyEh45lFtCODIxtNZeD3shbmCzlxxMpVVM/TKPe33sNoOEyP8mzztCbLoxah8XEegA9HhBLJQ== X-Received: by 2002:a5d:6d8a:: with SMTP id l10mr8975272wrs.490.1642888017991; Sat, 22 Jan 2022 13:46:57 -0800 (PST) Received: from nereus.lab.linutronix.de. (b2b-109-90-143-203.unitymedia.biz. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id h11sm14491343wmb.12.2022.01.22.13.46.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Jan 2022 13:46:57 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin , Khem Raj Subject: [PATCH 1/4] minidlna: update 1.2.1 -> 1.3.0 Date: Sat, 22 Jan 2022 22:46:49 +0100 Message-Id: <20220122214652.929263-1-alex@linutronix.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 22 Jan 2022 21:47:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/95008 Drop unneeded patch. This addresses build failures with ffmpeg 5.0 Signed-off-by: Alexander Kanavin --- .../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 -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 ---- - 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 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 + --- - 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 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 +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 +--- + 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" From patchwork Sat Jan 22 21:46:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 2822 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1D7FFC433F5 for ; Sat, 22 Jan 2022 21:47:01 +0000 (UTC) Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mx.groups.io with SMTP id smtpd.web09.2076.1642888020043688439 for ; Sat, 22 Jan 2022 13:47:00 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=J/t1l7gj; spf=pass (domain: gmail.com, ip: 209.85.221.46, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f46.google.com with SMTP id f17so6464836wrx.1 for ; Sat, 22 Jan 2022 13:46:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=m6C52p0/otumOp1CU3xDtS41twLhl9sjFPpuZZQakT4=; b=J/t1l7gjI2ao7Hn/8Y3x13B/MdQNG435hkOaGlihdJZddRDB8ltRAQFpW9fQ5MUpJ5 nIURLwaDDK9lrgy8JRcOhGBCTw5bPv44qA/cPGljh0sEn+Ur/3JUdWFYMnnvDJIYX+8X G7rvCCwj91ew7ebvRHuoZw5MUe5ZJD00B6xAqNgBKGBt0rB2QnQcaGmlvvHB2VzD+wDS g3xoYt8Tua7jBN3j+65dfCV7QLK7NOCOTzWCSwMdMHM1l5C9yF2MAdRec4fYR6eP5hTE fisavaVc/3n2iuz21FrH8zclXPRC+TfD3Sv8MrOGtyJis6R0vDy5OsaX0HsfYun/RrYb yLsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=m6C52p0/otumOp1CU3xDtS41twLhl9sjFPpuZZQakT4=; b=4XcJtp/FJ0CBV6b5f8yR1nDChO6eDPhlHtakZHUDp6QeJe0qt3JpYtXk4Ol1yeXpVQ w5IJYIyvY7thf3LzLB2msQdCnhznCJOEyxcjnWBpcLvfGXvlagp6cAk/AgceUoEC+TZY FZKyBPLG6+NYdS/G8w8JLQrAbB7H6w+QVdLmE9rghvui24nfzcL9oaAq5MPLtwyhxDXb GuJkms62lg/KnKCm0N3lJy32Uemfi7FIze4LJSIwyCEc0LtXAloBWUeXHTIlLDnJUzYv FrLypj9lj+ctossRP1k24JSX7k+YL3bC4wO15w+1xT5SPuiQXugfESyj7hSb7sjNB/sr 5TpQ== X-Gm-Message-State: AOAM531e2uEdBizKCJ7/XyZQdEg/9hhgeMUtH1WwTCNjCQbVLKaiuUpK pYhr3ejW9p24mFZNoY37FP7Twn10ZEo= X-Google-Smtp-Source: ABdhPJyU+dbo1DVAoT8/kZ1wmbi8TYNIpWUjHRWN/mgG05hsMUvpHMrh1DpsNt9+Sxk6nr0Jw2bPkg== X-Received: by 2002:a5d:6250:: with SMTP id m16mr8741792wrv.412.1642888018676; Sat, 22 Jan 2022 13:46:58 -0800 (PST) Received: from nereus.lab.linutronix.de. (b2b-109-90-143-203.unitymedia.biz. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id h11sm14491343wmb.12.2022.01.22.13.46.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Jan 2022 13:46:58 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin , Khem Raj Subject: [PATCH 2/4] mpd: update 0.22.9 -> 0.23.5 Date: Sat, 22 Jan 2022 22:46:50 +0100 Message-Id: <20220122214652.929263-2-alex@linutronix.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220122214652.929263-1-alex@linutronix.de> References: <20220122214652.929263-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 22 Jan 2022 21:47:01 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/95009 This resolves ffmpeg 5.0 issues. Signed-off-by: Alexander Kanavin --- ...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 -Date: Tue, 29 Jun 2021 19:31:34 -0700 -Subject: [PATCH] include 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)...); - -Upstream-Status: Submitted [https://github.com/MusicPlayerDaemon/MPD/pull/1201] -Signed-off-by: Khem Raj ---- - 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 -+#include - - 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 - - #include -+#include - - 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" From patchwork Sat Jan 22 21:46:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 2823 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 24B57C433FE for ; Sat, 22 Jan 2022 21:47:02 +0000 (UTC) Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by mx.groups.io with SMTP id smtpd.web12.2189.1642888020742448461 for ; Sat, 22 Jan 2022 13:47:01 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=DRIYO0u4; spf=pass (domain: gmail.com, ip: 209.85.128.44, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f44.google.com with SMTP id j5-20020a05600c1c0500b0034d2e956aadso25017963wms.4 for ; Sat, 22 Jan 2022 13:47:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Av4d37wmz/Sn+Ja6B/XSA++eCylW0a2PipOKUF8SobE=; b=DRIYO0u4prJRU0KLvX/9avqe/AxiLwCtuIAg/e19DzWTKr2FW56UBCuDTcX+RZFjMa SG9DiKQiJutsfaA+vaCdeYKiWklcyxg1XcrXoYKrtCw1XTu+SoUVqg6XEbKwtCyzs/6s i54pl/JQWQF4SweDY9ZOARcKnkoJY5kF7nyghc9YT6gco1AiwJp5UC51bAEJ3Eg1pCQK CRxtSuslH+ghGIvLwz/TYecVjavC9yvXLGAfCU1Ork5UDvllQuz5+q1L5ClTFp0YGXuJ EuHMA5WRM0F2noWDJy24Cgd6viZ6ZBkbGMcLo1AM1KHFFk5P0rkQ6W7ieskzu6Z5boAs kqJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Av4d37wmz/Sn+Ja6B/XSA++eCylW0a2PipOKUF8SobE=; b=ASVc9b30d8hZzBjKsur1sCN6Wzprur0rGmJyZLApKSwX9IZORSJeXzSV60WQ8h05gk rLgmYvwTjopeVdvlVGQ9/4JKy6jFol+wZWwXtqwkAjR+TCEhQmXANyKQF1ME35ml6vlZ TONYTRF7/2bthbEeTfi18S9iFr3BgOHQuPVJoSLx+AGdU2t08MI1Ilxa0/DCjqnHZ5CW iKGUaHIhkzWsEFOMRgPPqmLQEIbTuDYETo3YC9C4idTCUjgP/2HGsyNj1VVJmatYXpvJ WqJ7mO7jXtLhDmDB3zwCGEQgb650QSNA9jaPwC+Fe3SXNAuCqqGWV1UGDTou5MpBhOQl BQJg== X-Gm-Message-State: AOAM532VlYqZofCPgafQyP0opzgifTpIgd8A9ouJpu1ZWNtjqG+fyTiU n+rBb3+hHVLCrLCMyBGoM/2VX1hBQpI= X-Google-Smtp-Source: ABdhPJxZIWj7GO2woc5I7FQ9IittSorAPBBMPOLwDC3l0k8vK96obB4YT7GGk4AtCqXBWu3xpi5kwg== X-Received: by 2002:a1c:f302:: with SMTP id q2mr5651352wmq.107.1642888019300; Sat, 22 Jan 2022 13:46:59 -0800 (PST) Received: from nereus.lab.linutronix.de. (b2b-109-90-143-203.unitymedia.biz. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id h11sm14491343wmb.12.2022.01.22.13.46.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Jan 2022 13:46:59 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 3/4] libvncserver: disable ffmpeg support due to incompatiblility with ffmpeg 5.0 Date: Sat, 22 Jan 2022 22:46:51 +0100 Message-Id: <20220122214652.929263-3-alex@linutronix.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220122214652.929263-1-alex@linutronix.de> References: <20220122214652.929263-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 22 Jan 2022 21:47:02 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/95010 Signed-off-by: Alexander Kanavin --- 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 \ From patchwork Sat Jan 22 21:46:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 2825 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 255B5C4332F for ; Sat, 22 Jan 2022 21:47:02 +0000 (UTC) Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mx.groups.io with SMTP id smtpd.web11.2087.1642888021497403836 for ; Sat, 22 Jan 2022 13:47:01 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Z6TcdRPq; spf=pass (domain: gmail.com, ip: 209.85.221.44, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f44.google.com with SMTP id a13so6463099wrh.9 for ; Sat, 22 Jan 2022 13:47:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PhhGjwRmQ/AsWv8i4dS7N0D3XhNXP3iXi66WND0aavU=; b=Z6TcdRPqoVliuBaMrktoQquAqbqxO8TNB6HArDL9cm+WLzZ1jq7eS9XfH1NZb3zdtf lvK/OW2oH817tRMgEAWwIR7s+M85HfdhP/iQwkuJ6/Aq0WAw3lSz7kDcTrJjhFfvDC3i LFyVK7paN2vZVI30u8uA3R7vEjvarb790hVMS0q3yU91v0XVxARmrMGFB3nSOTnj2R9n wN+4oA9yg4x1tJid4qntatB1tu1r3m47BHQM0/p+7NMwyJvcjTdWf31IIbTa0I5jxkjt lNJa4bKRb9C2nLYi32hhsRgyCC3oyN9yVFkD4S940UIUIe3q8knxYUJl02hix91Z2VC5 eccQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PhhGjwRmQ/AsWv8i4dS7N0D3XhNXP3iXi66WND0aavU=; b=LjqSiPLSoEgWahBvKtPx8frtj/qKGHv2etWIu9Lgkz2mNokGfSwkno4b8jx/B778or uyL38bIU8GUNdzXsJ65+KxKOtgOOKQ3gbJrUYuKMXnZj2h+G755ZbcuK4oL8qp50B3Z5 IcpT7crShdjwU+dLxo+6Xjl7c/9W8Bt0W2mvBnhWDzZMgwBTi2gM9bp2E5Yd+JLmSogD H9oN1MlDFueUrAgTIIQPu64OPiU4v9qN8O7qYwj13WEnouXIBjYbvUPXOxcl01EfspK/ wQqaoqdqSXs/1ZU6ZoHx8pALBk1DA9ACR7+sbGoScXGZk2ROQ4Tzf+nsILxfDSntWdmT hnNQ== X-Gm-Message-State: AOAM5336j3/Aiv9TYK09iqwoK4rb5TehN4srGlE7sKr4Uzo+Vbhv6ONo zty4lQvWzkhzr8pPdyZ1BDjQJ7VQ9nU= X-Google-Smtp-Source: ABdhPJyF+4Z/+fd3ycnFIOUZI5eyvaMR1AR7EovjjRKKYpe0cEcGEa3KdxNZbzfI2sstXleqvJ54fQ== X-Received: by 2002:a5d:5712:: with SMTP id a18mr8783967wrv.30.1642888020033; Sat, 22 Jan 2022 13:47:00 -0800 (PST) Received: from nereus.lab.linutronix.de. (b2b-109-90-143-203.unitymedia.biz. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id h11sm14491343wmb.12.2022.01.22.13.46.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Jan 2022 13:46:59 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin , Martin Jansa Subject: [PATCH 4/4] opencv: update 4.5.2 -> 4.5.5 Date: Sat, 22 Jan 2022 22:46:52 +0100 Message-Id: <20220122214652.929263-4-alex@linutronix.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220122214652.929263-1-alex@linutronix.de> References: <20220122214652.929263-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 22 Jan 2022 21:47:02 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/95011 Drop backports. Disable ffmpeg, as opencv is not yet compatible with ffmpeg 5.0. Signed-off-by: Alexander Kanavin --- ...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 -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 ---- - 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 - #include -+#include - #include - - #include -@@ -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 -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 ---- - 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"