From patchwork Sat Jan 21 18:00:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18413 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 38552C004D4 for ; Sat, 21 Jan 2023 18:01:27 +0000 (UTC) Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by mx.groups.io with SMTP id smtpd.web11.2057.1674324085724780259 for ; Sat, 21 Jan 2023 10:01:25 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=E+iffHvF; spf=pass (domain: gmail.com, ip: 209.85.214.180, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f180.google.com with SMTP id z20so5992847plc.2 for ; Sat, 21 Jan 2023 10:01:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=oWf+5iProbL2k5SQElwmvEepIDnou7B6HufTtvcjgyY=; b=E+iffHvFban58RtJBsQ5rECpkN/hIx1ajEYk4XM8ABjNR/5kLP8kEOrgIQ0OhmFBeI dcRpBLtcoMiNHEdHTpdkG2hbGqysfTrbxrr21Rve1p4veTt0CBDxLwkHLh3kCwWnrG7u DSTDQ1AJl3AqvbhXg5P47vSgF1zRpzVadD1B09RkSpS1r4ROXPMvZVY/iyJK9ci8EO/V SYXw4/D3s0mIH7AYSeErhAUwyRrDf0NPtWyRfHetkFjsv88wapqkdstgTUssX6a6OiGH 8UFsVshXver3XfnP2dzwEPYnrnJEuzU8nK2ukFoILZJZ8Bk2afQNSjjMNyuGss3aX5sS 5TiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=oWf+5iProbL2k5SQElwmvEepIDnou7B6HufTtvcjgyY=; b=7rQRKlKYFbXxP5lKCX/0DqguqTGrWsAyLjdPrB8ABuOCRaCZGc7Du/f1hv3P1DblQ1 PHth8p741TORjEnBTQWyRnQ2sOhqfTrg0Zk8jmse3JnlSDV1eSTPb9HUYo5jZ2lvcmSY 4ASptk8mGa9w3/FRQqKFNPE4OGRpheZocbDIvn6nAL4yNZwkD5CpN6gSCcwnqjjJuqPX +A7b0drzj/WIp9f2sc5I2uw2eKTAm0agCPWf0EOqpsW7BMEgSnUaicyNMnnSUv8bT3Aq ms/jcUBlOpkUgvj2V7g2i4Rc6SsFkwwxoJMf8DjuSBUGO0YiTQQ1oiHDPESc0XWu010E XBNg== X-Gm-Message-State: AFqh2kqRDbvReKv1rbMckZk1m053kLd0kmDrL0JUXuUCDq1c8BCHCgMJ Bsqp6bilSMrE1PvgZlsD5oXcdIbAp9sbHw== X-Google-Smtp-Source: AMrXdXtQMadLGuA24KIQhGyZbgLWybnNEjAS6DGZhOg4GrlLVgbBxC2olkgnwo8DZkHUY6tbeSNDgQ== X-Received: by 2002:a17:90b:3909:b0:229:ffd3:ad36 with SMTP id ob9-20020a17090b390900b00229ffd3ad36mr8850670pjb.0.1674324084461; Sat, 21 Jan 2023 10:01:24 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id d15-20020a17090a02cf00b00226c2d90c04sm3623583pjd.38.2023.01.21.10.01.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Jan 2023 10:01:24 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 01/30] libmodplug: Fix build with c++17 Date: Sat, 21 Jan 2023 10:00:52 -0800 Message-Id: <20230121180121.1229895-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.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, 21 Jan 2023 18:01:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100668 Signed-off-by: Khem Raj --- ...-Drop-register-storage-class-keyword.patch | 38 +++++++++++++++++++ .../libmodplug/libmodplug_0.8.9.0.bb | 5 ++- 2 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 meta-oe/recipes-multimedia/libmodplug/libmodplug/0001-fastmix-Drop-register-storage-class-keyword.patch diff --git a/meta-oe/recipes-multimedia/libmodplug/libmodplug/0001-fastmix-Drop-register-storage-class-keyword.patch b/meta-oe/recipes-multimedia/libmodplug/libmodplug/0001-fastmix-Drop-register-storage-class-keyword.patch new file mode 100644 index 0000000000..dfdaf810d8 --- /dev/null +++ b/meta-oe/recipes-multimedia/libmodplug/libmodplug/0001-fastmix-Drop-register-storage-class-keyword.patch @@ -0,0 +1,38 @@ +From 7a25d5def379db387de9237f0b03605b3ae277b6 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 17 Jan 2023 11:32:59 -0800 +Subject: [PATCH] fastmix: Drop 'register' storage class keyword + +It has been dropped from laters C/C++ standards ( c++17 and newer ) + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/fastmix.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/fastmix.cpp b/src/fastmix.cpp +index d693d20..aa51c4a 100644 +--- a/src/fastmix.cpp ++++ b/src/fastmix.cpp +@@ -288,7 +288,7 @@ CzWINDOWEDFIR sfir; + // MIXING MACROS + // ---------------------------------------------------------------------------- + #define SNDMIX_BEGINSAMPLELOOP8\ +- register MODCHANNEL * const pChn = pChannel;\ ++ MODCHANNEL * const pChn = pChannel;\ + nPos = pChn->nPosLo;\ + const signed char *p = (signed char *)(pChn->pCurrentSample+pChn->nPos);\ + if (pChn->dwFlags & CHN_STEREO) p += pChn->nPos;\ +@@ -296,7 +296,7 @@ CzWINDOWEDFIR sfir; + do { + + #define SNDMIX_BEGINSAMPLELOOP16\ +- register MODCHANNEL * const pChn = pChannel;\ ++ MODCHANNEL * const pChn = pChannel;\ + nPos = pChn->nPosLo;\ + const signed short *p = (signed short *)(pChn->pCurrentSample+(pChn->nPos*2));\ + if (pChn->dwFlags & CHN_STEREO) p += pChn->nPos;\ +-- +2.39.0 + diff --git a/meta-oe/recipes-multimedia/libmodplug/libmodplug_0.8.9.0.bb b/meta-oe/recipes-multimedia/libmodplug/libmodplug_0.8.9.0.bb index 144c737e76..e04e763776 100644 --- a/meta-oe/recipes-multimedia/libmodplug/libmodplug_0.8.9.0.bb +++ b/meta-oe/recipes-multimedia/libmodplug/libmodplug_0.8.9.0.bb @@ -4,8 +4,9 @@ HOMEPAGE = "http://modplug-xmms.sf.net" LICENSE = "PD" LIC_FILES_CHKSUM = "file://COPYING;md5=c9182faa1f7c316f7b97d404bcbe3685" -SRC_URI = "${SOURCEFORGE_MIRROR}/modplug-xmms/libmodplug-${PV}.tar.gz" -SRC_URI[md5sum] = "5ba16981e6515975e9a68a58d5ba69d1" +SRC_URI = "${SOURCEFORGE_MIRROR}/modplug-xmms/libmodplug-${PV}.tar.gz \ + file://0001-fastmix-Drop-register-storage-class-keyword.patch" + SRC_URI[sha256sum] = "457ca5a6c179656d66c01505c0d95fafaead4329b9dbaa0f997d00a3508ad9de" inherit autotools pkgconfig From patchwork Sat Jan 21 18:00:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18414 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 39B21C25B50 for ; Sat, 21 Jan 2023 18:01:27 +0000 (UTC) Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by mx.groups.io with SMTP id smtpd.web11.2058.1674324086149702811 for ; Sat, 21 Jan 2023 10:01:26 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=OsUUhdDi; spf=pass (domain: gmail.com, ip: 209.85.216.45, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f45.google.com with SMTP id k10-20020a17090a590a00b0022ba875a1a4so4919612pji.3 for ; Sat, 21 Jan 2023 10:01:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SNmxBgRpkQpSkqIsoBDsT/T+ppQx0yz2P3wixtKBeDg=; b=OsUUhdDixiQiBfmz24Js+7SP+dNHxsBEqyCOJ/GIMx772O0gm05GTNrtXsLiqP8iox mzlcOqpaiWuNZisg+bicvQ5l6OT0kKPAjtFskkKIwvLZ3M1bhc7y+jS48Ej6Cbs5UyVj n4oGblF2whflcG5n2n05XCOFtunuE16FXcMmP2JqUoE7qMKLN/BMg42fe5NwU5X1fUiI Kl5ScK6y7JbwBGJ+aIVqbZ0l+6Yv6wjwoQzyszTawiHCUyG2pRyiE8yPdg4RlVw7IFSz NcW5bJ17ZcWTbiFk88X/9jWOF+V2rPj+jgXEsClj5cKZTR9mBsEVjrYzSI0B+UiMkz+A 0c4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SNmxBgRpkQpSkqIsoBDsT/T+ppQx0yz2P3wixtKBeDg=; b=UvJbvmIBkFmRCiD+2gtP2mKPzyI+OpRupuUM47TnzSA9+2rzWhy/iJ5pe9ZqxiBhnT 15am31HRiOaGNdVsBq1SEhLL3I2vee0oyteTGdR96DgvoybCf6M3PtKWby3FDgXUXcd6 TormDIPqTz2eT7WTzi7++lXSiK7il1xtYkiBrU97iL+McZ9scXQPHqXiY8zgxOeC3YVQ K1BweBs1ri6NgUYBfZeh9UiDMg6vnHbRfAOdZlYn6JO3idbNjroKWSE+y25M/X6T+weW lQ8Uk4zCx1fPuU6VsqziYo2W3o8HHkGGWvNJZbtLoSNHoPyiS1zSogFrKx3ulO+0rUnQ RFug== X-Gm-Message-State: AFqh2krmsT0R8dFagF6rbyFqElz2bJVSimltAkR8lzgfkS9bFi+0T+aP yj/25oKOIvik8ibkoarxzgkyUHizqV6cCA== X-Google-Smtp-Source: AMrXdXstctW39VwT3uIxJI4ZtQi2Guw9Ezkt3LtOJFNuFvH5N52dlrRRfO9+dBwen7WdoAPNOcUrkA== X-Received: by 2002:a17:90a:688f:b0:228:e790:4c2a with SMTP id a15-20020a17090a688f00b00228e7904c2amr20118848pjd.2.1674324085263; Sat, 21 Jan 2023 10:01:25 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id d15-20020a17090a02cf00b00226c2d90c04sm3623583pjd.38.2023.01.21.10.01.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Jan 2023 10:01:25 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 02/30] xmlrpc-c: Upgrade to 1.54.06 Date: Sat, 21 Jan 2023 10:00:53 -0800 Message-Id: <20230121180121.1229895-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230121180121.1229895-1-raj.khem@gmail.com> References: <20230121180121.1229895-1-raj.khem@gmail.com> 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, 21 Jan 2023 18:01:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100669 Drop upstream applied patch see [1] [1] https://github.com/mirror/xmlrpc-c/commit/148e64a5bb5588a89840ee498430332456c216f3 Signed-off-by: Khem Raj --- ...rc-Makefile-Fix-Makefile-macro-error.patch | 29 ------------------- ...mlrpc-c_1.54.02.bb => xmlrpc-c_1.54.06.bb} | 6 ++-- 2 files changed, 2 insertions(+), 33 deletions(-) delete mode 100644 meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0003-src-Makefile-Fix-Makefile-macro-error.patch rename meta-oe/recipes-devtools/xmlrpc-c/{xmlrpc-c_1.54.02.bb => xmlrpc-c_1.54.06.bb} (91%) diff --git a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0003-src-Makefile-Fix-Makefile-macro-error.patch b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0003-src-Makefile-Fix-Makefile-macro-error.patch deleted file mode 100644 index 3d861fc625..0000000000 --- a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0003-src-Makefile-Fix-Makefile-macro-error.patch +++ /dev/null @@ -1,29 +0,0 @@ -From ea4ca50ca9cab755f3722096158a46deec0e663a Mon Sep 17 00:00:00 2001 -From: Arthur She -Date: Tue, 25 Aug 2020 09:51:26 -0700 -Subject: [PATCH] src/Makefile: Fix Makefile macro error - -This error caused the curl library wouldn't be linked correctly. - -Upstream-Status: Pending -Signed-off-by: Arthur She ---- - src/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Makefile b/src/Makefile -index 1cdf8b0..acd04dd 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -57,7 +57,7 @@ ifeq ($(MUST_BUILD_CURL_CLIENT),yes) - TRANSPORT_MODS += $(BLDDIR)/lib/curl_transport/xmlrpc_curl_transport - TRANSPORT_MODS += $(BLDDIR)/lib/curl_transport/curltransaction - TRANSPORT_MODS += $(BLDDIR)/lib/curl_transport/curlmulti -- TRANSPORT_LIBDEP += $(shell $CURL_CONFIG --libs) -+ TRANSPORT_LIBDEP += $(shell $(CURL_CONFIG) --libs) - TRANSPORT_INCLUDES += -Isrcdir/lib/curl_transport - endif - ifeq ($(MUST_BUILD_LIBWWW_CLIENT),yes) --- -2.17.1 - diff --git a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.54.02.bb b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.54.06.bb similarity index 91% rename from meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.54.02.bb rename to meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.54.06.bb index 36205009a4..0a7ad33c64 100644 --- a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.54.02.bb +++ b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.54.06.bb @@ -8,11 +8,9 @@ LIC_FILES_CHKSUM = "file://doc/COPYING;md5=aefbf81ba0750f02176b6f86752ea951" SRC_URI = "git://github.com/mirror/xmlrpc-c.git;branch=master;protocol=https \ file://0001-test-cpp-server_abyss-Fix-build-with-clang-libc.patch \ file://0002-fix-formatting-issues.patch \ - file://0003-src-Makefile-Fix-Makefile-macro-error.patch \ " - -#Release 1.54.02 -SRCREV = "86405c7e1bd4f70287204a28d242a1054daab520" +#Release 1.54.06 +SRCREV = "00870af80021aa0a66cc72c9aeb00587cbfde560" S = "${WORKDIR}/git/stable" From patchwork Sat Jan 21 18:00:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18417 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 1C95CC38142 for ; Sat, 21 Jan 2023 18:01:37 +0000 (UTC) Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by mx.groups.io with SMTP id smtpd.web11.2059.1674324087091825361 for ; Sat, 21 Jan 2023 10:01:27 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=WMLQg05g; spf=pass (domain: gmail.com, ip: 209.85.216.53, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f53.google.com with SMTP id b10so8403175pjo.1 for ; Sat, 21 Jan 2023 10:01:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tMWUrQlJVWoll8Fiyc3ZC9IPj2hU5xdcLKOrJw0OvNk=; b=WMLQg05gLA3YOpbORdRR4+80U0gqqUAAha3fNzWRrcSqw9bRx0U9LIX5We+t2ZzQD/ sh0ndIapphXdRiiP0iouzNnNsLghM/M38ivZQAyj+Pl4/Zeqr/ovWCttH2XlS/ZqgSw5 nC6XcJwaCTpCMbIWCJNEMbyqmTZWKCVnkzwqYDuW1gOTScTS8ascRsNqKarTRJyUD5y7 B7t2TEC0ghWCXAVZGQu7yVwkXm2MufBa3PLoZKN34hmufgreV+pTTmgTHjk5O+69qO/p 7iYmqnkDb7mCYkpq8p08Jubn5vRmmJyZSCcdrsgsV9OYQj+zSoiMMmmRTEBB9mAJSHKt ZSlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tMWUrQlJVWoll8Fiyc3ZC9IPj2hU5xdcLKOrJw0OvNk=; b=MoQBAlwUuRoHxAmn5vJWCZdEUWf6091PQeFEBH9481U74zxlYrwAk4pTx/s+Dxg5tN CmyV+88j2YKgX5oQPwEBp3kzmURURazrPmNebYh+Y8lYS4GyETgJZ7JSjm9ryu4SMlwX d8f1j/iq13FQOgqIL/xrqjcAijqx6Hcme/jq07+o5/f4nic/0aVyGyihL2l8pMhAbtYF +1zJJPFxLhOhWjpNOVmldli5RaAY+J782LcM7MSPD35STSMiLGEZ0fEoWfuO+2vgay+Q Skvrp4LXQeMeinWj1LARPCMy9/upziSt66UL32GcGuGDXCcrOPudB50GZnPXDEQWLRy+ 18sg== X-Gm-Message-State: AFqh2kpOqF6RuN6KAc0tokTIZDj9TctE4OmIDGcatMq/VD86oqNj5NHc GWjOv4ZR4F50OC99pwkcOq5XZ7liT+DyyA== X-Google-Smtp-Source: AMrXdXvQLfgtul7tzn5rAAzyfZCma3074mAHnA2qKrsb5Fhbf9eodkoqxdk/KIvmKpdH17c69Ym8cg== X-Received: by 2002:a17:90b:208:b0:229:307f:8832 with SMTP id fy8-20020a17090b020800b00229307f8832mr19856437pjb.37.1674324086194; Sat, 21 Jan 2023 10:01:26 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id d15-20020a17090a02cf00b00226c2d90c04sm3623583pjd.38.2023.01.21.10.01.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Jan 2023 10:01:25 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 03/30] satyr: Fix build with musl Date: Sat, 21 Jan 2023 10:00:54 -0800 Message-Id: <20230121180121.1229895-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230121180121.1229895-1-raj.khem@gmail.com> References: <20230121180121.1229895-1-raj.khem@gmail.com> 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, 21 Jan 2023 18:01:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100670 Add missing typedefs for __compar_fn_t and compare_fn_t for non __GLIBC__ case. Signed-off-by: Khem Raj --- ...mpile-failure-against-musl-C-library.patch | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/meta-oe/recipes-support/satyr/files/0002-fix-compile-failure-against-musl-C-library.patch b/meta-oe/recipes-support/satyr/files/0002-fix-compile-failure-against-musl-C-library.patch index b6c32c4bd5..24efc13560 100644 --- a/meta-oe/recipes-support/satyr/files/0002-fix-compile-failure-against-musl-C-library.patch +++ b/meta-oe/recipes-support/satyr/files/0002-fix-compile-failure-against-musl-C-library.patch @@ -10,19 +10,17 @@ Signed-off-by: Hongxu Jia lib/rpm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/lib/rpm.c b/lib/rpm.c -index 920e145..58140bf 100644 --- a/lib/rpm.c +++ b/lib/rpm.c -@@ -191,7 +191,7 @@ sr_rpm_package_sort(struct sr_rpm_package *packages) - } +@@ -34,6 +34,11 @@ + #include + #include - /* Sort the array. */ -- qsort(array, count, sizeof(struct sr_rpm_package*), (comparison_fn_t)cmp_nevra_qsort_wrapper); -+ qsort(array, count, sizeof(struct sr_rpm_package*), cmp_nevra_qsort_wrapper); - - /* Create a linked list from the sorted array. */ - for (size_t loop = 0; loop < count; ++loop) --- -2.8.1 - ++#if !defined(__GLIBC__) ++typedef int (*__compar_fn_t) (const void*, const void*); ++typedef __compar_fn_t comparison_fn_t; ++#endif ++ + struct sr_rpm_package * + sr_rpm_package_new() + { From patchwork Sat Jan 21 18:00:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18426 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 5ECFDC54EB6 for ; Sat, 21 Jan 2023 18:01:37 +0000 (UTC) Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by mx.groups.io with SMTP id smtpd.web10.2123.1674324088066323550 for ; Sat, 21 Jan 2023 10:01:28 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=qnn4nKfX; spf=pass (domain: gmail.com, ip: 209.85.216.53, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f53.google.com with SMTP id u1-20020a17090a450100b0022936a63a21so11896070pjg.4 for ; Sat, 21 Jan 2023 10:01:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kemONC4zWzB5LfUGGhzGgvYbITs7ImRyCupBEftI+ng=; b=qnn4nKfXHviM0IA6esOrBs3773ksoRPEb+MW2Z0raohI4I8mlJWp7wrsNJbVsCamk/ VSl6HX0zRwH+ADvlDKHRGX1uE6vm51wbGPjh9QZq9WwrHjx66UL28ZckNMXArYglWZ3u zLV27LtSpRZhDeRA+nbuSv6azZcb86oOpm5FHwyLVND7BchiuOqh3Hj9p5ZmQMRyUX4h sRex2BBIlZKgW9UWFvzL8CuXuN/0sezeKtdaekIXw3tXDa8Z4jv0eF+enYMQ59MMEb6t kT1wleMiykL83VrYMShp9QnwW6eYnUpYy8zMjbxk4AxgmXjzA3b8d0qJXtBOMAmZ95+Q i+yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kemONC4zWzB5LfUGGhzGgvYbITs7ImRyCupBEftI+ng=; b=jlB2DEOiOI4WsdCVG3Zx4gCawlOdJpO5UZmya0emv85syj3jwNSAKzH8jmc3AgMOY7 4WS03TiF+eMnOYrQW5dCZMrh/1TCjm0f4raM/soj0WIXHsqfXSQyeuiDAiWbOQFkeu4w oWZJOAr9xyhJsx6dQRhZdTxZT8cRmh3tkMj3ZTYy36b3ssyyjDFs1aiXO5gghrea+sUt 6mb8N7B2UklbhiAxYfoeihgixyqE2TmD0219437P0ABAmuSBhFug2JGsysVpqp9kb3Fr +4A5J1fv9z8q6dIoyORqGhsWGy8K1670nrFbYyKuik51hCNjmMRRiZGeUBv45H9/wWj6 b3ow== X-Gm-Message-State: AFqh2ko1mtZdhcUxOrDUirX21F+Ddug2l42mPmuig4wJyUh7gGEHQgCK By1CNMWiC/+xUjqwkvfkOptZBSMBmc5XJg== X-Google-Smtp-Source: AMrXdXsuQsDY5FRTkOZtr6f2lDkkcLPcHuBD9j0sYpIp7x4sxCaRpXtLVPVWEyozUALCW/mhskU/7A== X-Received: by 2002:a17:90a:9409:b0:229:1de8:3cfd with SMTP id r9-20020a17090a940900b002291de83cfdmr19595239pjo.29.1674324087187; Sat, 21 Jan 2023 10:01:27 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id d15-20020a17090a02cf00b00226c2d90c04sm3623583pjd.38.2023.01.21.10.01.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Jan 2023 10:01:26 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 04/30] p8platform: Fix build with c++17 clang Date: Sat, 21 Jan 2023 10:00:55 -0800 Message-Id: <20230121180121.1229895-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230121180121.1229895-1-raj.khem@gmail.com> References: <20230121180121.1229895-1-raj.khem@gmail.com> 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, 21 Jan 2023 18:01:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100671 Signed-off-by: Khem Raj --- ...e-resulting-cmake-config-relocatable.patch | 64 ------------------- .../p8platform/p8platform_git.bb | 7 +- 2 files changed, 3 insertions(+), 68 deletions(-) delete mode 100644 meta-oe/recipes-extended/p8platform/files/0001-Make-resulting-cmake-config-relocatable.patch diff --git a/meta-oe/recipes-extended/p8platform/files/0001-Make-resulting-cmake-config-relocatable.patch b/meta-oe/recipes-extended/p8platform/files/0001-Make-resulting-cmake-config-relocatable.patch deleted file mode 100644 index 9ff85b12a3..0000000000 --- a/meta-oe/recipes-extended/p8platform/files/0001-Make-resulting-cmake-config-relocatable.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 2650bb3bd3644784359be373252b0436873ca8cb Mon Sep 17 00:00:00 2001 -From: Pascal Bach -Date: Fri, 28 Sep 2018 16:44:37 +0200 -Subject: [PATCH] Make resulting cmake config relocatable - -This change avoids hardcoded install prefix in the p8-platform-config.cmake. -Especially important when doing cross compilation with Yocto for example. - -Upstream-Status: Submitted [https://github.com/Pulse-Eight/platform/pull/38] - ---- - CMakeLists.txt | 4 ---- - p8-platform-config.cmake.in | 13 +++++++++---- - 2 files changed, 9 insertions(+), 8 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7144b0b..f2db66e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -22,10 +22,6 @@ if(WIN32) - src/windows/os-threads.cpp) - endif() - --set(p8-platform_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include/p8-platform") --IF(WIN32) -- LIST(APPEND p8-platform_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include/p8-platform/windows") --ENDIF(WIN32) - set(p8-platform_LIBRARIES ${CMAKE_THREAD_LIBS_INIT}) - - if(NOT ${CORE_SYSTEM_NAME} STREQUAL "") -diff --git a/p8-platform-config.cmake.in b/p8-platform-config.cmake.in -index 47f30f1..b08e96c 100644 ---- a/p8-platform-config.cmake.in -+++ b/p8-platform-config.cmake.in -@@ -9,17 +9,22 @@ - # p8-platform_LIBRARY_DIRS - directories in which the libraries are situated - # - # propagate these properties from one build system to the other -+get_filename_component(_p8-platform_rootdir ${CMAKE_CURRENT_LIST_DIR}/../ ABSOLUTE) -+ - set (p8-platform_VERSION "@p8-platform_VERSION_MAJOR@.@p8-platform_VERSION_MINOR@") --set (p8-platform_INCLUDE_DIRS @p8-platform_INCLUDE_DIRS@ @CMAKE_INSTALL_PREFIX@/include) --set (p8-platform_LIBRARY_DIRS "@CMAKE_LIBRARY_OUTPUT_DIRECTORY@") -+set (p8-platform_INCLUDE_DIRS "${_p8-platform_rootdir}/include" "${_p8-platform_rootdir}/include/p8-platform") -+if(WIN32) -+ list(APPEND p8-platform_INCLUDE_DIRS "${_p8-platform_rootdir}/include/p8-platform/windows") -+endif(WIN32) -+set (p8-platform_LIBRARY_DIRS "${_p8-platform_rootdir}") - set (p8-platform_LINKER_FLAGS "@p8-platform_LINKER_FLAGS@") - set (p8-platform_CONFIG_VARS "@p8-platform_CONFIG_VARS@") - - # libraries come from the build tree where this file was generated - if(WIN32) -- set (p8-platform_LIBRARY "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/p8-platform.lib") -+ set (p8-platform_LIBRARY "${_p8-platform_rootdir}/p8-platform.lib") - else(WIN32) -- set (p8-platform_LIBRARY "-L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -lp8-platform") -+ set (p8-platform_LIBRARY "-L${_p8-platform_rootdir} -lp8-platform") - endif(WIN32) - set (p8-platform_LIBRARIES ${p8-platform_LIBRARY} "@p8-platform_LIBRARIES@") - mark_as_advanced (p8-platform_LIBRARY) --- -2.11.0 - diff --git a/meta-oe/recipes-extended/p8platform/p8platform_git.bb b/meta-oe/recipes-extended/p8platform/p8platform_git.bb index 1307f6dc4a..bb9574feb2 100644 --- a/meta-oe/recipes-extended/p8platform/p8platform_git.bb +++ b/meta-oe/recipes-extended/p8platform/p8platform_git.bb @@ -4,11 +4,10 @@ HOMEPAGE = "http://libcec.pulse-eight.com/" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://src/os.h;md5=752555fa94e82005d45fd201fee5bd33" -PV = "2.1.0.1" +PV = "2.1.0.1+git${SRCPV}" -SRC_URI = "git://github.com/Pulse-Eight/platform.git;branch=master;protocol=https \ - file://0001-Make-resulting-cmake-config-relocatable.patch" -SRCREV = "2d90f98620e25f47702c9e848380c0d93f29462b" +SRC_URI = "git://github.com/Pulse-Eight/platform.git;branch=master;protocol=https" +SRCREV = "a7cd0d5780ed80a4e70480d1650749f29e8a1fb2" S = "${WORKDIR}/git" From patchwork Sat Jan 21 18:00:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18423 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 5E3A2C54EAA for ; Sat, 21 Jan 2023 18:01:37 +0000 (UTC) Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by mx.groups.io with SMTP id smtpd.web10.2124.1674324088920343131 for ; Sat, 21 Jan 2023 10:01:28 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=bCC6a6r/; spf=pass (domain: gmail.com, ip: 209.85.216.49, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f49.google.com with SMTP id x24-20020a17090ab01800b00229f43b506fso6877336pjq.5 for ; Sat, 21 Jan 2023 10:01:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XPIeV3faIKQdfS7mfu8VqadUB1zM8xenrNhNepNhcaw=; b=bCC6a6r/tyvEE30XEP+qtoFJvK/CQHfoz0slkkywpSI/53gnoECwd1GRSH+tud8AAA k1fin0hmo7nBSEI5uphD1Ml3ZTNMbva/2tB2PZ3yw7N3ujXmjAOnSg+1uvMgp+r1uPnD wTvvwEI6y1/L3qo+featUDskW4GW6yz3Zq9fBMp3NcF6OIDCoKyeVjLxeWRQUPgW4eA3 8G5gbzJ3onZHtpqvWU2JBnfh98AcTypxbnCiik+L8ck8mWGmxEiyvh41TwMJpGec/nPh 0o+CuLLNRHjywBdV0pEnMXPB08p/W8WteWhKxrqasGUom14+faOh4gYWW3vt/rCNEQ8D m91Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XPIeV3faIKQdfS7mfu8VqadUB1zM8xenrNhNepNhcaw=; b=Z3cspNsk/Jv8Ur0E2p6khH+pQp0LcJD7QoD5C8Id48hoZcxq/7p/nQ8NBVcJ7Dr06Z Qd05XwaD2DYVrzyTg5zt+jzF5Xo4/mNqi7gMSlfsFFB53eP6qzRPCX2P1isG8h7+MpWx 8XP++Z2BNHTu4ATEpgPY9b+tpmHC6/PjrK/JZ8ZEe6fOmbVt+7Uf3EKM7Thk9PnHNCl8 hOlbG8ZUPGyXBzc2ed9Z0EhOJMli3kS73WSGzN9GCJSTEsYcQ2pTVRmvtovIX7lI2FwU qiukYCyQxthEzpgCMSnXQSCVe8D6ifd83uiHsxXunsr9wlTYae4mHf9N0pUVxcUKUQgC is3g== X-Gm-Message-State: AFqh2krB+ghHztWbdXkzDVhuk9eTVSdpuocd0QdlZsnhZ8vXp3EHcUqS lk+E2Z2v3ptYQMjCE/1NI8cTfOPs7iixTw== X-Google-Smtp-Source: AMrXdXtQxErwIQzOOtyhS2co6SFBnEjN4umlosxCdgM2s3X1gwpPVJj4dLh52zGWUAC9jJ2o1/aSaQ== X-Received: by 2002:a17:90b:35c9:b0:229:8e0c:68b0 with SMTP id nb9-20020a17090b35c900b002298e0c68b0mr20651766pjb.19.1674324088056; Sat, 21 Jan 2023 10:01:28 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id d15-20020a17090a02cf00b00226c2d90c04sm3623583pjd.38.2023.01.21.10.01.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Jan 2023 10:01:27 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 05/30] freerdp: Fix incompatible function pointer type Date: Sat, 21 Jan 2023 10:00:56 -0800 Message-Id: <20230121180121.1229895-5-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230121180121.1229895-1-raj.khem@gmail.com> References: <20230121180121.1229895-1-raj.khem@gmail.com> 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, 21 Jan 2023 18:01:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100672 Signed-off-by: Khem Raj --- ...-incompatible-function-pointer-types.patch | 32 +++++++++++++++++++ .../recipes-support/freerdp/freerdp_2.9.0.bb | 1 + 2 files changed, 33 insertions(+) create mode 100644 meta-oe/recipes-support/freerdp/freerdp/0001-Fix-incompatible-function-pointer-types.patch diff --git a/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-incompatible-function-pointer-types.patch b/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-incompatible-function-pointer-types.patch new file mode 100644 index 0000000000..ce230dbf22 --- /dev/null +++ b/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-incompatible-function-pointer-types.patch @@ -0,0 +1,32 @@ +From 9c785ca0535d9c24e6699ee1243b427c1407acb5 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 17 Jan 2023 19:31:17 -0800 +Subject: [PATCH] Fix incompatible function pointer types + +clang 16+ is flagging the function pointer prototype mismatches, +therefore fix it. + +Fixes Issue #8487 + +Upstream-Status: Submitted [https://github.com/FreeRDP/FreeRDP/pull/8622] +Signed-off-by: Khem Raj +--- + client/X11/xf_disp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/client/X11/xf_disp.c b/client/X11/xf_disp.c +index 32ddb626c..ef0cb93ff 100644 +--- a/client/X11/xf_disp.c ++++ b/client/X11/xf_disp.c +@@ -248,7 +248,7 @@ static void xf_disp_OnTimer(void* context, TimerEventArgs* e) + xf_disp_sendResize(xfDisp); + } + +-static void xf_disp_OnWindowStateChange(void* context, const WindowStateChangeEventArgs* e) ++static void xf_disp_OnWindowStateChange(void* context, WindowStateChangeEventArgs* e) + { + xfContext* xfc; + xfDispContext* xfDisp; +-- +2.39.1 + diff --git a/meta-oe/recipes-support/freerdp/freerdp_2.9.0.bb b/meta-oe/recipes-support/freerdp/freerdp_2.9.0.bb index 0856a60bed..3b8fee0f5f 100644 --- a/meta-oe/recipes-support/freerdp/freerdp_2.9.0.bb +++ b/meta-oe/recipes-support/freerdp/freerdp_2.9.0.bb @@ -16,6 +16,7 @@ PKGV = "${GITPKGVTAG}" SRCREV = "fa8e1b1c765a4466030ac52240f052c0b440a4d1" SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=stable-2.0;protocol=https \ file://winpr-makecert-Build-with-install-RPATH.patch \ + file://0001-Fix-incompatible-function-pointer-types.patch \ " S = "${WORKDIR}/git" From patchwork Sat Jan 21 18:00:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18427 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 5EC6BC54EB4 for ; Sat, 21 Jan 2023 18:01:37 +0000 (UTC) Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by mx.groups.io with SMTP id smtpd.web11.2062.1674324091113259352 for ; Sat, 21 Jan 2023 10:01:31 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=H1AcdaaR; spf=pass (domain: gmail.com, ip: 209.85.216.48, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f48.google.com with SMTP id y3-20020a17090a390300b00229add7bb36so7760847pjb.4 for ; Sat, 21 Jan 2023 10:01:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=eJ74psF7aDUpUuGrmjXD0H4mTPGaLMagGC1d+jCjYdo=; b=H1AcdaaRKU8XWVfrAQ+Evn9J58s86GEX4z/604hJHYAqDVgvi03fV3dvc8kUVNJlBO Uy10KpbWD9x/Fnp4FYPcUir0ZoC3PFhG9VPeLEjIDWgVQXaJcNXL6ecri2mDxhCkaxTb loKM3xz7eXMOVcepg09BNc545c7J64gU/Mk9tOOI5gZxJq2dpmSzq3ZMKkghVYiCumVr yjjAVCMadjNS2NQkPIeEgSKsFE/cml40hQmqosCyn7/VvXPC5MOPlnnT2IqRGxmcyco1 TatNEu7RqF90o1AOWaXovLl7ClHuidrchmEGR0efmrCBb9Vc5kUZd/ZPqa3mDXHuENK5 KFPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eJ74psF7aDUpUuGrmjXD0H4mTPGaLMagGC1d+jCjYdo=; b=fIic0DGgSgei6EWHRxai5gGKCrmWX40qIpaww/7vuRcz9PA2GXMr42DwFVlPAIPSpu 0vszvSyYKsB7RIap+Pw+/Ol6h6CdPhQ1ewYv4bVA5TtKyMg3xNi0xr/HTDie4cXL6oM0 JuMNk/3OpMEhf8D+2EZ2MkHbOHQrWqRHcz1CZpbSPrD+DwHGtMGX5vcpOt7mIrd1ueZp JdxYIflRHOA0XWBx64/CmvkgpYpYMfdzNjhBYN+fPErfWYZjUU+qlfmeaBSFx36WvLg2 kLy2vaaYBBqtOcplMharjWGO3mdTZG/FriN5VTdof1Olk4Eqv7PNRY8pG2ScDyV8IDB9 DXXw== X-Gm-Message-State: AFqh2koWNJP1CshPHi5YG0uauKiktQI0FUt+i38v+j/xxzVoGH7air3G 4LpnZKygR/2RWO2ijALrXhzmfrtEwXd/vg== X-Google-Smtp-Source: AMrXdXswfo1gsBJpPqtuE/SDuaUK6iy+HbIEbBS+6n/wJLc1ehbyIVY/vVYdFO/Qfm7QYxALpd0a6Q== X-Received: by 2002:a17:90b:1c0c:b0:22b:b824:827c with SMTP id oc12-20020a17090b1c0c00b0022bb824827cmr5574422pjb.48.1674324088867; Sat, 21 Jan 2023 10:01:28 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id d15-20020a17090a02cf00b00226c2d90c04sm3623583pjd.38.2023.01.21.10.01.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Jan 2023 10:01:28 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 06/30] libtorrent: Update to tip of trunk Date: Sat, 21 Jan 2023 10:00:57 -0800 Message-Id: <20230121180121.1229895-6-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230121180121.1229895-1-raj.khem@gmail.com> References: <20230121180121.1229895-1-raj.khem@gmail.com> 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, 21 Jan 2023 18:01:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100675 Drop cross compile patch as we do not need it anymore since we now use --enable-aligned License-Update: Correctly mark the license as GPL-2.0+ Signed-off-by: Khem Raj --- ...t-run-code-while-configuring-package.patch | 28 ------------------- .../libtorrent/libtorrent_git.bb | 18 +++++------- 2 files changed, 7 insertions(+), 39 deletions(-) delete mode 100644 meta-oe/recipes-connectivity/libtorrent/libtorrent/don-t-run-code-while-configuring-package.patch diff --git a/meta-oe/recipes-connectivity/libtorrent/libtorrent/don-t-run-code-while-configuring-package.patch b/meta-oe/recipes-connectivity/libtorrent/libtorrent/don-t-run-code-while-configuring-package.patch deleted file mode 100644 index 8d8867aea7..0000000000 --- a/meta-oe/recipes-connectivity/libtorrent/libtorrent/don-t-run-code-while-configuring-package.patch +++ /dev/null @@ -1,28 +0,0 @@ -Using AC_RUN_IFELSE prevent people from configuring package for -cross-compiling. Don't run code while configuring package. - -Upstream-Status: Pending -Signed-off-by: Andrei Gherzan - -Index: git/scripts/common.m4 -=================================================================== ---- git.orig/scripts/common.m4 -+++ git/scripts/common.m4 -@@ -153,7 +153,7 @@ dnl Need to fix this so that it uses t - AC_DEFUN([TORRENT_CHECK_EXECINFO], [ - AC_MSG_CHECKING(for execinfo.h) - -- AC_COMPILE_IFELSE([AC_LANG_SOURCE([ -+ AC_LINK_IFELSE([AC_LANG_SOURCE([ - #include - int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;} - ])], -@@ -168,7 +168,7 @@ AC_DEFUN([TORRENT_CHECK_EXECINFO], [ - AC_DEFUN([TORRENT_CHECK_ALIGNED], [ - AC_MSG_CHECKING(the byte alignment) - -- AC_RUN_IFELSE([AC_LANG_SOURCE([ -+ AC_LINK_IFELSE([AC_LANG_SOURCE([ - #include - int main() { - char buf@<:@8@:>@ = { 0, 0, 0, 0, 1, 0, 0, 0 }; diff --git a/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb b/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb index 28a3e1e77a..50096cfdbc 100644 --- a/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb +++ b/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb @@ -1,36 +1,32 @@ DESCRIPTION = "libTorrent is a BitTorrent library written in C++ for *nix, \ with a focus on high performance and good code." HOMEPAGE = "http://libtorrent.rakshasa.no/" -LICENSE = "GPL-2.0-only" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" DEPENDS = "zlib libsigc++-2.0 openssl cppunit" -SRC_URI = "git://github.com/rakshasa/libtorrent;branch=master;protocol=https \ - file://don-t-run-code-while-configuring-package.patch \ - " -SRCREV = "756f70010779927dc0691e1e722ed433d5d295e1" +SRC_URI = "git://github.com/rakshasa/libtorrent;branch=master;protocol=https" +SRCREV = "e60f222241319aaae482789517ad00ae9344bd13" CVE_CHECK_IGNORE += "\ CVE-2009-1760 \ " -PV = "0.13.8" +PV = "0.13.8+git${SRCPV}" S = "${WORKDIR}/git" -PACKAGECONFIG ??= "instrumentation" + +PACKAGECONFIG ??= "instrumentation aligned" PACKAGECONFIG:remove:mipsarch = "instrumentation" PACKAGECONFIG:remove:powerpc = "instrumentation" PACKAGECONFIG:remove:riscv32 = "instrumentation" PACKAGECONFIG[instrumentation] = "--enable-instrumentation,--disable-instrumentation," +PACKAGECONFIG[aligned] = "--enable-aligned,--disable-aligned," inherit autotools pkgconfig EXTRA_OECONF = "--with-zlib=${STAGING_EXECPREFIXDIR}" - -do_configure:prepend() { - (cd ${S}; ./autogen.sh; cd -) -} From patchwork Sat Jan 21 18:00:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18425 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 1E20FC004D4 for ; Sat, 21 Jan 2023 18:01:37 +0000 (UTC) Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by mx.groups.io with SMTP id smtpd.web11.2061.1674324090384446993 for ; Sat, 21 Jan 2023 10:01:30 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=ZcBfQc+Z; spf=pass (domain: gmail.com, ip: 209.85.214.181, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f181.google.com with SMTP id c6so7987718pls.4 for ; Sat, 21 Jan 2023 10:01:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UOOOFIhoZzE0fXDVQCOKHF19mKSTZO60b3TrK95oqXs=; b=ZcBfQc+Z5QEtyoRGcUTV5hrCqxXpLuQpYHI9WGWNbHBGyAM6tccNUHxcK2cMnJNVl1 g/7gkP0M0e9fwmz29byp6ctHrkcXIvb0Kse15J4hQ0IS1xPSaodxRiUsEsxzFAnXW9Sm teomftf0WPqRhFgl3MYyOmnCzFaHxmloder5Ivk3ZLn9i2d4BZ0GupY2oeS5j1DnrAFW eDxKyfce8LJJT9JVFWdc1VCUTnHsuE20IhkOZbhh4y0KNAs9ZaCmZlRMyWvBAGmChWgc M1i9g3Nml8mqxazBlyoYOefRCsvKy/VxEArUI6t8gR47lZQ+pa1JkhlBLKGunup57wAF 9HJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UOOOFIhoZzE0fXDVQCOKHF19mKSTZO60b3TrK95oqXs=; b=YoYISGW7Uqb1gpEtghhuQtkmhnJDPe2Kc1hWFA6ZRvX7yONuMbjZFnE1hUJRpeuugJ eTMuX4VkeBL0XoE1Ogo+xbFN/YDlHsp9zk5xuwqq9h55FV4jiA7ldJ17gUtMfpxDkjIp zrpio7Edu1jaWbj6yxQzyUaKbThmFm+oUuM79RaLr43bslLzywZtueasdbM3PjWgNK3M pGWDeSWxgB1+6oeyFws9hJzCPDsm+5FmA0mSK5+Yz6itrTzJMoF9zTCrs4km7O5XQCXY /vAjxT67Z4HxzmW9KkAgX2jyy+gDpRA3WNIXmI1J8Mq7959Qog3hlSutdUps2ElLeaiu /uSw== X-Gm-Message-State: AFqh2kqQ8Qv/KjiDx0YEpxX+MJaGBuO8Xp7VEvD1DCzQNKX1Kdvy/GAT zYslQDuDISk67YP+O0vh+1QaOcIZsQZekg== X-Google-Smtp-Source: AMrXdXtxz7wL37y+A8M6m1z9c2kVsbFZYvjf3NhV2ctnmRCtsV5xZ0x9jBtBIlAk88p167yRWLjQyg== X-Received: by 2002:a17:90a:aa8a:b0:227:ca8:4ec8 with SMTP id l10-20020a17090aaa8a00b002270ca84ec8mr21001557pjq.17.1674324089593; Sat, 21 Jan 2023 10:01:29 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id d15-20020a17090a02cf00b00226c2d90c04sm3623583pjd.38.2023.01.21.10.01.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Jan 2023 10:01:29 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-gnome][PATCH 07/30] gnuchess: Fix build with c++17 Date: Sat, 21 Jan 2023 10:00:58 -0800 Message-Id: <20230121180121.1229895-7-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230121180121.1229895-1-raj.khem@gmail.com> References: <20230121180121.1229895-1-raj.khem@gmail.com> 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, 21 Jan 2023 18:01:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100673 Signed-off-by: Khem Raj --- ...ve-register-storage-class-classifier.patch | 149 ++++++++++++++++++ .../gnome-chess/gnuchess_6.2.9.bb | 3 +- 2 files changed, 151 insertions(+), 1 deletion(-) create mode 100644 meta-gnome/recipes-gnome/gnome-chess/gnuchess/0001-Remove-register-storage-class-classifier.patch diff --git a/meta-gnome/recipes-gnome/gnome-chess/gnuchess/0001-Remove-register-storage-class-classifier.patch b/meta-gnome/recipes-gnome/gnome-chess/gnuchess/0001-Remove-register-storage-class-classifier.patch new file mode 100644 index 0000000000..69237fd57a --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-chess/gnuchess/0001-Remove-register-storage-class-classifier.patch @@ -0,0 +1,149 @@ +From 321eb9b1ca1b230063259dc43be8a2ab2f3bfee9 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 17 Jan 2023 22:16:36 -0800 +Subject: [PATCH] Remove 'register' storage class classifier + +This is gone with c++17 + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/frontend/atak.cc | 4 ++-- + src/frontend/lexpgn.cc | 34 +++++++++++++++++----------------- + src/frontend/util.cc | 2 +- + 3 files changed, 20 insertions(+), 20 deletions(-) + +diff --git a/src/frontend/atak.cc b/src/frontend/atak.cc +index ef19d87..640e150 100644 +--- a/src/frontend/atak.cc ++++ b/src/frontend/atak.cc +@@ -37,7 +37,7 @@ short SqAtakd (short sq, short side) + * + **************************************************************************/ + { +- register BitBoard *a, b, *c, d, blocker; ++ BitBoard *a, b, *c, d, blocker; + int t; + + a = board.b[side]; +@@ -89,7 +89,7 @@ BitBoard AttackTo (int sq, int side) + * + ***************************************************************************/ + { +- register BitBoard *a, b, *c, e, blocker; ++ BitBoard *a, b, *c, e, blocker; + int t; + + a = board.b[side]; +diff --git a/src/frontend/lexpgn.cc b/src/frontend/lexpgn.cc +index 475899d..971aa13 100644 +--- a/src/frontend/lexpgn.cc ++++ b/src/frontend/lexpgn.cc +@@ -2431,9 +2431,9 @@ extern int yylex (void); + */ + YY_DECL + { +- register yy_state_type yy_current_state; +- register char *yy_cp, *yy_bp; +- register int yy_act; ++ yy_state_type yy_current_state; ++ char *yy_cp, *yy_bp; ++ int yy_act; + + #line 153 "lexpgn.ll" + +@@ -3118,9 +3118,9 @@ case YY_STATE_EOF(RAV): + */ + static int yy_get_next_buffer (void) + { +- register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; +- register char *source = (yytext_ptr); +- register int number_to_move, i; ++ char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; ++ char *source = (yytext_ptr); ++ int number_to_move, i; + int ret_val; + + if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] ) +@@ -3252,8 +3252,8 @@ static int yy_get_next_buffer (void) + + static yy_state_type yy_get_previous_state (void) + { +- register yy_state_type yy_current_state; +- register char *yy_cp; ++ yy_state_type yy_current_state; ++ char *yy_cp; + + yy_current_state = (yy_start); + yy_current_state += YY_AT_BOL(); +@@ -3278,8 +3278,8 @@ static int yy_get_next_buffer (void) + */ + static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state ) + { +- register int yy_is_jam; +- register char *yy_cp = (yy_c_buf_p); ++ int yy_is_jam; ++ char *yy_cp = (yy_c_buf_p); + + yy_current_state = yy_nxt[yy_current_state][1]; + yy_is_jam = (yy_current_state <= 0); +@@ -3296,9 +3296,9 @@ static int yy_get_next_buffer (void) + return yy_is_jam ? 0 : yy_current_state; + } + +- static void yyunput (int c, register char * yy_bp ) ++ static void yyunput (int c, char * yy_bp ) + { +- register char *yy_cp; ++ char *yy_cp; + + yy_cp = (yy_c_buf_p); + +@@ -3308,10 +3308,10 @@ static int yy_get_next_buffer (void) + if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) + { /* need to shift things up to make room */ + /* +2 for EOB chars. */ +- register yy_size_t number_to_move = (yy_n_chars) + 2; +- register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ ++ yy_size_t number_to_move = (yy_n_chars) + 2; ++ char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ + YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2]; +- register char *source = ++ char *source = + &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]; + + while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) +@@ -3925,7 +3925,7 @@ int yylex_destroy (void) + #ifndef yytext_ptr + static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) + { +- register int i; ++ int i; + for ( i = 0; i < n; ++i ) + s1[i] = s2[i]; + } +@@ -3934,7 +3934,7 @@ static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) + #ifdef YY_NEED_STRLEN + static int yy_flex_strlen (yyconst char * s ) + { +- register int n; ++ int n; + for ( n = 0; s[n]; ++n ) + ; + +diff --git a/src/frontend/util.cc b/src/frontend/util.cc +index 5d3efe2..f7f7f1d 100644 +--- a/src/frontend/util.cc ++++ b/src/frontend/util.cc +@@ -75,7 +75,7 @@ void UpdateFriends (void) + * + ***************************************************************************/ + { +- register BitBoard *w, *b; ++ BitBoard *w, *b; + + w = board.b[white]; + b = board.b[black]; +-- +2.39.1 + diff --git a/meta-gnome/recipes-gnome/gnome-chess/gnuchess_6.2.9.bb b/meta-gnome/recipes-gnome/gnome-chess/gnuchess_6.2.9.bb index 8ca40229ee..78606b8a2a 100644 --- a/meta-gnome/recipes-gnome/gnome-chess/gnuchess_6.2.9.bb +++ b/meta-gnome/recipes-gnome/gnome-chess/gnuchess_6.2.9.bb @@ -4,7 +4,8 @@ LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -SRC_URI = "https://git.savannah.gnu.org/cgit/chess.git/snapshot/chess-${PV}.tar.gz" +SRC_URI = "https://git.savannah.gnu.org/cgit/chess.git/snapshot/chess-${PV}.tar.gz \ + file://0001-Remove-register-storage-class-classifier.patch" SRC_URI[sha256sum] = "03f9e844ccdd48d20ee49314174404f8b643d83bb8ce9ec9d2e6a21f1b6fb9f5" S = "${WORKDIR}/chess-${PV}" From patchwork Sat Jan 21 18:00:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18419 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 492E5C54794 for ; Sat, 21 Jan 2023 18:01:37 +0000 (UTC) Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by mx.groups.io with SMTP id smtpd.web11.2062.1674324091113259352 for ; Sat, 21 Jan 2023 10:01:31 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=igK35m7z; spf=pass (domain: gmail.com, ip: 209.85.216.48, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f48.google.com with SMTP id y3-20020a17090a390300b00229add7bb36so7760833pjb.4 for ; Sat, 21 Jan 2023 10:01:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=K2LzTNAdkTt9uJ7Uo6YGQ6nbpU3H0243F9WbhiqTsMY=; b=igK35m7zBLb5gaDU7XDCtj8DnkyQykEHx4W51m5qSWPgEh8ZZjqdRG/BA7CCFBCQHL a0fgrI+yc9iBGLtZ1aS58zM6qPvy+43mea4mvOg75Gz4MnSrLasPibvYHrVBE0blFGpj vwPfXCFr959E9cuh1XaDtliK0iroNWmoZMjhqDtMYEjviIocKKzUt1wEttwkLGhlptmu IGvM0YdBL1vs9ujFJURVVm/+HWlGSvjEzCgBo6EOmdBZWbZ2WBpy2vOxUgDdGiCHy4Nm HOQWtu32Viy1yNqLBjBG71O5CR24mXbuZ6fRHgHy0En6UuY1go/64MSLPMbwpEaobnF4 5tug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=K2LzTNAdkTt9uJ7Uo6YGQ6nbpU3H0243F9WbhiqTsMY=; b=xDPR4RJ2JTWQJMcUSAvxg0tMV9sc2trCxQBkyAt+2Oyw2ZO9HlthZjuJmEWED1NfQC oLWnfaXtUc4LF3xGV0HHO0OiB2NkHZh8agZXm984jlNu/Holb/o+rBtKG3zCPjJ5mGl3 mSIYHXR52FBbehtKm6m/+7f8HAK9MNE6QRBLWOAF+6AUpy6QUhvEv3Ca8K/GuTs0Xx7i j3cQDhaDOdHNWYjAjEm16P9D3OwTHf8jzrUspEOL7QjGAb/X0J4rnpuntmqYdkXKBP4z 6W0iYyuLtWEzp1kIJePwnNaH9BQ5jqDvLT7bfAjuh1qdTInO9gvEo26Y9LR2Y5cQDy7b 7Hew== X-Gm-Message-State: AFqh2koLBF/ONOEKaTBcyc8+8khc4eEebSYKmAw4IXXa9kgTUdp7niwU UQogmGWb3SKezWTof2AJKJOIFtuaW3xT7g== X-Google-Smtp-Source: AMrXdXt1ZoEuG5yeFSxTwi0q9QpbHNqLpeAIC1tPxgovp7A8o81iBBnpb5n1H7s+U8l0/ktFVN+EnA== X-Received: by 2002:a17:90b:4c85:b0:229:f915:ef32 with SMTP id my5-20020a17090b4c8500b00229f915ef32mr9346009pjb.36.1674324090341; Sat, 21 Jan 2023 10:01:30 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id d15-20020a17090a02cf00b00226c2d90c04sm3623583pjd.38.2023.01.21.10.01.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Jan 2023 10:01:30 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-networking][PATCH 08/30] ippool: Use unsigned int type for 1-bit integer bitfield Date: Sat, 21 Jan 2023 10:00:59 -0800 Message-Id: <20230121180121.1229895-8-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230121180121.1229895-1-raj.khem@gmail.com> References: <20230121180121.1229895-1-raj.khem@gmail.com> 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, 21 Jan 2023 18:01:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100674 Signed-off-by: Khem Raj --- ...-int-type-for-1-bit-integer-bitfield.patch | 42 +++++++++++++++++++ .../recipes-daemons/ippool/ippool_1.3.bb | 1 + 2 files changed, 43 insertions(+) create mode 100644 meta-networking/recipes-daemons/ippool/ippool/0001-Use-unsigned-int-type-for-1-bit-integer-bitfield.patch diff --git a/meta-networking/recipes-daemons/ippool/ippool/0001-Use-unsigned-int-type-for-1-bit-integer-bitfield.patch b/meta-networking/recipes-daemons/ippool/ippool/0001-Use-unsigned-int-type-for-1-bit-integer-bitfield.patch new file mode 100644 index 0000000000..0533616722 --- /dev/null +++ b/meta-networking/recipes-daemons/ippool/ippool/0001-Use-unsigned-int-type-for-1-bit-integer-bitfield.patch @@ -0,0 +1,42 @@ +From 4788ce6ec602f6441970e1095572c4ff0e90c7c5 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 17 Jan 2023 22:33:52 -0800 +Subject: [PATCH] Use unsigned int type for 1-bit integer bitfield + +In C++, signed integers are represented in two's complement. This also applies to signed bitfields. +A signed bitfield composed of one bit can therefore store a value in the range -1 to 0. +Assigning a value of 1 to such a bitfield should produce a warning since it is out of range of representable values. +Therefore fix this case by using unsigned int instead of signed int + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + usl/usl_signal.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/usl/usl_signal.c b/usl/usl_signal.c +index 45ddd94..8c1d4d0 100644 +--- a/usl/usl_signal.c ++++ b/usl/usl_signal.c +@@ -39,12 +39,12 @@ struct usl_notifier { + }; + + typedef struct { +- volatile int sighup:1; +- volatile int sigterm:1; +- volatile int sigchld:1; +- volatile int sigusr1:1; +- volatile int sigusr2:1; +- volatile int running:1; ++ volatile unsigned int sighup:1; ++ volatile unsigned int sigterm:1; ++ volatile unsigned int sigchld:1; ++ volatile unsigned int sigusr1:1; ++ volatile unsigned int sigusr2:1; ++ volatile unsigned int running:1; + sig_atomic_t waiting; + sigjmp_buf sigjmp; + } usl_signal_data_t; +-- +2.39.1 + diff --git a/meta-networking/recipes-daemons/ippool/ippool_1.3.bb b/meta-networking/recipes-daemons/ippool/ippool_1.3.bb index 984acac76e..26b03814d6 100644 --- a/meta-networking/recipes-daemons/ippool/ippool_1.3.bb +++ b/meta-networking/recipes-daemons/ippool/ippool_1.3.bb @@ -29,6 +29,7 @@ SRC_URI = "https://sourceforge.net/projects/openl2tp/files/${BPN}/${PV}/${BPN}-$ file://strncpy-truncation.patch \ file://0001-pppd-ippool.c-Fix-type-casting-issues-between-in_add.patch \ file://0002-ippool_rpc_server.c-Add-missing-prototype-for-ippool.patch \ + file://0001-Use-unsigned-int-type-for-1-bit-integer-bitfield.patch \ " LIC_FILES_CHKSUM = "file://LICENSE;md5=4c59283b82fc2b166455e0fc23c71c6f" From patchwork Sat Jan 21 18:01:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18422 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 4B220C54E94 for ; Sat, 21 Jan 2023 18:01:37 +0000 (UTC) Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by mx.groups.io with SMTP id smtpd.web10.2128.1674324091860425572 for ; Sat, 21 Jan 2023 10:01:31 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=cRbtnNpK; spf=pass (domain: gmail.com, ip: 209.85.214.171, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f171.google.com with SMTP id k13so8032898plg.0 for ; Sat, 21 Jan 2023 10:01:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=sOhbP0B0u0BAGq7YyGBmk0vqRTHf1kQlf1jU6L6c67c=; b=cRbtnNpKby8JfKApqBW52Z6CUTDOnphO/+5H7NPjE7dzWqZ1WqVb0UIxnPlxSJx2Yn M0Oh8z8h2wJGc67I7S9in7h1M05ty6ROT6a5sQhumqbNbyeQ4xVYsz2NDAH5e8KEddPj EPjNJzE+AaSvGqjHFisPPxRwh+KdDMK2Mh2RGAi9FsiCI7jXI87mm6Fiw71Y/zGpp5Kt JFOhZspF8ewsfGlqRLKijlQz8cGztzbhzymA3U5xK2zspOaq6aEe+mQS0PvubdW0wulm Q6aPd0P1rgsNO/fzCWg6XXKIkSQ9yw0KVfS9YJ2vpmvP/ASQ6/um2Hjm0Y/UmdlqJkLs gl6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sOhbP0B0u0BAGq7YyGBmk0vqRTHf1kQlf1jU6L6c67c=; b=7aCflIQ2TUts+IxwnTNH+fXkocrg8Tu2ir3n/wi8yXwbhu55yVynsALuwGC+twSR3q Q4n5lMZsR56xntP2v6iHbHD7idmJT1I7zxL+Y6+TNWkrkWfQpIAXkL9CebaUjeXlaaq6 pzYCiBHsw6WmfN/9337gt1hCwMQELjF6kaV8VbBJUrfY3GamuxLx9dXWzVMxKJD8VSzw VeWo/kCk3G+DIVbyNDQ+5BosSbKIfleIxiAXyxVDw1Ipdw76EZIV0QccIaZmJhS3I2XP 09UGcNJGvdqATuQgg8sT4cCYMREqm/VlsIKHdNzvTImXcaDVdmIfOieDlpuJBMvq7P6l EEFg== X-Gm-Message-State: AFqh2kqo6gfS1EMZrJjAzn6jQqLQBf/0l+HvLadwEWwRkLB+nE/lWkOI 3jknau9QNK15i090G55fB1ncyGNyEuqUMw== X-Google-Smtp-Source: AMrXdXt1KJJJ+KlOR0yDLYsUszNBseb48KD0nF7Ws6WoDbPPwJVD4G8oRKWxHfX68CiQIXrcN1JmKg== X-Received: by 2002:a17:90a:be14:b0:229:8ada:ccb2 with SMTP id a20-20020a17090abe1400b002298adaccb2mr20653732pjs.27.1674324091154; Sat, 21 Jan 2023 10:01:31 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id d15-20020a17090a02cf00b00226c2d90c04sm3623583pjd.38.2023.01.21.10.01.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Jan 2023 10:01:30 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 09/30] audiofile: Stick to c++14 std Date: Sat, 21 Jan 2023 10:01:00 -0800 Message-Id: <20230121180121.1229895-9-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230121180121.1229895-1-raj.khem@gmail.com> References: <20230121180121.1229895-1-raj.khem@gmail.com> 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, 21 Jan 2023 18:01:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100676 It uses std::unary_function which is removed from c++17 onwards, until this is removed/replaced we can not move beyond c++14 Signed-off-by: Khem Raj --- meta-oe/recipes-multimedia/audiofile/audiofile_0.3.6.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-multimedia/audiofile/audiofile_0.3.6.bb b/meta-oe/recipes-multimedia/audiofile/audiofile_0.3.6.bb index e91c81d703..a09f84381e 100644 --- a/meta-oe/recipes-multimedia/audiofile/audiofile_0.3.6.bb +++ b/meta-oe/recipes-multimedia/audiofile/audiofile_0.3.6.bb @@ -19,6 +19,8 @@ SRC_URI[sha256sum] = "ea2449ad3f201ec590d811db9da6d02ffc5e87a677d06b92ab15363d8c inherit autotools lib_package pkgconfig +CXXFLAGS += "-std=c++14" + DEPENDS = " \ asciidoc-native \ alsa-lib \ From patchwork Sat Jan 21 18:01:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18424 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 6E53EC54ED2 for ; Sat, 21 Jan 2023 18:01:37 +0000 (UTC) Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by mx.groups.io with SMTP id smtpd.web11.2063.1674324092782604368 for ; Sat, 21 Jan 2023 10:01:32 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=CF/SjNO2; spf=pass (domain: gmail.com, ip: 209.85.216.48, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f48.google.com with SMTP id d8so8375657pjc.3 for ; Sat, 21 Jan 2023 10:01:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=L3B59X6DsOQUq+KhJDwdDZ2zMaEwy4djFqrtlZtFRGU=; b=CF/SjNO2tUMh9bx6MfdxQKf7HeOIwWVyhH2nW+F0/xuxjO2mvFBAHSYE73xVn5kubC c7qFiRElWzvDvhFN82Hj5K6vtqCuoo8/TjLSarMsLuz97rj1a4jmB5IYNmTZc+gUmfV2 Wn7mKe0UBsh2W9g8oLnqxOj9x4QOEuMm3xO6vtYNIPmtaNftzzTEVWKA12K1yDT3MsrB IEVFVC2iNnKwT9GeBDi/o+Vhs/eQ7v7Vk8Jc3j7zLun490KUKg9MUU9Cn1HucKWrsv94 fIpxRq0fvIrg/JEcyzavm7RjLGfdPvW0FDpaINaRn4dmjJYYhkKKuBkhu+YkaxmpZvIB 82Aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=L3B59X6DsOQUq+KhJDwdDZ2zMaEwy4djFqrtlZtFRGU=; b=DNAAlLZcIowC476eosyq/dIGBbBDI+wl/BctLwNTSR0wl0luE6Sk7TLPDRJxB/T7yp wJIiNLUoNamt2zuCxWoozNGbGMyK0/n8h2wJEg87GF1aa/thp9cqeT1FoRK+x0bOJRaL VgCbbY99vMqBpjAaJFpVzpE8RUA72gu527Vm/XYDyE8HavZdCxcy2iaVpDgZ9O1vZOXG fAUgfD0Mv1J3mx3cHWRab7oORZg4A9vJpDa1w2xbe9tAlxvexmVkPR1Hs6QdEQBL1nDz hgwSymAJisTHakmmBocBXIAFDzSgnoCQj7rFbZXFGDyejaIMNGdF+PRLONvpakldKd15 ukQw== X-Gm-Message-State: AFqh2koRnaIRW10ruMfaE2fQ9JXPDTl63iO5VqzB2DNv2VsDK3kdPgjN noPXvrup/JEN8UmTO3TwPcMF62DbM0l1CQ== X-Google-Smtp-Source: AMrXdXsjU8Y3C16Enb4ecPqR7GjE7tRjrQQAnW/e9uyQ82/r24gSkYKEBVJWB487Pzl2gyKPUnfmxQ== X-Received: by 2002:a17:90a:b798:b0:229:d641:9ef2 with SMTP id m24-20020a17090ab79800b00229d6419ef2mr12874541pjr.40.1674324091958; Sat, 21 Jan 2023 10:01:31 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id d15-20020a17090a02cf00b00226c2d90c04sm3623583pjd.38.2023.01.21.10.01.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Jan 2023 10:01:31 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 10/30] ssiapi: Use c++14 standard Date: Sat, 21 Jan 2023 10:01:01 -0800 Message-Id: <20230121180121.1229895-10-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230121180121.1229895-1-raj.khem@gmail.com> References: <20230121180121.1229895-1-raj.khem@gmail.com> 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, 21 Jan 2023 18:01:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100677 It depends on std::auto_ptr which is gone with c++17 therefore pin to c++14 until auto_ptr is replaced with something else e.g. unique_ptr Signed-off-by: Khem Raj --- meta-oe/recipes-support/ssiapi/ssiapi_1.3.0.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-support/ssiapi/ssiapi_1.3.0.bb b/meta-oe/recipes-support/ssiapi/ssiapi_1.3.0.bb index 13ed7570b1..bf9de31f84 100644 --- a/meta-oe/recipes-support/ssiapi/ssiapi_1.3.0.bb +++ b/meta-oe/recipes-support/ssiapi/ssiapi_1.3.0.bb @@ -29,6 +29,8 @@ S ="${WORKDIR}/${BPN}.${PV}" inherit autotools +CXXFLAGS += "-std=gnu++14" + do_configure:prepend(){ ${S}/autogen.sh } From patchwork Sat Jan 21 18:01:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18416 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 33EC7C38A23 for ; Sat, 21 Jan 2023 18:01:37 +0000 (UTC) Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by mx.groups.io with SMTP id smtpd.web10.2123.1674324088066323550 for ; Sat, 21 Jan 2023 10:01:33 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Te3U8cW4; spf=pass (domain: gmail.com, ip: 209.85.216.53, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f53.google.com with SMTP id u1-20020a17090a450100b0022936a63a21so11896200pjg.4 for ; Sat, 21 Jan 2023 10:01:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dI/25VhHbiUyxNIZZnEGfn5/N4f2+D9dPjMKIxsF95s=; b=Te3U8cW48sQZ9eQdcsvwNyi7z/qbSUGAEOdrcXNGGY+f+RT3O+8R1d7puE8IYYQbVL A1PHw0/eLMOEU63T72L0I6z1jNtuBXumc26uH61bdnnSlmVRVyrb291CoZaM+EZ0jg0r y8Zu308pAOwp/5fUF/D89Zk6IgyYkBiswQVv5AJsktqlOB4VzojEjLFnbITmXATUwFIp +fZINNUiE4fpaqsanFq/MO8XV4nYKhejigseLv5k5zJ5ajDkFIceytdjYnvn9okS9iOc f2P4a0G+fNdgbLu8kn6KkJb4KyJb1w8AZO2eUtyJkTZw997zjMHrgah5JbaOQJTT4kA9 Boew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dI/25VhHbiUyxNIZZnEGfn5/N4f2+D9dPjMKIxsF95s=; b=0liOprFEmGB7hwJbFjOCPmH177/6oEAfKvAO1PwOL7jf/KNHxVe4jW9XEK+wLb7JdM 517Rq8rdLvWK81VI3mUNfzY+f1zDBkK4ZRI3uJQa/cWKnf9F8McqBa3QWn0ksSEWQcEh u4eJCFB24T8Q2FqyL68X64TZxKGO9X7M6x5HcFdcyoK7Gf1RmNEjXstT3TH0IoJY+Wci ca5PXvDc7ijwijuaPiekdNgtTYZBhfGd85qigl0/kcqbuwy8ir9wSP4mXjjxeQvEIJs2 QJMpxLGArlWp3x6WLGWu+3RFKOlwDp9urDC8qzDmwBts8KXaSogQivVq7RQ3qvFYM/x9 RWzQ== X-Gm-Message-State: AFqh2kq+h8QC5onAXDaYujcRyEo4H5C2YEiK8XmB+22ts5oFXxng5FvC Mg3sov5Cdw3u2oXk3uQ6yPPyHxhPcQq0jw== X-Google-Smtp-Source: AMrXdXvBkpsyrhHIeSChf4rjkMLlgPDWxcVl9m93FxS7a5fVo8gqgainXs5CSHS4AdEQ+mIqBNqF3Q== X-Received: by 2002:a17:90b:1b49:b0:22b:b5e9:ec37 with SMTP id nv9-20020a17090b1b4900b0022bb5e9ec37mr5972648pjb.1.1674324092732; Sat, 21 Jan 2023 10:01:32 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id d15-20020a17090a02cf00b00226c2d90c04sm3623583pjd.38.2023.01.21.10.01.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Jan 2023 10:01:32 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 11/30] log4cpp: Keep using std=c++14 Date: Sat, 21 Jan 2023 10:01:02 -0800 Message-Id: <20230121180121.1229895-11-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230121180121.1229895-1-raj.khem@gmail.com> References: <20230121180121.1229895-1-raj.khem@gmail.com> 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, 21 Jan 2023 18:01:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100678 It still needs auto_ptr which is pre c++17 | ../../log4cpp/include/log4cpp/BufferingAppender.hh:21:81: error: no template named 'auto_ptr' in namespace 'std' Signed-off-by: Khem Raj --- meta-oe/recipes-support/log4cpp/log4cpp_1.1.3.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-support/log4cpp/log4cpp_1.1.3.bb b/meta-oe/recipes-support/log4cpp/log4cpp_1.1.3.bb index d9a55dd761..8e6d455174 100644 --- a/meta-oe/recipes-support/log4cpp/log4cpp_1.1.3.bb +++ b/meta-oe/recipes-support/log4cpp/log4cpp_1.1.3.bb @@ -19,3 +19,5 @@ EXTRA_OECONF = "\ --enable-html-docs=no \ --enable-latex-docs=no \ " + +CXXFLAGS += "-std=c++14" From patchwork Sat Jan 21 18:01:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18420 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 35406C38159 for ; Sat, 21 Jan 2023 18:01:37 +0000 (UTC) Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by mx.groups.io with SMTP id smtpd.web11.2064.1674324094311231906 for ; Sat, 21 Jan 2023 10:01:34 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=UgVnpze5; spf=pass (domain: gmail.com, ip: 209.85.216.42, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f42.google.com with SMTP id m3-20020a17090a414300b00229ef93c5b0so7072178pjg.2 for ; Sat, 21 Jan 2023 10:01:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=jv5+bGV27t5TwgoCgdzMm1nu7G0yRcBSgLh/yDBWPhU=; b=UgVnpze5cHP3aMTY8B9GioW8Dbb3hYp3onamfloSNB4fKt0EuQv6tIcEXBE3e4Ibjy 2RCN08bC5pGeTLRLlUWBEXBiQuJcf7vGxRkxPFVQnxgGnLp5LGo+a1Z16qpBfFiEjxlV q05wOoC1YTtP8juyAPA1SMAYWHcBy9T2zdDFozye/BkicYxxGNX3DUnND1wBSB5l4Qu0 SP27AcB/sH8t9Nuf8Im+g9Qi+FPzhGjpa1Iyow+HqSocWV9yjfarcFGnEIc3+mzJwW52 5VzO4N+auI3ahhljhlC+XjR0OKGrLxpliyabsdCUv4+3abDGc/rSUTHRWbOLBBSMlUnb mTaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jv5+bGV27t5TwgoCgdzMm1nu7G0yRcBSgLh/yDBWPhU=; b=DJEwJlKQ+Cl0yHU5X6MBYkNsa9pbq35Z9mGgzBs24i3z6cu3CXQQWmWqRu6a7MAXrB sI1ZPjkP7T5VPLA56MD7H4b+0Ym5reBYFcNZv5B05DadFZ7DsxWBicFX2DwTrknTLHfp 5VAiIkEGfhdqA2DGbg1FDlQ/BuCV/TGMpzPXhJLkvUaIYN4+detim8uQiScPfunyVntx FRy77gVbj9JoEsoYGm1d6aWg8cd7dpT2ZXhp8YWjWy54vDHVU3DKNzId99iEOCu1QT6i mw37V55z+yZACCt7hyqvW1XuOOpGqWwnfaCAOGENBRyb3PXZ4NhCHax0N78HAYh8Rd3M UNAg== X-Gm-Message-State: AFqh2kr/nmk8UvlBMlY9CnWGETNY7OBagEKNJ8TDohhXs6qXgrocx2e3 tZz+edT2e9aQof6rsWnL2mUG3uIf9FtdSw== X-Google-Smtp-Source: AMrXdXsWjHHw4LKPkV31JVh/Hq532aTcusAKya+mXaHmYvsHO0yB+LD7mEA51YXIm3AeR07PJqtUJw== X-Received: by 2002:a17:90a:7309:b0:228:e521:3430 with SMTP id m9-20020a17090a730900b00228e5213430mr20143392pjk.21.1674324093527; Sat, 21 Jan 2023 10:01:33 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id d15-20020a17090a02cf00b00226c2d90c04sm3623583pjd.38.2023.01.21.10.01.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Jan 2023 10:01:33 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 12/30] gengetopt: Use std=c++14 Date: Sat, 21 Jan 2023 10:01:03 -0800 Message-Id: <20230121180121.1229895-12-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230121180121.1229895-1-raj.khem@gmail.com> References: <20230121180121.1229895-1-raj.khem@gmail.com> 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, 21 Jan 2023 18:01:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100679 It needs std::unary_operator which is gone in c++17, until it is forward ported to work with c++17, pin to c++14 ../../gengetopt-2.23/src/gm_utils.h:132:35: error: no template named 'unary_function' in namespace 'std'; did you mean '__unary_function'? | struct pair_print_f : public std::unary_function | ~~~~~^~~~~~~~~~~~~~ Signed-off-by: Khem Raj --- meta-oe/recipes-support/gengetopt/gengetopt_2.23.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-support/gengetopt/gengetopt_2.23.bb b/meta-oe/recipes-support/gengetopt/gengetopt_2.23.bb index 52c1016335..4d97b1a419 100644 --- a/meta-oe/recipes-support/gengetopt/gengetopt_2.23.bb +++ b/meta-oe/recipes-support/gengetopt/gengetopt_2.23.bb @@ -13,4 +13,6 @@ SRC_URI[sha256sum] = "b941aec9011864978dd7fdeb052b1943535824169d2aa2b0e7eae9ab80 inherit autotools texinfo +CXXFLAGS += "-std=c++14" + BBCLASSEXTEND = "native nativesdk" From patchwork Sat Jan 21 18:01:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18418 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 33FD2C52D77 for ; Sat, 21 Jan 2023 18:01:37 +0000 (UTC) Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by mx.groups.io with SMTP id smtpd.web10.2129.1674324095317219574 for ; Sat, 21 Jan 2023 10:01:35 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=X5oAAF1s; spf=pass (domain: gmail.com, ip: 209.85.214.170, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f170.google.com with SMTP id z13so7968652plg.6 for ; Sat, 21 Jan 2023 10:01:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fK8cZMmEO3MZJb6gFaEvYKQaXb1WZy8bkp8kVqmMFBw=; b=X5oAAF1sPMsav7sHiQnt+xh6LFjHcWWoa6Ms0dooOfm+sR2o/gfV+/i8S6Ut8PqaHJ k9jB4ZWTbIPJIB+byEfcaHwq1KPyWyza8zV0g42hRc3iv5ZxPr+qyvpKUEG1Q3DWz7HY uLev93d2WWvnop7fJrnlzT+XvqTJtJ6/ilrax2LfWCJnCD/SggeW2fjt2eolZjcBOXtB SDiXWD4VnqOgdrRN3yRSjZTl5ZvISOPWSgf9dMkXzgrQIN46gc9FAXa+T+mv+cstM7wM Xp6TWwbBTF1jHYr0EO8qHDgP9yesSFCI6kHzArZdOo6uvk2lPdhnvUnJ5ZGk/Fx0xApI /snA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fK8cZMmEO3MZJb6gFaEvYKQaXb1WZy8bkp8kVqmMFBw=; b=sURBr27tcYAWYbi8DNgsR7xTZGzA2y4x+CHcOj/2BKVUlLpzxXIOVZLZVKsGoa1eXH F8V5PHR8km/C/3BApqgB+GwgOzWQ1mcAiBfDI/VKz9EMkO8pemwNtCAZfr8t8xfpHqWo s1ydQHmelMxFkeUcroKGZ1PaFJ2QmZw/piguG0IT6RTrmlL0m8U/q536YmtKQ6/jQn5v sGDc1QxpoGne5Z3rHNmgvAXfAiBdv15T1dvMKmhZwlL7kG3rC6j1bEx81tL/PnAyi8xI 3yesejyaKjP9RrORPL65vAatUuWH7zyH1MuQNuwr+4tsxz19qHiU4v5B6CIQkZvOcdND 2T3w== X-Gm-Message-State: AFqh2kphVQ5yxGl+CXV+9edwtTRdEKiVvKA3uqfVuEV4aOIPwapQptgL l2R9vkuZ0JHS5cgCIbjLThSgAOlmFrNMMA== X-Google-Smtp-Source: AMrXdXsAP5x+Jd/+cn5Kyro59EEUOr7qdSpTMU56H2+KyZM7TTcuHtliDDHMw4LYj4nsvciY7+q2CQ== X-Received: by 2002:a17:90a:300b:b0:227:db2:25fe with SMTP id g11-20020a17090a300b00b002270db225femr19889753pjb.35.1674324094460; Sat, 21 Jan 2023 10:01:34 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id d15-20020a17090a02cf00b00226c2d90c04sm3623583pjd.38.2023.01.21.10.01.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Jan 2023 10:01:34 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 13/30] libmimetic: Pin to using -std=c++14 Date: Sat, 21 Jan 2023 10:01:04 -0800 Message-Id: <20230121180121.1229895-13-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230121180121.1229895-1-raj.khem@gmail.com> References: <20230121180121.1229895-1-raj.khem@gmail.com> 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, 21 Jan 2023 18:01:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100680 It uses unary_function which is removed in c++17 | ../../../git/mimetic/rfc822/header.h:37:21: error: no template named 'unary_function' in namespace 'std'; did you mean '__unary_function'? | public std::unary_function | ~~~~~^~~~~~~~~~~~~~ Signed-off-by: Khem Raj --- meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb b/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb index fc0b1ee495..06536ca70f 100644 --- a/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb +++ b/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb @@ -19,6 +19,6 @@ UPSTREAM_CHECK_COMMITS = "1" S = "${WORKDIR}/git" -CXXFLAGS += "-Wno-narrowing" +CXXFLAGS += "-Wno-narrowing -std=c++14" inherit autotools From patchwork Sat Jan 21 18:01:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18421 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 49805C54737 for ; Sat, 21 Jan 2023 18:01:37 +0000 (UTC) Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by mx.groups.io with SMTP id smtpd.web10.2130.1674324096164790802 for ; Sat, 21 Jan 2023 10:01:36 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=QsfIlCaV; spf=pass (domain: gmail.com, ip: 209.85.214.180, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f180.google.com with SMTP id k18so7976908pll.5 for ; Sat, 21 Jan 2023 10:01:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=w6Mmq6W8+GK6gUr+dGQZZfJVge37nr9fsPuouuFbQsM=; b=QsfIlCaV4NO5htQf8/hQU2iUFRgJ8H8ETLJmNL/p9zY+6ie9wYEPNHK/jFrl77S8px 6wUuK4bFHmN3QUtw8Y5sTyqvDBfXkntHRZADJTSCV+h488Vqj/r+bKRzy+QA78nyGFvO IWKofOx+5d1/Q0661vIZfsD/z6JBuVumLFuyMMKZLzC/6GBj7LTxSUhjQDWFE/FDtXkO YfC2llXTIOBc6YCPJs0/krVAz0/v3qYR2tzkKnith/0af3xzxIue9YAiihWBsSbmubvq c6+lSeAe3Hkl2PDPgFNeIGMq9Mcj/BMPSRgJzyfUxf+B8tf/JTiDUTl8d35tpMHMf+UC bp2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=w6Mmq6W8+GK6gUr+dGQZZfJVge37nr9fsPuouuFbQsM=; b=2zNLISi0nDxPhPYLbNKf63B71KTn8C/+9HXAGtOYHBwaICtDw5tFSC1uMh08J4xnPo 8IPSvgH2LDb86RynmiXsSLiBPWGEu1g5OXfFMyHrc+diOr5hSILvLeOr5qzMr0zWMwrv c1GksoQiU3SHJ2vdFerCGdjMJsPEFygBusio2rlYwLvTEm+CkTae/roultaZkqImpUg6 hIbgmpAkX/42x9u5GSWB7W/YNOELevLhx+H5KS8xEDPtNK544ApRyHzEOqtrGtWDMQ3U ezfvUv540eWRUZTRJawwVB1bzSIjmMk79yBk7Q0c8iJuUucRC4oWLKaxSu85TSY6N1Q+ IS1Q== X-Gm-Message-State: AFqh2kqdsIcd163l8wRXNTMKScN5ouFwPCj4JMxVYo+Ym01ubUTFHJEg qh3FcX0cnLhrOJNoIjPR99w06cKgf4E5ng== X-Google-Smtp-Source: AMrXdXvngke1BcTC4jL14SXiPE6leSBMZItIDNSqe5cUHjVemHnSehsVt5NSu7toImJtibWuvknSaA== X-Received: by 2002:a17:90a:ba11:b0:223:de00:f5ab with SMTP id s17-20020a17090aba1100b00223de00f5abmr19569635pjr.28.1674324095302; Sat, 21 Jan 2023 10:01:35 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id d15-20020a17090a02cf00b00226c2d90c04sm3623583pjd.38.2023.01.21.10.01.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Jan 2023 10:01:34 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 14/30] ace: Upgrade to 6.5.19 Date: Sat, 21 Jan 2023 10:01:05 -0800 Message-Id: <20230121180121.1229895-14-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230121180121.1229895-1-raj.khem@gmail.com> References: <20230121180121.1229895-1-raj.khem@gmail.com> 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, 21 Jan 2023 18:01:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100681 Signed-off-by: Khem Raj --- .../ace/{ace_6.5.12.bb => ace_6.5.19.bb} | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) rename meta-oe/recipes-connectivity/ace/{ace_6.5.12.bb => ace_6.5.19.bb} (83%) diff --git a/meta-oe/recipes-connectivity/ace/ace_6.5.12.bb b/meta-oe/recipes-connectivity/ace/ace_6.5.19.bb similarity index 83% rename from meta-oe/recipes-connectivity/ace/ace_6.5.12.bb rename to meta-oe/recipes-connectivity/ace/ace_6.5.19.bb index 6c68aede03..af4f2c54bb 100644 --- a/meta-oe/recipes-connectivity/ace/ace_6.5.12.bb +++ b/meta-oe/recipes-connectivity/ace/ace_6.5.19.bb @@ -7,12 +7,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d2c090e9c730fd91677782d8e2091d77" DEPENDS += "openssl gperf-native" -SRC_URI = "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_12/ACE-${PV}.tar.bz2 \ +SRC_URI = "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_19/ACE-${PV}.tar.bz2 \ file://ace_config.patch \ file://no_sysctl.patch \ " - -SRC_URI[sha256sum] = "ccd94fa45df1e8bb1c901d02c0a64c1626497e5eeda2f057fcf0a1578dae2148" +SRC_URI[sha256sum] = "739be290a38229aaa5b5150e6ea55ce427e80970f0ace4c5040ac46644526f41" COMPATIBLE_HOST:libc-musl = "null" @@ -23,7 +22,7 @@ export ACE_ROOT="${WORKDIR}/ACE_wrappers" inherit pkgconfig CXXFLAGS:append = " -fpermissive -Wnodeprecated-declarations" -CXX:append = " -ffile-prefix-map=${WORKDIR}= -fdebug-prefix-map=${WORKDIR}= " +CXX:append = " -std=gnu++14 -ffile-prefix-map=${WORKDIR}= -fdebug-prefix-map=${WORKDIR}= " EXTRA_OEMAKE += "INSTALL_LIB=${baselib}" do_install() { From patchwork Sat Jan 21 18:01:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18415 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 1C929C25B50 for ; Sat, 21 Jan 2023 18:01:37 +0000 (UTC) Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by mx.groups.io with SMTP id smtpd.web10.2131.1674324096895347591 for ; Sat, 21 Jan 2023 10:01:36 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=h+UA0NAz; spf=pass (domain: gmail.com, ip: 209.85.216.47, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f47.google.com with SMTP id lp10so4949964pjb.4 for ; Sat, 21 Jan 2023 10:01:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rLzr+LYiVermOH3tcxV9g2hMGYTE7+/8hGhjfyd7kBc=; b=h+UA0NAz36VN0e7Nz+3wgXQF9YLyQotgiXzRuKlkYe3nMdbij7j+PAtE3o043brywB MZqPAvykrgjXF5dkQTijbwpnljDSpYg3MD3iy53G2od2aZX6IhaH2+2FqJPlGt/kzOu6 gOdY9ekvz46EUToG1nLu+fvcO42A1KinBKe7i5jBmc9qOZFrb7vqOAPiLiiqvTB0gefn r2RpjCCbdfqJ6by5Fge8ftofGTISCyd/stgQF7BEmpvCmvlzlHvKs/wp0gxQrHKu0svg RZyyMxyYp6cU/4D89BIaufrhAo1eh7L3c2DGhSDjTexMmaDS3dOF5y3QsEcPEQoVAPmf eypQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rLzr+LYiVermOH3tcxV9g2hMGYTE7+/8hGhjfyd7kBc=; b=e/Pyy7mKMxfj/MstM+Meupr7MqfhbNoI6NvOcHAoxV1r+xZcYd/Gn+saEOXMcGOjVf 2C+lYCgTTX6SxsTNwNLI0tSzDdETDYfl33dG8IUHF17jXcADVv+HstMS2+LJDHDwdePQ o7V6dIAwk4yYnOgaeW56Px8ei1Oyx2sf1PLxj0Q4X3HFWgTrsD5rdzFoEpm2FTLytlOG Qg6HBEXmtz+2BzPoNrwCoEqQc/n93SFwR1L9GQXMcrUiQ0jDfw7cPakJtA7q4XNWvzvH kmT8dRqRo3SbiD13MGlszz50k4UswFAXo7PCGBwc8yR6cetc2kDQsfLyosTG/XbcZb/7 N3ZA== X-Gm-Message-State: AFqh2krIYpALvX7ClKdgSjqXnKm8fiZo+i5zlgfFwdTeSlPZQEWYn7ZC z+T7szFZokISBj++FRjYhBG9bzVoCykJMg== X-Google-Smtp-Source: AMrXdXtHC+mhvhSNKUYtkA2u+Y+W8vMo1jj9UH5gJjSdnPY7qfNlw+75qun2mbpMdDYBYm74SS/4Yw== X-Received: by 2002:a17:90a:e647:b0:229:5b13:d850 with SMTP id ep7-20020a17090ae64700b002295b13d850mr19645093pjb.5.1674324096148; Sat, 21 Jan 2023 10:01:36 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id d15-20020a17090a02cf00b00226c2d90c04sm3623583pjd.38.2023.01.21.10.01.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Jan 2023 10:01:35 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-multimedia][PATCH 15/30] pipewire-media-session: Use PW_ENABLE_DEPRECATED Date: Sat, 21 Jan 2023 10:01:06 -0800 Message-Id: <20230121180121.1229895-15-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230121180121.1229895-1-raj.khem@gmail.com> References: <20230121180121.1229895-1-raj.khem@gmail.com> 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, 21 Jan 2023 18:01:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100682 pipewire 0.64 has removed [1] NODE_TARGET which is still used by pipewire-media-session so enable deprecated features for now to get the definition of PW_KEY_NODE_TARGET [2] [1] https://gitlab.freedesktop.org/pipewire/pipewire/-/releases/0.3.64#highlights [2] https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/2952 Signed-off-by: Khem Raj --- .../pipewire/pipewire-media-session_0.4.1.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-multimedia/recipes-multimedia/pipewire/pipewire-media-session_0.4.1.bb b/meta-multimedia/recipes-multimedia/pipewire/pipewire-media-session_0.4.1.bb index 9fdb60380b..da8d1d7ad6 100644 --- a/meta-multimedia/recipes-multimedia/pipewire/pipewire-media-session_0.4.1.bb +++ b/meta-multimedia/recipes-multimedia/pipewire/pipewire-media-session_0.4.1.bb @@ -16,7 +16,8 @@ S = "${WORKDIR}/git" SRCREV = "e5d5cf2404786af8bcc40bdb8a2962bef4ec18b6" inherit meson pkgconfig - +# https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/2952 +CFLAGS += "-DPW_ENABLE_DEPRECATED" FILES:${PN} += " \ ${systemd_user_unitdir}/pipewire-media-session.service \ ${datadir}/pipewire/media-session.d/* \ From patchwork Sat Jan 21 18:01:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18433 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 62042C25B50 for ; Sat, 21 Jan 2023 18:01:47 +0000 (UTC) Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by mx.groups.io with SMTP id smtpd.web11.2059.1674324087091825361 for ; Sat, 21 Jan 2023 10:01:37 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=n+OiIIR9; spf=pass (domain: gmail.com, ip: 209.85.216.53, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f53.google.com with SMTP id b10so8403465pjo.1 for ; Sat, 21 Jan 2023 10:01:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=msJRGgUQAOTVe5/aDUmfmhAepzeIs/VzdVmXe5J1u5g=; b=n+OiIIR9q0eLzoQ7SUYE/wak+b54YbDHXot2ynFU0r4KdhIW/l0hUgSHH6OjF3ZTk5 LR8siHNpGEqQOg93cZlBp60t969rL3R/524mC06PXqX5rUlGNjDfSsaR950oG2ZE7ELu oVL1r4ynzpLNI5wdTIHZQY8l31iAatuOaOltKw3Am7Ta9Gb9UOqwBgPx9lLDgYec6dDf T6Uk6QVtwO55Ua+KZ1YI7hNSHeciDGCPH5d+49PiAVEvNDELoIa1oYWCcnkEMz1PzVe8 K0C1dGzLVN2q8gkJd3xJOCs2rJTjawPNDAwP2dLeVoIR7Rk2e6TkiJby3OEbAh7IpUJU b62w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=msJRGgUQAOTVe5/aDUmfmhAepzeIs/VzdVmXe5J1u5g=; b=M8UgqUsxfSplLF2QupbGB636aXqK2SMCPOMySbH6iAAoRpHlMJKHgMb14fkBOoIKk1 cHCJLmrlIE+/sZWxhzwuhjhDjhr7flh3J4SwI3NnaTPqSy9yreNO5vzGz+rkIv0u5e3c SpXQBsGa9dZH9bBihpbr/nFiQmGbJP2gZ7O5Gpvt7YdXXQvoq/GV4qe6nb27/Zz91NVC okJ5rUYB90y4eI1Punhq5ZbnQemNgWVB9Foi8O9MXtd13REeFEyNU1Lzc3yhSNQAJjEP r2CqgC0bIqkN074Bwjp0/cP1fiVE+AofyuUJ6fmEFgwhzlHwhIUSlRhPVyO0VS+zyqW4 Cygw== X-Gm-Message-State: AFqh2krMJZL1krEesWB59Wb4xb7eJSa+rzKly7ucxMp4mT7p64MO1+8S 3Uzvd7CbCPMdh7+cxI5rh2IonpDTlebbmg== X-Google-Smtp-Source: AMrXdXs9aCH0xECmRq8Vf90M9nKQjOlJbMVyye5IL08/e/osVT3JjPLRxL96onQGWmx7CGoS9FnQSQ== X-Received: by 2002:a17:90a:4291:b0:229:f363:4a71 with SMTP id p17-20020a17090a429100b00229f3634a71mr9901930pjg.0.1674324096890; Sat, 21 Jan 2023 10:01:36 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id d15-20020a17090a02cf00b00226c2d90c04sm3623583pjd.38.2023.01.21.10.01.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Jan 2023 10:01:36 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 16/30] rtorrent: Update to latest tip of trunk Date: Sat, 21 Jan 2023 10:01:07 -0800 Message-Id: <20230121180121.1229895-16-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230121180121.1229895-1-raj.khem@gmail.com> References: <20230121180121.1229895-1-raj.khem@gmail.com> 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, 21 Jan 2023 18:01:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100683 This is needed to get it working with latest compilers always --enable-aligned so it does not have to perform runtime test Drop the patch for removing AC_RUN_IFELSE as this macro is no longer excercised in OE builds Pin to c++14 for now, since std::binary_function is in use which is gone in c++17 ( default with clang 16+ ) License-Update: Use GPL-2.0 or later identifier correctly Signed-off-by: Khem Raj --- ...t-run-code-while-configuring-package.patch | 104 ------------------ .../rtorrent/rtorrent_git.bb | 19 ++-- 2 files changed, 8 insertions(+), 115 deletions(-) delete mode 100644 meta-oe/recipes-connectivity/rtorrent/rtorrent/don-t-run-code-while-configuring-package.patch diff --git a/meta-oe/recipes-connectivity/rtorrent/rtorrent/don-t-run-code-while-configuring-package.patch b/meta-oe/recipes-connectivity/rtorrent/rtorrent/don-t-run-code-while-configuring-package.patch deleted file mode 100644 index 7d09f4382f..0000000000 --- a/meta-oe/recipes-connectivity/rtorrent/rtorrent/don-t-run-code-while-configuring-package.patch +++ /dev/null @@ -1,104 +0,0 @@ -Using AC_RUN_IFELSE prevent people from configuring package - for cross-compiling. Don't run code while configuring package. - -Upstream-Status: Pending -Signed-off-by: Andrei Gherzan - -Update for 0.9.8. -Signed-off-by: Zheng Ruoqin ---- - scripts/checks.m4 | 34 ---------------------------------- - scripts/common.m4 | 28 ---------------------------- - 2 files changed, 62 deletions(-) - -diff --git a/scripts/checks.m4 b/scripts/checks.m4 -index 83be846..1af80f5 100644 ---- a/scripts/checks.m4 -+++ b/scripts/checks.m4 -@@ -95,40 +95,6 @@ AC_DEFUN([TORRENT_CHECK_KQUEUE], [ - - AC_DEFUN([TORRENT_CHECK_KQUEUE_SOCKET_ONLY], [ - AC_MSG_CHECKING(whether kqueue supports pipes and ptys) -- -- AC_LINK_IFELSE([AC_LANG_SOURCE([ -- #include -- #include -- #include -- #include -- #include -- int main() { -- struct kevent ev@<:@2@:>@, ev_out@<:@2@:>@; -- struct timespec ts = { 0, 0 }; -- int pfd@<:@2@:>@, pty@<:@2@:>@, kfd, n; -- char buffer@<:@9001@:>@; -- if (pipe(pfd) == -1) return 1; -- if (fcntl(pfd@<:@1@:>@, F_SETFL, O_NONBLOCK) == -1) return 2; -- while ((n = write(pfd@<:@1@:>@, buffer, sizeof(buffer))) == sizeof(buffer)); -- if ((pty@<:@0@:>@=posix_openpt(O_RDWR | O_NOCTTY)) == -1) return 3; -- if ((pty@<:@1@:>@=grantpt(pty@<:@0@:>@)) == -1) return 4; -- EV_SET(ev+0, pfd@<:@1@:>@, EVFILT_WRITE, EV_ADD | EV_ENABLE, 0, 0, NULL); -- EV_SET(ev+1, pty@<:@1@:>@, EVFILT_READ, EV_ADD | EV_ENABLE, 0, 0, NULL); -- if ((kfd = kqueue()) == -1) return 5; -- if ((n = kevent(kfd, ev, 2, NULL, 0, NULL)) == -1) return 6; -- if (ev_out@<:@0@:>@.flags & EV_ERROR) return 7; -- if (ev_out@<:@1@:>@.flags & EV_ERROR) return 8; -- read(pfd@<:@0@:>@, buffer, sizeof(buffer)); -- if ((n = kevent(kfd, NULL, 0, ev_out, 2, &ts)) < 1) return 9; -- return 0; -- } -- ])], -- [ -- AC_MSG_RESULT(yes) -- ], [ -- AC_DEFINE(KQUEUE_SOCKET_ONLY, 1, kqueue only supports sockets.) -- AC_MSG_RESULT(no) -- ]) - ]) - - AC_DEFUN([TORRENT_WITH_KQUEUE], [ -diff --git a/scripts/common.m4 b/scripts/common.m4 -index aaf005e..42fb016 100644 ---- a/scripts/common.m4 -+++ b/scripts/common.m4 -@@ -152,38 +152,10 @@ dnl Need to fix this so that it uses the stuff defined by the system. - - AC_DEFUN([TORRENT_CHECK_EXECINFO], [ - AC_MSG_CHECKING(for execinfo.h) -- -- AC_COMPILE_IFELSE([AC_LANG_SOURCE([ -- #include -- int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;} -- ])], -- [ -- AC_MSG_RESULT(yes) -- AC_DEFINE(USE_EXECINFO, 1, Use execinfo.h) -- ], [ -- AC_MSG_RESULT(no) -- ]) - ]) - - AC_DEFUN([TORRENT_CHECK_ALIGNED], [ - AC_MSG_CHECKING(the byte alignment) -- -- AC_LINK_IFELSE([AC_LANG_SOURCE([ -- #include -- int main() { -- char buf@<:@8@:>@ = { 0, 0, 0, 0, 1, 0, 0, 0 }; -- int i; -- for (i = 1; i < 4; ++i) -- if (*(uint32_t*)(buf + i) == 0) return -1; -- return 0; -- } -- ])], -- [ -- AC_MSG_RESULT(none needed) -- ], [ -- AC_DEFINE(USE_ALIGNED, 1, Require byte alignment) -- AC_MSG_RESULT(required) -- ]) - ]) - - --- -2.7.4 - diff --git a/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb b/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb index 7879324cc6..b4fe10cb1c 100644 --- a/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb +++ b/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb @@ -1,17 +1,14 @@ SUMMARY = "Torrent client" HOMEPAGE = "http://libtorrent.rakshasa.no/" -LICENSE = "GPL-2.0-only" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "libsigc++-2.0 curl cppunit libtorrent ncurses" +DEPENDS = "libsigc++-2.0 curl cppunit libtool libtorrent ncurses" -SRC_URI = "git://github.com/rakshasa/rtorrent;branch=master;protocol=https \ - file://don-t-run-code-while-configuring-package.patch \ -" -# v0.9.8 -SRCREV = "6154d1698756e0c4842b1c13a0e56db93f1aa947" +SRC_URI = "git://github.com/rakshasa/rtorrent;branch=master;protocol=https" +SRCREV = "d067bd802e44f0e6a747aabcc311ada2175fd550" -PV = "0.9.8" +PV = "0.9.8+git${SRCPV}" S = "${WORKDIR}/git" @@ -21,6 +18,6 @@ PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," inherit autotools pkgconfig -do_configure:prepend() { - (cd ${S}; ./autogen.sh; cd -) -} +EXTRA_AUTORECONF += "--exclude=aclocal" + +CXXFLAGS += "-std=gnu++14" From patchwork Sat Jan 21 18:01:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18437 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 8A57BC54794 for ; Sat, 21 Jan 2023 18:01:47 +0000 (UTC) Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by mx.groups.io with SMTP id smtpd.web11.2070.1674324098542295303 for ; Sat, 21 Jan 2023 10:01:38 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=qiFVLJbn; spf=pass (domain: gmail.com, ip: 209.85.214.172, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f172.google.com with SMTP id g23so7941015plq.12 for ; Sat, 21 Jan 2023 10:01:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=jb05g9PJW9t4tuOdTDVkNr09sttP1dEG7ShiZEJtz6I=; b=qiFVLJbn+tEKASmMO3s3bl+xydB8Ghg6Z3ojOvqMwhruGRNI+QUDCb0Uu6ByRdpatN XkgBHpJ0t5S6qKa1u+4NgBzZMJ/1Svtwn0kiYe8uVE5TqoyRI4/igtzSbitAq3Ry9PPz zuWyfQI7LzLvvpwy5eqTvaovxanU3PE8wg9nt+B4fKUmoWKpWbKb+BwzlpkQzNV1Ivlk T+oK2lFojJtuCNzSr284BZs8BmdQnL3W823BuCiLWcTNBZsOIs/LHgeL+q5rEoQOoNvL Sqksh2uOg6/w1moTz4p3deic+SjaF5mUc56P8kdfS/Zn0iVrONJPWV6Al9Y7zA7XD+nf 8uog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jb05g9PJW9t4tuOdTDVkNr09sttP1dEG7ShiZEJtz6I=; b=FCtxMaOfmqX2k9zTNVO261xWMu93XkJoiV5DShXqkl1uVfH8ILezWvhc/9xomR7Hcf Ig3JQblmWvfGBRMXBd/HvEkXMf1FRG2CGqqSKZg2BYQWcMI/Gz+7Wrh7A11+AlgLJq5E GE00jxgMnalRAEJdD5WCqomwvhEz5M/f5QGingh6y+dB6hwCfziEiebvB6wbmgZReD/Y IkjPsltG3odhV9Iw9alpugzQqRqqOpIwIMf4cSM5zW0zAjoczWF+S0F9S2SnnRt0mn3A XcI+WjIuQnNOW3rCU53wxPeKHG5+A5QI5sdyEQwKTz4Ya7fbNO8TSkVGpa+z/3yUuctS Yzyg== X-Gm-Message-State: AFqh2kob96JHeozbPlZQ4V+oqW2umsx1TBn05srcjsv6IGSmq6c/v0Na y7MahDUP1Gw9sjsBzCNqfYjoUg9NYbASqA== X-Google-Smtp-Source: AMrXdXtogWT1qAIGNm8963BDFfVy+e+K+02yKBSiQFK/PB5WtVZm2Fr88K3aEZ6o6GYDpgYlQlzonA== X-Received: by 2002:a17:90a:5793:b0:229:1f6d:47fc with SMTP id g19-20020a17090a579300b002291f6d47fcmr20226207pji.41.1674324097721; Sat, 21 Jan 2023 10:01:37 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id d15-20020a17090a02cf00b00226c2d90c04sm3623583pjd.38.2023.01.21.10.01.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Jan 2023 10:01:37 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 17/30] nspr: Fix build with clang16 Date: Sat, 21 Jan 2023 10:01:08 -0800 Message-Id: <20230121180121.1229895-17-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230121180121.1229895-1-raj.khem@gmail.com> References: <20230121180121.1229895-1-raj.khem@gmail.com> 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, 21 Jan 2023 18:01:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100684 Signed-off-by: Khem Raj --- ...Wincompatible-function-pointer-types.patch | 39 +++++++++++++++++++ meta-oe/recipes-support/nspr/nspr_4.35.bb | 1 + 2 files changed, 40 insertions(+) create mode 100644 meta-oe/recipes-support/nspr/nspr/0001-Fix-Wincompatible-function-pointer-types.patch diff --git a/meta-oe/recipes-support/nspr/nspr/0001-Fix-Wincompatible-function-pointer-types.patch b/meta-oe/recipes-support/nspr/nspr/0001-Fix-Wincompatible-function-pointer-types.patch new file mode 100644 index 0000000000..8515075fe0 --- /dev/null +++ b/meta-oe/recipes-support/nspr/nspr/0001-Fix-Wincompatible-function-pointer-types.patch @@ -0,0 +1,39 @@ +From d24dc9bebaefbd8abf32707bad5efc0c811c0cd4 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 18 Jan 2023 13:04:56 -0800 +Subject: [PATCH] Fix -Wincompatible-function-pointer-types + +Fixes warnings with clang16 +testfile.c:576:31: error: incompatible function pointer types passing 'PRInt32 (void *)' (aka 'int (void *)') to parameter of type 'void (*)(void *)' [-Wincompatible-function-pointe r-types] + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + pr/tests/testfile.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pr/tests/testfile.c b/pr/tests/testfile.c +index 79d8a05..42aa6a7 100644 +--- a/pr/tests/testfile.c ++++ b/pr/tests/testfile.c +@@ -123,7 +123,7 @@ PRThread* create_new_thread(PRThreadType type, + if (native_thread) { + #if defined(_PR_PTHREADS) + pthread_t tid; +- if (!pthread_create(&tid, NULL, start, arg)) { ++ if (!pthread_create(&tid, NULL, (void*(*)(void*))start, arg)) { + return((PRThread *) tid); + } + else { +@@ -573,7 +573,7 @@ static PRInt32 RunDirTest(void) + + thrarg.done= 0; + t = create_new_thread(PR_USER_THREAD, +- DirTest, &thrarg, ++ (void (*)(void *))DirTest, &thrarg, + PR_PRIORITY_NORMAL, + PR_LOCAL_THREAD, + PR_UNJOINABLE_THREAD, +-- +2.39.1 + diff --git a/meta-oe/recipes-support/nspr/nspr_4.35.bb b/meta-oe/recipes-support/nspr/nspr_4.35.bb index c8cb618bc9..f8d329398b 100644 --- a/meta-oe/recipes-support/nspr/nspr_4.35.bb +++ b/meta-oe/recipes-support/nspr/nspr_4.35.bb @@ -12,6 +12,7 @@ SRC_URI = "http://ftp.mozilla.org/pub/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz file://0001-md-Fix-build-with-musl.patch \ file://Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch \ file://0001-config-nspr-config.in-don-t-pass-LDFLAGS.patch \ + file://0001-Fix-Wincompatible-function-pointer-types.patch \ file://nspr.pc.in \ " From patchwork Sat Jan 21 18:01:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18435 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 92E65C54E94 for ; Sat, 21 Jan 2023 18:01:47 +0000 (UTC) Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by mx.groups.io with SMTP id smtpd.web11.2071.1674324099363399348 for ; Sat, 21 Jan 2023 10:01:39 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=MAQsrgs1; spf=pass (domain: gmail.com, ip: 209.85.216.54, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f54.google.com with SMTP id n20-20020a17090aab9400b00229ca6a4636so11049302pjq.0 for ; Sat, 21 Jan 2023 10:01:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9/OoG2E/ViMfwlb/cwkls7blrjZeLpnE2kRoHSoBG8Y=; b=MAQsrgs18dANFtymAwES0u1DNQaw8NMZmSgxGDEI/nKXfqpytxh2kmpUzAS4Xhhexh LzFlRpq2vDvxkm89KSL0jMMInq0mLw0H1A7vq1a+bCFCYf04KQG8jlQeXX/ce4DdBaSk 6OBmtBihkly0IyTuqT1Xyl0uQVFyYB08cTLg4JLyTYg9t1SX8E7ZQA65vdPx/gJl2I6V J/f7VvayMAy4i5qM/Z4tvofadUZDN+9RYgiRHmB3wYk7dSYy4jrDuB+pmfPLwhR7yU3S P76GIYDntroI1hx4kCPiy97q8DVuhrn1Tl/hHH4I3A6PqGg1Kp4atjW41IthGQryE/yS kUUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9/OoG2E/ViMfwlb/cwkls7blrjZeLpnE2kRoHSoBG8Y=; b=kBhpUFQxMbWlityhZw+YA798RQ7uTBoE6k5l2DLJO4TruOvjQkuMCCFBZ8bu29itvX ZUNtQYJI8wu9nwWDdsUJqSNnofzdvu6HK44w2gYARtTx9B1fXIrTcu5gq7/jC8h3J67w 86qcZAkKZiIxggqkHZQNv8UDqIefoA4IHWj4/u1QDliuc5x6ZUQ0JLrjkzQ7e2j2fM4G W8ofC3IT/iufXq3lszIPi+Os6j3Z/JKIdrVVKU22wNaKCir4OZYkrZyKXMzzQBiUsni3 aSoh1FyyTfJz1mglkqzSClWls7I2Sd9nKDhoMaYSMUQCbalG87WqYRjHUbQeAMesH2Zn GGMw== X-Gm-Message-State: AFqh2kr4FM1eSa068ayxqs+TcGs3cyDLiv/XfZfxAyenupscgxz2b8Th iCvTfvM1XtNc4+wkZM9GRtOSrZ5yVlzWew== X-Google-Smtp-Source: AMrXdXvSc8bIHLjK+W6gmYYn6l70Q24arsxi3vYyeOAZcWuNkpBQcFtIZirAHFzc7MGJ6T/0B8CrQg== X-Received: by 2002:a17:90a:41:b0:229:f580:e68a with SMTP id 1-20020a17090a004100b00229f580e68amr10277726pjb.17.1674324098562; Sat, 21 Jan 2023 10:01:38 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id d15-20020a17090a02cf00b00226c2d90c04sm3623583pjd.38.2023.01.21.10.01.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Jan 2023 10:01:38 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-networking][PATCH 18/30] net-snmp: Fix build with clang16 Date: Sat, 21 Jan 2023 10:01:09 -0800 Message-Id: <20230121180121.1229895-18-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230121180121.1229895-1-raj.khem@gmail.com> References: <20230121180121.1229895-1-raj.khem@gmail.com> 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, 21 Jan 2023 18:01:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100685 Signed-off-by: Khem Raj --- ...eturn-attribute-to-netsnmp_pci_error.patch | 32 +++++++++++++++++++ .../net-snmp/net-snmp_5.9.3.bb | 1 + 2 files changed, 33 insertions(+) create mode 100644 meta-networking/recipes-protocols/net-snmp/net-snmp/0001-Add-noreturn-attribute-to-netsnmp_pci_error.patch diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-Add-noreturn-attribute-to-netsnmp_pci_error.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-Add-noreturn-attribute-to-netsnmp_pci_error.patch new file mode 100644 index 0000000000..6fbace75a5 --- /dev/null +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-Add-noreturn-attribute-to-netsnmp_pci_error.patch @@ -0,0 +1,32 @@ +From 5719f40db65a72624a0b0f08e546d12bf823bd1e Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 18 Jan 2023 14:38:44 -0800 +Subject: [PATCH] Add noreturn attribute to netsnmp_pci_error() + +Fixes build with clang16 +| mibgroup/if-mib/data_access/interface_linux.c:152:23: error: incompatible function pointer types assigning to 'void (*)(char *, ...) __attribute__((noreturn))' from 'void (char *, ...)' [-Wincompatible-function-pointer-types] +| pci_access->error = netsnmp_pci_error; +| ^ ~~~~~~~~~~~~~~~~~ + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + agent/mibgroup/if-mib/data_access/interface_linux.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/agent/mibgroup/if-mib/data_access/interface_linux.c b/agent/mibgroup/if-mib/data_access/interface_linux.c +index c6cc54e..12eb865 100644 +--- a/agent/mibgroup/if-mib/data_access/interface_linux.c ++++ b/agent/mibgroup/if-mib/data_access/interface_linux.c +@@ -31,7 +31,7 @@ static struct pci_access *pci_access; + /* Avoid letting libpci call exit(1) when no PCI bus is available. */ + static int do_longjmp =0; + static jmp_buf err_buf; +-static void ++__attribute__((noreturn)) static void + netsnmp_pci_error(char *msg, ...) + { + va_list args; +-- +2.39.1 + diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.3.bb b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.3.bb index 7af5147566..78d711fbfd 100644 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.3.bb +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.3.bb @@ -26,6 +26,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \ file://net-snmp-fix-for-disable-des.patch \ file://reproducibility-have-printcap.patch \ file://0001-ac_add_search_path.m4-keep-consistent-between-32bit.patch \ + file://0001-Add-noreturn-attribute-to-netsnmp_pci_error.patch \ " SRC_URI[sha256sum] = "2097f29b7e1bf3f1300b4bae52fa2308d0bb8d5d3998dbe02f9462a413a2ef0a" From patchwork Sat Jan 21 18:01:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18429 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 699B5C38A23 for ; Sat, 21 Jan 2023 18:01:47 +0000 (UTC) Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by mx.groups.io with SMTP id smtpd.web11.2062.1674324091113259352 for ; Sat, 21 Jan 2023 10:01:40 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=mL8AY3Rs; spf=pass (domain: gmail.com, ip: 209.85.216.48, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f48.google.com with SMTP id y3-20020a17090a390300b00229add7bb36so7761083pjb.4 for ; Sat, 21 Jan 2023 10:01:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UIwWbM/CP0OSkVNOhpWQ1JEetUePZCIWGGu6en4swK8=; b=mL8AY3Rsxo9azlcRPAg/bs9eI/FLNm+BjbpwXLYzTQSvRLnuZu3DaQCOqUuzqeU6OG lOHUDFpsOMcOaWs1+QudAxm1NvasE3L25T5ZB3mb/vXg0Oy7T0oV0yQcPeiCk6XJB4QR gN4s8HeiP+UaDQTd/O4AYOn9r/5OpS9M6UmUeRJhhBMHdH9inO/T+u5LSOqoszMfzHjb KHMsWZI0wELIs/Xp5p2YVLGTSOW/8S/zNNpHlAUHeyIohpxm7GGd9RN5UV1Rvvr+io/B h4fe4qwe2aJ/Fb+llXCz0Ynams7g7UHYgpb9OUYBHz0dVkjNRBxAr6W+YTZxPTZk+ejK bP6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UIwWbM/CP0OSkVNOhpWQ1JEetUePZCIWGGu6en4swK8=; b=P13CvJl/40nrx/A4+BTOBzqJCsnls6XzLqqunlCf3N071TRjUxFLS4gn6dnxxrNfYm QXc1kXZcd64hKIDpftgWJWBvPE24Lwj6lZB+bOdtFiE5/wlTWtWPJRdWTQ5EDlXTVvQW DD/AYzgim4jVlSUZuPkPdAZo5bkzgdQtvYmhy3ta9z8h4rFai8uSBGB1rfXbgowHwuih rAZiIMCLKwhIWehvEJhVmntiM3B315Ggyy93Z9GjISMElSlrXGJ7nHgkjkOOPey6tXkC /fKP9AIOiC9QUMLNTo46EQY0AZLulL1B1jiH3ALnnzECbsKuTXHah2tMtkwhTjjn2I7z aJRQ== X-Gm-Message-State: AFqh2koKHItLxHTBaob6VIsAG6dl+7VkFyxniszzaZcoW69qc2qIz/EJ PXFWq/j1XYcp/We7RogtNqFO+OeEHtgXSw== X-Google-Smtp-Source: AMrXdXtSLcRGMx/QMq6idjsZvArvTKLixjQ4kgoUz68LVMMrDnlgaPmWGjqroiNI5yW49m9iwP3CgQ== X-Received: by 2002:a17:90b:3c0c:b0:226:eac4:b22e with SMTP id pb12-20020a17090b3c0c00b00226eac4b22emr20664851pjb.8.1674324099334; Sat, 21 Jan 2023 10:01:39 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id d15-20020a17090a02cf00b00226c2d90c04sm3623583pjd.38.2023.01.21.10.01.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Jan 2023 10:01:39 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 19/30] xmlstarlet: Fix build with clang16 Date: Sat, 21 Jan 2023 10:01:10 -0800 Message-Id: <20230121180121.1229895-19-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230121180121.1229895-1-raj.khem@gmail.com> References: <20230121180121.1229895-1-raj.khem@gmail.com> 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, 21 Jan 2023 18:01:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100686 Signed-off-by: Khem Raj --- .../0001-Fix-hash_key_put-signature.patch | 33 +++++++++++++++++++ .../xmlstarlet/xmlstarlet_1.6.1.bb | 4 +-- 2 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 meta-oe/recipes-support/xmlstarlet/files/0001-Fix-hash_key_put-signature.patch diff --git a/meta-oe/recipes-support/xmlstarlet/files/0001-Fix-hash_key_put-signature.patch b/meta-oe/recipes-support/xmlstarlet/files/0001-Fix-hash_key_put-signature.patch new file mode 100644 index 0000000000..2a766dbb87 --- /dev/null +++ b/meta-oe/recipes-support/xmlstarlet/files/0001-Fix-hash_key_put-signature.patch @@ -0,0 +1,33 @@ +From 64cb138aaaafc87c8462885d502c9323be86a003 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 18 Jan 2023 14:50:08 -0800 +Subject: [PATCH] Fix hash_key_put() signature + +Fixes + +../xmlstarlet-1.6.1/src/xml_elem.c:271:27: error: incompatible function pointer types passing 'void (void *, void *, xmlChar *)' (aka 'void (void *, void *, unsigned char *)') to parameter of type 'xmlHashScanner' (aka 'void (*)(void *, void *, const unsigned char *)') [-Wincompatible-function-pointer-types] + xmlHashScan(uniq, hash_key_put, &lines); + ^~~~~~~~~~~~ + +Upstream-Status: Submitted [https://sourceforge.net/p/xmlstar/code/merge-requests/6/] +Signed-off-by: Khem Raj +--- + src/xml_elem.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/xml_elem.c b/src/xml_elem.c +index 024e62a..a73038a 100644 +--- a/src/xml_elem.c ++++ b/src/xml_elem.c +@@ -186,7 +186,7 @@ typedef struct { + * put @name into @data->array[@data->offset] + */ + static void +-hash_key_put(void *payload, void *data, xmlChar *name) ++hash_key_put(void *payload, void *data, const xmlChar *name) + { + ArrayDest *dest = data; + dest->array[dest->offset++] = name; +-- +2.39.1 + diff --git a/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb b/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb index e28fd61a03..930fbdd6c7 100644 --- a/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb +++ b/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb @@ -14,8 +14,8 @@ DEPENDS = "libxml2 libxslt" SRC_URI = "${SOURCEFORGE_MIRROR}/xmlstar/${BP}.tar.gz \ file://configure.ac.patch \ - file://0001-usage2c.awk-fix-wrong-basename-regexp.patch" -SRC_URI[md5sum] = "f3c5dfa3b1a2ee06cd57c255cc8b70a0" + file://0001-usage2c.awk-fix-wrong-basename-regexp.patch \ + file://0001-Fix-hash_key_put-signature.patch" SRC_URI[sha256sum] = "15d838c4f3375332fd95554619179b69e4ec91418a3a5296e7c631b7ed19e7ca" inherit autotools From patchwork Sat Jan 21 18:01:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18431 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 77E7AC52D77 for ; Sat, 21 Jan 2023 18:01:47 +0000 (UTC) Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by mx.groups.io with SMTP id smtpd.web10.2130.1674324096164790802 for ; Sat, 21 Jan 2023 10:01:40 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=WY9oIply; spf=pass (domain: gmail.com, ip: 209.85.214.180, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f180.google.com with SMTP id k18so7977023pll.5 for ; Sat, 21 Jan 2023 10:01:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9qLb2Z04vbsEulA2V4ZSwDQL5vYciiWsIlo+5oPAFro=; b=WY9oIplydMOsEU8oze181FwlMEmnshQBCmRWuO4jpsmuNyyIGYgEawzbfK0UYnDXbd o2pZbF+uaWjwKTUoI6WIfxhiir6U+vLJ77hqT38kd6hwNvBA/x2v0jAv3EoJWbu3I+bC GIAow8uq76Q1bdo7Yr3J2CJBAXM8tE7+wjZAr4vSbHC3Ypf/k344G+FnCQS0SS+4pU+L CrtQTDZMIbjT6XGcFK93xnnjhXXLBfTbikA9GIYFqkgiEMXFChcKUhZXhvdWY5xOFhGz oMkf5F5pCNzwaKV2UsJnNlmO15azNM4fizcClHoFFbaN2eXIVqn4DSyxMtZRBNaQWb2X CNGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9qLb2Z04vbsEulA2V4ZSwDQL5vYciiWsIlo+5oPAFro=; b=02ftNawpLCiaciv/Dyzkk30fzxgzD2L4Scu4U49ZUXoc8ucT/sJ27UcuQmjB9m7VSP leAFveiLLAas2jDhaE8MBZSQd0HBbsT0JqBJuWG12tCMI4m49hnvRC63D18QFRkLMlL9 cFSe5gRmQh2EZrDd5QZHkpA1czoxasLw/D1a3+4yq5cD56PXJ673sVtDjUHT8BUANOh+ bLht7BOJc6dXk/dEzcqZy6U75/VxErynpnFZOXOfWRkDvsjWxOpVJHg9BOQ7W/orqvX0 yMovN4Gl/KocYpl23vb7HvW2Nhiq4ThlBYi3vtBd/yAu2kWRW7dUp//FX72Vv3gCX+vM WBGw== X-Gm-Message-State: AFqh2krGiIoXWpUTcipDjeH+3hfv6ywmFk1ikBiMUU0/Gl5ELVPkYV6x mLzDnIQiu1m2pEb6DTNPVWuBG9IO3DJWQQ== X-Google-Smtp-Source: AMrXdXuODqjSAvbhbpbQ4b1VciZn10QT/C32O4DW8S+s11BTavoe1+9cxhRuPCWU1iTYi1Jr0rBqMg== X-Received: by 2002:a17:90b:3695:b0:229:189c:c48e with SMTP id mj21-20020a17090b369500b00229189cc48emr20964252pjb.17.1674324100130; Sat, 21 Jan 2023 10:01:40 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id d15-20020a17090a02cf00b00226c2d90c04sm3623583pjd.38.2023.01.21.10.01.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Jan 2023 10:01:39 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 20/30] libol: Drop recipe Date: Sat, 21 Jan 2023 10:01:11 -0800 Message-Id: <20230121180121.1229895-20-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230121180121.1229895-1-raj.khem@gmail.com> References: <20230121180121.1229895-1-raj.khem@gmail.com> 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, 21 Jan 2023 18:01:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100687 In past it was needed by syslog-ng until it was bundled into syslog-ng and once syslog-ng was upgraded [1] this recipe became more or less unused This package is now included in the syslog-ng 1.6.x or newer release tarball [1] https://git.openembedded.org/meta-openembedded/commit/?id=1a6e16bcb1145df51b15c19df0d7ef655b683f5e Signed-off-by: Khem Raj --- .../packagegroups/packagegroup-meta-oe.bb | 1 - .../libol/libol/configure.patch | 14 ------------- meta-oe/recipes-support/libol/libol_0.3.18.bb | 20 ------------------- 3 files changed, 35 deletions(-) delete mode 100644 meta-oe/recipes-support/libol/libol/configure.patch delete mode 100644 meta-oe/recipes-support/libol/libol_0.3.18.bb diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 20291b576d..34689fb48b 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -827,7 +827,6 @@ RDEPENDS:packagegroup-meta-oe-support ="\ liblinebreak \ mailcap \ liboauth \ - libol \ mg \ monit \ mscgen \ diff --git a/meta-oe/recipes-support/libol/libol/configure.patch b/meta-oe/recipes-support/libol/libol/configure.patch deleted file mode 100644 index 87695fb06d..0000000000 --- a/meta-oe/recipes-support/libol/libol/configure.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: libol-0.3.18/configure.in -=================================================================== ---- libol-0.3.18.orig/configure.in 2006-03-27 14:44:52.000000000 +0000 -+++ libol-0.3.18/configure.in 2014-07-18 07:05:56.029481372 +0000 -@@ -1,7 +1,7 @@ - dnl Process this file with autoconf to produce a configure script. --AC_INIT(src/abstract_io.c) -+AC_INIT(libol, "0.3.18") - --AM_INIT_AUTOMAKE(libol, "0.3.18", 1) -+AM_INIT_AUTOMAKE([foreign]) - if test -n "$SNAPSHOT_VERSION"; then - VERSION=$VERSION+$SNAPSHOT_VERSION - fi diff --git a/meta-oe/recipes-support/libol/libol_0.3.18.bb b/meta-oe/recipes-support/libol/libol_0.3.18.bb deleted file mode 100644 index 21a56264e4..0000000000 --- a/meta-oe/recipes-support/libol/libol_0.3.18.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "A tiny C support library" -HOMEPAGE = "https://my.balabit.com/downloads/libol" -SECTION = "libs" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b" - -SRC_URI = "http://www.balabit.com/downloads/libol/0.3/${BP}.tar.gz \ - file://configure.patch" -SRC_URI[md5sum] = "cbadf4b7ea276dfa85acc38a1cc5ff17" -SRC_URI[sha256sum] = "9de3bf13297ff882e02a1e6e5f6bf760a544aff92a9d8a1cf4328a32005cefe7" - -inherit autotools binconfig - -do_compile:prepend() { - install ${S}/utils/make_class.in ${B}/utils -} - -do_install:append() { - rm -fr ${D}${bindir} -} From patchwork Sat Jan 21 18:01:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18436 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 88D85C54EAA for ; Sat, 21 Jan 2023 18:01:47 +0000 (UTC) Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by mx.groups.io with SMTP id smtpd.web10.2134.1674324101933118399 for ; Sat, 21 Jan 2023 10:01:41 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=jnKQDSq7; spf=pass (domain: gmail.com, ip: 209.85.216.50, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f50.google.com with SMTP id z9-20020a17090a468900b00226b6e7aeeaso7779810pjf.1 for ; Sat, 21 Jan 2023 10:01:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2HFEJxUpe/F1UHYQML5PCMv0n1Fwbf0Pw8qvJnyf8LI=; b=jnKQDSq7yqmIAe/68QR11mAiw/U6KuoCfB3veEBD4nybfn3ILQxgzvvGVLepPVXN8z 3t9inLPzAiooYUKLAqJUoS9Qehb0Osb0OKk6xbpymCvaGWm9mpwlcXB9AOppTzCayTBx B7ECrvCrGFiiFW3P6RuTxiztsHjd+9gHB5hqdyB4DUxLFIv4GUihA3NmRHnlZ89DT2VM iEok/mu8AZDSNdMzmi3YHPW8cqLEuF9Bs79NHwaN74at0Ptny5fs+VDD8VqGd3NTm8l8 geZbKysBRkLp3J4PNG7fPt6gRggAwylCQjkveJ1RxPM1kgn/iLnAEDkEzfXqR6txsQdN lyUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2HFEJxUpe/F1UHYQML5PCMv0n1Fwbf0Pw8qvJnyf8LI=; b=sxYOJ+s3Q8iyf5zzwzwduP0r1GJ1gpOtFa6jc+lVY/DzH7cCpqVdwfKeKPGTCPkTU9 bR4U5GxUBfU1naUGoUsf+6rqanD3ipeywIpI2MGDY/L1GSoEr1IgqaDdAoliUETzFRsu QYJrQnn6ORdUSpVb6cHUq5YCMIn/Qflrgc2ZqRPgYW4xux8XDOfv/SBuECUokCqpRDom q5Qzuaktt2LUZVShz5rLmEApvOoCaivV7+PsoaS/TqeQDSgwBu0Ukl85WOU8dj0OOMRx frKVA/lWOW9yaJMs0D0PfgauECoBhThaFCGO28e3bUEgTATpFc1yK+Q3f7J3ZZKiKsw/ /N7Q== X-Gm-Message-State: AFqh2kpWCKfGKnc3e9szW4pt7eFOR8yAldmSh0nXgg7lpEQymSG4N727 tr+R5BmBE63otQ4O2lZAS5EVhf0qFOH7Kg== X-Google-Smtp-Source: AMrXdXud1RXwruCy5ck5v0XWn6J454a+IpS/dnDnJN3oChtFtw6cRdzM/pcp8cmTEDuTiE6aj1tSVg== X-Received: by 2002:a17:90a:8409:b0:228:de0e:c8af with SMTP id j9-20020a17090a840900b00228de0ec8afmr20423595pjn.16.1674324100970; Sat, 21 Jan 2023 10:01:40 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id d15-20020a17090a02cf00b00226c2d90c04sm3623583pjd.38.2023.01.21.10.01.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Jan 2023 10:01:40 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 21/30] hplip: Update to 3.22.10 Date: Sat, 21 Jan 2023 10:01:12 -0800 Message-Id: <20230121180121.1229895-21-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230121180121.1229895-1-raj.khem@gmail.com> References: <20230121180121.1229895-1-raj.khem@gmail.com> 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, 21 Jan 2023 18:01:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100688 Add a patch to drop 'register' keyword Signed-off-by: Khem Raj --- ...op-using-register-storage-classifier.patch | 309 ++++++++++++++++++ .../hplip/hplip/configure.patch | 2 +- .../{hplip_3.22.6.bb => hplip_3.22.10.bb} | 4 +- 3 files changed, 312 insertions(+), 3 deletions(-) create mode 100644 meta-oe/recipes-extended/hplip/hplip/0001-Drop-using-register-storage-classifier.patch rename meta-oe/recipes-extended/hplip/{hplip_3.22.6.bb => hplip_3.22.10.bb} (95%) diff --git a/meta-oe/recipes-extended/hplip/hplip/0001-Drop-using-register-storage-classifier.patch b/meta-oe/recipes-extended/hplip/hplip/0001-Drop-using-register-storage-classifier.patch new file mode 100644 index 0000000000..237374d74b --- /dev/null +++ b/meta-oe/recipes-extended/hplip/hplip/0001-Drop-using-register-storage-classifier.patch @@ -0,0 +1,309 @@ +From c36f0af7ba75c133edc46f052b291188351b6c20 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 18 Jan 2023 15:49:16 -0800 +Subject: [PATCH] Drop using register storage classifier + +Its beeing dropped from latest standards beginning C++17 + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + ip/xjpg_dct.c | 4 +-- + ip/xjpg_dct.h | 4 +-- + prnt/hpcups/Mode9.cpp | 2 +- + prnt/hpcups/ModeDeltaPlus.cpp | 4 +-- + prnt/hpcups/jccolor.c | 46 +++++++++++++++++------------------ + prnt/hpijs/compression.cpp | 2 +- + prnt/hpijs/jccolor.c | 44 ++++++++++++++++----------------- + prnt/hpijs/ljfastraster.cpp | 4 +-- + prnt/hpps/psutil.c | 6 ++--- + 9 files changed, 58 insertions(+), 58 deletions(-) + +diff --git a/ip/xjpg_dct.c b/ip/xjpg_dct.c +index 63f021b..1986923 100644 +--- a/ip/xjpg_dct.c ++++ b/ip/xjpg_dct.c +@@ -103,7 +103,7 @@ + | for the Winograd DCT. | + |____________________________________________________________________________| + */ +-void dct_forward (register int *block_p) ++void dct_forward (int *block_p) + { + #define CONST_FRAC_BITS 14 /* bits of frac in CONST_1-CONST_5 below */ + +@@ -257,7 +257,7 @@ void dct_forward (register int *block_p) + | and level-shifting, you must clamp these values to 0..255. | + |____________________________________________________________________________| + */ +-void dct_inverse (register int *block_p) ++void dct_inverse (int *block_p) + { + #define CONST_FRAC_BITS 13 /* bits of frac in CONST_1-CONST_5 below */ + +diff --git a/ip/xjpg_dct.h b/ip/xjpg_dct.h +index 7dc90f3..149d66f 100644 +--- a/ip/xjpg_dct.h ++++ b/ip/xjpg_dct.h +@@ -43,8 +43,8 @@ + |____________________________________________________________________________| + */ + +-void dct_forward (register int *block_p); ++void dct_forward (int *block_p); + +-void dct_inverse (register int *block_p); ++void dct_inverse (int *block_p); + + /* End of File */ +diff --git a/prnt/hpcups/Mode9.cpp b/prnt/hpcups/Mode9.cpp +index 94ff571..6cc210a 100644 +--- a/prnt/hpcups/Mode9.cpp ++++ b/prnt/hpcups/Mode9.cpp +@@ -203,7 +203,7 @@ bool Mode9::Process(RASTERDATA* input) + unsigned int offset,byte_count,rem_count; + Mode9_comtype command; + char* dest= (char*) compressBuf; +- register char *dptr=dest; ++ char *dptr=dest; + + while ( size > 0 ) + { +diff --git a/prnt/hpcups/ModeDeltaPlus.cpp b/prnt/hpcups/ModeDeltaPlus.cpp +index 4552f4a..6a5837f 100644 +--- a/prnt/hpcups/ModeDeltaPlus.cpp ++++ b/prnt/hpcups/ModeDeltaPlus.cpp +@@ -241,8 +241,8 @@ bool ModeDeltaPlus::compress (BYTE *outmem, + const uint32_t inheight, + uint32_t horz_ht_dist) + { +- register BYTE *outptr = outmem; +- register uint32_t col; ++ BYTE *outptr = outmem; ++ uint32_t col; + const BYTE *seedrow; + uint32_t seedrow_count = 0; + uint32_t location = 0; +diff --git a/prnt/hpcups/jccolor.c b/prnt/hpcups/jccolor.c +index 7cc8906..6794575 100644 +--- a/prnt/hpcups/jccolor.c ++++ b/prnt/hpcups/jccolor.c +@@ -73,7 +73,7 @@ typedef my_color_converter * my_cconvert_ptr; + + /* We allocate one big table and divide it up into eight parts, instead of + * doing eight alloc_small requests. This lets us use a single table base +- * address, which can be held in a register in the inner loops on many ++ * address, which can be held in a in the inner loops on many + * machines (more than can hold all eight addresses, anyway). + */ + +@@ -205,11 +205,11 @@ rgb_ycc_convert (j_compress_ptr cinfo, + JDIMENSION output_row, int num_rows) + { + my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert; +- register int r, g, b; +- register INT32 * ctab = cconvert->rgb_ycc_tab; +- register JSAMPROW inptr; +- register JSAMPROW outptr0, outptr1, outptr2; +- register JDIMENSION col; ++ int r, g, b; ++ INT32 * ctab = cconvert->rgb_ycc_tab; ++ JSAMPROW inptr; ++ JSAMPROW outptr0, outptr1, outptr2; ++ JDIMENSION col; + JDIMENSION num_cols = cinfo->image_width; + + while (--num_rows >= 0) { +@@ -261,11 +261,11 @@ rgb_gray_convert (j_compress_ptr cinfo, + JDIMENSION output_row, int num_rows) + { + my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert; +- register int r, g, b; +- register INT32 * ctab = cconvert->rgb_ycc_tab; +- register JSAMPROW inptr; +- register JSAMPROW outptr; +- register JDIMENSION col; ++ int r, g, b; ++ INT32 * ctab = cconvert->rgb_ycc_tab; ++ JSAMPROW inptr; ++ JSAMPROW outptr; ++ JDIMENSION col; + JDIMENSION num_cols = cinfo->image_width; + + while (--num_rows >= 0) { +@@ -300,11 +300,11 @@ cmyk_ycck_convert (j_compress_ptr cinfo, + JDIMENSION output_row, int num_rows) + { + my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert; +- register int r, g, b; +- register INT32 * ctab = cconvert->rgb_ycc_tab; +- register JSAMPROW inptr; +- register JSAMPROW outptr0, outptr1, outptr2, outptr3; +- register JDIMENSION col; ++ int r, g, b; ++ INT32 * ctab = cconvert->rgb_ycc_tab; ++ JSAMPROW inptr; ++ JSAMPROW outptr0, outptr1, outptr2, outptr3; ++ JDIMENSION col; + JDIMENSION num_cols = cinfo->image_width; + + while (--num_rows >= 0) { +@@ -354,9 +354,9 @@ grayscale_convert (j_compress_ptr cinfo, + JSAMPARRAY input_buf, JSAMPIMAGE output_buf, + JDIMENSION output_row, int num_rows) + { +- register JSAMPROW inptr; +- register JSAMPROW outptr; +- register JDIMENSION col; ++ JSAMPROW inptr; ++ JSAMPROW outptr; ++ JDIMENSION col; + JDIMENSION num_cols = cinfo->image_width; + int instride = cinfo->input_components; + +@@ -383,10 +383,10 @@ null_convert (j_compress_ptr cinfo, + JSAMPARRAY input_buf, JSAMPIMAGE output_buf, + JDIMENSION output_row, int num_rows) + { +- register JSAMPROW inptr; +- register JSAMPROW outptr; +- register JDIMENSION col; +- register int ci; ++ JSAMPROW inptr; ++ JSAMPROW outptr; ++ JDIMENSION col; ++ int ci; + int nc = cinfo->num_components; + JDIMENSION num_cols = cinfo->image_width; + +diff --git a/prnt/hpijs/compression.cpp b/prnt/hpijs/compression.cpp +index fcac793..10194ca 100644 +--- a/prnt/hpijs/compression.cpp ++++ b/prnt/hpijs/compression.cpp +@@ -266,7 +266,7 @@ BOOL Mode9::Process(RASTERDATA* input) + unsigned int offset,byte_count,rem_count; + Mode9_comtype command; + char* dest= (char*) compressBuf; +- register char *dptr=dest; ++ char *dptr=dest; + + while ( size > 0 ) + { +diff --git a/prnt/hpijs/jccolor.c b/prnt/hpijs/jccolor.c +index a6b2333..8486b65 100644 +--- a/prnt/hpijs/jccolor.c ++++ b/prnt/hpijs/jccolor.c +@@ -206,11 +206,11 @@ rgb_ycc_convert (j_compress_ptr cinfo, + JDIMENSION output_row, int num_rows) + { + my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert; +- register int r, g, b; +- register INT32 * ctab = cconvert->rgb_ycc_tab; +- register JSAMPROW inptr; +- register JSAMPROW outptr0, outptr1, outptr2; +- register JDIMENSION col; ++ int r, g, b; ++ INT32 * ctab = cconvert->rgb_ycc_tab; ++ JSAMPROW inptr; ++ JSAMPROW outptr0, outptr1, outptr2; ++ JDIMENSION col; + JDIMENSION num_cols = cinfo->image_width; + + while (--num_rows >= 0) { +@@ -262,11 +262,11 @@ rgb_gray_convert (j_compress_ptr cinfo, + JDIMENSION output_row, int num_rows) + { + my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert; +- register int r, g, b; +- register INT32 * ctab = cconvert->rgb_ycc_tab; +- register JSAMPROW inptr; +- register JSAMPROW outptr; +- register JDIMENSION col; ++ int r, g, b; ++ INT32 * ctab = cconvert->rgb_ycc_tab; ++ JSAMPROW inptr; ++ JSAMPROW outptr; ++ JDIMENSION col; + JDIMENSION num_cols = cinfo->image_width; + + while (--num_rows >= 0) { +@@ -301,11 +301,11 @@ cmyk_ycck_convert (j_compress_ptr cinfo, + JDIMENSION output_row, int num_rows) + { + my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert; +- register int r, g, b; +- register INT32 * ctab = cconvert->rgb_ycc_tab; +- register JSAMPROW inptr; +- register JSAMPROW outptr0, outptr1, outptr2, outptr3; +- register JDIMENSION col; ++ int r, g, b; ++ INT32 * ctab = cconvert->rgb_ycc_tab; ++ JSAMPROW inptr; ++ JSAMPROW outptr0, outptr1, outptr2, outptr3; ++ JDIMENSION col; + JDIMENSION num_cols = cinfo->image_width; + + while (--num_rows >= 0) { +@@ -355,9 +355,9 @@ grayscale_convert (j_compress_ptr cinfo, + JSAMPARRAY input_buf, JSAMPIMAGE output_buf, + JDIMENSION output_row, int num_rows) + { +- register JSAMPROW inptr; +- register JSAMPROW outptr; +- register JDIMENSION col; ++ JSAMPROW inptr; ++ JSAMPROW outptr; ++ JDIMENSION col; + JDIMENSION num_cols = cinfo->image_width; + int instride = cinfo->input_components; + +@@ -384,10 +384,10 @@ null_convert (j_compress_ptr cinfo, + JSAMPARRAY input_buf, JSAMPIMAGE output_buf, + JDIMENSION output_row, int num_rows) + { +- register JSAMPROW inptr; +- register JSAMPROW outptr; +- register JDIMENSION col; +- register int ci; ++ JSAMPROW inptr; ++ JSAMPROW outptr; ++ JDIMENSION col; ++ int ci; + int nc = cinfo->num_components; + JDIMENSION num_cols = cinfo->image_width; + +diff --git a/prnt/hpijs/ljfastraster.cpp b/prnt/hpijs/ljfastraster.cpp +index 8c7073a..7e82fac 100644 +--- a/prnt/hpijs/ljfastraster.cpp ++++ b/prnt/hpijs/ljfastraster.cpp +@@ -919,8 +919,8 @@ BOOL ModeDeltaPlus::Compress (HPUInt8 *outmem, + const uint32_t inheight, + uint32_t horz_ht_dist) + { +- register HPUInt8 *outptr = outmem; +- register uint32_t col; ++ HPUInt8 *outptr = outmem; ++ uint32_t col; + const HPUInt8 *seedrow; + uint32_t seedrow_count = 0; + uint32_t location = 0; +diff --git a/prnt/hpps/psutil.c b/prnt/hpps/psutil.c +index 7282dc2..87fba4f 100644 +--- a/prnt/hpps/psutil.c ++++ b/prnt/hpps/psutil.c +@@ -148,9 +148,9 @@ static int fcopy(long upto) + /* build array of pointers to start/end of pages */ + void scanpages(void) + { +- register char *comment = buffer+2; +- register int nesting = 0; +- register long int record; ++ char *comment = buffer+2; ++ int nesting = 0; ++ long int record; + + if ((pageptr = (long *)malloc(sizeof(long)*maxpages)) == NULL) + message(FATAL, "out of memory\n"); +-- +2.39.1 + diff --git a/meta-oe/recipes-extended/hplip/hplip/configure.patch b/meta-oe/recipes-extended/hplip/hplip/configure.patch index 571d5fe308..a6e61a47ca 100644 --- a/meta-oe/recipes-extended/hplip/hplip/configure.patch +++ b/meta-oe/recipes-extended/hplip/hplip/configure.patch @@ -1,7 +1,7 @@ --- a/configure.in +++ b/configure.in @@ -30,7 +30,7 @@ - AC_INIT([HP Linux Imaging and Printing], [3.22.6], [3.22.6], [hplip]) + AC_INIT([HP Linux Imaging and Printing], [3.22.10], [3.22.10], [hplip]) #AM_INIT_AUTOMAKE([1.9 foreign]) -AM_INIT_AUTOMAKE diff --git a/meta-oe/recipes-extended/hplip/hplip_3.22.6.bb b/meta-oe/recipes-extended/hplip/hplip_3.22.10.bb similarity index 95% rename from meta-oe/recipes-extended/hplip/hplip_3.22.6.bb rename to meta-oe/recipes-extended/hplip/hplip_3.22.10.bb index b746006c20..e054553d85 100644 --- a/meta-oe/recipes-extended/hplip/hplip_3.22.6.bb +++ b/meta-oe/recipes-extended/hplip/hplip_3.22.10.bb @@ -15,8 +15,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz \ file://0004-Define-missing-prototype-for-functions.patch \ file://0005-hp_ipp.c-Add-printf-format-to-snprintf-calls.patch \ file://0006-Workaround-patch-for-missing-Python3-transition-of-t.patch \ -" -SRC_URI[sha256sum] = "27ed0d492febb0b47c656234820d3ce573b24ff5b62e3bf4b2c47f82868d6bb4" + file://0001-Drop-using-register-storage-classifier.patch" +SRC_URI[sha256sum] = "533c3f2f6b53e4163ded4fd81d1f11ae6162a0f6451bd5e62a8382d0c1366624" DEPENDS += "cups python3 libusb" From patchwork Sat Jan 21 18:01:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18434 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 780AFC54737 for ; Sat, 21 Jan 2023 18:01:47 +0000 (UTC) Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by mx.groups.io with SMTP id smtpd.web11.2057.1674324085724780259 for ; Sat, 21 Jan 2023 10:01:42 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=SsPb9zxJ; spf=pass (domain: gmail.com, ip: 209.85.214.180, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f180.google.com with SMTP id z20so5993269plc.2 for ; Sat, 21 Jan 2023 10:01:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=34nGtaPKs8By/umZcvzCM4+cizu4UgHT1CpJZi0rLjo=; b=SsPb9zxJCm7NdWpO9LrQ7n8D5L4GbWsucco9waaCRypedrMkMJd6dbf+Os63UGjZ+W yC5b6S8oScI3FsWmlucF6bmOqOdThqO3SKvDZooVdsNqgqC/hl3dxR5zUWQ2zTSq2ufq b6IcWBQCfhWf+kxbLa+vZKXagCITuRCrbV4OzlyQz5Vndl+GxhM+J1z432h57a80Jijb joPZnVpMktL7IkaX07wYm9QB6DqLcg23gDCe6XWQ5qwllc+/VFnlAqSHEzLV3k9IPVLT OV/FQ6ftxqWSNvQOdPfWuhAiqgcfOYqfvoHemGx+pErHv0YF2G+q2KqdcFRM4CU591el 4YdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=34nGtaPKs8By/umZcvzCM4+cizu4UgHT1CpJZi0rLjo=; b=xftYF4cU32Kxu1VSpz8iVXX92YRwPjBp2uTwmZGPMvVFUFZP1NCi+N/tDGznLBJ8oF ZUOSUBdRB2zP5298Awv+hl4jDYm0qPXEaWVqVY/OxI7VbdIQ6jgpvxwez9of2QQUFFOT XKo+ikb/OervawYyw6nzc7kkd4122tPF0JrXKyGcnS5AMKo12Kz0O/KHOrEhoIkN5LtZ Vcv6zS5bQosaz+xof2zXpTUIeSyjL5N8foqT4xfeGRq2Ijk2pnNlxqYfW4wghctP0lBq Hfwrr4EIEPRGwImilr6JOOENrjrPD3AzcpitcZ0OFrUNCUXlMQL0qOAMUaj5vio7B55h g73A== X-Gm-Message-State: AFqh2krN/LdYuaLfvUpBbGqfXArbfjUgjRGkO0QnpHN79UZfTY0ZT3ir 7E6LGegLiAYJaTMvaZaBMu1PPeQbjsuEyA== X-Google-Smtp-Source: AMrXdXtQVIbt+IZUyd1PGusiM2pjxNG3/XI4WCZV4knLhwWar3EKTjRhX5hZxPExTbDJ5GFge6wtAQ== X-Received: by 2002:a17:90a:1d6:b0:22b:b282:a9d7 with SMTP id 22-20020a17090a01d600b0022bb282a9d7mr6485667pjd.20.1674324101847; Sat, 21 Jan 2023 10:01:41 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id d15-20020a17090a02cf00b00226c2d90c04sm3623583pjd.38.2023.01.21.10.01.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Jan 2023 10:01:41 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 22/30] espeak: Drop using 'register' keyword for storage classifier Date: Sat, 21 Jan 2023 10:01:13 -0800 Message-Id: <20230121180121.1229895-22-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230121180121.1229895-1-raj.khem@gmail.com> References: <20230121180121.1229895-1-raj.khem@gmail.com> 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, 21 Jan 2023 18:01:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100689 Fixes build with latest clang Signed-off-by: Khem Raj --- .../recipes-support/espeak/espeak_1.48.04.bb | 1 + ...ister-keyword-for-storage-classifier.patch | 38 +++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 meta-oe/recipes-support/espeak/files/0001-Drop-using-register-keyword-for-storage-classifier.patch diff --git a/meta-oe/recipes-support/espeak/espeak_1.48.04.bb b/meta-oe/recipes-support/espeak/espeak_1.48.04.bb index 0dc61c1c30..147a8069fa 100644 --- a/meta-oe/recipes-support/espeak/espeak_1.48.04.bb +++ b/meta-oe/recipes-support/espeak/espeak_1.48.04.bb @@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://License.txt;md5=cb7a20edb4c9f5f478de6523dcd7362c" SRC_URI = "http://downloads.sourceforge.net/espeak/espeak-1.48.04-source.zip \ file://0001-Fix-build-of-shared-library-on-architectures-needing.patch \ file://0002-tr_languages-cast-string_ordinal-init-values.patch \ + file://0001-Drop-using-register-keyword-for-storage-classifier.patch \ " SRC_URI[md5sum] = "cadd7482eaafe9239546bdc09fa244c3" SRC_URI[sha256sum] = "bf9a17673adffcc28ff7ea18764f06136547e97bbd9edf2ec612f09b207f0659" diff --git a/meta-oe/recipes-support/espeak/files/0001-Drop-using-register-keyword-for-storage-classifier.patch b/meta-oe/recipes-support/espeak/files/0001-Drop-using-register-keyword-for-storage-classifier.patch new file mode 100644 index 0000000000..d9c0d08ec9 --- /dev/null +++ b/meta-oe/recipes-support/espeak/files/0001-Drop-using-register-keyword-for-storage-classifier.patch @@ -0,0 +1,38 @@ +From bad6131463275bd8013a82c28fb0b27e882bc801 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 18 Jan 2023 16:07:35 -0800 +Subject: [PATCH] Drop using 'register' keyword for storage classifier + +Its gone from C++17 and newer + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/klatt.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/klatt.cpp b/src/klatt.cpp +index b15f77c..9c51bc5 100755 +--- a/src/klatt.cpp ++++ b/src/klatt.cpp +@@ -167,7 +167,7 @@ Output = (rnz.a * input) + (rnz.b * oldin1) + (rnz.c * oldin2) + #ifdef deleted + static double antiresonator(resonator_ptr r, double input) + { +- register double x = (double)r->a * (double)input + (double)r->b * (double)r->p1 + (double)r->c * (double)r->p2; ++ double x = (double)r->a * (double)input + (double)r->b * (double)r->p1 + (double)r->c * (double)r->p2; + r->p2 = (double)r->p1; + r->p1 = (double)input; + return (double)x; +@@ -176,7 +176,7 @@ static double antiresonator(resonator_ptr r, double input) + + static double antiresonator2(resonator_ptr r, double input) + { +- register double x = (double)r->a * (double)input + (double)r->b * (double)r->p1 + (double)r->c * (double)r->p2; ++ double x = (double)r->a * (double)input + (double)r->b * (double)r->p1 + (double)r->c * (double)r->p2; + r->p2 = (double)r->p1; + r->p1 = (double)input; + +-- +2.39.1 + From patchwork Sat Jan 21 18:01:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18438 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 980A5C54EB4 for ; Sat, 21 Jan 2023 18:01:47 +0000 (UTC) Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by mx.groups.io with SMTP id smtpd.web11.2070.1674324098542295303 for ; Sat, 21 Jan 2023 10:01:43 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Z2IVFXJx; spf=pass (domain: gmail.com, ip: 209.85.214.172, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f172.google.com with SMTP id g23so7941120plq.12 for ; Sat, 21 Jan 2023 10:01:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=DhwAvFSjlVzO70x3/LnV23Fd39zL2KM8n/nDl4jdpiI=; b=Z2IVFXJxg4tnUTP8PozODaKPZ4Wh7Ywdy4iSIjnG4JKUmyLM4v5W/IItB9sNE88cHe 1QwgR4Ahh5uPfKaQEMypqAX76dB8FUZVz/e+LTnTWKFO8s7tBBV3rkR0Fw7vbBxzvVlX whQUt/z6sKvgNFOfb40N2h2fJvanOamhRSbfWbLfNRQyn7fmmfbJl/AWLkJCq+YIOWPa T5P/UWY7vZP01xxZz3LK3QZD0UWqHVYQ6svNx0FFoQRKZ5HygpdVLjbxE3AEG8RVhEj4 Zn0zwpTFocfFXNs8BJqL7mXKuzSIlq52gfhfZAyhV24fx6gvDUm1j5DcJPC3mWLwQDYf 8H7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DhwAvFSjlVzO70x3/LnV23Fd39zL2KM8n/nDl4jdpiI=; b=rzYkOGALtJ1gMFI/m9Rh/jf/GoHOzzwRvq84NaDGd8ZHhaR9I8vUjZsswCJi4fymb9 12dRKBYVbUAne/pcOt5PQWeJdI/gWmlvAdhqENwBALtdK1k6enPCbkKvs3i8ddziN1cm sRXqVPgS6YSMAfBf1gyaOgMbs9pcSvOKnC1kuodVASwdQ6ueELo5KpLUBz4Q7AXFlSW9 ouTrtrxMOpkDHqxgeLTMikRmj83riO5sEYesq/tq7CofGCdOamkcvGLAEiXXDNU/UPy8 FMtIhe+J6FWTqiTITX4yMH4pv7rNmvCg1mK/BzSqojx8SOPT/vMoYfru/jFHY2yt6Nhl up/Q== X-Gm-Message-State: AFqh2kpSPl+c2MLCd/Nc/oWR3PRjc92UGWi8E8K6FoYfqr0ffN17k98I LenStyzqnxmeniZRVwvWg/2iw5nqobqycA== X-Google-Smtp-Source: AMrXdXuUEoggDu0cCeIukbB6MYNN1Shpf+8H0vpAgcT6kl1C35C/CxkQVK9km6QhEpOZ/l/up67Iqw== X-Received: by 2002:a17:90a:66c1:b0:228:d42c:d5d6 with SMTP id z1-20020a17090a66c100b00228d42cd5d6mr43228159pjl.27.1674324102629; Sat, 21 Jan 2023 10:01:42 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id d15-20020a17090a02cf00b00226c2d90c04sm3623583pjd.38.2023.01.21.10.01.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Jan 2023 10:01:42 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 23/30] uw-imap: Fix build with clang 16 Date: Sat, 21 Jan 2023 10:01:14 -0800 Message-Id: <20230121180121.1229895-23-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230121180121.1229895-1-raj.khem@gmail.com> References: <20230121180121.1229895-1-raj.khem@gmail.com> 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, 21 Jan 2023 18:01:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100690 Signed-off-by: Khem Raj --- ...Wincompatible-function-pointer-types.patch | 178 ++++++++++++++++++ .../recipes-devtools/uw-imap/uw-imap_2007f.bb | 1 + 2 files changed, 179 insertions(+) create mode 100644 meta-oe/recipes-devtools/uw-imap/uw-imap/0001-Fix-Wincompatible-function-pointer-types.patch diff --git a/meta-oe/recipes-devtools/uw-imap/uw-imap/0001-Fix-Wincompatible-function-pointer-types.patch b/meta-oe/recipes-devtools/uw-imap/uw-imap/0001-Fix-Wincompatible-function-pointer-types.patch new file mode 100644 index 0000000000..428ee91031 --- /dev/null +++ b/meta-oe/recipes-devtools/uw-imap/uw-imap/0001-Fix-Wincompatible-function-pointer-types.patch @@ -0,0 +1,178 @@ +From 3170b245aba99694390c3c87d326639b6685d4dd Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 19 Jan 2023 14:34:05 -0800 +Subject: [PATCH] Fix -Wincompatible-function-pointer-types + +Fixes new found errors with clang 16 + +news.c:370:36: error: incompatible function pointer types passing 'int (struct dirent *)' to parameter of type 'int (*)(const struct dirent *)' [-Wincompatible-function-pointer-types] + if ((nmsgs = scandir (tmp,&names,news_select,news_numsort)) >= 0) { + ^~~~~~~~~~~ +/mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/uw-imap/2007f-r0/recipe-sysroot/usr/include/dirent.h:259:13: note: passing argument to parameter '__selector' here + int (*__selector) (const struct dirent *), + ^ +news.c:370:48: error: incompatible function pointer types passing 'int (const void *, const void *)' to parameter of type 'int (*)(const struct dirent **, const struct dirent **)' [-Wincompatible-function-pointer-types] + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + src/osdep/unix/mh.c | 8 ++++---- + src/osdep/unix/mix.c | 12 ++++++------ + src/osdep/unix/mx.c | 8 ++++---- + src/osdep/unix/news.c | 8 ++++---- + 4 files changed, 18 insertions(+), 18 deletions(-) + +diff --git a/src/osdep/unix/mh.c b/src/osdep/unix/mh.c +index 0226b7a..9264624 100644 +--- a/src/osdep/unix/mh.c ++++ b/src/osdep/unix/mh.c +@@ -103,8 +103,8 @@ long mh_copy (MAILSTREAM *stream,char *sequence,char *mailbox, + long options); + long mh_append (MAILSTREAM *stream,char *mailbox,append_t af,void *data); + +-int mh_select (struct direct *name); +-int mh_numsort (const void *d1,const void *d2); ++int mh_select (const struct direct *name); ++int mh_numsort (const struct dirent **d1,const struct dirent **d2); + char *mh_file (char *dst,char *name); + long mh_canonicalize (char *pattern,char *ref,char *pat); + void mh_setdate (char *file,MESSAGECACHE *elt); +@@ -1194,7 +1194,7 @@ long mh_append (MAILSTREAM *stream,char *mailbox,append_t af,void *data) + * Returns: T to use file name, NIL to skip it + */ + +-int mh_select (struct direct *name) ++int mh_select (const struct direct *name) + { + char c; + char *s = name->d_name; +@@ -1209,7 +1209,7 @@ int mh_select (struct direct *name) + * Returns: negative if d1 < d2, 0 if d1 == d2, postive if d1 > d2 + */ + +-int mh_numsort (const void *d1,const void *d2) ++int mh_numsort (const struct dirent **d1,const struct dirent **d2) + { + return atoi ((*(struct direct **) d1)->d_name) - + atoi ((*(struct direct **) d2)->d_name); +diff --git a/src/osdep/unix/mix.c b/src/osdep/unix/mix.c +index fbf4a02..c2207f6 100644 +--- a/src/osdep/unix/mix.c ++++ b/src/osdep/unix/mix.c +@@ -125,7 +125,7 @@ long mix_unsubscribe (MAILSTREAM *stream,char *mailbox); + long mix_create (MAILSTREAM *stream,char *mailbox); + long mix_delete (MAILSTREAM *stream,char *mailbox); + long mix_rename (MAILSTREAM *stream,char *old,char *newname); +-int mix_rselect (struct direct *name); ++int mix_rselect (const struct direct *name); + MAILSTREAM *mix_open (MAILSTREAM *stream); + void mix_close (MAILSTREAM *stream,long options); + void mix_abort (MAILSTREAM *stream); +@@ -140,8 +140,8 @@ THREADNODE *mix_thread (MAILSTREAM *stream,char *type,char *charset, + long mix_ping (MAILSTREAM *stream); + void mix_check (MAILSTREAM *stream); + long mix_expunge (MAILSTREAM *stream,char *sequence,long options); +-int mix_select (struct direct *name); +-int mix_msgfsort (const void *d1,const void *d2); ++int mix_select (const struct direct *name); ++int mix_msgfsort (const struct dirent **d1,const struct dirent **d2); + long mix_addset (SEARCHSET **set,unsigned long start,unsigned long size); + long mix_burp (MAILSTREAM *stream,MIXBURP *burp,unsigned long *reclaimed); + long mix_burp_check (SEARCHSET *set,size_t size,char *file); +@@ -587,7 +587,7 @@ long mix_rename (MAILSTREAM *stream,char *old,char *newname) + * Returns: T if mix file name, NIL otherwise + */ + +-int mix_rselect (struct direct *name) ++int mix_rselect (const struct direct *name) + { + return mix_dirfmttest (name->d_name); + } +@@ -1146,7 +1146,7 @@ long mix_expunge (MAILSTREAM *stream,char *sequence,long options) + * ".mix" with no suffix was used by experimental versions + */ + +-int mix_select (struct direct *name) ++int mix_select (const struct direct *name) + { + char c,*s; + /* make sure name has prefix */ +@@ -1165,7 +1165,7 @@ int mix_select (struct direct *name) + * Returns: -1 if d1 < d2, 0 if d1 == d2, 1 d1 > d2 + */ + +-int mix_msgfsort (const void *d1,const void *d2) ++int mix_msgfsort (const struct dirent **d1,const struct dirent **d2) + { + char *n1 = (*(struct direct **) d1)->d_name + sizeof (MIXNAME) - 1; + char *n2 = (*(struct direct **) d2)->d_name + sizeof (MIXNAME) - 1; +diff --git a/src/osdep/unix/mx.c b/src/osdep/unix/mx.c +index 4549527..b5c5adf 100644 +--- a/src/osdep/unix/mx.c ++++ b/src/osdep/unix/mx.c +@@ -98,8 +98,8 @@ long mx_append (MAILSTREAM *stream,char *mailbox,append_t af,void *data); + long mx_append_msg (MAILSTREAM *stream,char *flags,MESSAGECACHE *elt, + STRING *st,SEARCHSET *set); + +-int mx_select (struct direct *name); +-int mx_numsort (const void *d1,const void *d2); ++int mx_select (const struct direct *name); ++int mx_numsort (const struct dirent **d1,const struct dirent **d2); + char *mx_file (char *dst,char *name); + long mx_lockindex (MAILSTREAM *stream); + void mx_unlockindex (MAILSTREAM *stream); +@@ -1110,7 +1110,7 @@ long mx_append_msg (MAILSTREAM *stream,char *flags,MESSAGECACHE *elt, + * Returns: T to use file name, NIL to skip it + */ + +-int mx_select (struct direct *name) ++int mx_select (const struct direct *name) + { + char c; + char *s = name->d_name; +@@ -1125,7 +1125,7 @@ int mx_select (struct direct *name) + * Returns: negative if d1 < d2, 0 if d1 == d2, postive if d1 > d2 + */ + +-int mx_numsort (const void *d1,const void *d2) ++int mx_numsort (const struct dirent **d1,const struct dirent **d2) + { + return atoi ((*(struct direct **) d1)->d_name) - + atoi ((*(struct direct **) d2)->d_name); +diff --git a/src/osdep/unix/news.c b/src/osdep/unix/news.c +index 4cf5bb7..3da5207 100644 +--- a/src/osdep/unix/news.c ++++ b/src/osdep/unix/news.c +@@ -76,8 +76,8 @@ long news_create (MAILSTREAM *stream,char *mailbox); + long news_delete (MAILSTREAM *stream,char *mailbox); + long news_rename (MAILSTREAM *stream,char *old,char *newname); + MAILSTREAM *news_open (MAILSTREAM *stream); +-int news_select (struct direct *name); +-int news_numsort (const void *d1,const void *d2); ++int news_select (const struct direct *name); ++int news_numsort (const struct dirent ** d1,const struct dirent ** d2); + void news_close (MAILSTREAM *stream,long options); + void news_fast (MAILSTREAM *stream,char *sequence,long flags); + void news_flags (MAILSTREAM *stream,char *sequence,long flags); +@@ -402,7 +402,7 @@ MAILSTREAM *news_open (MAILSTREAM *stream) + * Returns: T to use file name, NIL to skip it + */ + +-int news_select (struct direct *name) ++int news_select (const struct direct *name) + { + char c; + char *s = name->d_name; +@@ -417,7 +417,7 @@ int news_select (struct direct *name) + * Returns: negative if d1 < d2, 0 if d1 == d2, postive if d1 > d2 + */ + +-int news_numsort (const void *d1,const void *d2) ++int news_numsort (const struct dirent ** d1,const struct dirent ** d2) + { + return atoi ((*(struct direct **) d1)->d_name) - + atoi ((*(struct direct **) d2)->d_name); +-- +2.39.1 + diff --git a/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb b/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb index 29c4b20878..2f4261b00d 100644 --- a/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb +++ b/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb @@ -14,6 +14,7 @@ SRC_URI = "https://fossies.org/linux/misc/old/imap-${PV}.tar.gz \ file://0001-Define-prototype-for-safe_flock.patch \ file://0001-Do-not-build-mtest.patch \ file://0002-tmail-Include-ctype.h-for-isdigit.patch \ + file://0001-Fix-Wincompatible-function-pointer-types.patch \ " SRC_URI[md5sum] = "2126fd125ea26b73b20f01fcd5940369" From patchwork Sat Jan 21 18:01:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18430 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 70F87C38142 for ; Sat, 21 Jan 2023 18:01:47 +0000 (UTC) Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by mx.groups.io with SMTP id smtpd.web11.2063.1674324092782604368 for ; Sat, 21 Jan 2023 10:01:44 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=T1dciYX5; spf=pass (domain: gmail.com, ip: 209.85.216.48, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f48.google.com with SMTP id d8so8375958pjc.3 for ; Sat, 21 Jan 2023 10:01:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=koUcgKCFWXov3+NezwzTEpayFNsZPqRly/yqvoVV4ps=; b=T1dciYX5T3EkPINH5BHOvgqHWbGPtYt+l+d50hlVuzPT9QV7FsJHK/Yzukd6q6XiS+ R1CldNf0qWJrxd3sl8bdBcYu+r3fPZ2AGM621OwNFNMiagqu07NyxxD+t3KXMlqMVtF1 x9i364NjSHsS+f6Hb/meS/7w259yTpjURMjC1jQwDkTbkGtD7DAUxPI6e7uSCNy1UR3J wGc9VJeRq16JM+J9XRsfdFv6t9ukDPT6ONn6I8PmERXGdXI8oVzSwmT/+glqfiDlI8Tf N2IG24hTzQXVD7y/Jv2exnD1y1H2/P0sv8rxgYIOIhAUAJB4EUxa4qjDQUB4XGRKZJa3 8zwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=koUcgKCFWXov3+NezwzTEpayFNsZPqRly/yqvoVV4ps=; b=ywNcMw/vmEWJBHzce2D3DMlFzS8rXB5NCvpv4P2oT66mIUvMJY2Ve2jOJnm/x6BLWE xXvVxezmuokOm3aAtlOTYLE6Gl45TM/7MDXuGSAJB3RGGDnzIzC+DL0cDWQnfRvnWp6r ixoZYFVXIKY8yn8th3BqcbhZKDZe5hZuuU2PT3krNEzpy6hFlJRe7XMfPf9BoLlmAppA 1sV+EIWKXrsjX53Fg39ebBnO5BsCvpYn3RUx1YqqM/HLPy/9NHkytJITg3sX17sdOIlB k57M/jK0MSYjw3TLwKnPSYlID0rFt8JovHwEriAompVwDk7VOvZ1b6c2GDpu5W9Ywr0l blsg== X-Gm-Message-State: AFqh2kouKwNZl9hRVidxtBXVBEDp5gexubaE13HGP8vHwenruSkcwMLO WgAbzC/F7cPH3n13ct67Qf8shUXEboQf0Q== X-Google-Smtp-Source: AMrXdXuPg0ZGym+Q1QPqyTCug3eSqipKNr2pXVHZMObGDmHNbMxKI+ZjnAo4ewaQQ2wCZKy3fnrDVA== X-Received: by 2002:a17:90a:cb84:b0:229:7110:712d with SMTP id a4-20020a17090acb8400b002297110712dmr20210085pju.45.1674324103442; Sat, 21 Jan 2023 10:01:43 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id d15-20020a17090a02cf00b00226c2d90c04sm3623583pjd.38.2023.01.21.10.01.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Jan 2023 10:01:43 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 24/30] xmlsec1: Include xmlsec/parser.h for xmlSecParserSetDefaultOptions() Date: Sat, 21 Jan 2023 10:01:15 -0800 Message-Id: <20230121180121.1229895-24-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230121180121.1229895-1-raj.khem@gmail.com> References: <20230121180121.1229895-1-raj.khem@gmail.com> 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, 21 Jan 2023 18:01:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100691 Signed-off-by: Khem Raj --- ...mldsigverify-Include-xmlsec-parser.h.patch | 43 +++++++++++++++++++ .../recipes-support/xmlsec1/xmlsec1_1.2.37.bb | 1 + 2 files changed, 44 insertions(+) create mode 100644 meta-oe/recipes-support/xmlsec1/xmlsec1/0001-xmldsigverify-Include-xmlsec-parser.h.patch diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-xmldsigverify-Include-xmlsec-parser.h.patch b/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-xmldsigverify-Include-xmlsec-parser.h.patch new file mode 100644 index 0000000000..4347e925a3 --- /dev/null +++ b/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-xmldsigverify-Include-xmlsec-parser.h.patch @@ -0,0 +1,43 @@ +From 30e1afe60820c18c89cd10e9dcb7208ad5676d1d Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 19 Jan 2023 15:06:35 -0800 +Subject: [PATCH] xmldsigverify: Include xmlsec/parser.h + +this ensures that xmlSecParserSetDefaultOptions definition is made +available + +Fixes +| xmldsigverify.c:275:5: error: call to undeclared function 'xmlSecParserSetDefaultOptions'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] +| xmlSecParserSetDefaultOptions(XML_PARSE_NOENT | XML_PARSE_NOCDATA | +| ^ + +Upstream-Status: Submitted [https://github.com/lsh123/xmlsec/pull/463] +Signed-off-by: Khem Raj +--- + examples/xmldsigverify.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/examples/xmldsigverify.c b/examples/xmldsigverify.c +index ed538c70..ff68120e 100644 +--- a/examples/xmldsigverify.c ++++ b/examples/xmldsigverify.c +@@ -25,6 +25,7 @@ + #include + #include + ++#include + /* #define XMLDSIGVERIFY_DEFAULT_TRUSTED_CERTS_FOLDER "/etc/httpd/conf/ssl.crt" */ + #define XMLDSIGVERIFY_DEFAULT_TRUSTED_CERTS_FOLDER "/var/www/cgi-bin/keys-certs.def" + #define XMLDSIGVERIFY_KEY_AND_CERTS_FOLDER "/var/www/cgi-bin/keys-certs" +@@ -36,7 +37,7 @@ int verify_request(xmlSecKeysMngrPtr mngr); + int url_decode(char *buf, size_t size); + + int +-main(int , char **) { ++main() { + xmlSecKeysMngrPtr mngr; + #ifndef XMLSEC_NO_XSLT + xsltSecurityPrefsPtr xsltSecPrefs = NULL; +-- +2.39.1 + diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.37.bb b/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.37.bb index bd9c584dfd..a3da770943 100644 --- a/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.37.bb +++ b/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.37.bb @@ -20,6 +20,7 @@ SRC_URI = "http://www.aleksey.com/xmlsec/download/${BP}.tar.gz \ file://0001-nss-nspr-fix-for-multilib.patch \ file://run-ptest \ file://ensure-search-path-non-host.patch \ + file://0001-xmldsigverify-Include-xmlsec-parser.h.patch \ " SRC_URI[sha256sum] = "5f8dfbcb6d1e56bddd0b5ec2e00a3d0ca5342a9f57c24dffde5c796b2be2871c" From patchwork Sat Jan 21 18:01:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18432 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 69955C38159 for ; Sat, 21 Jan 2023 18:01:47 +0000 (UTC) Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by mx.groups.io with SMTP id smtpd.web10.2130.1674324096164790802 for ; Sat, 21 Jan 2023 10:01:45 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=W7cyLWI/; spf=pass (domain: gmail.com, ip: 209.85.214.180, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f180.google.com with SMTP id k18so7977116pll.5 for ; Sat, 21 Jan 2023 10:01:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=CzXIIBH41TLotM9db06XUxGEnJHqBuLUJsznNUToQu0=; b=W7cyLWI/eAwnKtLGATbMWWFoGwC9QaxH0/EvMXddgygYQVG9/5mbn7hICR5tH6c+is SBCQrKLc/bEsxA0F1CKk5rx91mQvxETB+2BOfAptKwTdwuWHa6iSBFB1hDXra3sCOXs+ 6Do6ldtqJOh/BKxTVqT2axDVXTjJPKU/iEbuowyoHcuWj6ehIismtkflm9F5ZemCt75I NBQ5Z6BcDELgvRLd9KyHEI73we8rcKYZg+DoTlITYtZ5Qv3wr83MsrHGBsZBRlPi8GxY ai/fMLOt3qqnqmCw2ay6oTXucA/8x0zvgm7vRdA5q/yZ5pWoQGAiIE0oCz2lCEkRhYcb OadA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CzXIIBH41TLotM9db06XUxGEnJHqBuLUJsznNUToQu0=; b=To3uXar7AZcCbLx24CzeDHRZtiIV/kE90qbMpW4GvNUF4KPvzY96ZimeBXwFLL69jn ta7wdeSugH+uYABKxJKjvWDlvjaAnLtmDdF2/W79ZNk1Nl/wX6S57zTdAxPaMeYsBUUC dtMFSNlhPBtQ0jelpEa14u2MPxFUxEm5y46cQoaL5jEGOTYDq2J6s8yuIpE+NZypJJrl 67QSFQLa4/K828C9T14G+V8V18h3lQXM/6MLB0FuMvuwzIyewE0Ue8isrAwoHSaJ1eNS iL1zai6nhdboUQtVgZqWA17d4ehw3PGc4piW5xg4yqRT7I4woGz4m86MhNuhoz468YIj 9WBQ== X-Gm-Message-State: AFqh2kr8mqhtkcJC87NQjbHVV0sr5qyNIQkPMpMyKwcjyVsGNpJdoZ6K n55xVgQP6v4SQE+5vt60pGGw51IQ+BMh7w== X-Google-Smtp-Source: AMrXdXsZyqkYcoOcgEH9jagFercJFCjMkeZCrM+O7BAi/3cHNeMeIT2pOcPzXomDk/qpmNy9MhHcgg== X-Received: by 2002:a17:90a:898b:b0:225:c2b4:5742 with SMTP id v11-20020a17090a898b00b00225c2b45742mr44464808pjn.34.1674324104257; Sat, 21 Jan 2023 10:01:44 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id d15-20020a17090a02cf00b00226c2d90c04sm3623583pjd.38.2023.01.21.10.01.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Jan 2023 10:01:43 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 25/30] exiv2: Upgrade to 0.27.6 Date: Sat, 21 Jan 2023 10:01:16 -0800 Message-Id: <20230121180121.1229895-25-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230121180121.1229895-1-raj.khem@gmail.com> References: <20230121180121.1229895-1-raj.khem@gmail.com> 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, 21 Jan 2023 18:01:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100692 Drop backported patches Signed-off-by: Khem Raj --- ...-protection-only-if-compiler-arch-su.patch | 40 ------ .../exiv2/exiv2/CVE-2021-29457.patch | 26 ---- .../exiv2/exiv2/CVE-2021-29458.patch | 37 ------ .../exiv2/exiv2/CVE-2021-29463.patch | 120 ------------------ .../exiv2/exiv2/CVE-2021-29464.patch | 72 ----------- .../exiv2/exiv2/CVE-2021-29470.patch | 32 ----- .../exiv2/exiv2/CVE-2021-29473.patch | 21 --- .../exiv2/exiv2/CVE-2021-3482.patch | 54 -------- meta-oe/recipes-support/exiv2/exiv2_0.27.3.bb | 30 ----- meta-oe/recipes-support/exiv2/exiv2_0.27.6.bb | 19 +++ 10 files changed, 19 insertions(+), 432 deletions(-) delete mode 100644 meta-oe/recipes-support/exiv2/exiv2/0001-Use-compiler-fcf-protection-only-if-compiler-arch-su.patch delete mode 100644 meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29457.patch delete mode 100644 meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29458.patch delete mode 100644 meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29463.patch delete mode 100644 meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29464.patch delete mode 100644 meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29470.patch delete mode 100644 meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29473.patch delete mode 100644 meta-oe/recipes-support/exiv2/exiv2/CVE-2021-3482.patch delete mode 100644 meta-oe/recipes-support/exiv2/exiv2_0.27.3.bb create mode 100644 meta-oe/recipes-support/exiv2/exiv2_0.27.6.bb diff --git a/meta-oe/recipes-support/exiv2/exiv2/0001-Use-compiler-fcf-protection-only-if-compiler-arch-su.patch b/meta-oe/recipes-support/exiv2/exiv2/0001-Use-compiler-fcf-protection-only-if-compiler-arch-su.patch deleted file mode 100644 index 96146a1957..0000000000 --- a/meta-oe/recipes-support/exiv2/exiv2/0001-Use-compiler-fcf-protection-only-if-compiler-arch-su.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 04d5f4805a86302a0e135a28d58a6c1ff6a68d52 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Thu, 30 Jul 2020 23:03:51 +0200 -Subject: [PATCH] Use compiler -fcf-protection only if compiler/arch supports - it -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -There have been some PRs they were either rejected or some general suggestion -for more flags suggested. So - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller ---- - cmake/compilerFlags.cmake | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/cmake/compilerFlags.cmake b/cmake/compilerFlags.cmake -index 12caf42..455525e 100644 ---- a/cmake/compilerFlags.cmake -+++ b/cmake/compilerFlags.cmake -@@ -26,7 +26,12 @@ if ( MINGW OR UNIX OR MSYS ) # MINGW, Linux, APPLE, CYGWIN - # This fails under Fedora, MinGW GCC 8.3.0 and CYGWIN/MSYS 9.3.0 - if (NOT (MINGW OR CMAKE_HOST_SOLARIS OR CYGWIN OR MSYS) ) - if (COMPILER_IS_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8.0) -- add_compile_options(-fstack-clash-protection -fcf-protection) -+ # Gcc does support -fcf-protection on few arches only -+ CHECK_CXX_COMPILER_FLAG(-fcf-protection COMPILER_SUPPORTS_FCF_PROTECTION) -+ if (COMPILER_SUPPORTS_FCF_PROTECTION) -+ add_compile_options(-fcf-protection) -+ endif() -+ add_compile_options(-fstack-clash-protection) - endif() - - if( (COMPILER_IS_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 5.0) # Not in GCC 4.8 --- -2.21.3 - diff --git a/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29457.patch b/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29457.patch deleted file mode 100644 index e5d069487c..0000000000 --- a/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29457.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 13e5a3e02339b746abcaee6408893ca2fd8e289d Mon Sep 17 00:00:00 2001 -From: Pydera -Date: Thu, 8 Apr 2021 17:36:16 +0200 -Subject: [PATCH] Fix out of buffer access in #1529 - ---- - src/jp2image.cpp | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/jp2image.cpp b/src/jp2image.cpp -index 88ab9b2d6..12025f966 100644 ---- a/src/jp2image.cpp -+++ b/src/jp2image.cpp -@@ -776,9 +776,10 @@ static void boxes_check(size_t b,size_t m) - #endif - box.length = (uint32_t) (io_->size() - io_->tell() + 8); - } -- if (box.length == 1) -+ if (box.length < 8) - { -- // FIXME. Special case. the real box size is given in another place. -+ // box is broken, so there is nothing we can do here -+ throw Error(kerCorruptedMetadata); - } - - // Read whole box : Box header + Box data (not fixed size - can be null). diff --git a/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29458.patch b/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29458.patch deleted file mode 100644 index 285f6fe4ce..0000000000 --- a/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29458.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 9b7a19f957af53304655ed1efe32253a1b11a8d0 Mon Sep 17 00:00:00 2001 -From: Kevin Backhouse -Date: Fri, 9 Apr 2021 13:37:48 +0100 -Subject: [PATCH] Fix integer overflow. ---- - src/crwimage_int.cpp | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/crwimage_int.cpp b/src/crwimage_int.cpp -index aefaf22..2e3e507 100644 ---- a/src/crwimage_int.cpp -+++ b/src/crwimage_int.cpp -@@ -559,7 +559,7 @@ namespace Exiv2 { - void CiffComponent::setValue(DataBuf buf) - { - if (isAllocated_) { -- delete pData_; -+ delete[] pData_; - pData_ = 0; - size_ = 0; - } -@@ -1167,7 +1167,11 @@ namespace Exiv2 { - pCrwMapping->crwDir_); - if (edX != edEnd || edY != edEnd || edO != edEnd) { - uint32_t size = 28; -- if (cc && cc->size() > size) size = cc->size(); -+ if (cc) { -+ if (cc->size() < size) -+ throw Error(kerCorruptedMetadata); -+ size = cc->size(); -+ } - DataBuf buf(size); - std::memset(buf.pData_, 0x0, buf.size_); - if (cc) std::memcpy(buf.pData_ + 8, cc->pData() + 8, cc->size() - 8); --- -2.25.1 - diff --git a/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29463.patch b/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29463.patch deleted file mode 100644 index 5ab64a7d3e..0000000000 --- a/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29463.patch +++ /dev/null @@ -1,120 +0,0 @@ -From 783b3a6ff15ed6f82a8f8e6c8a6f3b84a9b04d4b Mon Sep 17 00:00:00 2001 -From: Kevin Backhouse -Date: Mon, 19 Apr 2021 18:06:00 +0100 -Subject: [PATCH] Improve bound checking in WebPImage::doWriteMetadata() - ---- - src/webpimage.cpp | 41 ++++++++++++++++++++++++++++++----------- - 1 file changed, 30 insertions(+), 11 deletions(-) - -diff --git a/src/webpimage.cpp b/src/webpimage.cpp -index 4ddec544c..fee110bca 100644 ---- a/src/webpimage.cpp -+++ b/src/webpimage.cpp -@@ -145,7 +145,7 @@ namespace Exiv2 { - DataBuf chunkId(WEBP_TAG_SIZE+1); - chunkId.pData_ [WEBP_TAG_SIZE] = '\0'; - -- io_->read(data, WEBP_TAG_SIZE * 3); -+ readOrThrow(*io_, data, WEBP_TAG_SIZE * 3, Exiv2::kerCorruptedMetadata); - uint64_t filesize = Exiv2::getULong(data + WEBP_TAG_SIZE, littleEndian); - - /* Set up header */ -@@ -185,13 +185,20 @@ namespace Exiv2 { - case we have any exif or xmp data, also check - for any chunks with alpha frame/layer set */ - while ( !io_->eof() && (uint64_t) io_->tell() < filesize) { -- io_->read(chunkId.pData_, WEBP_TAG_SIZE); -- io_->read(size_buff, WEBP_TAG_SIZE); -- long size = Exiv2::getULong(size_buff, littleEndian); -+ readOrThrow(*io_, chunkId.pData_, WEBP_TAG_SIZE, Exiv2::kerCorruptedMetadata); -+ readOrThrow(*io_, size_buff, WEBP_TAG_SIZE, Exiv2::kerCorruptedMetadata); -+ const uint32_t size_u32 = Exiv2::getULong(size_buff, littleEndian); -+ -+ // Check that `size_u32` is safe to cast to `long`. -+ enforce(size_u32 <= static_cast(std::numeric_limits::max()), -+ Exiv2::kerCorruptedMetadata); -+ const long size = static_cast(size_u32); - DataBuf payload(size); -- io_->read(payload.pData_, payload.size_); -- byte c; -- if ( payload.size_ % 2 ) io_->read(&c,1); -+ readOrThrow(*io_, payload.pData_, payload.size_, Exiv2::kerCorruptedMetadata); -+ if ( payload.size_ % 2 ) { -+ byte c; -+ readOrThrow(*io_, &c, 1, Exiv2::kerCorruptedMetadata); -+ } - - /* Chunk with information about features - used in the file. */ -@@ -199,6 +206,7 @@ namespace Exiv2 { - has_vp8x = true; - } - if (equalsWebPTag(chunkId, WEBP_CHUNK_HEADER_VP8X) && !has_size) { -+ enforce(size >= 10, Exiv2::kerCorruptedMetadata); - has_size = true; - byte size_buf[WEBP_TAG_SIZE]; - -@@ -227,6 +235,7 @@ namespace Exiv2 { - } - #endif - if (equalsWebPTag(chunkId, WEBP_CHUNK_HEADER_VP8) && !has_size) { -+ enforce(size >= 10, Exiv2::kerCorruptedMetadata); - has_size = true; - byte size_buf[2]; - -@@ -244,11 +253,13 @@ namespace Exiv2 { - - /* Chunk with with lossless image data. */ - if (equalsWebPTag(chunkId, WEBP_CHUNK_HEADER_VP8L) && !has_alpha) { -+ enforce(size >= 5, Exiv2::kerCorruptedMetadata); - if ((payload.pData_[4] & WEBP_VP8X_ALPHA_BIT) == WEBP_VP8X_ALPHA_BIT) { - has_alpha = true; - } - } - if (equalsWebPTag(chunkId, WEBP_CHUNK_HEADER_VP8L) && !has_size) { -+ enforce(size >= 5, Exiv2::kerCorruptedMetadata); - has_size = true; - byte size_buf_w[2]; - byte size_buf_h[3]; -@@ -276,11 +287,13 @@ namespace Exiv2 { - - /* Chunk with animation frame. */ - if (equalsWebPTag(chunkId, WEBP_CHUNK_HEADER_ANMF) && !has_alpha) { -+ enforce(size >= 6, Exiv2::kerCorruptedMetadata); - if ((payload.pData_[5] & 0x2) == 0x2) { - has_alpha = true; - } - } - if (equalsWebPTag(chunkId, WEBP_CHUNK_HEADER_ANMF) && !has_size) { -+ enforce(size >= 12, Exiv2::kerCorruptedMetadata); - has_size = true; - byte size_buf[WEBP_TAG_SIZE]; - -@@ -309,16 +322,22 @@ namespace Exiv2 { - - io_->seek(12, BasicIo::beg); - while ( !io_->eof() && (uint64_t) io_->tell() < filesize) { -- io_->read(chunkId.pData_, 4); -- io_->read(size_buff, 4); -+ readOrThrow(*io_, chunkId.pData_, 4, Exiv2::kerCorruptedMetadata); -+ readOrThrow(*io_, size_buff, 4, Exiv2::kerCorruptedMetadata); -+ -+ const uint32_t size_u32 = Exiv2::getULong(size_buff, littleEndian); - -- long size = Exiv2::getULong(size_buff, littleEndian); -+ // Check that `size_u32` is safe to cast to `long`. -+ enforce(size_u32 <= static_cast(std::numeric_limits::max()), -+ Exiv2::kerCorruptedMetadata); -+ const long size = static_cast(size_u32); - - DataBuf payload(size); -- io_->read(payload.pData_, size); -+ readOrThrow(*io_, payload.pData_, size, Exiv2::kerCorruptedMetadata); - if ( io_->tell() % 2 ) io_->seek(+1,BasicIo::cur); // skip pad - - if (equalsWebPTag(chunkId, WEBP_CHUNK_HEADER_VP8X)) { -+ enforce(size >= 1, Exiv2::kerCorruptedMetadata); - if (has_icc){ - payload.pData_[0] |= WEBP_VP8X_ICC_BIT; - } else { diff --git a/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29464.patch b/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29464.patch deleted file mode 100644 index f0c482450c..0000000000 --- a/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29464.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 61734d8842cb9cc59437463e3bac54d6231d9487 Mon Sep 17 00:00:00 2001 -From: Wang Mingyu -Date: Tue, 18 May 2021 10:52:54 +0900 -Subject: [PATCH] modify - -Signed-off-by: Wang Mingyu ---- - src/jp2image.cpp | 14 +++++++++----- - 1 file changed, 9 insertions(+), 5 deletions(-) - -diff --git a/src/jp2image.cpp b/src/jp2image.cpp -index 52723a4..0ac4f50 100644 ---- a/src/jp2image.cpp -+++ b/src/jp2image.cpp -@@ -643,11 +643,11 @@ static void boxes_check(size_t b,size_t m) - void Jp2Image::encodeJp2Header(const DataBuf& boxBuf,DataBuf& outBuf) - { - DataBuf output(boxBuf.size_ + iccProfile_.size_ + 100); // allocate sufficient space -- int outlen = sizeof(Jp2BoxHeader) ; // now many bytes have we written to output? -- int inlen = sizeof(Jp2BoxHeader) ; // how many bytes have we read from boxBuf? -+ long outlen = sizeof(Jp2BoxHeader) ; // now many bytes have we written to output? -+ long inlen = sizeof(Jp2BoxHeader) ; // how many bytes have we read from boxBuf? - Jp2BoxHeader* pBox = (Jp2BoxHeader*) boxBuf.pData_; -- int32_t length = getLong((byte*)&pBox->length, bigEndian); -- int32_t count = sizeof (Jp2BoxHeader); -+ uint32_t length = getLong((byte*)&pBox->length, bigEndian); -+ uint32_t count = sizeof (Jp2BoxHeader); - char* p = (char*) boxBuf.pData_; - bool bWroteColor = false ; - -@@ -664,6 +664,7 @@ static void boxes_check(size_t b,size_t m) - #ifdef EXIV2_DEBUG_MESSAGES - std::cout << "Jp2Image::encodeJp2Header subbox: "<< toAscii(subBox.type) << " length = " << subBox.length << std::endl; - #endif -+ enforce(subBox.length <= length - count, Exiv2::kerCorruptedMetadata); - count += subBox.length; - newBox.type = subBox.type; - } else { -@@ -672,12 +673,13 @@ static void boxes_check(size_t b,size_t m) - count = length; - } - -- int32_t newlen = subBox.length; -+ uint32_t newlen = subBox.length; - if ( newBox.type == kJp2BoxTypeColorHeader ) { - bWroteColor = true ; - if ( ! iccProfileDefined() ) { - const char* pad = "\x01\x00\x00\x00\x00\x00\x10\x00\x00\x05\x1cuuid"; - uint32_t psize = 15; -+ enforce(newlen <= output.size_ - outlen, Exiv2::kerCorruptedMetadata); - ul2Data((byte*)&newBox.length,psize ,bigEndian); - ul2Data((byte*)&newBox.type ,newBox.type,bigEndian); - ::memcpy(output.pData_+outlen ,&newBox ,sizeof(newBox)); -@@ -686,6 +688,7 @@ static void boxes_check(size_t b,size_t m) - } else { - const char* pad = "\0x02\x00\x00"; - uint32_t psize = 3; -+ enforce(newlen <= output.size_ - outlen, Exiv2::kerCorruptedMetadata); - ul2Data((byte*)&newBox.length,psize+iccProfile_.size_,bigEndian); - ul2Data((byte*)&newBox.type,newBox.type,bigEndian); - ::memcpy(output.pData_+outlen ,&newBox ,sizeof(newBox) ); -@@ -694,6 +697,7 @@ static void boxes_check(size_t b,size_t m) - newlen = psize + iccProfile_.size_; - } - } else { -+ enforce(newlen <= output.size_ - outlen, Exiv2::kerCorruptedMetadata); - ::memcpy(output.pData_+outlen,boxBuf.pData_+inlen,subBox.length); - } - --- -2.25.1 - diff --git a/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29470.patch b/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29470.patch deleted file mode 100644 index eedf9d79aa..0000000000 --- a/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29470.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 6628a69c036df2aa036290e6cd71767c159c79ed Mon Sep 17 00:00:00 2001 -From: Kevin Backhouse -Date: Wed, 21 Apr 2021 12:06:04 +0100 -Subject: [PATCH] Add more bounds checks in Jp2Image::encodeJp2Header ---- - src/jp2image.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/jp2image.cpp b/src/jp2image.cpp -index b424225..349a9f0 100644 ---- a/src/jp2image.cpp -+++ b/src/jp2image.cpp -@@ -645,13 +645,16 @@ static void boxes_check(size_t b,size_t m) - DataBuf output(boxBuf.size_ + iccProfile_.size_ + 100); // allocate sufficient space - long outlen = sizeof(Jp2BoxHeader) ; // now many bytes have we written to output? - long inlen = sizeof(Jp2BoxHeader) ; // how many bytes have we read from boxBuf? -+ enforce(sizeof(Jp2BoxHeader) <= static_cast(output.size_), Exiv2::kerCorruptedMetadata); - Jp2BoxHeader* pBox = (Jp2BoxHeader*) boxBuf.pData_; - uint32_t length = getLong((byte*)&pBox->length, bigEndian); -+ enforce(length <= static_cast(output.size_), Exiv2::kerCorruptedMetadata); - uint32_t count = sizeof (Jp2BoxHeader); - char* p = (char*) boxBuf.pData_; - bool bWroteColor = false ; - - while ( count < length || !bWroteColor ) { -+ enforce(sizeof(Jp2BoxHeader) <= length - count, Exiv2::kerCorruptedMetadata); - Jp2BoxHeader* pSubBox = (Jp2BoxHeader*) (p+count) ; - - // copy data. pointer could be into a memory mapped file which we will decode! --- -2.25.1 - diff --git a/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29473.patch b/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29473.patch deleted file mode 100644 index 4afedf8e59..0000000000 --- a/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29473.patch +++ /dev/null @@ -1,21 +0,0 @@ -From e6a0982f7cd9282052b6e3485a458d60629ffa0b Mon Sep 17 00:00:00 2001 -From: Kevin Backhouse -Date: Fri, 23 Apr 2021 11:44:44 +0100 -Subject: [PATCH] Add bounds check in Jp2Image::doWriteMetadata(). - ---- - src/jp2image.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/jp2image.cpp b/src/jp2image.cpp -index 1694fed27..ca8c9ddbb 100644 ---- a/src/jp2image.cpp -+++ b/src/jp2image.cpp -@@ -908,6 +908,7 @@ static void boxes_check(size_t b,size_t m) - - case kJp2BoxTypeUuid: - { -+ enforce(boxBuf.size_ >= 24, Exiv2::kerCorruptedMetadata); - if(memcmp(boxBuf.pData_ + 8, kJp2UuidExif, 16) == 0) - { - #ifdef EXIV2_DEBUG_MESSAGES diff --git a/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-3482.patch b/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-3482.patch deleted file mode 100644 index e7c5e1b656..0000000000 --- a/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-3482.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 22ea582c6b74ada30bec3a6b15de3c3e52f2b4da Mon Sep 17 00:00:00 2001 -From: Robin Mills -Date: Mon, 5 Apr 2021 20:33:25 +0100 -Subject: [PATCH] fix_1522_jp2image_exif_asan - ---- - src/jp2image.cpp | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -diff --git a/src/jp2image.cpp b/src/jp2image.cpp -index eb31cea4a..88ab9b2d6 100644 ---- a/src/jp2image.cpp -+++ b/src/jp2image.cpp -@@ -28,6 +28,7 @@ - #include "image.hpp" - #include "image_int.hpp" - #include "basicio.hpp" -+#include "enforce.hpp" - #include "error.hpp" - #include "futils.hpp" - #include "types.hpp" -@@ -353,7 +354,7 @@ static void boxes_check(size_t b,size_t m) - if (io_->error()) throw Error(kerFailedToReadImageData); - if (bufRead != rawData.size_) throw Error(kerInputDataReadFailed); - -- if (rawData.size_ > 0) -+ if (rawData.size_ > 8) // "II*\0long" - { - // Find the position of Exif header in bytes array. - long pos = ( (rawData.pData_[0] == rawData.pData_[1]) -@@ -497,6 +498,7 @@ static void boxes_check(size_t b,size_t m) - position = io_->tell(); - box.length = getLong((byte*)&box.length, bigEndian); - box.type = getLong((byte*)&box.type, bigEndian); -+ enforce(box.length <= io_->size()-io_->tell() , Exiv2::kerCorruptedMetadata); - - if (bPrint) { - out << Internal::stringFormat("%8ld | %8ld | ", (size_t)(position - sizeof(box)), -@@ -581,12 +583,13 @@ static void boxes_check(size_t b,size_t m) - throw Error(kerInputDataReadFailed); - - if (bPrint) { -- out << Internal::binaryToString(makeSlice(rawData, 0, 40)); -+ out << Internal::binaryToString( -+ makeSlice(rawData, 0, rawData.size_>40?40:rawData.size_)); - out.flush(); - } - lf(out, bLF); - -- if (bIsExif && bRecursive && rawData.size_ > 0) { -+ if (bIsExif && bRecursive && rawData.size_ > 8) { // "II*\0long" - if ((rawData.pData_[0] == rawData.pData_[1]) && - (rawData.pData_[0] == 'I' || rawData.pData_[0] == 'M')) { - BasicIo::AutoPtr p = BasicIo::AutoPtr(new MemIo(rawData.pData_, rawData.size_)); diff --git a/meta-oe/recipes-support/exiv2/exiv2_0.27.3.bb b/meta-oe/recipes-support/exiv2/exiv2_0.27.3.bb deleted file mode 100644 index 1380638ba7..0000000000 --- a/meta-oe/recipes-support/exiv2/exiv2_0.27.3.bb +++ /dev/null @@ -1,30 +0,0 @@ -SUMMARY = "Exif, Iptc and XMP metadata manipulation library and tools" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=625f055f41728f84a8d7938acc35bdc2" - -DEPENDS = "zlib expat" - -SRC_URI = "https://exiv2.org/releases/${BPN}-${PV}-Source.tar.gz" -SRC_URI[sha256sum] = "a79f5613812aa21755d578a297874fb59a85101e793edc64ec2c6bd994e3e778" - -# Once patch is obsolete (project should be aware due to PRs), dos2unix can be removed either -inherit dos2unix -SRC_URI += "file://0001-Use-compiler-fcf-protection-only-if-compiler-arch-su.patch \ - file://CVE-2021-29457.patch \ - file://CVE-2021-29458.patch \ - file://CVE-2021-29463.patch \ - file://CVE-2021-29464.patch \ - file://CVE-2021-29470.patch \ - file://CVE-2021-29473.patch \ - file://CVE-2021-3482.patch" - -S = "${WORKDIR}/${BPN}-${PV}-Source" - -inherit cmake gettext - -do_install:append:class-target() { - # reproducibility: remove build host path - sed -i ${D}${libdir}/cmake/exiv2/exiv2Config.cmake \ - -e 's:${STAGING_DIR_HOST}::g' -} - diff --git a/meta-oe/recipes-support/exiv2/exiv2_0.27.6.bb b/meta-oe/recipes-support/exiv2/exiv2_0.27.6.bb new file mode 100644 index 0000000000..6ccd9fb266 --- /dev/null +++ b/meta-oe/recipes-support/exiv2/exiv2_0.27.6.bb @@ -0,0 +1,19 @@ +SUMMARY = "Exif, Iptc and XMP metadata manipulation library and tools" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=625f055f41728f84a8d7938acc35bdc2" + +DEPENDS = "zlib expat" + +SRC_URI = "https://github.com/Exiv2/${BPN}/releases/download/v${PV}/${BP}-Source.tar.gz" +SRC_URI[sha256sum] = "4c192483a1125dc59a3d70b30d30d32edace9e14adf52802d2f853abf72db8a6" +# Once patch is obsolete (project should be aware due to PRs), dos2unix can be removed either +# inherit dos2unix +S = "${WORKDIR}/${BP}-Source" + +inherit cmake gettext + +do_install:append:class-target() { + # reproducibility: remove build host path + sed -i ${D}${libdir}/cmake/exiv2/exiv2Config.cmake \ + -e 's:${STAGING_DIR_HOST}::g' +} From patchwork Sat Jan 21 18:01:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18428 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 5E884C004D4 for ; Sat, 21 Jan 2023 18:01:47 +0000 (UTC) Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by mx.groups.io with SMTP id smtpd.web11.2071.1674324099363399348 for ; Sat, 21 Jan 2023 10:01:45 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=DDMHZXOf; spf=pass (domain: gmail.com, ip: 209.85.216.54, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f54.google.com with SMTP id n20-20020a17090aab9400b00229ca6a4636so11049474pjq.0 for ; Sat, 21 Jan 2023 10:01:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=aqqHqOOIzlY3UpaQlFCXlJYsY4A6cIJx3l1zspQKVLU=; b=DDMHZXOf8GUb/3asDNg/yHKQc8ghHKbgXduwA4NGGkHHF+Y8E+big/TtOhig9Gqu3M VPZPOjY1W6xEcoY/9+kzOxZ0zOFdp6vYtEPp+AP6MCNbXeN5hkg1yQwgfL0eFkqOdj4M YR+3zAeSqBEc+IN19E0FtHPAFT3AsU7ZWr0lStLJdqgrPHMIP/bewLjpIG99MHL1FgpI uEnfbGZYMYVT0h5WBtmOfoQ///P2oc7Yix8mcAGB1mDzmkmgI8fwR0DZJxZrKWJapzzp 47/0dGf/a7HJPOj2um2r/VeCJlncCjBP3t64dJ8q6snAtZ01+44cH0rhTXCLZNyb9z5h ffOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=aqqHqOOIzlY3UpaQlFCXlJYsY4A6cIJx3l1zspQKVLU=; b=rmH7TNuP8Gd2r7U7sRsFkFc5mu7EPIN+MpGzJRfYNr108BZiwX9p1goywe9lD/iPWm TMrtL2k+7+hzZOmEkF2jnZNXs1II7mpx7oN24KX/GlOUgeZO5KszFyF6CvAlQz8yTW9H 6o3oQndbroJIjiTYEIkyT+Ay5k+Ib6PKx72kbYl7TZc6A1Y5lQYDdsMYcDLWiMu/ySLG ny3Rt+zC7h2v88iMeCz8UzFdnDmiWX9T9Yw6vggORcY0gkusXKrpBqmhCJQ2wtl2nYHL CTPhHzllsgU2uCLT1Fz5VctwPn5/mpuB694ZqKClFwWvdkPOqFjADm5rVEzGMgeJr1mH T2jQ== X-Gm-Message-State: AFqh2kpzOoI20pOeSsc0lxdbuseU4qc0oLjy3VgR6ApY8FILwPCKerTy ll59r6dyuFkVlsY0+ilEkh+6jMie+dsl6A== X-Google-Smtp-Source: AMrXdXsQyR3Wo+/S41nwBsO3SPHqFXZMhG5z0npr2u4e9UAf8nZ2g3Hg1JaHU4+T7FR+VdrLPz0ppg== X-Received: by 2002:a17:90a:d344:b0:229:4b4f:99e7 with SMTP id i4-20020a17090ad34400b002294b4f99e7mr20543987pjx.16.1674324105004; Sat, 21 Jan 2023 10:01:45 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id d15-20020a17090a02cf00b00226c2d90c04sm3623583pjd.38.2023.01.21.10.01.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Jan 2023 10:01:44 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 26/30] packagegroup-meta-oe: Remove mongodb for upsupported arches Date: Sat, 21 Jan 2023 10:01:17 -0800 Message-Id: <20230121180121.1229895-26-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230121180121.1229895-1-raj.khem@gmail.com> References: <20230121180121.1229895-1-raj.khem@gmail.com> 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, 21 Jan 2023 18:01:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100693 Signed-off-by: Khem Raj --- .../recipes-core/packagegroups/packagegroup-meta-oe.bbappend | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta-oe/dynamic-layers/meta-python/recipes-core/packagegroups/packagegroup-meta-oe.bbappend b/meta-oe/dynamic-layers/meta-python/recipes-core/packagegroups/packagegroup-meta-oe.bbappend index 43afad7515..51197c27f3 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-core/packagegroups/packagegroup-meta-oe.bbappend +++ b/meta-oe/dynamic-layers/meta-python/recipes-core/packagegroups/packagegroup-meta-oe.bbappend @@ -3,6 +3,10 @@ RDEPENDS:packagegroup-meta-oe-devtools += "\ rwmem \ mongodb \ " +packagegroup-meta-oe-devtools:remove:riscv64 = "mongodb" +packagegroup-meta-oe-devtools:remove:riscv32 = "mongodb" +packagegroup-meta-oe-devtools:remove:mipsarch = "mongodb" +packagegroup-meta-oe-devtools:remove:powerpc = "mongodb" RDEPENDS:packagegroup-meta-oe-connectivity += "\ lirc \ From patchwork Sat Jan 21 18:01:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18439 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 7E931C5320B for ; Sat, 21 Jan 2023 18:01:47 +0000 (UTC) Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by mx.groups.io with SMTP id smtpd.web11.2062.1674324091113259352 for ; Sat, 21 Jan 2023 10:01:46 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=l0hKpKXT; spf=pass (domain: gmail.com, ip: 209.85.216.48, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f48.google.com with SMTP id y3-20020a17090a390300b00229add7bb36so7761212pjb.4 for ; Sat, 21 Jan 2023 10:01:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6f4GbVRNchgj3Ls0t5zNcofOZbUwcNgJUZOFusCrFzc=; b=l0hKpKXTSJD0I/1T4iw0w3hkMNOuXq8DpvzTlfZFMsG4TquAKMye6Omgzfw1vS53sL I7kLC5alOYxTWxmyjPEeFuaEwMsoC6pJ1pTiRLQKP2fFYdanY6sd4OrhWevCavwoHYCl roVXbLmLDkd334NHPFUpSh91QgUmmYtvvp+fEqdmwYBmWNRMG5f0dsWVrmOkyDpCOfn6 sX5oZskLjE4pimEr3N8PLAvaczdL6PQkfGrPOD/rj7Sf47qYVpCznT7KAaEzMdA9fOBR 7N39OJ/PJTWSa//QDYmrTilE72Ap2J37BYpVtfdJeJ2hISw1v7D2YZz15EUeK0MYfPkB W5gQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6f4GbVRNchgj3Ls0t5zNcofOZbUwcNgJUZOFusCrFzc=; b=m57RswmVuEP5/m9p87hzkNXYeZOjnjPjN4xokuqyEyLmI3kNhUYSk18S17wiBnPO4E oOtUkTE9/NoAYthEBjBTzBt+1XnziExcvH7zvZDy1ny/qbrRKz3YqjIFKI97UzYlAZSw FXHPqdsrpGHmm8c8psM506jZdJsEktf2CEECxEnB1U49Vdnp++/rugISzCQinsZt5GPd Tz8yk+n3uztfadu9fNxcPOQPkAnB47+awVqDUo49ZGw1qUQg2zuj+fzogzVRWb4cJKs4 I58InICv5tGsZP0l8Z7kD6xrXkruN4yCcPvZVRB60JBWO623C/M2ZYoWtWa1S0L3n6nX /sbA== X-Gm-Message-State: AFqh2kpJ2k0wsOOnJgEOJ8gCxOXlVwYE6DJCqo1e2VcE0RVI7yAmzLgG q2Wq85T6N6rJpgONAAyUcZuDCHQ3V6vTHA== X-Google-Smtp-Source: AMrXdXv3eYQOCwMqcJCgLkVyzryBKXlVw000OMCR72A8hgD6L9BgIH0V0hgDWYzK2QlmVppfICzIUw== X-Received: by 2002:a17:90a:f198:b0:229:98a2:1b9c with SMTP id bv24-20020a17090af19800b0022998a21b9cmr18790868pjb.39.1674324105712; Sat, 21 Jan 2023 10:01:45 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id d15-20020a17090a02cf00b00226c2d90c04sm3623583pjd.38.2023.01.21.10.01.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Jan 2023 10:01:45 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 27/30] rtorrent: Add missing dependency on autoconf-archive Date: Sat, 21 Jan 2023 10:01:18 -0800 Message-Id: <20230121180121.1229895-27-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230121180121.1229895-1-raj.khem@gmail.com> References: <20230121180121.1229895-1-raj.khem@gmail.com> 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, 21 Jan 2023 18:01:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100694 Fixes configure errors e.g. | configure:8269: error: possibly undefined macro: PKG_CHECK_EXISTS Signed-off-by: Khem Raj --- meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb b/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb index b4fe10cb1c..d5411b19b2 100644 --- a/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb +++ b/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://libtorrent.rakshasa.no/" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "libsigc++-2.0 curl cppunit libtool libtorrent ncurses" +DEPENDS = "autoconf-archive libsigc++-2.0 curl cppunit libtool libtorrent ncurses" SRC_URI = "git://github.com/rakshasa/rtorrent;branch=master;protocol=https" SRCREV = "d067bd802e44f0e6a747aabcc311ada2175fd550" From patchwork Sat Jan 21 18:01:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18441 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 93A39C38159 for ; Sat, 21 Jan 2023 18:01:57 +0000 (UTC) Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by mx.groups.io with SMTP id smtpd.web10.2135.1674324107457591306 for ; Sat, 21 Jan 2023 10:01:47 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=iNo/n22V; spf=pass (domain: gmail.com, ip: 209.85.214.173, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f173.google.com with SMTP id d3so7955449plr.10 for ; Sat, 21 Jan 2023 10:01:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=19E9+pORw/MT4AKwl6+zmyp5brZBB+5HQzpkeCoPXCQ=; b=iNo/n22Vb/Jm7rDt341MtNY9xZ5y6d1/WHhSYneqTE6PvR7pAruZ8rXXl2PEazgSI4 SaX319Iz46aZxesV3YcECxe/Oisqsd8LLGhZu/EPXbmqoUt5Veo15wVPcsdaco5G+h+T a0KRQyRvTJXrCSYe6XyFGMqSDP8tept1p2S3BNwMlC5P4oiETlDaHGdeLkqR3mnx+uG5 +rSysDX7zUzjJjXAmhuB0BKcJm47dws1w+hpkiJOhR3pKbg0+ZyOUg6hTgr3lFrKbI3t iSahfB08YdrGD8H0FK95546+gaxCwlT6pzUvuXnkqrIxFkcTIJf2N/Rak6cXJtQmOaZ1 7gbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=19E9+pORw/MT4AKwl6+zmyp5brZBB+5HQzpkeCoPXCQ=; b=VFbSczT8gVDzJEWJqDhfOzcTEnmH47VSwTjeme3pwvycyzefYo0k0RrhkgDvHwpZ24 ydIoJwIS24dhNl0hMHYdZiyhy1viVpIe8ayH6hIqLZriTRN/zyIfBDiAEOm3IGJMNqFM ZkqPtXYrgoPS8x5z+OWxYyh78XuTlWsR2meMtC37nmICW6ondGhUz6k7ubCVIHD9j1Aj HFdSLDLkmt7YlnKu1UQaPQdlsNJGu2ItppNxSg+DX2sZta55qwmFg9hOTrOMI4btHKEw dg0sv3jggrERQnLTkf4s9x+dqU0FvMaTJ4x+57AIWQsOA06K816y5uYc8nUWVCrg82u3 bNYg== X-Gm-Message-State: AFqh2komS3tsBTzpxiQCZnFASslcBP4IRHaVT/Qpa4YGACGsKXBIxQcP pbfGWX/IqVfop9KHNrZT//nu+Lyj7MF32A== X-Google-Smtp-Source: AMrXdXs4igfgRTvfjImZ8ndMGuI42Gxdi2ms4oOKByqlc6xgUubmBRIbgPGQ8aLmBbP4ty11PU6CKw== X-Received: by 2002:a17:90a:b792:b0:226:51ff:a8f8 with SMTP id m18-20020a17090ab79200b0022651ffa8f8mr20154414pjr.15.1674324106556; Sat, 21 Jan 2023 10:01:46 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id d15-20020a17090a02cf00b00226c2d90c04sm3623583pjd.38.2023.01.21.10.01.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Jan 2023 10:01:46 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 28/30] thrift: Fix c++ and system header include order problem Date: Sat, 21 Jan 2023 10:01:19 -0800 Message-Id: <20230121180121.1229895-28-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230121180121.1229895-1-raj.khem@gmail.com> References: <20230121180121.1229895-1-raj.khem@gmail.com> 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, 21 Jan 2023 18:01:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100695 Signed-off-by: Khem Raj --- ...ake-Use-idirafter-instead-of-isystem.patch | 180 ++++++++++++++++++ .../thrift/thrift_0.17.0.bb | 1 + 2 files changed, 181 insertions(+) create mode 100644 meta-oe/recipes-connectivity/thrift/thrift/0001-cmake-Use-idirafter-instead-of-isystem.patch diff --git a/meta-oe/recipes-connectivity/thrift/thrift/0001-cmake-Use-idirafter-instead-of-isystem.patch b/meta-oe/recipes-connectivity/thrift/thrift/0001-cmake-Use-idirafter-instead-of-isystem.patch new file mode 100644 index 0000000000..fd995153b3 --- /dev/null +++ b/meta-oe/recipes-connectivity/thrift/thrift/0001-cmake-Use-idirafter-instead-of-isystem.patch @@ -0,0 +1,180 @@ +From 0b9c6c4286a33961016839826e709a0e7394b28b Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 21 Jan 2023 00:00:04 -0800 +Subject: [PATCH] cmake: Use -idirafter instead of -isystem + +isystem dirs are searched before the regular system dirs +this exposes an interesting include ordering problem when using +clang + libc++, when including C++ headers like + +cstdlib includes stdlib.h and in case of libc++, this should be coming +from libc++ as well, which is then eventually including system stdlib.h + +libc++ has added a check for checking this order recently, which means +if cstlib ends up including system stdlib.h before libc++ provided +stdlib.h it errors out + +/mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/thrift/0.17.0-r0/recipe-sysroot/usr/include/c++/v1/cstdlib:90:5: error: tried including but didn't find libc++'s header. This usually means that your header search paths are not configured properly. The header search paths should contain the C++ Standard Library headers before any C Standard Library, and you are probably using compiler flags that make that not be the case. + ^ + +The reason is that include_directories with SYSTEM property adds the +directory via -system and some of these directories point to sysroot +e.g. OPENSSL_INCLUDE_DIR which ends up adding -isystem +/usr/include and causes the system stdlib.h to included before +libc++ stdlib.h + +A fix is to use -idirafter which preserved the effects of system headers +but instead of prepending, it will append to system headers and the +issue is addressed + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + build/cmake/BoostMacros.cmake | 2 +- + lib/c_glib/CMakeLists.txt | 4 ++-- + lib/c_glib/test/CMakeLists.txt | 2 +- + lib/cpp/CMakeLists.txt | 7 +++---- + lib/cpp/test/CMakeLists.txt | 2 +- + test/c_glib/CMakeLists.txt | 6 +++--- + test/cpp/CMakeLists.txt | 6 +++--- + 7 files changed, 14 insertions(+), 15 deletions(-) + +diff --git a/build/cmake/BoostMacros.cmake b/build/cmake/BoostMacros.cmake +index ffb85af..9f9d2dd 100644 +--- a/build/cmake/BoostMacros.cmake ++++ b/build/cmake/BoostMacros.cmake +@@ -26,7 +26,7 @@ macro(REQUIRE_BOOST_HEADERS) + endif() + if (DEFINED Boost_INCLUDE_DIRS) + # pre-boost 1.70.0 aware cmake, otherwise it is using targets +- include_directories(SYSTEM "${Boost_INCLUDE_DIRS}") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${Boost_INCLUDE_DIRS}") + endif() + endmacro() + +diff --git a/lib/c_glib/CMakeLists.txt b/lib/c_glib/CMakeLists.txt +index 218f7dd..d7a6161 100644 +--- a/lib/c_glib/CMakeLists.txt ++++ b/lib/c_glib/CMakeLists.txt +@@ -83,7 +83,7 @@ if(OPENSSL_FOUND AND WITH_OPENSSL) + list(APPEND SYSLIBS OpenSSL::Crypto) + endif() + else() +- include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${OPENSSL_INCLUDE_DIR}") + list(APPEND SYSLIBS "${OPENSSL_LIBRARIES}") + endif() + endif() +@@ -97,7 +97,7 @@ target_link_libraries(thrift_c_glib PUBLIC ${SYSLIBS}) + + # If Zlib is not found just ignore the Zlib stuff + if(WITH_ZLIB) +- include_directories(SYSTEM ${ZLIB_INCLUDE_DIRS}) ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${ZLIB_INCLUDE_DIRS}") + ADD_LIBRARY_THRIFT(thrift_c_glib_zlib ${thrift_c_glib_zlib_SOURCES}) + target_link_libraries(thrift_c_glib_zlib ${SYSLIBS} ${ZLIB_LIBRARIES}) + target_link_libraries(thrift_c_glib_zlib thrift_c_glib) +diff --git a/lib/c_glib/test/CMakeLists.txt b/lib/c_glib/test/CMakeLists.txt +index 85c6dd0..0c8d3d2 100644 +--- a/lib/c_glib/test/CMakeLists.txt ++++ b/lib/c_glib/test/CMakeLists.txt +@@ -129,7 +129,7 @@ target_link_libraries(testthriftmemorybufferreadcheck testgenc) + add_test(NAME testthriftmemorybufferreadcheck COMMAND testthriftmemorybufferreadcheck) + + if(WITH_ZLIB) +- include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${ZLIB_INCLUDE_DIRS}") + add_executable(testzlibtransport testzlibtransport.c) + target_link_libraries(testzlibtransport testgenc ${ZLIB_LIBRARIES}) + target_link_libraries(testzlibtransport thrift_c_glib_zlib) +diff --git a/lib/cpp/CMakeLists.txt b/lib/cpp/CMakeLists.txt +index 13b41c5..96bea53 100644 +--- a/lib/cpp/CMakeLists.txt ++++ b/lib/cpp/CMakeLists.txt +@@ -111,7 +111,7 @@ if(OPENSSL_FOUND AND WITH_OPENSSL) + list(APPEND SYSLIBS OpenSSL::Crypto) + endif() + else() +- include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${OPENSSL_INCLUDE_DIR}") + list(APPEND SYSLIBS "${OPENSSL_LIBRARIES}") + endif() + endif() +@@ -167,8 +167,7 @@ ADD_PKGCONFIG_THRIFT(thrift) + + if(WITH_LIBEVENT) + find_package(Libevent REQUIRED) # Libevent comes with CMake support from upstream +- include_directories(SYSTEM ${LIBEVENT_INCLUDE_DIRS}) +- ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${LIBEVENT_INCLUDE_DIRS}") + ADD_LIBRARY_THRIFT(thriftnb ${thriftcppnb_SOURCES}) + target_link_libraries(thriftnb PUBLIC thrift) + if(TARGET libevent::core AND TARGET libevent::extra) +@@ -182,7 +181,7 @@ endif() + + if(WITH_ZLIB) + find_package(ZLIB REQUIRED) +- include_directories(SYSTEM ${ZLIB_INCLUDE_DIRS}) ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${ZLIB_INCLUDE_DIRS}") + + ADD_LIBRARY_THRIFT(thriftz ${thriftcppz_SOURCES}) + target_link_libraries(thriftz PUBLIC thrift) +diff --git a/lib/cpp/test/CMakeLists.txt b/lib/cpp/test/CMakeLists.txt +index 19854e1..1b36b47 100644 +--- a/lib/cpp/test/CMakeLists.txt ++++ b/lib/cpp/test/CMakeLists.txt +@@ -127,7 +127,7 @@ endif () + add_test(NAME TServerIntegrationTest COMMAND TServerIntegrationTest) + + if(WITH_ZLIB) +-include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}") ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${ZLIB_INCLUDE_DIRS}") + add_executable(TransportTest TransportTest.cpp) + target_link_libraries(TransportTest + testgencpp +diff --git a/test/c_glib/CMakeLists.txt b/test/c_glib/CMakeLists.txt +index 410774d..cbda860 100644 +--- a/test/c_glib/CMakeLists.txt ++++ b/test/c_glib/CMakeLists.txt +@@ -21,14 +21,14 @@ + include(ThriftMacros) + + find_package(GLIB REQUIRED COMPONENTS gobject) +-include_directories(SYSTEM "${GLIB_INCLUDE_DIR}") +-include_directories(SYSTEM "${GLIBCONFIG_INCLUDE_DIR}") ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${GLIB_INCLUDE_DIR}") ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${GLIBCONFIG_INCLUDE_DIR}") + + #Make sure gen-c_glib files can be included + include_directories("${CMAKE_CURRENT_BINARY_DIR}") + include_directories("${CMAKE_CURRENT_BINARY_DIR}/gen-c_glib") + include_directories("${PROJECT_SOURCE_DIR}/lib/c_glib/src") +-include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}") ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${OPENSSL_INCLUDE_DIR}") + + set(crosstestgencglib_SOURCES + gen-c_glib/t_test_second_service.c +diff --git a/test/cpp/CMakeLists.txt b/test/cpp/CMakeLists.txt +index a6c1fd5..160c67b 100644 +--- a/test/cpp/CMakeLists.txt ++++ b/test/cpp/CMakeLists.txt +@@ -27,13 +27,13 @@ REQUIRE_BOOST_LIBRARIES(BOOST_COMPONENTS) + include(ThriftMacros) + + find_package(OpenSSL REQUIRED) +-include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}") ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${OPENSSL_INCLUDE_DIR}") + + find_package(Libevent REQUIRED) # Libevent comes with CMake support from upstream +-include_directories(SYSTEM ${LIBEVENT_INCLUDE_DIRS}) ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${LIBEVENT_INCLUDE_DIRS}") + + find_package(ZLIB REQUIRED) +-include_directories(SYSTEM ${ZLIB_INCLUDE_DIRS}) ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${ZLIB_INCLUDE_DIRS}") + + #Make sure gen-cpp files can be included + include_directories("${CMAKE_CURRENT_BINARY_DIR}") +-- +2.39.1 + diff --git a/meta-oe/recipes-connectivity/thrift/thrift_0.17.0.bb b/meta-oe/recipes-connectivity/thrift/thrift_0.17.0.bb index 24d07b8e52..216af02c42 100644 --- a/meta-oe/recipes-connectivity/thrift/thrift_0.17.0.bb +++ b/meta-oe/recipes-connectivity/thrift/thrift_0.17.0.bb @@ -10,6 +10,7 @@ DEPENDS = "thrift-native boost flex-native bison-native openssl zlib" SRC_URI = "https://www-eu.apache.org/dist/thrift//${PV}/${BPN}-${PV}.tar.gz \ file://0001-DefineInstallationPaths.cmake-Define-libdir-in-terms.patch \ + file://0001-cmake-Use-idirafter-instead-of-isystem.patch \ " SRC_URI[sha256sum] = "b272c1788bb165d99521a2599b31b97fa69e5931d099015d91ae107a0b0cc58f" From patchwork Sat Jan 21 18:01:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18440 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 93976C25B50 for ; Sat, 21 Jan 2023 18:01:57 +0000 (UTC) Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by mx.groups.io with SMTP id smtpd.web11.2064.1674324094311231906 for ; Sat, 21 Jan 2023 10:01:48 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=fbCDpRLK; spf=pass (domain: gmail.com, ip: 209.85.216.42, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f42.google.com with SMTP id m3-20020a17090a414300b00229ef93c5b0so7072497pjg.2 for ; Sat, 21 Jan 2023 10:01:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tYIH0P1UsYnlWBWpM4vNunz65KQ/kwfxZ4ZmlmYhsok=; b=fbCDpRLKUWiFiUkv5twZavT9YVo8PAcwp9nRMqhhGUNN1FBjmzUP0iYklIeJy7pmJR +Wq9VZb3uFEnAFyGY7hM195+14OQ6rDspNG9tHaKbwXtaY+VMbnGyePXTdqaR5bWZfll KzjFhSUuJcBbpHimOItOA9MfekeyDvL9PhWY/02BGRK1krbcIIAXjVTPuvkWi0MjMDwT O6IKtSWmxu9H+xTtm/75E0rDhvZxEqB0E2Zb8uB98HAvlguVlqSqB/FHmJH+nztE6TsB /cXfr/8sAs2G5VnW01IA6UdNy6H86nEnH6tXGZSlpMIpuaBamNGTpKa+qyQtS+aV0MRE sw/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tYIH0P1UsYnlWBWpM4vNunz65KQ/kwfxZ4ZmlmYhsok=; b=XecuWLspfSLE8EGewBgJvqcusu5McNkRH8FbX4sWRh6h7lZgf/qCa+kh+0roR0bSQ7 0xBF3JFBb21rytY8ELBOK98Qqx94pIN3dUW6+p8zVI3RtqvlwJ0fylQRcJZXihnjWYL+ +qMM05bYAEQ2ngvHGKEb40WLP97bbUkE8hYoWkVEEW6BtrsG/WtZ0Jd7+guAT5gj5IkG U3J6NbHJEHD6vEYGxS1WMRxoxzeGZgf/hdY0eUWRww1bAj/4HJ87ZJjBRslzJXXlmkZh nBXTukiFUFgPZYqwtzHQUKSturHuopkK/EWs8cskm4CUCLTB2mlbGaM9AWF+TL9KpjRg 4Iuw== X-Gm-Message-State: AFqh2koxb7wA8PMO/XgmJX0Ztc4vU8vRLPCLefB4NVTHtXh1z119nTne Tx6uJEqzB2RLSVhCapydU0KLopCpQKaHCQ== X-Google-Smtp-Source: AMrXdXu8RmKdlrCcpMFqJELMWMvNpIF45UUPn7zHpGwGBqeTof2wH+TUUu+UQvN7WkvyE5zBilV8cg== X-Received: by 2002:a17:90b:1d81:b0:22b:b51a:5652 with SMTP id pf1-20020a17090b1d8100b0022bb51a5652mr5963446pjb.26.1674324107440; Sat, 21 Jan 2023 10:01:47 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id d15-20020a17090a02cf00b00226c2d90c04sm3623583pjd.38.2023.01.21.10.01.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Jan 2023 10:01:47 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 29/30] libcereal: Use -idirafter instead of -isystem Date: Sat, 21 Jan 2023 10:01:20 -0800 Message-Id: <20230121180121.1229895-29-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230121180121.1229895-1-raj.khem@gmail.com> References: <20230121180121.1229895-1-raj.khem@gmail.com> 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, 21 Jan 2023 18:01:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100696 Signed-off-by: Khem Raj --- ...ake-Use-idirafter-instead-of-isystem.patch | 52 +++++++++++++++++++ .../libcereal/libcereal_1.3.2.bb | 1 + 2 files changed, 53 insertions(+) create mode 100644 meta-oe/recipes-support/libcereal/files/0001-cmake-Use-idirafter-instead-of-isystem.patch diff --git a/meta-oe/recipes-support/libcereal/files/0001-cmake-Use-idirafter-instead-of-isystem.patch b/meta-oe/recipes-support/libcereal/files/0001-cmake-Use-idirafter-instead-of-isystem.patch new file mode 100644 index 0000000000..fc30f0ad7c --- /dev/null +++ b/meta-oe/recipes-support/libcereal/files/0001-cmake-Use-idirafter-instead-of-isystem.patch @@ -0,0 +1,52 @@ +From ac70933783a70d5387a2bb2849c568e33ba52558 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 21 Jan 2023 01:41:32 -0800 +Subject: [PATCH] cmake: Use -idirafter instead of -isystem + +isystem dirs are searched before the regular system dirs +this exposes an interesting include ordering problem when using +clang + libc++, when including C++ headers like + +cstdlib includes stdlib.h and in case of libc++, this should be coming +from libc++ as well, which is then eventually including system stdlib.h + +libc++ has added a check for checking this order recently, which means +if cstlib ends up including system stdlib.h before libc++ provided +stdlib.h it errors out + +| /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/libcereal/1.3.2+gitAUTOINC+ebef1e9298-r0/recipe-sysroot/usr/include/c++/v1/cwchar:113:5: error: tried including but didn't find libc++'s header. This usually means that your header search paths are not configured properly. The header search paths should contain the C++ Standard Library headers before any C Standard + Library, and you are probably using compiler flags that make that not be the case. | # error tried including but didn't find libc++'s header. \ +| ^ + +The reason is that include_directories with SYSTEM property adds the +directory via -system and some of these directories point to sysroot +e.g. OPENSSL_INCLUDE_DIR which ends up adding -isystem +/usr/include and causes the system stdlib.h to included before +libc++ stdlib.h + +A fix is to use -idirafter which preserved the effects of system headers +but instead of prepending, it will append to system headers and the +issue is addressed + +Upstream-Status: Submitted [https://github.com/USCiLab/cereal/pull/777] +Signed-off-by: Khem Raj +--- + unittests/boost/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/unittests/boost/CMakeLists.txt b/unittests/boost/CMakeLists.txt +index 1d733bc7..08e6a169 100644 +--- a/unittests/boost/CMakeLists.txt ++++ b/unittests/boost/CMakeLists.txt +@@ -1,6 +1,6 @@ + file(GLOB TESTS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp) + +-include_directories(SYSTEM ${Boost_INCLUDE_DIRS}) ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${Boost_INCLUDE_DIRS}") + + # Build all of the non-special tests + foreach(TEST_SOURCE ${TESTS}) +-- +2.39.1 + diff --git a/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb b/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb index a40d2bc2e6..f15927554b 100644 --- a/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb +++ b/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb @@ -20,6 +20,7 @@ PV .= "+git${SRCPV}" SRCREV = "ebef1e929807629befafbb2918ea1a08c7194554" SRC_URI = "git://github.com/USCiLab/cereal.git;branch=master;protocol=https \ file://0001-sandbox-Do-not-use-int8_t-in-std-uniform_int_distrib.patch \ + file://0001-cmake-Use-idirafter-instead-of-isystem.patch \ file://run-ptest \ " From patchwork Sat Jan 21 18:01:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18442 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 8EFEAC004D4 for ; Sat, 21 Jan 2023 18:01:57 +0000 (UTC) Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by mx.groups.io with SMTP id smtpd.web11.2064.1674324094311231906 for ; Sat, 21 Jan 2023 10:01:48 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=hqunF+Hv; spf=pass (domain: gmail.com, ip: 209.85.216.42, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f42.google.com with SMTP id m3-20020a17090a414300b00229ef93c5b0so7072521pjg.2 for ; Sat, 21 Jan 2023 10:01:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=onEkt8ehE1cmwpU8sNmV6QqiWzqU5NoJT5ts0vVnNwM=; b=hqunF+HvmKZEg/btVsXgpXyNgwuqlGhV6Zz8pV6Fpbw0MFeqd9DIL9zNEwMblQaExU l0f8T52j4LRUJS7rWjNsKEe09bRUA3ZB1IVrOUFvSgPfLbv2OyUUZ/gAMe2cNPF30Nol bgzOGU3NxEJxE6H700FeERHqMS/Nc9Ibe1rgt1Y4uwWL9aV7FPBbGSfhf7ntlBwN5W0B dUS5IsoX2e0XuC+ud96hV8MsMRsL5woNFrzQwTsFs+910pZC6y+0+5AIO+6TKWZcEdm7 VPJAPqJpZbOuUB2Zf2toYOJ3ojBEI4aFDMdhjU4jMAKoqlF4lzXifXEH8WQaL7eQy0kq ODLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=onEkt8ehE1cmwpU8sNmV6QqiWzqU5NoJT5ts0vVnNwM=; b=KSAe472ov50SaN++gj0nEPj1Pomq0Z5UzlxNsxT6waxxTbSoZEkYnfhD2z9HCK203l 7Go8z3fwQ+9fVDVjGi+HcuJD/mbtLYxOWhbSfYIOiKcXVTGd1xh+6UaObWmiLB2MlUD1 CgwUpKoxKjzgUP6QgDCATiH3IobffSWLmDD2UBbPGWNGNBR/1Bs4lqD9LY1DNGcmxHeK wC20YmoQEGbyvpvDwXh7A9MblwLSuDgk51Y01F3yolKfO2sR0Ixqi21H/poZ/qz3eOQG rwZb5Mp3vUor8NqA95SFwbp4ZuA2KfvmrW22G3JP3X0X/wx0ruDeIQkvCSPPaIo9ZAOy r7pA== X-Gm-Message-State: AFqh2krKZl3fqJ6TkHB24saqmUAE+NzMNNFt6qllNMw0eePV9cvFKxg/ ZJunxcpD3DWhlWS5cubCiltW1rcKH5h4eQ== X-Google-Smtp-Source: AMrXdXugTPi+8sDRr6RTw5zun3Wdw39Q2dj2qKqlfq+AM13vL69m6UA4DkFetfO0U/SAe2/QENIafA== X-Received: by 2002:a17:90b:4f8b:b0:22b:b9d9:48e7 with SMTP id qe11-20020a17090b4f8b00b0022bb9d948e7mr5067830pjb.39.1674324108242; Sat, 21 Jan 2023 10:01:48 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id d15-20020a17090a02cf00b00226c2d90c04sm3623583pjd.38.2023.01.21.10.01.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Jan 2023 10:01:47 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 30/30] poppler: cmake: Do not use -isystem Date: Sat, 21 Jan 2023 10:01:21 -0800 Message-Id: <20230121180121.1229895-30-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230121180121.1229895-1-raj.khem@gmail.com> References: <20230121180121.1229895-1-raj.khem@gmail.com> 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, 21 Jan 2023 18:01:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100697 Signed-off-by: Khem Raj --- .../0001-cmake-Do-not-use-isystem.patch | 192 ++++++++++++++++++ .../poppler/poppler_23.01.0.bb | 1 + 2 files changed, 193 insertions(+) create mode 100644 meta-oe/recipes-support/poppler/poppler/0001-cmake-Do-not-use-isystem.patch diff --git a/meta-oe/recipes-support/poppler/poppler/0001-cmake-Do-not-use-isystem.patch b/meta-oe/recipes-support/poppler/poppler/0001-cmake-Do-not-use-isystem.patch new file mode 100644 index 0000000000..44a22963af --- /dev/null +++ b/meta-oe/recipes-support/poppler/poppler/0001-cmake-Do-not-use-isystem.patch @@ -0,0 +1,192 @@ +From 51a2a1e4d8ca4040a6a7eac398cb704da35f39e5 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 21 Jan 2023 03:09:08 -0800 +Subject: [PATCH] cmake: Do not use -isystem + +isystem dirs are searched before the regular system dirs +this exposes an interesting include ordering problem when using +clang + libc++, when including C++ headers like + +cstdlib includes stdlib.h and in case of libc++, this should be coming +from libc++ as well, which is then eventually including system stdlib.h + +libc++ has added a check for checking this order recently, which means +if cstlib ends up including system stdlib.h before libc++ provided +stdlib.h it errors out + +/mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/thrift/0.17.0-r0/recipe-sysroot/usr/include/c++/v1/cstdlib:90:5: error: tried including but didn't find libc++'s header. This usually means that your header search paths are not configured properly. The header search paths should contain the C++ Standard Library headers before any C Standard Library, and you are probably using compiler flags that make that not be the case. + ^ + +The reason is that include_directories with SYSTEM property adds the +directory via -system and some of these directories point to sysroot +e.g. OPENSSL_INCLUDE_DIR which ends up adding -isystem +/usr/include and causes the system stdlib.h to included before +libc++ stdlib.h + +A fix is to use -idirafter which preserved the effects of system headers +but instead of prepending, it will append to system headers and the +issue is addressed + +Signed-off-by: Khem Raj +--- + CMakeLists.txt | 4 ++-- + glib/CMakeLists.txt | 4 ++-- + qt5/src/CMakeLists.txt | 4 ++-- + qt6/src/CMakeLists.txt | 4 ++-- + test/CMakeLists.txt | 6 +++--- + utils/CMakeLists.txt | 10 +++++----- + 6 files changed, 16 insertions(+), 16 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4768ac8..cdc014d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -603,10 +603,10 @@ add_library(poppler ${poppler_SRCS}) + if (OpenJPEG_FOUND) + # check if we can remove this when we depend on newer openjpeg versions, 2.5 seems fixed + # target openjp2 may lack interface include directories +- target_include_directories(poppler SYSTEM PRIVATE ${OPENJPEG_INCLUDE_DIRS}) ++ target_include_directories(poppler PRIVATE ${OPENJPEG_INCLUDE_DIRS}) + endif() + if(USE_CMS) +- target_include_directories(poppler SYSTEM PRIVATE ${LCMS2_INCLUDE_DIR}) ++ target_include_directories(poppler PRIVATE ${LCMS2_INCLUDE_DIR}) + endif() + generate_export_header(poppler BASE_NAME poppler-private EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/poppler_private_export.h") + set_target_properties(poppler PROPERTIES VERSION 126.0.0 SOVERSION 126) +diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt +index 52e8687..08ab39a 100644 +--- a/glib/CMakeLists.txt ++++ b/glib/CMakeLists.txt +@@ -4,7 +4,7 @@ include_directories( + ) + + include_directories( +- SYSTEM ++ + ${GLIB2_INCLUDE_DIRS} + ${CAIRO_INCLUDE_DIRS} + ) +@@ -96,7 +96,7 @@ if(MINGW AND BUILD_SHARED_LIBS) + set_target_properties(poppler-glib PROPERTIES SUFFIX "-${POPPLER_GLIB_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}") + endif() + target_link_libraries(poppler-glib poppler PkgConfig::GLIB2 ${CAIRO_LIBRARIES} Freetype::Freetype) +-target_include_directories(poppler-glib SYSTEM PRIVATE ${CAIRO_INCLUDE_DIRS}) ++target_include_directories(poppler-glib PRIVATE ${CAIRO_INCLUDE_DIRS}) + install(TARGETS poppler-glib RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + + install(FILES +diff --git a/qt5/src/CMakeLists.txt b/qt5/src/CMakeLists.txt +index 5db3a6c..f242d29 100644 +--- a/qt5/src/CMakeLists.txt ++++ b/qt5/src/CMakeLists.txt +@@ -45,11 +45,11 @@ if(MINGW AND BUILD_SHARED_LIBS) + endif() + target_link_libraries(poppler-qt5 poppler Qt5::Core Qt5::Gui Qt5::Xml Freetype::Freetype) + if (ENABLE_NSS3) +- target_include_directories(poppler-qt5 SYSTEM PRIVATE ${NSS3_INCLUDE_DIRS}) ++ target_include_directories(poppler-qt5 PRIVATE ${NSS3_INCLUDE_DIRS}) + endif() + if(USE_CMS) + target_link_libraries(poppler-qt5 poppler ${LCMS2_LIBRARIES}) +- target_include_directories(poppler-qt5 SYSTEM PRIVATE ${LCMS2_INCLUDE_DIR}) ++ target_include_directories(poppler-qt5 PRIVATE ${LCMS2_INCLUDE_DIR}) + endif() + install(TARGETS poppler-qt5 RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + +diff --git a/qt6/src/CMakeLists.txt b/qt6/src/CMakeLists.txt +index cd91975..6c42e12 100644 +--- a/qt6/src/CMakeLists.txt ++++ b/qt6/src/CMakeLists.txt +@@ -45,11 +45,11 @@ if(MINGW AND BUILD_SHARED_LIBS) + endif() + target_link_libraries(poppler-qt6 poppler Qt6::Core Qt6::Gui Freetype::Freetype) + if (ENABLE_NSS3) +- target_include_directories(poppler-qt6 SYSTEM PRIVATE ${NSS3_INCLUDE_DIRS}) ++ target_include_directories(poppler-qt6 PRIVATE ${NSS3_INCLUDE_DIRS}) + endif() + if(USE_CMS) + target_link_libraries(poppler-qt6 poppler ${LCMS2_LIBRARIES}) +- target_include_directories(poppler-qt6 SYSTEM PRIVATE ${LCMS2_INCLUDE_DIR}) ++ target_include_directories(poppler-qt6 PRIVATE ${LCMS2_INCLUDE_DIR}) + endif() + install(TARGETS poppler-qt6 RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index afa1352..9bd3b9a 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -23,7 +23,7 @@ if (GTK_FOUND) + ) + poppler_add_test(gtk-test BUILD_GTK_TESTS ${gtk_splash_test_SRCS}) + target_link_libraries(gtk-test ${CAIRO_LIBRARIES} poppler-glib PkgConfig::GTK3) +- target_include_directories(gtk-test SYSTEM PRIVATE ${CAIRO_INCLUDE_DIRS}) ++ target_include_directories(gtk-test PRIVATE ${CAIRO_INCLUDE_DIRS}) + + if (HAVE_CAIRO) + +@@ -35,7 +35,7 @@ if (GTK_FOUND) + ) + poppler_add_test(pdf-inspector BUILD_GTK_TESTS ${pdf_inspector_SRCS}) + target_link_libraries(pdf-inspector ${CAIRO_LIBRARIES} Freetype::Freetype ${common_libs} PkgConfig::GTK3 poppler) +- target_include_directories(pdf-inspector SYSTEM PRIVATE ${CAIRO_INCLUDE_DIRS}) ++ target_include_directories(pdf-inspector PRIVATE ${CAIRO_INCLUDE_DIRS}) + target_compile_definitions(pdf-inspector PRIVATE -DSRC_DIR="${CMAKE_CURRENT_SOURCE_DIR}") + endif () + +@@ -59,7 +59,7 @@ if (HAVE_CAIRO) + ) + add_executable(cairo-thread-test ${cairo_thread_test_SRCS}) + target_link_libraries(cairo-thread-test ${CAIRO_LIBRARIES} Freetype::Freetype Threads::Threads poppler) +- target_include_directories(cairo-thread-test SYSTEM PRIVATE ${CAIRO_INCLUDE_DIRS}) ++ target_include_directories(cairo-thread-test PRIVATE ${CAIRO_INCLUDE_DIRS}) + endif () + endif () + +diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt +index 1c3ebcb..bc1840a 100644 +--- a/utils/CMakeLists.txt ++++ b/utils/CMakeLists.txt +@@ -16,7 +16,7 @@ add_executable(pdftoppm ${pdftoppm_SOURCES}) + target_link_libraries(pdftoppm ${common_libs}) + if(LCMS2_FOUND) + target_link_libraries(pdftoppm ${LCMS2_LIBRARIES}) +- target_include_directories(pdftoppm SYSTEM PRIVATE ${LCMS2_INCLUDE_DIR}) ++ target_include_directories(pdftoppm PRIVATE ${LCMS2_INCLUDE_DIR}) + endif() + install(TARGETS pdftoppm DESTINATION bin) + install(FILES pdftoppm.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) +@@ -37,10 +37,10 @@ if (HAVE_CAIRO) + add_definitions(${CAIRO_CFLAGS}) + add_executable(pdftocairo ${pdftocairo_SOURCES}) + target_link_libraries(pdftocairo ${CAIRO_LIBRARIES} Freetype::Freetype ${common_libs}) +- target_include_directories(pdftocairo SYSTEM PRIVATE ${CAIRO_INCLUDE_DIRS}) ++ target_include_directories(pdftocairo PRIVATE ${CAIRO_INCLUDE_DIRS}) + if(LCMS2_FOUND) + target_link_libraries(pdftocairo ${LCMS2_LIBRARIES}) +- target_include_directories(pdftocairo SYSTEM PRIVATE ${LCMS2_INCLUDE_DIR}) ++ target_include_directories(pdftocairo PRIVATE ${LCMS2_INCLUDE_DIR}) + endif() + install(TARGETS pdftocairo DESTINATION bin) + install(FILES pdftocairo.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) +@@ -99,7 +99,7 @@ if (ENABLE_NSS3) + pdfsig.cc + ) + add_executable(pdfsig ${pdfsig_SOURCES}) +- target_include_directories(pdfsig SYSTEM PRIVATE ${NSS3_INCLUDE_DIRS}) ++ target_include_directories(pdfsig PRIVATE ${NSS3_INCLUDE_DIRS}) + target_link_libraries(pdfsig ${common_libs}) + install(TARGETS pdfsig DESTINATION bin) + install(FILES pdfsig.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) +@@ -114,7 +114,7 @@ add_executable(pdftops ${pdftops_SOURCES}) + target_link_libraries(pdftops ${common_libs}) + if(LCMS2_FOUND) + target_link_libraries(pdftops ${LCMS2_LIBRARIES}) +- target_include_directories(pdftops SYSTEM PRIVATE ${LCMS2_INCLUDE_DIR}) ++ target_include_directories(pdftops PRIVATE ${LCMS2_INCLUDE_DIR}) + endif() + install(TARGETS pdftops DESTINATION bin) + install(FILES pdftops.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) +-- +2.39.1 + diff --git a/meta-oe/recipes-support/poppler/poppler_23.01.0.bb b/meta-oe/recipes-support/poppler/poppler_23.01.0.bb index 849c35812d..4d1a089d7b 100644 --- a/meta-oe/recipes-support/poppler/poppler_23.01.0.bb +++ b/meta-oe/recipes-support/poppler/poppler_23.01.0.bb @@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ file://0001-Do-not-overwrite-all-our-build-flags.patch \ file://basename-include.patch \ + file://0001-cmake-Do-not-use-isystem.patch \ " SRC_URI[sha256sum] = "fae9b88d3d5033117d38477b79220cfd0d8e252c278ec870ab1832501741fd94"