From patchwork Fri Jan 9 05:01:57 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Yiding Liu (Fujitsu)" X-Patchwork-Id: 78307 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 A1F02D232DE for ; Fri, 9 Jan 2026 05:02:05 +0000 (UTC) Received: from TYVP286CU001.outbound.protection.outlook.com (TYVP286CU001.outbound.protection.outlook.com [52.101.125.33]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.4140.1767934923594569692 for ; Thu, 08 Jan 2026 21:02:04 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@fujitsu.com header.s=selector1 header.b=FeyxDJOQ; spf=pass (domain: fujitsu.com, ip: 52.101.125.33, mailfrom: liuyd.fnst@fujitsu.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=bKOSPLSZNbOKkISx5BYF3Cz77Fsk3FJG3oL5ZcOBINQMWmuJLVxhS0AstDt6EpuATGB3lu1hLCITMC+Rw4yYIHZs+uEqeqSw6Fi399Adj6A6jHLa+UWDTlqmk2pGs3YVxgUu6yH5UtKWd1jGzZE/q97VU67L82y52AyVV19VGHf8FNV17BffVCvH1JCHjFMPfiVSPoSsclMorsdGmvfx2HChQvw3m6TgOuvVVwGlCevZ2N7VXmvoh6ru9qUicxxtFINUYWoJLGIXs0shwaUZnaAuF1fvm7jwNG/v22EKK/8PUkSiTaiMCmHT6ZLFTya0DNDSqu2qWd4F+1bsiHaahQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=XqvJRt9Qbe0pNigd5eOavyyguSPJVG965seo0T94Us4=; b=OOUkTRXV2edgm3XJrqqoZ6u/IoDGcOJjwLyQCDKY9ZByjNUiiZalpFaPfMJGQlN8CTNAmmwVWJS0SiznPdtJETexPWslCHETcoDA3XqaOqQSWbVg72pZx25gI7rT85ymXUeSeTtxer2Qjao/w+0gfjnvQ5vOhpbRzTHQf0+Gqv4k0KRe48RFnUGaBZU/kvLnSuaO+M+tRJHy8JDyCTWfSSKvkWhcpXCg1S4gesFXQMxfCp6npUdtdHK3jsIVLzixAZR9HYPdvyfVhhCnfc6hDHC1vi5UF9eeSuT/EJGsgNpR4EjIidjnnhMyXXVZB4DSDgmaQyWq4h+JaZNonyPoIA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=fujitsu.com; dmarc=pass action=none header.from=fujitsu.com; dkim=pass header.d=fujitsu.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fujitsu.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XqvJRt9Qbe0pNigd5eOavyyguSPJVG965seo0T94Us4=; b=FeyxDJOQhSdnmJu6RlC2KmyL72yi2DXAX/V2U62IJk6YlY++xoPzNtXzqH/uzRgEL91SRCijFbV9PrXx6IWX8J73UDcX/ys0uSUug8R3JCOTTbBOTyb3qaxidZFlBFaei3ASF4bAhi4isNpJ9CTe/c1fqddbZ5H1KUuYiQtMzimgwFHHITJeqDlAqrEUzl6PSHzJyIDDJIkbdXN8HOnvrIkd0tNVViEFqIOba27Ao+RVSMQ6uPGWu9Ular/e0GLTn2syJQzPTh3GriQkHTefm6oBJnQKT52UMT5SNAZYauv673BV6tqy9vRavsI3CioA0EUDOwiTZD0NSrlYvEcRiA== Received: from TY3PR01MB10110.jpnprd01.prod.outlook.com (2603:1096:400:1d9::5) by OS7PR01MB17385.jpnprd01.prod.outlook.com (2603:1096:604:439::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9499.1; Fri, 9 Jan 2026 05:01:57 +0000 Received: from TY3PR01MB10110.jpnprd01.prod.outlook.com ([fe80::2c3b:3362:fd90:f8aa]) by TY3PR01MB10110.jpnprd01.prod.outlook.com ([fe80::2c3b:3362:fd90:f8aa%5]) with mapi id 15.20.9520.001; Fri, 9 Jan 2026 05:01:57 +0000 From: "Yiding Liu (Fujitsu)" To: Khem Raj CC: "openembedded-devel@lists.openembedded.org" Subject: =?utf-8?b?5Zue5aSNOiBbb2VdW21ldGEtb2VdW1BBVENIXSBvcGVuY3Y6IHVwZ3Jh?= =?utf-8?b?ZGUgNC4xMi4wIC0+IDQuMTMuMA==?= Thread-Topic: [oe][meta-oe][PATCH] opencv: upgrade 4.12.0 -> 4.13.0 Thread-Index: AQHcgN8pBPUrV4Q9IUOkEXhOztjsibVJKYo7 Date: Fri, 9 Jan 2026 05:01:57 +0000 Message-ID: References: <20260107095801.912-1-liuyd.fnst@fujitsu.com> In-Reply-To: Accept-Language: zh-CN, en-US Content-Language: zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: MSIP_Label_a7295cc1-d279-42ac-ab4d-3b0f4fece050_Enabled=True;MSIP_Label_a7295cc1-d279-42ac-ab4d-3b0f4fece050_SiteId=a19f121d-81e1-4858-a9d8-736e267fd4c7;MSIP_Label_a7295cc1-d279-42ac-ab4d-3b0f4fece050_SetDate=2026-01-09T05:01:56.564Z;MSIP_Label_a7295cc1-d279-42ac-ab4d-3b0f4fece050_Name=FUJITSU-RESTRICTED;MSIP_Label_a7295cc1-d279-42ac-ab4d-3b0f4fece050_ContentBits=1;MSIP_Label_a7295cc1-d279-42ac-ab4d-3b0f4fece050_Method=Standard; authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=fujitsu.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: TY3PR01MB10110:EE_|OS7PR01MB17385:EE_ x-ms-office365-filtering-correlation-id: 2dc27eeb-80ba-404c-cd02-08de4f3c3715 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0;ARA:13230040|4022899009|1800799024|366016|376014|1580799027|7053199007|38070700021|13003099007|8096899003; x-microsoft-antispam-message-info: =?utf-8?q?0La/8JO66/5Ledf/wdP09mP+pkl5S3J?= =?utf-8?q?dF9Wy5h9gJMDdLg6QCmo4gevEYxn5eNXvbplRr20mfcyrZcOcYYrVzJBpREfTXJrn?= =?utf-8?q?lPM8KHMvlI8Pe/NYixmONgg2NwAdvhKqCqbFQtiItauQBLc+U1tXNeOHiQTfL62i3?= =?utf-8?q?gMuwMWu1IAu3P78AcZkdAuYG0uX0T7oC3MsGGn/hbJYwThJZHVIDt6N5NlZCpllvG?= =?utf-8?q?ZepJ+vd7tkiTXECQBswgOxhZKdXaMzonBBzKzkSARkCnQBbYisE927t/DQLx0UdtC?= =?utf-8?q?1SqzmVcXX+ODtVu/HK4VsxMH/H5ISuQzkDZudWk/BcqDPHJ91WR/CZj8OnbJv3FBW?= =?utf-8?q?LVkZVMasV6qIvcvH0PkNa9SaOFYzCKlF7K4InKG7/anSQcNf5KZLBwqQyK0DEIts8?= =?utf-8?q?lc1cF0rc8PMhoGLRU0F/tjh5GPP97YCAvg1XOCB6pvJ+/IBnjRGuPy+X3cKdjqsDQ?= =?utf-8?q?hccFYho1VpJQR2qYYaU/FrQaG2O3UYrnOWSaypjdf9dPJZio3KTV3nLJ3s4rbXwwF?= =?utf-8?q?iGgjTvYVyeYCH1NMT9BZLVfuQJQkJX7knZmp+epTj86u/R0StCcnstspZnsU0OgWu?= =?utf-8?q?jz+l+rwt/Fc3tLqeOQCAX9fHAeiNLlji7rqlB3pLK4CcE+QwcE4I016+90Pt/DEII?= =?utf-8?q?lj4aqu5w6FP/r2T52ujxEdzv4dNws7TQm9pTyT6zCB8aODwTT4Ba676olpa2FhZOG?= =?utf-8?q?nctXS7f7ghJn47nO4+DxlWrwHwRaV/Xl3J58bxBuX45heFXgXiozrL6K6vOE0XshQ?= =?utf-8?q?Sf08QOjvLSXgT15A4TfSQcCI0NOPet+UW4UGj3ffuTnOR24NQyGwek1MDFGHBk8J7?= =?utf-8?q?V83yZkkPQurdvxrBCgKgOW9XztEm7A4d5c8/M7H4TmXcxyZPcpREL4zF+HF6ryD5d?= =?utf-8?q?kOcTtWESwBH5y1xVpg3htVjA0u6byc+p1yymRcuJWHYYNb8fA1CZxVegGr7JZxMmr?= =?utf-8?q?ypgI5bu5DUdvIdbWAAquFVFY551bYBsAkwFqePG3VDqYKM5vgIw/5dB/aUbEmgTW4?= =?utf-8?q?zvrfG5fyy+TsHrhwn9CJq73piC0WBhm1WVAmh37yhrLOk8Za+HNQy8XKZ3e+EJvFi?= =?utf-8?q?P/OnkfYaO6YSaSMHgFi5aPJN/pKIxdJQ9uyLa1aIfqNBjQbuPNgkqtCc8mGKg7+U3?= =?utf-8?q?Iw+UjRUdYa+cF9wA/qipYou4iNcX09vn4m+KK99r4/Ibw1WoV/W+DCCQue5gfWHe0?= =?utf-8?q?xd3seQ6lGVLveakZgIn7+zmHkThRlUumyMBe577xheaZL33Ady/1qhC180EWWMjO/?= =?utf-8?q?3ojMGehXbq7lhqNG8GNTYcDqOlRVvCydaGljKzyKNwR+W277DKYhwc3ngFY+oaT4p?= =?utf-8?q?fUQJXCYbZk/ZlAxRkSYdzD/FPis6agosE0tbpUD1RLgw5wPi4TKGgdp2gfxKCpcxm?= =?utf-8?q?uiqvRPxpGX0L9Q/A8+olE/zJAee8gH9rYd4S5qfed1G1Fq+43j3E4o=3D?= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:zh-cn;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:TY3PR01MB10110.jpnprd01.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(4022899009)(1800799024)(366016)(376014)(1580799027)(7053199007)(38070700021)(13003099007)(8096899003);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?yWVYzIvkf0vxMgENEsnjJBxghvay?= =?utf-8?q?uttkLYz82EIdxtf8MN2E/0jnN0GVCdtB/MfIOdchCJdATjxyMRMXkPogSU8FsDTsk?= =?utf-8?q?QPwU3XKNs3w8WfKF2oKHP6vi8h/n21QlyhavfF7EHJSDZohrvTklAWFMLt9tCCTjr?= =?utf-8?q?ymD7VbeSUT0crp5PPpstMDE3Uq4dHyG0WIDB4PCzHOzA8e8ek79F2gIfWbtJxkHWI?= =?utf-8?q?8qvNWNjzfERA4lSbgaD0zIyy9BQK7gOiKZ+UmyjQ9PazBFjcJb5gAnryxvNqc3R+Y?= =?utf-8?q?5VoonaU29M9RC9yIBz2U1UKBDymTG8MPy/hS4bZNJSp8Ju8/ow6p+4oywmOrgk0he?= =?utf-8?q?5ajBa5XkhKOYhsoNGilVBi3wJrOIH3eoCtyS3cA6LnPpkmWOQF/mOBi2gumWWUEUs?= =?utf-8?q?LdJGoD7z4vHj51BigVflolyDNGGGk1wdtAeHsFStjmxb1Ydj/Os3toxUt/C21CoGj?= =?utf-8?q?t3ejMvb7E8kH7RFWoDkeBqPt5aWBAsX7bfJzw0zQawc2B8m1yAIJQfg3qdJdUvH06?= =?utf-8?q?3GbNTfMry7M56ecDV2m/jcMohVueyvLLJS4T/7WoWmaIYHJUUAUP5+4UWYoc/fzxg?= =?utf-8?q?4x1qxJUWh1895H5vkkrDK1f6yjlFHDALeNmQf/pX7P9bEMkjnlkza8WUChF4IusKT?= =?utf-8?q?mXTuX/F2UQ/myTQHzDw+cZY+jPzcszLXrSOhhcxUSxi48SzKpk4QUQifwYYtoCuWQ?= =?utf-8?q?EOXxQzzZPu6qwRuZJlEpqGgyYbxgdCX4HLHjrO8F9ugUHmJ16N5T5t9aKYQ4axKsp?= =?utf-8?q?zOJG+u8b448ltidmEnIVIMjUmVHwpcQuGkw2WpH7g3hgjcSeQ5uF9waAiWAzzcocB?= =?utf-8?q?Qa4uWqtlGC6kp0IJVoMESR1cHlR9aVoucv3iL7kETuWUhb7ZFEJJOyiLoEjHWhwU8?= =?utf-8?q?5j/ABwpi4SSy27EHZCkiXf/q2SbuJHGB4ff7ZLjzB4j7UsuNnysfpSLOO9LyjzKlg?= =?utf-8?q?oVNkDlZM3LLzpNOYKcO9SmfyAcpztiU7xsxklsYzxiLYV2qajLuXLtU2wB1CNXCGd?= =?utf-8?q?7hTv4v06dG74CUDBMWsR6f+BiDXwt80n9O/xjwNoJQ9MnIaLa52uHaIo/mkCNI7fc?= =?utf-8?q?5M9lzKFUd6QQJgxgb4C3h7eOCuwbQs9Ut8G7suSWn0QvVjRA2gTwFDAmybp6gA3mD?= =?utf-8?q?qly+EgoqFm29vdb0vJCDWqoIakTIKSPMikgfh3TfXKJUbSA9tE5kGBkCJv3rg/JsF?= =?utf-8?q?i+Rl/hiPGw68I/hUkRGGF7MjOOjTszaXw8NjusSRn8cdfXmX3rqhuG7SRiuxsE7BN?= =?utf-8?q?64wwHYwtXLleEM11YjvZwDu4evNbDjjgPyOxappiy/PoBazTrPPkGvRLXifPcXITY?= =?utf-8?q?QGjjJKmjY8EAyIsJyowz01hiYMEdmQ/2wvW4k4YcEwOI/hCcKZ/H1AQMLJ3y+NIEB?= =?utf-8?q?l8UXXc6eICHVob+VVSIywVMtnwfXJJUS14D2eJ17eEuOBc3w3AfpD7cE/1LoTE9v1?= =?utf-8?q?1lV3bTc42QBtZdPuJMD5YuPQriSFMZIIWaYxyvIHfel+mlVaUQz8PXEqUb1h6kvl2?= =?utf-8?q?m2p2f1hwUwo3Mq9bpKLyfP/rK5ByXosfpNdDCdQEgBSPlLOqRpKsKR6D+wUk+nwX1?= =?utf-8?q?eNH2V2QPw0NZsdXPH+FPmBjejmB+wXOG7lbEs/gPvNtZSUqFAQ919nvfYLZgNFDNr?= =?utf-8?q?Tj8ig+hDkEjIwiPP9M5pDVsVyihLMEvA=3D=3D?= MIME-Version: 1.0 X-OriginatorOrg: fujitsu.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: TY3PR01MB10110.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2dc27eeb-80ba-404c-cd02-08de4f3c3715 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Jan 2026 05:01:57.3498 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a19f121d-81e1-4858-a9d8-736e267fd4c7 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: mEf2t8KXIsRkn+hHvldc3TUQGD4u9gUVqWaZkkm/t3Xs6CDzmdLb5xQcq/8HGq+TgL2oeyMEc4YDAuJDFHPPnA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS7PR01MB17385 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 09 Jan 2026 05:02:05 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/123273 Hi Khem I compare opencv 4.12.0 and 4.13.0, the default option about kleidicv is different. 1. Compare of CMakeCache.txt file. In 4.12.0 WITH_KLEIDICV:BOOL=OFF In 4.13.0 WITH_KLEIDICV:BOOL=ON So in 4.13.0, KLEIDICV will be configured and kleidicv is not in Depends which result in configure fails. 2. Compare of CMakeLists.txt file. In 4.12.0 OCV_OPTION(WITH_KLEIDICV "Use KleidiCV library for ARM platforms" (ANDROID AND AARCH64 AND NOT CV_DISABLE_OPTIMIZATION) In 4.13.0 OCV_OPTION(WITH_KLEIDICV "Use KleidiCV library for ARM platforms" (NOT CV_DISABLE_OPTIMIZATION) VISIBLE_IF (AARCH64 AND (ANDROID OR UNIX))) In 4.12.0, the condition “ANDROID” is not meeted, so WITH_KLEIDICV is OFF. In 4.13.0, the condition "ANDROID OR UNIX" is meeted, so WITH_KLEIDICV is ON. 3. Which should I do next kleidicv is not in meta-oe now. Should I add a new recipe for kleidicv in meta-oe or just make WITH_KLEIDICV = OFF when using AARCH64? By the way, if add a new recipe for kleidicv, the version of kleidicv should match opencv. e.g opencv 4.13.0 needs kleidicv 0.7.0. How to resolve this problem? ________________________________ 发件人: Khem Raj 发送时间: 2026年1月9日 04:40 收件人: Liu, Yiding/刘 乙丁 抄送: openembedded-devel@lists.openembedded.org 主题: Re: [oe][meta-oe][PATCH] opencv: upgrade 4.12.0 -> 4.13.0 it fails to configure/build on qemurarm64/musl targets | -- Found TBB (cmake): /mnt/stash/tmp/work/cortexa57-yoe-linux-musl/opencv/4.13.0/recipe-sysroot/usr/lib/libtbb.so.12.17 | -- KLEIDICV: Downloading kleidicv-0.7.0.tar.gz from https://gitlab.arm.com/kleidi/kleidicv/-/archive/0.7.0/kleidicv-0.7.0.tar.gz | CMake Error at cmake/OpenCVDownload.cmake:210 (message): | Not going to download kleidicv-0.7.0.tar.gz | Call Stack (most recent call first): | hal/kleidicv/kleidicv.cmake:8 (ocv_download) | cmake/OpenCVFindLibsPerf.cmake:179 (download_kleidicv) | CMakeLists.txt:817 (include) | | On Wed, Jan 7, 2026 at 1:58 AM Yiding Liu (Fujitsu) via lists.openembedded.org > wrote: 1.Change Logs https://github.com/opencv/opencv/wiki/OpenCV-Change-Logs#version4130 2.Remove following patches as they have been merged in upstream. 27691.patch 0001-Renamed-templated-BlocksCompensator-feed-method-to-e.patch Signed-off-by: Liu Yiding > --- ...d-BlocksCompensator-feed-method-to-e.patch | 55 ------------------- .../recipes-support/opencv/opencv/27691.patch | 44 --------------- .../{opencv_4.12.0.bb => opencv_4.13.0.bb} | 14 ++--- 3 files changed, 6 insertions(+), 107 deletions(-) delete mode 100644 meta-oe/recipes-support/opencv/opencv/0001-Renamed-templated-BlocksCompensator-feed-method-to-e.patch delete mode 100644 meta-oe/recipes-support/opencv/opencv/27691.patch rename meta-oe/recipes-support/opencv/{opencv_4.12.0.bb => opencv_4.13.0.bb} (96%) -- 2.43.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#123195): https://lists.openembedded.org/g/openembedded-devel/message/123195 Mute This Topic: https://lists.openembedded.org/mt/117131696/1997914 Group Owner: openembedded-devel+owner@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com] -=-=-=-=-=-=-=-=-=-=-=- diff --git a/meta-oe/recipes-support/opencv/opencv/0001-Renamed-templated-BlocksCompensator-feed-method-to-e.patch b/meta-oe/recipes-support/opencv/opencv/0001-Renamed-templated-BlocksCompensator-feed-method-to-e.patch deleted file mode 100644 index ec2bb2d100..0000000000 --- a/meta-oe/recipes-support/opencv/opencv/0001-Renamed-templated-BlocksCompensator-feed-method-to-e.patch +++ /dev/null @@ -1,55 +0,0 @@ -From b28d9bef1d96d10e9a47d55a63d9f1443e6e3d2b Mon Sep 17 00:00:00 2001 -From: Alexander Smorkalov > -Date: Mon, 8 Sep 2025 14:52:58 +0300 -Subject: [PATCH] Renamed templated BlocksCompensator::feed method to exclude - claches with base class pure virtual method. - -Upstream-Status: Backport [https://github.com/opencv/opencv/commit/b28d9bef1d96d10e9a47d55a63d9f1443e6e3d2b] -Signed-off-by: Peter Kjellerstedt > ---- - .../opencv2/stitching/detail/exposure_compensate.hpp | 2 +- - modules/stitching/src/exposure_compensate.cpp | 6 +++--- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/modules/stitching/include/opencv2/stitching/detail/exposure_compensate.hpp b/modules/stitching/include/opencv2/stitching/detail/exposure_compensate.hpp -index dea76c957b..2954f32ca3 100644 ---- a/modules/stitching/include/opencv2/stitching/detail/exposure_compensate.hpp -+++ b/modules/stitching/include/opencv2/stitching/detail/exposure_compensate.hpp -@@ -187,7 +187,7 @@ public: - - protected: - template -- void feed(const std::vector &corners, const std::vector &images, -+ void feedWithStrategy(const std::vector &corners, const std::vector &images, - const std::vector > &masks); - - private: -diff --git a/modules/stitching/src/exposure_compensate.cpp b/modules/stitching/src/exposure_compensate.cpp -index 59542d95ba..f7c33fa4ef 100644 ---- a/modules/stitching/src/exposure_compensate.cpp -+++ b/modules/stitching/src/exposure_compensate.cpp -@@ -460,7 +460,7 @@ void ChannelsCompensator::setMatGains(std::vector& umv) - - - template --void BlocksCompensator::feed(const std::vector &corners, const std::vector &images, -+void BlocksCompensator::feedWithStrategy(const std::vector &corners, const std::vector &images, - const std::vector > &masks) - { - CV_Assert(corners.size() == images.size() && images.size() == masks.size()); -@@ -605,13 +605,13 @@ void BlocksCompensator::setMatGains(std::vector& umv) - void BlocksGainCompensator::feed(const std::vector &corners, const std::vector &images, - const std::vector > &masks) - { -- BlocksCompensator::feed(corners, images, masks); -+ BlocksCompensator::feedWithStrategy(corners, images, masks); - } - - void BlocksChannelsCompensator::feed(const std::vector &corners, const std::vector &images, - const std::vector > &masks) - { -- BlocksCompensator::feed(corners, images, masks); -+ BlocksCompensator::feedWithStrategy(corners, images, masks); - } - - diff --git a/meta-oe/recipes-support/opencv/opencv/27691.patch b/meta-oe/recipes-support/opencv/opencv/27691.patch deleted file mode 100644 index c8c23c93aa..0000000000 --- a/meta-oe/recipes-support/opencv/opencv/27691.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 90c444abd387ffa70b2e72a34922903a2f0f4f5a Mon Sep 17 00:00:00 2001 -From: Alexander Smorkalov > -Date: Wed, 20 Aug 2025 10:53:51 +0300 -Subject: [PATCH] FFmpeg 8.0 support. - -Upstream-Status: Backport [https://github.com/opencv/opencv/commit/86df53155411b3ade57d0213bf8dd63006bf248f] ---- - modules/videoio/src/cap_ffmpeg_impl.hpp | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -diff --git a/modules/videoio/src/cap_ffmpeg_impl.hpp b/modules/videoio/src/cap_ffmpeg_impl.hpp -index 489dbe565d3d..5780b4c11361 100644 ---- a/modules/videoio/src/cap_ffmpeg_impl.hpp -+++ b/modules/videoio/src/cap_ffmpeg_impl.hpp -@@ -685,7 +685,10 @@ void CvCapture_FFMPEG::close() - if( video_st ) - { - #ifdef CV_FFMPEG_CODECPAR -+// avcodec_close removed in FFmpeg release 8.0 -+# if (LIBAVCODEC_BUILD < CALC_FFMPEG_VERSION(62, 11, 100)) - avcodec_close( context ); -+# endif - #endif - video_st = NULL; - } -@@ -2005,7 +2008,18 @@ void CvCapture_FFMPEG::get_rotation_angle() - rotation_angle = 0; - #if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(57, 68, 100) - const uint8_t *data = 0; -+ // av_stream_get_side_data removed in FFmpeg release 8.0 -+# if (LIBAVCODEC_BUILD < CALC_FFMPEG_VERSION(62, 11, 100)) - data = av_stream_get_side_data(video_st, AV_PKT_DATA_DISPLAYMATRIX, NULL); -+# else -+ AVPacketSideData* sd = video_st->codecpar->coded_side_data; -+ int nb_sd = video_st->codecpar->nb_coded_side_data; -+ if (sd && nb_sd > 0) -+ { -+ const AVPacketSideData* mtx = av_packet_side_data_get(sd, nb_sd, AV_PKT_DATA_DISPLAYMATRIX); -+ data = mtx->data; -+ } -+# endif - if (data) - { - rotation_angle = -cvRound(av_display_rotation_get((const int32_t*)data)); diff --git a/meta-oe/recipes-support/opencv/opencv_4.12.0.bb b/meta-oe/recipes-support/opencv/opencv_4.13.0.bb similarity index 96% rename from meta-oe/recipes-support/opencv/opencv_4.12.0.bb rename to meta-oe/recipes-support/opencv/opencv_4.13.0.bb index b8e83cd6be..315ee571c5 100644 --- a/meta-oe/recipes-support/opencv/opencv_4.12.0.bb +++ b/meta-oe/recipes-support/opencv/opencv_4.13.0.bb @@ -10,31 +10,29 @@ ARM_INSTRUCTION_SET:armv5 = "arm" DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" -SRCREV_opencv = "49486f61fb25722cbcf586b7f4320921d46fb38e" -SRCREV_contrib = "d943e1d61c8bc556a13783e1546ee7c1a9e0b1cf" +SRCREV_opencv = "fe38fc608f6acb8b68953438a62305d8318f4fcd" +SRCREV_contrib = "d99ad2a188210cc35067c2e60076eed7c2442bc3" SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" SRCREV_face = "8afa57abc8229d611c4937165d20e2a2d9fc5a12" SRCREV_wechat-qrcode = "a8b69ccc738421293254aec5ddb38bd523503252" -SRCREV_fastcv = "2265e79b3b9a8512a9c615b8c4d0244e88f45a9d" +SRCREV_fastcv = "9e8d42b6d7e769548d70b2e5674e263b056de8b4" SRCREV_FORMAT = "opencv_contrib_ipp_boostdesc_vgg_fastcv" -SRC_URI = "git://github.com/opencv/opencv.git;name=opencv;branch=4.x;protocol=https \ - git://github.com/opencv/opencv_contrib.git;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/contrib;name=contrib;branch=4.x;protocol=https \ +SRC_URI = "git://github.com/opencv/opencv.git;name=opencv;branch=4.x;protocol=https;tag=${PV} \ + git://github.com/opencv/opencv_contrib.git;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/contrib;name=contrib;branch=4.x;protocol=https;tag=${PV} \ git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/boostdesc;name=boostdesc;protocol=https \ git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/vgg;name=vgg;protocol=https \ git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/face;name=face;protocol=https \ git://github.com/WeChatCV/opencv_3rdparty.git;branch=wechat_qrcode;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/wechat_qrcode;name=wechat-qrcode;protocol=https \ - git://github.com/opencv/opencv_3rdparty.git;branch=fastcv/4.x_20250606;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/fastcv;name=fastcv;protocol=https \ + git://github.com/opencv/opencv_3rdparty.git;branch=fastcv/4.x_20250715;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/fastcv;name=fastcv;protocol=https \ file://0003-To-fix-errors-as-following.patch \ file://0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch \ file://0001-Dont-use-isystem.patch \ file://download.patch \ file://0001-Make-ts-module-external.patch \ file://0008-Do-not-embed-build-directory-in-binaries.patch \ - file://27691.patch \ - file://0001-Renamed-templated-BlocksCompensator-feed-method-to-e.patch \ " SRC_URI:append:riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=contrib"