From patchwork Tue May 21 18:10:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 43939 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 2D47DC25B74 for ; Tue, 21 May 2024 18:10:38 +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.web11.3089.1716315028163201691 for ; Tue, 21 May 2024 11:10:28 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=f84/WHYm; 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 d9443c01a7336-1ee38966529so774265ad.1 for ; Tue, 21 May 2024 11:10:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716315027; x=1716919827; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=S90XyFejNHJ2N0qgSC012XAl7AylnrJIKFqUMfJ/aYw=; b=f84/WHYmn3ann1T5NBY01oGf/z+GUnFmUCChrENJ/tqJJgmXF3qrQm0hLCtG86kYpH VRK+RhOkZUv2SKLnj3s4r2LHTXfKh4RqMdnmnd5wiHRC4baeGOSGbVYezlMOwEgQovp6 uUsH3ys+02Fk6jc/e0VSEs1Pjlxk/tSqiT3B0ebl8sHKWx6+hCZEoLfsfoiljjghRzZu Hz4Q1dPC4XKNlc+SgbIABJ6u+EV2x16KTAKSEpFMs4UWEly6Rj0eA2b4v/Hk474dAEvT sWeqoR4SqwLzCK9c8wPV03es2o2MpTCtkuxsdlk6MrN+uKGy9qKOQ0xOz0HV+MDnX+f3 gKsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716315027; x=1716919827; 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=S90XyFejNHJ2N0qgSC012XAl7AylnrJIKFqUMfJ/aYw=; b=ZUIBBA7HGJ8Gr4AAN7LK1jdHeBGT5PNo7DKOpce3+5YKudFBmOzYyjKHS+l4JG1oMr o/Oe0J+s2gPwo/tRDlVvJ68v2OSwW2AIy9ooeMNXyBGWxgM0gQkOL05aovbfmagfSivk Xr7Tgw+Lm38kmZNIhc2rKyNsRYvCV436H0sbPAPWV2QNfd5jReghptXrSOOUfKVteOmM z4ic24XCmpLd3U1XGzj+nAzMcnUu6GRIQf2BR2bEKq/7c2x4BVSuJlWUfue8IySabzyQ UeE6vgYqxMIPDOREu9ku7t5cx8CHyHEssabbGEuQAAArsVgnIqUUa79JwExByPkvA+uO 3xOQ== X-Gm-Message-State: AOJu0YyobvMoj2UndyuysFrnxMJ/SGzqVTfMeJzF7Th9ThWXpc3v1tqA qM0W1SoLfnsZGrqrVHYBlg2xnvByCH8l9ajJ0BaM33zJsrTXMPyRqNF68qzXa20= X-Google-Smtp-Source: AGHT+IHGxm5/cyyltckswnjBSgjJvIMoEJHBNPTl69O8P/AdD9vAZS8ozh268DxHFhPkzch9cQ6Gtg== X-Received: by 2002:a17:903:41c7:b0:1f3:3b0:61a7 with SMTP id d9443c01a7336-1f303b06359mr79610925ad.12.1716315027269; Tue, 21 May 2024 11:10:27 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9d80:4380::e8eb]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1ef0c136354sm224799075ad.244.2024.05.21.11.10.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 May 2024 11:10:26 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][ 01/22] libsdl: Fix build with musl Date: Tue, 21 May 2024 11:10:02 -0700 Message-ID: <20240521181024.426176-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.45.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 ; Tue, 21 May 2024 18:10:38 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/110450 Signed-off-by: Khem Raj --- ...iconv-use-portable-across-glibc-musl.patch | 52 +++++++++++++++++++ .../recipes-graphics/libsdl/libsdl_1.2.15.bb | 1 + 2 files changed, 53 insertions(+) create mode 100644 meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/0001-stdlib-Make-iconv-use-portable-across-glibc-musl.patch diff --git a/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/0001-stdlib-Make-iconv-use-portable-across-glibc-musl.patch b/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/0001-stdlib-Make-iconv-use-portable-across-glibc-musl.patch new file mode 100644 index 0000000000..2007766f74 --- /dev/null +++ b/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/0001-stdlib-Make-iconv-use-portable-across-glibc-musl.patch @@ -0,0 +1,52 @@ +From 6c35fc94ca30a4d0662479f7ef8a704d97aa7352 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 18 May 2024 18:13:30 -0700 +Subject: [PATCH] stdlib: Make iconv use portable across glibc/musl + +This is a backport from libsdl2 + +Upstream-Status: Backport [https://github.com/libsdl-org/SDL/blob/main/src/stdlib/SDL_iconv.c#L49C1-L51C1] +Signed-off-by: Khem Raj +--- + src/stdlib/SDL_iconv.c | 19 ++++--------------- + 1 file changed, 4 insertions(+), 15 deletions(-) + +diff --git a/src/stdlib/SDL_iconv.c b/src/stdlib/SDL_iconv.c +index fa56a99..087b6ec 100644 +--- a/src/stdlib/SDL_iconv.c ++++ b/src/stdlib/SDL_iconv.c +@@ -28,27 +28,16 @@ + + #ifdef HAVE_ICONV + +-/* Depending on which standard the iconv() was implemented with, +- iconv() may or may not use const char ** for the inbuf param. +- If we get this wrong, it's just a warning, so no big deal. +-*/ +-#if defined(_XGP6) || \ +- defined(__GLIBC__) && ((__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2)) +-#define ICONV_INBUF_NONCONST +-#endif +- + #include + + size_t SDL_iconv(SDL_iconv_t cd, + const char **inbuf, size_t *inbytesleft, + char **outbuf, size_t *outbytesleft) + { +- size_t retCode; +-#ifdef ICONV_INBUF_NONCONST +- retCode = iconv(cd, (char **)inbuf, inbytesleft, outbuf, outbytesleft); +-#else +- retCode = iconv(cd, inbuf, inbytesleft, outbuf, outbytesleft); +-#endif ++ /* iconv's second parameter may or may not be `const char const *` depending on the ++ C runtime's whims. Casting to void * seems to make everyone happy, though. */ ++ ++ const size_t retCode = iconv((iconv_t)((uintptr_t)cd), (void *)inbuf, inbytesleft, outbuf, outbytesleft); + if ( retCode == (size_t)-1 ) { + switch(errno) { + case E2BIG: +-- +2.45.1 + diff --git a/meta-oe/recipes-graphics/libsdl/libsdl_1.2.15.bb b/meta-oe/recipes-graphics/libsdl/libsdl_1.2.15.bb index 4fc4679f7f..1f436c6d7f 100644 --- a/meta-oe/recipes-graphics/libsdl/libsdl_1.2.15.bb +++ b/meta-oe/recipes-graphics/libsdl/libsdl_1.2.15.bb @@ -15,6 +15,7 @@ SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ file://libsdl-1.2.15-xdata32.patch \ file://pkgconfig.patch \ file://0001-build-Pass-tag-CC-explictly-when-using-libtool.patch \ + file://0001-stdlib-Make-iconv-use-portable-across-glibc-musl.patch \ file://CVE-2019-7577.patch \ file://CVE-2019-7574.patch \ file://CVE-2019-7572.patch \ From patchwork Tue May 21 18:10:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 43943 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 3C507C25B7D for ; Tue, 21 May 2024 18:10:38 +0000 (UTC) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by mx.groups.io with SMTP id smtpd.web10.3045.1716315029722569823 for ; Tue, 21 May 2024 11:10:29 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=lDtUzkte; spf=pass (domain: gmail.com, ip: 209.85.214.175, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-1ec4dc64c6cso3505365ad.0 for ; Tue, 21 May 2024 11:10:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716315029; x=1716919829; darn=lists.openembedded.org; 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=z0KxQrfFr+RjOyonqJMkC/E2Uwv7W6nQs5LoBMf2cC0=; b=lDtUzkte92zM/1NK951DqlFy1sqg7b0TUmJ9srl0O/QpWufqZFduyBQxdnsYCcGgWb HT2/UDuje8NO+iO+sbUNTHg6/blf65kLIFrn67qIz5xx3qG40DnMnDqiDnSCRa1uAH+5 rHA4yoOm5ooNJd5J1rUa0h682HMsCDRxfWJJbUglUgOue6DFQ+FmW0xPTnkmseGT7Yy/ ZSmhogSq3GTgoz9STjE6xacKJxlQMXyx/AAuIKt+kNxFxMi3Xg7DChFXqNGehl2+dLjB PXurcz95jAmYMElc0doNxRcOefHO62MKDD/JAQT1ytg6QmVujSKK/U8x/WOYZDYuNOgm u9hA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716315029; x=1716919829; 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=z0KxQrfFr+RjOyonqJMkC/E2Uwv7W6nQs5LoBMf2cC0=; b=cclOMoDr3JmnGbDSAes6cnG8U2SbHrvLhD37NVdr2sKU+/Dlmgjs6EeYIwd1JcYG7f h5w9w+lju4Fk3FqzL4ugrtXyZZYB7hquVcyM4zIQTEsujGUi7aQuNKRQto+4ajaw59GA P7Fdmmpe+kVq24oeMJ4hPYG98l+2DqaXfFf38pB1+gfFnigh1YELoTzFrPNHo7R7zuuZ UMDV9iMKss2j10AlzJrwExT5dt0ZBGnz0V/uNKhcTTKTaKVeRAcXsN/lqVz6xdGiovXW UztQf0Yoz7t5xg0yYDfhOicEBD5LdO14OoI+674SyJ3yFyE22qUau8j/EGux8f6yvIsk 9t6g== X-Gm-Message-State: AOJu0Yw0kmJ9weZvlgadIgxX3HzONvsRhd0rniqTAtLL84uX1V6PV5Gj JnxnLuTw8Sp4H3lbtQRKNEUiHv+wPRHITZVRxEA5jufIrQ8qDJZ58i99iU6QprM= X-Google-Smtp-Source: AGHT+IEPsSHOMrRkEXf8f+VFwrjLrpu6fMDSZR3oyU3Hvg5gvQOg11LQaJtS12wy86nHa/BUy1AJBg== X-Received: by 2002:a17:902:f691:b0:1f2:fdec:d29b with SMTP id d9443c01a7336-1f2fdecd5cemr79490155ad.49.1716315028608; Tue, 21 May 2024 11:10:28 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9d80:4380::e8eb]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1ef0c136354sm224799075ad.244.2024.05.21.11.10.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 May 2024 11:10:27 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-gnome][ 02/22] folks: Upgrade to 0.15.9 Date: Tue, 21 May 2024 11:10:03 -0700 Message-ID: <20240521181024.426176-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240521181024.426176-1-raj.khem@gmail.com> References: <20240521181024.426176-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 ; Tue, 21 May 2024 18:10:38 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/110451 Signed-off-by: Khem Raj --- .../folks/{folks_0.15.8.bb => folks_0.15.9.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-gnome/recipes-connectivity/folks/{folks_0.15.8.bb => folks_0.15.9.bb} (92%) diff --git a/meta-gnome/recipes-connectivity/folks/folks_0.15.8.bb b/meta-gnome/recipes-connectivity/folks/folks_0.15.9.bb similarity index 92% rename from meta-gnome/recipes-connectivity/folks/folks_0.15.8.bb rename to meta-gnome/recipes-connectivity/folks/folks_0.15.9.bb index 4d26817107..899b8da261 100644 --- a/meta-gnome/recipes-connectivity/folks/folks_0.15.8.bb +++ b/meta-gnome/recipes-connectivity/folks/folks_0.15.9.bb @@ -25,4 +25,4 @@ PACKAGECONFIG ??= "" inherit pkgconfig gnomebase gettext gobject-introspection vala features_check -SRC_URI[archive.sha256sum] = "954a6afb3e378f01d310fd443790f235cb0eb71e2139cff4f05f09ab725e49c2" +SRC_URI[archive.sha256sum] = "2311b37355c351f33f163fdc394874a22a0a0682c319493d6d8a6e420711415f" From patchwork Tue May 21 18:10:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 43947 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 7C745C27C43 for ; Tue, 21 May 2024 18:10:38 +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.3090.1716315030234051887 for ; Tue, 21 May 2024 11:10:30 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=mwEzpP5a; 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 d9443c01a7336-1ec4dc64c6cso3505405ad.0 for ; Tue, 21 May 2024 11:10:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716315029; x=1716919829; darn=lists.openembedded.org; 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=jRtaQ5HluQak9rMe3/ErNqMR1MLJzdOvV0Adr+bdlFM=; b=mwEzpP5aBCgU/EoEmnAHLfILrw7GV8XyavkedDH8MZMW5VD5toGUjom0VQeZM8/puf El2YVRygkDjoz02V5Vbnoly5pFrJs6q+CBd/GjvCfnNWfjF1ooiAUqdpeja/Hw94gxt9 Wqtx1DpI8hBW5MM1XGYDst/VSq5nHIn8/TRnfh0F4M0hXlKFo5CA6e/tViyLsfiVcXMX 9EXSncBn6S6nCsCWEqRc56QO7YFVscNjEeN8wu7NbVU0DB3K48FqvkNZ0h78CMgKA/Vq difibpho770ogjD9gswrCAWRDVi0PXnF9F06ok22Vhz3/KLRBzJsc8vJBkeXSrmWc3yb 79Pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716315029; x=1716919829; 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=jRtaQ5HluQak9rMe3/ErNqMR1MLJzdOvV0Adr+bdlFM=; b=bamX/J9i6jqrTNG0hX6FNlaX6j80zs3GLDDMZFS3HMPf/2Xlv0d6DHlGURxzZTwahk OUEuA80sHDiNnKUkhTNC9MLmYuvHicYz3BCIme66YYqZwPY3Zh/fo6ysyOofAdwMr3kC AFdvJOyCv1g5zcozowM/PuIaRE9CM7EcUTEGX/2QM5kEa5C28Fsccd2waSk5scgyDDFN LU+NDC6ht/3JVWpsMfa2eoFudaFD5Jtqn+Jo5R5pnjOyy0n5P3nsU9QXteNMTrKcrz0S 2alDrKPdSJNTutalA7qrgVCJ+A+N4TaLjoPuZ9PDCO8RqMnP/tt1dusUFyFXxxttShUn McuQ== X-Gm-Message-State: AOJu0Yx+7geL2zOrz8V8v0ME4vlw5yFA1VshDXfLk1QZfAM3TnJhrXsn JkHUQvQjpSSPVqEUr6yIZKLZwVqlXZI+Uzo9+5q+144WLuzHffxh4yFl7Tn+GV8= X-Google-Smtp-Source: AGHT+IF2ULkei/IFrSW3DnjrogOajxMm4qAZdT37soSdc/67LVgPOJmp2SgIkdC0YAYowg/CoSoLQg== X-Received: by 2002:a17:902:e809:b0:1f3:695:eeda with SMTP id d9443c01a7336-1f30695f16bmr58094775ad.61.1716315029415; Tue, 21 May 2024 11:10:29 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9d80:4380::e8eb]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1ef0c136354sm224799075ad.244.2024.05.21.11.10.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 May 2024 11:10:29 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-xfce][ 03/22] xfce4-notes-plugin: Upgrade to 1.11.0 Date: Tue, 21 May 2024 11:10:04 -0700 Message-ID: <20240521181024.426176-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240521181024.426176-1-raj.khem@gmail.com> References: <20240521181024.426176-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 ; Tue, 21 May 2024 18:10:38 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/110452 Signed-off-by: Khem Raj --- ...-notes-plugin_1.10.0.bb => xfce4-notes-plugin_1.11.0.bb} | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) rename meta-xfce/recipes-panel-plugins/notes/{xfce4-notes-plugin_1.10.0.bb => xfce4-notes-plugin_1.11.0.bb} (57%) diff --git a/meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.10.0.bb b/meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.11.0.bb similarity index 57% rename from meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.10.0.bb rename to meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.11.0.bb index 8c9768b1e3..0262620e6c 100644 --- a/meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.10.0.bb +++ b/meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.11.0.bb @@ -7,4 +7,8 @@ inherit xfce-panel-plugin DEPENDS += "gtk+3 libxfce4ui xfce4-panel xfconf" -SRC_URI[sha256sum] = "2ee4406042edd352a91e166c83b60d13220ef04dce3fa6b9e0eb13636d636929" +CFLAGS += "-Wno-error=incompatible-pointer-types" +SRC_URI[sha256sum] = "eb38246deb0fc89535fa9ff9b953c762cece232b5585d8210fab9abbf282aae3" + +# Add /usr/share/xfce4/notes/gtk-3.0/gtk.css +FILES:${PN} += "${datadir}/xfce4/notes" From patchwork Tue May 21 18:10:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 43948 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 88ACFC27C4E for ; Tue, 21 May 2024 18:10:38 +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.web10.3046.1716315031418183760 for ; Tue, 21 May 2024 11:10:31 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=O14APLJo; 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 d9443c01a7336-1ee0132a6f3so3483135ad.0 for ; Tue, 21 May 2024 11:10:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716315031; x=1716919831; darn=lists.openembedded.org; 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=GU9xvFeyZnDJryhNeRpbPyYKhkh1NO7qC0CMXJ/cRg8=; b=O14APLJoqkXJebe62M6nSAvMXz6UrKPfjh/XTgSzOrIg8jtib+Z+0TkCanKq7GSG6s E0ytaahvna/+gG3aM6oDXjofNP7FDngjZX9Al45hMC2fnOUQo2dzSyjI7c6ZMzvWiLNk N7RB9uxtU5Amaesc+iNrQtD8GI9WiQaoEavhYsdbnJffP9Z5VQBFJtzSTSclSx2PMhQB AsDSekeeMjFgiFmjKy6xRVkukqOvIflcR+rBNy9O/LxPxvehjie3ZLvA7DMGkpsV75/H R13bxHsC5yXmwDd1NNKRNs/2hEdd96fh8tAMbFis3nL8kVR0jB/m9YExOfTKT8OtFGhv gFRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716315031; x=1716919831; 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=GU9xvFeyZnDJryhNeRpbPyYKhkh1NO7qC0CMXJ/cRg8=; b=ulYYOmUzEFd1FJtMDjoRHw8liVdPQkPSJit1v3xL8gmaFWNmYmv1+sDKZl2NujbwLP BJSGhCGhd6yQ9oTKI+kUbclGhOhUepkYp6UcpHkRxvphpk63RI5mDHdt8xRRNwNaFGA2 ecUy39kGu3Ab0aYSPEnp/e+TbGB1BcFQ8sfVSLuxl+7c8Kw4H80f37FbZkd5vO0/oFwn YUEoS9RZK3lD9bmLrs1k1V6iRpt/soslAtyB5YUndab5z3GH6ba8UV3ZLBwxRv9JRa4E Wnmet3vWlQLeZVSJdAiLSokzMzbJScRDT2/hW82ZOYjWJhbr/QT9HDvkMmB2lfOz2QRe NcAA== X-Gm-Message-State: AOJu0Yzufxz1Nxx1xiPV7ew8KaYhf/fPCyMX6wMe14M4Sc9UwYDtkHAo YM3jWDVLo4D3H+aT9SW3yWhu9MTsVbvCK16LxykOKhEyGZ37EmFmqqJIVlF7J6o= X-Google-Smtp-Source: AGHT+IHkyLvYGUcfh2WFF9pTYl1NLFVWdVSBWN4yz/X+E7biZ0Bf10TNtJ4hOPqeLjcDKj9Uf2UK5A== X-Received: by 2002:a17:902:e54d:b0:1f3:244:c619 with SMTP id d9443c01a7336-1f30244c8e0mr73178775ad.7.1716315030601; Tue, 21 May 2024 11:10:30 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9d80:4380::e8eb]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1ef0c136354sm224799075ad.244.2024.05.21.11.10.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 May 2024 11:10:29 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][ 04/22] gosu: Adjust for UNPACKDIR/WORKDIR rework Date: Tue, 21 May 2024 11:10:05 -0700 Message-ID: <20240521181024.426176-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240521181024.426176-1-raj.khem@gmail.com> References: <20240521181024.426176-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 ; Tue, 21 May 2024 18:10:38 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/110453 Signed-off-by: Khem Raj --- meta-oe/recipes-extended/etcd/etcd_3.5.7.bb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/meta-oe/recipes-extended/etcd/etcd_3.5.7.bb b/meta-oe/recipes-extended/etcd/etcd_3.5.7.bb index 0794158a52..24e111dea0 100644 --- a/meta-oe/recipes-extended/etcd/etcd_3.5.7.bb +++ b/meta-oe/recipes-extended/etcd/etcd_3.5.7.bb @@ -2,12 +2,12 @@ DESCRIPTION = "etcd is a distributed key-value store for distributed systems" HOMEPAGE = "https://etcd.io/" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${S}/${GO_INSTALL}/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" +LIC_FILES_CHKSUM = "file://${GO_INSTALL}/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" SRC_URI = " \ - git://github.com/etcd-io/etcd;branch=release-3.5;protocol=https \ - file://0001-xxhash-bump-to-v2.1.2.patch;patchdir=src/${GO_IMPORT} \ - file://0001-test_lib.sh-remove-gobin-requirement-during-build.patch;patchdir=src/${GO_IMPORT} \ + git://github.com/etcd-io/etcd;branch=release-3.5;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} \ + file://0001-xxhash-bump-to-v2.1.2.patch;patchdir=${GO_INSTALL} \ + file://0001-test_lib.sh-remove-gobin-requirement-during-build.patch;patchdir=${GO_INSTALL} \ file://etcd.service \ file://etcd-existing.conf \ file://etcd-new.service \ @@ -62,11 +62,11 @@ do_install:append() { install -m 0755 ${D}${libdir}/go/src/go.etcd.io/etcd/v3/bin/etcd ${D}${bindir} install -m 0755 ${D}${libdir}/go/src/go.etcd.io/etcd/v3/bin/etcdctl ${D}${bindir} install -m 0755 ${D}${libdir}/go/src/go.etcd.io/etcd/v3/bin/etcdutl ${D}${bindir} - install -m 0644 ${WORKDIR}/etcd-existing.conf -D -t ${D}${sysconfdir}/etcd.d + install -m 0644 ${UNPACKDIR}/etcd-existing.conf -D -t ${D}${sysconfdir}/etcd.d install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/etcd.service ${D}${systemd_system_unitdir}/ - install -m 0644 ${WORKDIR}/etcd-new.service ${D}${systemd_system_unitdir}/ - install -m 0644 ${WORKDIR}/etcd-new.path ${D}${systemd_system_unitdir}/ + install -m 0644 ${UNPACKDIR}/etcd.service ${D}${systemd_system_unitdir}/ + install -m 0644 ${UNPACKDIR}/etcd-new.service ${D}${systemd_system_unitdir}/ + install -m 0644 ${UNPACKDIR}/etcd-new.path ${D}${systemd_system_unitdir}/ } FILES:${PN}:append = " ${sysconfdir}/etcd.d/etcd-existing.conf" From patchwork Tue May 21 18:10:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 43945 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 644A6C27C41 for ; Tue, 21 May 2024 18:10:38 +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.3047.1716315032420322273 for ; Tue, 21 May 2024 11:10:32 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=MQW1p6rC; 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 d9443c01a7336-1edc696df2bso3912935ad.0 for ; Tue, 21 May 2024 11:10:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716315032; x=1716919832; darn=lists.openembedded.org; 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=b+6Mnbpkgor/lvdC0R0niCX9F0F6CloUEIOHIeYChI4=; b=MQW1p6rCMminkG72olEQfd6B1x8zhnvTABekHBNP+SYBA0jsMfEfjyHlMs41F0oKei z74YTgSA5tMbCpFUOOmBKUk6paXWFeWyRbFBd+apyYCRFlclOnEq24Hv3/6QWLqUNrAA ITBa1U4SwF0iBpDmnyRbsnLR2AA6Ps+WxhM7rNgj/q0M8wKk6UcQ1ldO87K3bFnbL1dG c7vb6q8kWYWUmeqGxYf7PAvaDJyAry5VUY5b0F0rsX7Q7tUZ6fcGnbD73ZirNCXc+zLY 5yGnf+/NwlkieQm7L6x6Z3bTR+gn78/Jw91Uui1M28LEm2cbeOzxzDnFClPKoWE8n2El whYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716315032; x=1716919832; 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=b+6Mnbpkgor/lvdC0R0niCX9F0F6CloUEIOHIeYChI4=; b=ARcg9xaW9XNUwvbTX+UzqxANh7YggxJhz5K1uIOzO6KSXVYN6E+L/IqRgCOqpxkgdg X6BVBTds2c0EGsfVdb9MGIMWjE0tSIPqwaU4XVIidJo4z5nctXU84wrDOxysz1HkT+JQ OGGk9WNNBxSj+j70KJRWH3gCzukdfMaZ+4AaQ/fQZwJXRMSc9Mll38dgyepfjxN7H6BX r6QLELZZqKld5i4hGn8ZIU9LNA0uYa9XkeLff4V6f8VFSv45yl/3UTqjD9HEsQjvSUQQ BErhcmpsJ3umsJGfjsJvgJYiW1k86Jqq5EwimWc8Jo4K3GZZN109cVvQOjytcGT3Yo/x Uu+A== X-Gm-Message-State: AOJu0Yzfkr3Hm2TOZhFK73VkbVTD0EVL4hElZaGNZFcO8hQ940PxzQ4p zKct4p/wlFXUCqdOXPo0yYC4imQB05SGuOuvm1uqTTDmPkyMhM/IqnVhj+uTsMk= X-Google-Smtp-Source: AGHT+IHcrrWHojKMhcvnA9iQ6FsReIEE3qOcecQCyDo9vb0k67zFwzv+NOPfRGhq4cMk4DBkxJKr4g== X-Received: by 2002:a17:902:aa47:b0:1e3:f27c:457d with SMTP id d9443c01a7336-1ef44059ba2mr313531725ad.65.1716315031540; Tue, 21 May 2024 11:10:31 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9d80:4380::e8eb]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1ef0c136354sm224799075ad.244.2024.05.21.11.10.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 May 2024 11:10:31 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][ 05/22] crucible: Adjust for UNPACKDIR/WORKDIR rework Date: Tue, 21 May 2024 11:10:06 -0700 Message-ID: <20240521181024.426176-5-raj.khem@gmail.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240521181024.426176-1-raj.khem@gmail.com> References: <20240521181024.426176-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 ; Tue, 21 May 2024 18:10:38 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/110454 Signed-off-by: Khem Raj --- meta-oe/recipes-support/crucible/crucible_2023.11.02.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/crucible/crucible_2023.11.02.bb b/meta-oe/recipes-support/crucible/crucible_2023.11.02.bb index d53e1a276b..4247263b5a 100644 --- a/meta-oe/recipes-support/crucible/crucible_2023.11.02.bb +++ b/meta-oe/recipes-support/crucible/crucible_2023.11.02.bb @@ -3,7 +3,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=201414b6610203caed355323b1ab3116" GO_IMPORT = "github.com/usbarmory/crucible" -SRC_URI = "git://${GO_IMPORT}.git;protocol=https;branch=master" +SRC_URI = "git://${GO_IMPORT}.git;protocol=https;branch=master;destsuffix=${GO_SRCURI_DESTSUFFIX}" GO_INSTALL = "\ ${GO_IMPORT}/cmd/crucible \ From patchwork Tue May 21 18:10:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 43944 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 4A330C25B7F for ; Tue, 21 May 2024 18:10:38 +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.3091.1716315033181958451 for ; Tue, 21 May 2024 11:10:33 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=MzGYmb1V; 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 d9443c01a7336-1eb0e08bfd2so110893845ad.1 for ; Tue, 21 May 2024 11:10:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716315032; x=1716919832; darn=lists.openembedded.org; 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=H3p5DTwy9GDz07zpnsXsuS3lsFX+U7atvQsndUnh+Sw=; b=MzGYmb1Vf1crOKN89wu5A5FzdtZ4y+GVoMRdzMWyrWnYfuMIAXa3KHqRanns8cszDA Kcjul43kH4O5Tty2vEBXSTl0BuCuHgNyrb60Sq19v9FJ+gKGTkcbDjNW5RskF57S56c1 2tzdPa+oiii1sbiQUA84UMVB+GOSMGSbYTDBfJMWedl4jwRDbqWpCEHkbW/42UBsoS/5 z6WmPOkZ0fpSbR16zHwBZHindBRVqy2nqrGllBXNP8LrrUhRqipreCiMMdW0D/8EZ5E2 ilst4/yV+jkW/mB6hXP6kXfxGyFarSnzkJpkh3IqSdQj+PhTteHgT/ADgQeB0hmSyYWW vQwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716315032; x=1716919832; 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=H3p5DTwy9GDz07zpnsXsuS3lsFX+U7atvQsndUnh+Sw=; b=kuetujdvLmuyM+OiF1W3t6LwTKLDQkz3PYafLSIsDSGmw4a9x/7NPB0NL/BqtkoNmV 0qUtx4eRAVXfk1rGLlZvlQHUrLeKgS/il9xj67ZjgXmTzv6BLM8wZe7/rmHOkhRCi1Q5 nkfLF7Bu7G6IJh0f+0h+1tYcivD0NRgB6vS1P1qbV/xBONq/WH9/K85qnZige5fLjwHg WN3ybeFDUhPe5ov740nKXisKCN3FuSabaaR8JgKzz6i8eprIieav2QkJL0HheRoI26Yd j075Q38vZ0NrOGlGR1qt8BiwEGRPp25jciOAsN8EBb/UASkM9zZP+f+j26Vgh4SrQLCS qlRg== X-Gm-Message-State: AOJu0YwqFOqMv+d3o7qrffgmfsN95IGTe5A/9WVeo800Htfpv02HZeSI 8A6GAiX00O6gP6WIHiNYy+mJJVF5vitiapDDtQ1tbxmXV5mnvfHi2eWFl7Kzqzs= X-Google-Smtp-Source: AGHT+IH7OQVjIfY95J9SzIxdf9VshwpF7X60zGjiKSTREYUrPW4lab+7BPf4e2yfL8Vau6JnSSMIIA== X-Received: by 2002:a17:902:e805:b0:1f2:f9de:c9e8 with SMTP id d9443c01a7336-1f2f9ded095mr80777295ad.2.1716315032469; Tue, 21 May 2024 11:10:32 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9d80:4380::e8eb]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1ef0c136354sm224799075ad.244.2024.05.21.11.10.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 May 2024 11:10:32 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][ 06/22] gosu: Adjust for UNPACKDIR/WORKDIR rework Date: Tue, 21 May 2024 11:10:07 -0700 Message-ID: <20240521181024.426176-6-raj.khem@gmail.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240521181024.426176-1-raj.khem@gmail.com> References: <20240521181024.426176-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 ; Tue, 21 May 2024 18:10:38 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/110455 Signed-off-by: Khem Raj --- meta-oe/recipes-support/gosu/gosu_1.17.bb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-support/gosu/gosu_1.17.bb b/meta-oe/recipes-support/gosu/gosu_1.17.bb index a29d6bce45..6a4441fc24 100644 --- a/meta-oe/recipes-support/gosu/gosu_1.17.bb +++ b/meta-oe/recipes-support/gosu/gosu_1.17.bb @@ -5,9 +5,9 @@ LICENSE = "Apache-2.0 " LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" GO_IMPORT = "github.com/tianon/gosu" -SRC_URI = "git://${GO_IMPORT}.git;branch=master;protocol=https \ - git://github.com/moby/sys;name=user;destsuffix=${S}/src/github.com/moby/sys;branch=main;protocol=https \ - git://github.com/golang/sys;name=sys;destsuffix=${S}/src/golang.org/x/sys;branch=master;protocol=https \ +SRC_URI = "git://${GO_IMPORT}.git;destsuffix=src/${GO_IMPORT};branch=master;protocol=https \ + git://github.com/moby/sys;name=user;destsuffix=src/github.com/moby/sys;branch=main;protocol=https \ + git://github.com/golang/sys;name=sys;destsuffix=src/golang.org/x/sys;branch=master;protocol=https \ " SRCREV = "0d1847490b448a17eb347e5e357f2c0478df87ad" #v0.1.0 @@ -17,6 +17,7 @@ SRCREV_sys = "95e765b1cc43ac521bd4fd501e00774e34401449" SRCREV_FORMAT .= "_user_sys" +S = "${UNPACKDIR}" inherit go CGO_ENABLED = "1" From patchwork Tue May 21 18:10:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 43946 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 5732CC25B78 for ; Tue, 21 May 2024 18:10:38 +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.3049.1716315034240279483 for ; Tue, 21 May 2024 11:10:34 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=deMl2Wwi; 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 d9443c01a7336-1f2f566a7c7so76364405ad.1 for ; Tue, 21 May 2024 11:10:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716315033; x=1716919833; darn=lists.openembedded.org; 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=k76fqCJFiRpRZb3G68sq4uFV46wTEHHGVijUbYtO32s=; b=deMl2Wwiz8hXzKJRjkDWEf4UUE06Wn6X8BlsRO1lhookeLBOygVuzwq502Pvz2q886 qfZovKKOH0UzDi9ILTKdofgaLHBi6aLW27/gIYu5pMKFmheIeLGQYlM61GYh0FBq2taO VS18WJueFj7fWKxzrssQJOyxfZ+Msu/li9P0lKl5sKagbL6Lb8Xib3wM7Nw3F3RyJc/4 njYPGOhe1bNuahBdFiDMupq5C4O2lJL8DhdOoJuJ3dd0dAzyKA53IUYk61zXzm2s8CAu p6V15DOdynu8F65YQ4NIdAOgRwog0EUKvqJmBGhiwc2EeHxE7r2sC6pd7azf3SNjZpXY SqBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716315033; x=1716919833; 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=k76fqCJFiRpRZb3G68sq4uFV46wTEHHGVijUbYtO32s=; b=dPEyvphhi4myejYjL3yiR9kObKm8WBhF1DUqBijXUj6ujTVUhbMvl06XXT3DZB2PIj b80sXqn7cmNyyOzhYvNvxCSmwpZOrH8xnUhEBIuig3OPOLGhwP07DuI211AinclcjLgi ax6i8NoxbVTsgkJkf/o3hNCZu18mFEIoKGk1GCdI22RWT3miOred0Ki+7XwyY57TSTvM 07bM5yfnuWKtuXb9KVmLBjGNpRMbRBwDQ3EWMcHxpwn3pHHDUkHBSRz/3iKohQoO2Vdb fhDfOPw34u6QiXqs3DO+IoKTrHE6rJbl09H9W3MO4o4A8Xb+zTxByLz7T6cfE03qANxz dZXw== X-Gm-Message-State: AOJu0Yz2z/zvGIFGjpiM3yAUhSDDVIcMr/vM9vUcWIkjc7n2N1zqAPrf Lh7lCdEE1mba41qOKuK2N0B8HJsv90RNQEp5Mpipj00HBMktMIXksUMXpZAEOHA= X-Google-Smtp-Source: AGHT+IFuG2a7ITeUURRqo8F00hELGZDFF/6WOh9IWVPusJ4HRB9B5fOlLB5rqTq6S1zQZ50zGUNNxw== X-Received: by 2002:a17:902:cecd:b0:1f3:4c1:83ec with SMTP id d9443c01a7336-1f304c18438mr68466625ad.26.1716315033173; Tue, 21 May 2024 11:10:33 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9d80:4380::e8eb]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1ef0c136354sm224799075ad.244.2024.05.21.11.10.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 May 2024 11:10:32 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][ 07/22] influxdb: Do not remove non-existing files Date: Tue, 21 May 2024 11:10:08 -0700 Message-ID: <20240521181024.426176-7-raj.khem@gmail.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240521181024.426176-1-raj.khem@gmail.com> References: <20240521181024.426176-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 ; Tue, 21 May 2024 18:10:38 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/110456 Signed-off-by: Khem Raj --- meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb b/meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb index 5301071516..9506d0e55d 100644 --- a/meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb +++ b/meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb @@ -38,19 +38,20 @@ USERADD_PACKAGES = "${PN}" USERADD_PARAM:${PN} = "--system -d /var/lib/influxdb -m -s /bin/nologin influxdb" do_install:prepend() { - rm ${B}/src/${GO_IMPORT}/build.py - rm ${B}/src/${GO_IMPORT}/build.sh - rm ${B}/src/${GO_IMPORT}/Dockerfile* + test -e ${B}/src/${GO_IMPORT}/build.py && rm ${B}/src/${GO_IMPORT}/build.py + test -e ${B}/src/${GO_IMPORT}/build.sh && rm ${B}/src/${GO_IMPORT}/build.sh + rm -rf ${B}/src/${GO_IMPORT}/Dockerfile* + sed -i -e "s#usr/bin/sh#bin/sh#g" ${B}/src/${GO_IMPORT}/scripts/ci/run_perftest.sh } do_install:append() { install -d ${D}${sysconfdir}/influxdb - install -m 0644 ${WORKDIR}/influxdb.conf ${D}${sysconfdir}/influxdb + install -m 0644 ${UNPACKDIR}/influxdb.conf ${D}${sysconfdir}/influxdb chown -R root:influxdb ${D}${sysconfdir}/influxdb install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/influxdb ${D}${sysconfdir}/init.d/influxdb + install -m 0755 ${UNPACKDIR}/influxdb ${D}${sysconfdir}/init.d/influxdb if [ "${@bb.utils.filter('DISTRO_FEATURES', 'sysvinit', d)}" ] ; then install -d ${D}${sysconfdir}/logrotate.d From patchwork Tue May 21 18:10:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 43941 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 4A0DCC25B7E for ; Tue, 21 May 2024 18:10:38 +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.3092.1716315034774941177 for ; Tue, 21 May 2024 11:10:34 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=HU8b4a1e; 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 d9443c01a7336-1ec69e3dbcfso3612755ad.0 for ; Tue, 21 May 2024 11:10:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716315034; x=1716919834; darn=lists.openembedded.org; 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=3TQR1bekewoarKPm7NfK2B+SiAVN+H0dggRIFr7YOxo=; b=HU8b4a1efEuhhphViPcsSvSFCj7oq+WYhMviBCpoPXY6jk01Ehr6X27eYBrTMGNl/t YVnWV7oKcYViRUkIPmByTT9cdFtd+Q/7QHaWjhgveIEFlZqibp34kmWJRIKRzGjbNzH7 LhYIHlGqEWsr5ignVKcT2b6MARWmcIdpznPK/AzXpnBJs6rsEUyx3Lo3M2Fkk+RXo6YR dP84c49RcWLEawUa9lvUnkJiTbap6kjibBSeTyk+dcAoM36UJkr44OP5SJBCsaesc2BX 8iwZKoyMhjY2EWKdA593LrXPv+koGL85NAW4WiIFPEQqeuVNmSf09wiZ4+gIQDg0+UDd CpSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716315034; x=1716919834; 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=3TQR1bekewoarKPm7NfK2B+SiAVN+H0dggRIFr7YOxo=; b=KRUlsXh2IrCfpRySJMOA4JDDcPZP4EaMssohSwmDMepbLvy+31FepPSyOX/8PeCXGG b6x1D48sN5xBvbK0zI08NEi4SGnIv+d5GJoXz0NCU7SsOzAfa63J8k8utpsguzoOB6NB YmiUBcBIu3rn0mYimwaufJqwF1sz0eYXWcfrKf2qCO3l6LCjhjRaa6Hk/pbLe6uM6VE2 wqPf0VhMcM3BMirYs7fnUzkNYkcLiBNvhJ8dlFDJRyusTy84o2oKxJJX+SXShRzBgEZ9 nBMAmPn1aqq1eOiQl5Xv8m0/euMHnxJHX2U7cxLy19nl6KbX9xAsOA+ET7OG+tYuuIlM 79BQ== X-Gm-Message-State: AOJu0YxQi3gcB+O1ChYBkIu3VyopoIOR0HNiuD/YH2ce3gd3ztYGVIMf JZMAiMOKoX9aUyy7eaRLqHVD3MJXPVXE0IHTIjkbILgtzvwxdMFedRQXbPDaRzo= X-Google-Smtp-Source: AGHT+IFEmITY/n0pm0HbMS4/OrrMf7h3JkK9RrhDdd6iINPY0pIqV7QXI7P5YWhXBzQ58XdnwZwfWw== X-Received: by 2002:a17:902:8f85:b0:1eb:1af6:e7ea with SMTP id d9443c01a7336-1ef43d2e9abmr312442565ad.34.1716315033895; Tue, 21 May 2024 11:10:33 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9d80:4380::e8eb]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1ef0c136354sm224799075ad.244.2024.05.21.11.10.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 May 2024 11:10:33 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-xfce][ 08/22] xfmpc: Disable incompatible-pointer-types warning as error Date: Tue, 21 May 2024 11:10:09 -0700 Message-ID: <20240521181024.426176-8-raj.khem@gmail.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240521181024.426176-1-raj.khem@gmail.com> References: <20240521181024.426176-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 ; Tue, 21 May 2024 18:10:38 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/110457 Fixes build with GCC-14 Signed-off-by: Khem Raj --- meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.3.1.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.3.1.bb b/meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.3.1.bb index 1e02bbe54f..73eafeebcf 100644 --- a/meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.3.1.bb +++ b/meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.3.1.bb @@ -13,3 +13,6 @@ RRECOMMENDS:${PN} = "mpd" inherit xfce-app SRC_URI[sha256sum] = "4867d5dd100fa42ab39ebde6c784ec21ee31717f1adb3f4da070dafb3848d96d" + +# Fixes build with GCC-14 which enables incompatible-pointer-types as error +CFLAGS += "-Wno-error=incompatible-pointer-types" From patchwork Tue May 21 18:10:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 43942 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 3B89FC25B7C for ; Tue, 21 May 2024 18:10:38 +0000 (UTC) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mx.groups.io with SMTP id smtpd.web10.3050.1716315036049309374 for ; Tue, 21 May 2024 11:10:36 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=aS7WiReK; spf=pass (domain: gmail.com, ip: 209.85.214.179, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-1f2f566a7c7so76364625ad.1 for ; Tue, 21 May 2024 11:10:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716315035; x=1716919835; darn=lists.openembedded.org; 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=F5mh71xEMsHSr0lX1GwX2BI75naXSBQtt1JOTdyifqA=; b=aS7WiReKLuQjwuzeqosR3zbBHIU3HCqErBx7VXjXqdzR+dR7KWaWj+ISlvK7EgQzsd /rM2btEHjcE9T9eq8tajBgLoGnLbU5gvUhh1fv+CzpWHq/MKI1ml3hxTFX0CKgWafsB2 6avKKtXnX5u3s9B4j75+cX0qXidPU32BXzAqoKxqtykTo6W6PdUzl0UyTjaMMkX19TIF fjT3wjfM3JSgySifcWjAcNaWnuSVHPlMogoGJdv8Q2e6NSeTXiNWxo7XaxkswrVcw/B9 0DLbO1QHRKDAKGHNUoSU9YQC8SyLu8Qz/ujv6aEeRp02h2zkuCwWuvkHz/IGbvTEWptB JRXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716315035; x=1716919835; 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=F5mh71xEMsHSr0lX1GwX2BI75naXSBQtt1JOTdyifqA=; b=avYrUpCWQXsb2IxsrhKZ9JX3owAAPViRNGWWswN62emrJphY2inmPyqABqBBYfx4U/ lKcUnYIF32LoiHvIv+iTQ25Eh+Ce98ChVE8RlaTJQnH2f82MmH+K1BSoxy71Lebxcpku d3UZUqz90Ws38UNp92cLTKnz1PTe0IZysZdCFr0weHIjMfyVQDxVZTJ8ThWpmA8Kq+Nz ukVHOnELudIKAN2rjMSFQOXz303BvKDB7QJFjDQyLzL+eLd/rlzBRTACf1+5UBaxSqQ9 Wf8VMZfolY2zh2Q3xUq1xh3PiVHWP1nb1/3CvjMogrDDWngMkv2DvEntacYXr9pFK/91 LMcw== X-Gm-Message-State: AOJu0Yyv9fXCkjXx+I3CiT9ixLXKdbZUSS6rbLqDYAQd7CpYY2xjsXzQ IbFSxhuAMkMsVaCCkFBBhzpaNbP3JJDqrbUtEjzU8e/6DyR/KJ4oQ8Px1pBiNNw= X-Google-Smtp-Source: AGHT+IHUCnybTm3uBPdvubNGytK0EPJcNmRuJSvtN1sx8zk0IH2VpY+LImXaRoScFPTlPOQVc6Y8dQ== X-Received: by 2002:a17:902:780c:b0:1f3:1597:5e2 with SMTP id d9443c01a7336-1f3159711a5mr6062435ad.19.1716315035166; Tue, 21 May 2024 11:10:35 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9d80:4380::e8eb]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1ef0c136354sm224799075ad.244.2024.05.21.11.10.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 May 2024 11:10:34 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-multimedia][meta-oe][ 09/22] sox: Fix build with GCC-14 Date: Tue, 21 May 2024 11:10:10 -0700 Message-ID: <20240521181024.426176-9-raj.khem@gmail.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240521181024.426176-1-raj.khem@gmail.com> References: <20240521181024.426176-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 ; Tue, 21 May 2024 18:10:38 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/110458 Signed-off-by: Khem Raj --- ...s-Include-math.h-for-fabs-definition.patch | 33 +++++++++++++++++++ .../recipes-multimedia/sox/sox_14.4.2.bb | 1 + 2 files changed, 34 insertions(+) create mode 100644 meta-multimedia/recipes-multimedia/sox/sox/0001-tests-Include-math.h-for-fabs-definition.patch diff --git a/meta-multimedia/recipes-multimedia/sox/sox/0001-tests-Include-math.h-for-fabs-definition.patch b/meta-multimedia/recipes-multimedia/sox/sox/0001-tests-Include-math.h-for-fabs-definition.patch new file mode 100644 index 0000000000..5f9135a0ee --- /dev/null +++ b/meta-multimedia/recipes-multimedia/sox/sox/0001-tests-Include-math.h-for-fabs-definition.patch @@ -0,0 +1,33 @@ +From afe336ab63ff9b64ef759255de6b03b897dc4453 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 19 May 2024 09:09:46 -0700 +Subject: [PATCH] tests: Include math.h for fabs() definition + +Fixes build with gcc-14 + +../../sox-14.4.2/src/sox_sample_test.h:190:3: error: implicit declaration of function 'fabs' [-Wimplicit-function-declaration] + 190 | assert(fabs(d - 1) < 1e-9 && clips == 0); + | ^~~~~~ + ../../sox-14.4.2/src/sox_sample_test.h:23:1: note: include '' or provide a declaration of 'fabs' + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/sox_sample_test.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/sox_sample_test.h b/src/sox_sample_test.h +index 62b55e4..17f0069 100644 +--- a/src/sox_sample_test.h ++++ b/src/sox_sample_test.h +@@ -19,6 +19,7 @@ + #undef NDEBUG /* Must undef above assert.h or other that might include it. */ + #endif + #include ++#include + #include "sox.h" + + #define TEST_UINT(bits) \ +-- +2.45.1 + diff --git a/meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb b/meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb index 011cbc2a9d..800fcad2c9 100644 --- a/meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb +++ b/meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb @@ -30,6 +30,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=751419260aa954499f7abaabaa882bbe \ SRC_URI = "${SOURCEFORGE_MIRROR}/sox/sox-${PV}.tar.gz \ file://0001-remove-the-error-line-and-live-without-file-type-det.patch \ file://0001-Update-exported-symbol-list.patch \ + file://0001-tests-Include-math.h-for-fabs-definition.patch \ " SRC_URI[md5sum] = "d04fba2d9245e661f245de0577f48a33" SRC_URI[sha256sum] = "b45f598643ffbd8e363ff24d61166ccec4836fea6d3888881b8df53e3bb55f6c" From patchwork Tue May 21 18:10:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 43940 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 2E4ECC41513 for ; Tue, 21 May 2024 18:10:38 +0000 (UTC) Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by mx.groups.io with SMTP id smtpd.web10.3051.1716315037293518616 for ; Tue, 21 May 2024 11:10:37 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=N05AE+jy; spf=pass (domain: gmail.com, ip: 209.85.214.176, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-1ee38966529so775525ad.1 for ; Tue, 21 May 2024 11:10:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716315036; x=1716919836; darn=lists.openembedded.org; 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=4Ph62RPNzT3pA5eTxOETUoZvKpUOvL0lzcHDkRUdSDc=; b=N05AE+jy+cPF1Efwm04CCZ+96r3+lL+ZnMoSQhNg1hqxSy+wOPOSKvel3wmguc5TMK 5Jbrqz5EbIAK6L/Dn/teHUTGgIM/wcFxfMZPBjDhPNxuWzX11PBwFo+pZUw74dahPcCv d4s4T/JSN253A5Lp6lskW4UAKIvhcE6UsvD1udi8GteiYOE9aVVw/wJuN+U9ypFVvEeu ytFdl+0DJxbSszNTWAk8wQG7kXiFUUTF8y76iO6b2ImbBeKmJBMvDvsriAwoxvFk2l1S 2wc9UEqABB1c050HXeN3aknwlh5vKi6eydv/6xiY4kZetSU8N9oO8gw1PxbjpZbr5n/c iSnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716315036; x=1716919836; 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=4Ph62RPNzT3pA5eTxOETUoZvKpUOvL0lzcHDkRUdSDc=; b=vQYpp3dwCnewUT4DdQTErKw/5gUYP5G8/tqHVikQaZozpnjJbQPxZYZPUK/UGgbAO5 +Whnsq308Y7fvOZWnvVNIXEuY0cZwdif9u0+oxGBPgYBXp9qJ3EPyq4gG59yfppMKKid Sr6uOi5FpZjRHS/2nB053fiXKwqaK6U0o5qXxxusy9qZUbz0T3edvRAkQqZyqZ7znc52 cRkUh0tNhH3fj0JOchyyXUOQQx/X5EeSXowySYFe78QCJuosTPQDP+T3EgiXsYjiQYvU y2cYLEVU9Gthn8axYYtjwSTNihomuFlR9Dhg8ZvY73Q5WnZILqnmIE1r+SCTjVKcjKKB y6ig== X-Gm-Message-State: AOJu0Ywn8iEeqthiNH+vRu+pu6EX5dN+w167n9JiLtf+p92IPqc9S4QJ P7PMb1TbePV3HrFR80T85hkYwxjS3+qdrXOiIE1c+59suN5mIpDzj2AjEkBMe2w= X-Google-Smtp-Source: AGHT+IGdiFfVOB8q0pLo8vXHZQWdjPm+pme73PSnp0vqJeH71tmiefpKmoqTm2oXrAg/4jB7qFBDxQ== X-Received: by 2002:a17:903:1c4:b0:1f3:2d7:feb8 with SMTP id d9443c01a7336-1f302d80812mr83601215ad.10.1716315036407; Tue, 21 May 2024 11:10:36 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9d80:4380::e8eb]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1ef0c136354sm224799075ad.244.2024.05.21.11.10.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 May 2024 11:10:35 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-networking][meta-oe][ 10/22] nbd: Upgrade to 3.26.1 Date: Tue, 21 May 2024 11:10:11 -0700 Message-ID: <20240521181024.426176-10-raj.khem@gmail.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240521181024.426176-1-raj.khem@gmail.com> References: <20240521181024.426176-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 ; Tue, 21 May 2024 18:10:38 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/110459 Backport a build fix when using --disable-manpages Signed-off-by: Khem Raj --- ...8b0d8b54c21a1e5b0c6dce3277e938d07e7c.patch | 50 +++++++++++++++++++ .../recipes-support/nbd/nbd_3.24.bb | 20 -------- .../recipes-support/nbd/nbd_3.26.1.bb | 22 ++++++++ 3 files changed, 72 insertions(+), 20 deletions(-) create mode 100644 meta-networking/recipes-support/nbd/nbd/f0418b0d8b54c21a1e5b0c6dce3277e938d07e7c.patch delete mode 100644 meta-networking/recipes-support/nbd/nbd_3.24.bb create mode 100644 meta-networking/recipes-support/nbd/nbd_3.26.1.bb diff --git a/meta-networking/recipes-support/nbd/nbd/f0418b0d8b54c21a1e5b0c6dce3277e938d07e7c.patch b/meta-networking/recipes-support/nbd/nbd/f0418b0d8b54c21a1e5b0c6dce3277e938d07e7c.patch new file mode 100644 index 0000000000..716ded55be --- /dev/null +++ b/meta-networking/recipes-support/nbd/nbd/f0418b0d8b54c21a1e5b0c6dce3277e938d07e7c.patch @@ -0,0 +1,50 @@ +From f0418b0d8b54c21a1e5b0c6dce3277e938d07e7c Mon Sep 17 00:00:00 2001 +From: Dave Jones +Date: Thu, 14 Mar 2024 11:13:05 +0000 +Subject: [PATCH] Fix the check & no cases of enable_manpages + +Currently, running "configure --disable-manpages" while docbook2man *is* +installed results in the error "don't know what to do here" when it +should disable manpages. + +There also appears to be a missing conditional at the start of the line; +there's closing un-matched ]) at the end of the line. Still, at this +point the check can be done in pure shell; no need for AC macros. I've +also removed the confusing m4_divert_text call on the check case. Not +sure why that was there, but it appears unnecessary. + +Upstream-Status: Backport [https://github.com/NetworkBlockDevice/nbd/commit/f0418b0d8b54c21a1e5b0c6dce3277e938d07e7c] +Signed-off-by: Khem Raj +--- + configure.ac | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) + +--- a/configure.ac ++++ b/configure.ac +@@ -328,7 +328,7 @@ AC_MSG_CHECKING([whether man pages are r + AC_ARG_ENABLE([manpages], + AS_HELP_STRING([--disable-manpages], [Do not install man pages]), + [], +- [: m4_divert_text([DEFAULTS], [enable_manpages=check])] ++ [enable_manpages=check] + ) + AC_MSG_RESULT([$enable_manpages]) + +@@ -337,9 +337,14 @@ AS_IF([test "x$enable_manpages" != "xno" + ]) + AS_IF([test "x$enable_manpages" = "xyes" -a "x$DB2M" = "x"], [ + AC_MSG_ERROR([docbook2man not found, but is required to build manpages]) +- ], +- [test "x$DB2M" != "x"], [enable_manpages=yes], +- [AC_MSG_ERROR([don't know what to do here])]) ++ ]) ++if test "x$enable_manpages" = "xcheck"; then ++ if test "x$DB2M" = "x"; then ++ enable_manpages=no ++ else ++ enable_manpages=yes ++ fi ++fi + AC_MSG_CHECKING([whether to build manpages]) + AC_MSG_RESULT([$enable_manpages]) + diff --git a/meta-networking/recipes-support/nbd/nbd_3.24.bb b/meta-networking/recipes-support/nbd/nbd_3.24.bb deleted file mode 100644 index da9f829523..0000000000 --- a/meta-networking/recipes-support/nbd/nbd_3.24.bb +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION = "Network Block Device" -HOMEPAGE = "http://nbd.sourceforge.net" -SECTION = "net" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -DEPENDS = "autoconf-archive bison-native glib-2.0 libnl" - -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "a6d9e7bbc311a2ed07ef84a58b82b5dd" -SRC_URI[sha256sum] = "6877156d23a7b33f75eee89d2f5c2c91c542afc3cdcb636dea5a88539a58d10c" - -inherit autotools pkgconfig - -PACKAGES = "${PN}-client ${PN}-dbg ${PN}-doc ${PN}-server ${PN}-trdump ${PN}-trplay" - -FILES:${PN}-client = "${sbindir}/${BPN}-client" -FILES:${PN}-server = "${bindir}/${BPN}-server" -FILES:${PN}-trdump = "${bindir}/${BPN}-trdump" -FILES:${PN}-trplay = "${bindir}/${BPN}-trplay" diff --git a/meta-networking/recipes-support/nbd/nbd_3.26.1.bb b/meta-networking/recipes-support/nbd/nbd_3.26.1.bb new file mode 100644 index 0000000000..15d5f8b36b --- /dev/null +++ b/meta-networking/recipes-support/nbd/nbd_3.26.1.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "Network Block Device user-space tools (TCP version)" +HOMEPAGE = "https://github.com/NetworkBlockDevice/nbd" +SECTION = "net" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "autoconf-archive bison-native glib-2.0 libnl zlib bison-native" + +SRC_URI = "https://github.com/NetworkBlockDevice/${BPN}/releases/download/${BP}/${BP}.tar.xz \ + file://f0418b0d8b54c21a1e5b0c6dce3277e938d07e7c.patch" +SRC_URI[sha256sum] = "f0cf509fa5b20b1a07f7904eb637e9b47d3e30b6ed6f00075af5d8b701c78fef" + +inherit autotools pkgconfig systemd + +EXTRA_OECONF += "--enable-syslog --enable-lfs --disable-manpages" + +PACKAGES = "${PN}-client ${PN}-dbg ${PN}-doc ${PN}-server ${PN}-trdump ${PN}-trplay" + +FILES:${PN}-client = "${sbindir}/${BPN}-client" +FILES:${PN}-server = "${bindir}/${BPN}-server" +FILES:${PN}-trdump = "${bindir}/${BPN}-trdump" +FILES:${PN}-trplay = "${bindir}/${BPN}-trplay" From patchwork Tue May 21 18:10:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 43949 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 99DA3C27C44 for ; Tue, 21 May 2024 18:10:38 +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.3053.1716315038366411127 for ; Tue, 21 May 2024 11:10:38 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=AjOi20rS; 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 d9443c01a7336-1ec69e3dbcfso3613235ad.0 for ; Tue, 21 May 2024 11:10:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716315037; x=1716919837; darn=lists.openembedded.org; 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=s7wWtSmleGzk/6JDq1E5Gw+Jp/4BWXgclClxrFZ5Sbw=; b=AjOi20rS4cx6m7YntqXqb0H/MKmysD3O1fF1w6Yg+k56wutD0wxk2r6SgM9qT5zrcc ETPntweZkStYxDaXwnkdsJBh0SMEB/3OHgjyyrzdobLNnzJT+uow9ItX17JRXI6yxW6O kwT5+hRY726AbPufk6G4ItMUFR9s2zvxq5qNsafFoS9Sp4h2mYQFUdr/WlZhQMgyX/K3 TU3is7i3Fr9zR9E4t/dckE9iZaMEsYJBHMi1OlOy7OE25QDb+cn7ihq4Dvq/d5rbqZnB zrde+mDLGw2JxQuLFGbY5t1RO6yZ7/Nk5sQfyyoIdsXMNgztuly7mWVhgnxJYAZbHYAL sWPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716315037; x=1716919837; 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=s7wWtSmleGzk/6JDq1E5Gw+Jp/4BWXgclClxrFZ5Sbw=; b=mKo/11JC8ri0ZiRKmdyXaksUXcLqAHzJ0jxekHKT2IRJtPHrPdYWNmvSdQzyjaEqTy 3kGAUwES+2d1+xQhb2PxPGA38D9DnKkRy18SQ70dQjQZqxHkSn14gmyOy7n1S0lI0QAK ETD88iNw/t2WqfXJhROIjyK1EjLao6itqSNTAafK7BHjyD7XkFvUyBGb0UcV27N+KY7C TMYKFKXcMR5x+VCQb+x+DcfEk6YvaKhLWXAoxXNwoyWxN1szWDJt/sDDczV8QGCde3RE HXHa/x6uwKlVpBB/DxYJHUfn/CMnMgy+PCvWtbIaYCXAN9HSyD5pdWWHOMERxMMabkrJ jigg== X-Gm-Message-State: AOJu0YwfBAIJP+m5YRJpfCD0EH7wwZelHz5O7nig+yBjLHZTLyUVr0ce wu5Lc2uUp6A2nF02ezCvebdb422/0xEkAELgIq5aMlFAptVRP+1MsP+yPyPkhRU= X-Google-Smtp-Source: AGHT+IGUMbtWsgtRHZY+OcwiuxOBE54/VD5QhXkf1CGL6H1QHx1/E/TKXiqRadl3eCYfGpwrpGM1Xw== X-Received: by 2002:a17:902:ea01:b0:1f3:135c:f71e with SMTP id d9443c01a7336-1f3135cf7d6mr15007545ad.20.1716315037250; Tue, 21 May 2024 11:10:37 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9d80:4380::e8eb]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1ef0c136354sm224799075ad.244.2024.05.21.11.10.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 May 2024 11:10:36 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-multimedia][meta-oe][ 11/22] vlc: Backport fixes to enable GCC-14 based builds Date: Tue, 21 May 2024 11:10:12 -0700 Message-ID: <20240521181024.426176-11-raj.khem@gmail.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240521181024.426176-1-raj.khem@gmail.com> References: <20240521181024.426176-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 ; Tue, 21 May 2024 18:10:38 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/110460 Signed-off-by: Khem Raj --- .../recipes-multimedia/vlc/vlc/4645.patch | 179 +++++++++ .../recipes-multimedia/vlc/vlc/4665.patch | 377 ++++++++++++++++++ .../recipes-multimedia/vlc/vlc_3.0.20.bb | 2 + 3 files changed, 558 insertions(+) create mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc/4645.patch create mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc/4665.patch diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/4645.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/4645.patch new file mode 100644 index 0000000000..3f2aa60512 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/vlc/vlc/4645.patch @@ -0,0 +1,179 @@ +From 1e2918115ca2f5c4ffde00dc02ad89525714f6c2 Mon Sep 17 00:00:00 2001 +From: Thomas Guillem +Date: Tue, 5 Dec 2023 09:23:35 +0100 +Subject: [PATCH 1/5] input: fix incompatible-pointer-types assignment + +Fixes #28441 +Upstream-Status: Backport [https://code.videolan.org/videolan/vlc/-/merge_requests/4645] +Signed-off-by: Khem Raj +--- + src/input/input_internal.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/input/input_internal.h b/src/input/input_internal.h +index d29731edca1b..ea02f39f5add 100644 +--- a/src/input/input_internal.h ++++ b/src/input/input_internal.h +@@ -117,7 +117,7 @@ typedef struct input_thread_private_t + + /* Title infos FIXME multi-input (not easy) ? */ + int i_title; +- const input_title_t **title; ++ input_title_t * const *title; + + int i_title_offset; + int i_seekpoint_offset; +-- +GitLab + + +From adcf4e66e2ce2c382bb97957c91bfde040f4f3ca Mon Sep 17 00:00:00 2001 +From: Zhao Zhili +Date: Thu, 1 Mar 2018 14:25:59 +0800 +Subject: [PATCH 2/5] yadif: fix variable type + +Signed-off-by: Thomas Guillem +(cherry picked from commit 77b86f4452be4dbe0d56a9cd1b66da61b116da60) +Signed-off-by: Thomas Guillem +--- + modules/video_filter/deinterlace/yadif.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/modules/video_filter/deinterlace/yadif.h b/modules/video_filter/deinterlace/yadif.h +index 4bc592ba9307..af16443d0804 100644 +--- a/modules/video_filter/deinterlace/yadif.h ++++ b/modules/video_filter/deinterlace/yadif.h +@@ -140,10 +140,10 @@ static void yadif_filter_line_c(uint8_t *dst, uint8_t *prev, uint8_t *cur, uint8 + } + + static void yadif_filter_line_c_16bit(uint8_t *dst8, uint8_t *prev8, uint8_t *cur8, uint8_t *next8, int w, int prefs, int mrefs, int parity, int mode) { +- uint8_t *dst = (uint8_t *)dst8; +- uint8_t *prev = (uint8_t *)prev8; +- uint8_t *cur = (uint8_t *)cur8; +- uint8_t *next = (uint8_t *)next8; ++ uint16_t *dst = (uint16_t *)dst8; ++ uint16_t *prev = (uint16_t *)prev8; ++ uint16_t *cur = (uint16_t *)cur8; ++ uint16_t *next = (uint16_t *)next8; + int x; + uint16_t *prev2= parity ? prev : cur ; + uint16_t *next2= parity ? cur : next; +-- +GitLab + + +From 45198e5328ff2b2f4eb2fb76add0789fec26270f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= +Date: Sun, 3 Mar 2019 09:59:10 +0200 +Subject: [PATCH 3/5] swscale: avoid invalid pointer conversion + +(cherry picked from commit ab00e6c59d42e05ab08893091783d8b5febc0058) +Signed-off-by: Thomas Guillem +--- + modules/video_chroma/swscale.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/modules/video_chroma/swscale.c b/modules/video_chroma/swscale.c +index 8993d11ec5dd..11897527355c 100644 +--- a/modules/video_chroma/swscale.c ++++ b/modules/video_chroma/swscale.c +@@ -588,8 +588,9 @@ static void Convert( filter_t *p_filter, struct SwsContext *ctx, + { + filter_sys_t *p_sys = p_filter->p_sys; + uint8_t palette[AVPALETTE_SIZE]; +- uint8_t *src[4]; int src_stride[4]; +- uint8_t *dst[4]; int dst_stride[4]; ++ uint8_t *src[4], *dst[4]; ++ const uint8_t *csrc[4]; ++ int src_stride[4], dst_stride[4]; + + GetPixels( src, src_stride, p_sys->desc_in, &p_filter->fmt_in.video, + p_src, i_plane_count, b_swap_uvi ); +@@ -606,11 +607,14 @@ static void Convert( filter_t *p_filter, struct SwsContext *ctx, + GetPixels( dst, dst_stride, p_sys->desc_out, &p_filter->fmt_out.video, + p_dst, i_plane_count, b_swap_uvo ); + ++ for (size_t i = 0; i < ARRAY_SIZE(src); i++) ++ csrc[i] = src[i]; ++ + #if LIBSWSCALE_VERSION_INT >= ((0<<16)+(5<<8)+0) +- sws_scale( ctx, src, src_stride, 0, i_height, ++ sws_scale( ctx, csrc, src_stride, 0, i_height, + dst, dst_stride ); + #else +- sws_scale_ordered( ctx, src, src_stride, 0, i_height, ++ sws_scale_ordered( ctx, csrc, src_stride, 0, i_height, + dst, dst_stride ); + #endif + } +-- +GitLab + + +From 4431076ad4a21fdcabd3f7ef1d61c45891689b0c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= +Date: Sun, 3 Mar 2019 17:20:04 +0200 +Subject: [PATCH 4/5] dynamicoverlay: fix variable shadowing + +(cherry picked from commit d42e05d6b2c061ae352c131d5aebf8c8d8aa6d35) +Signed-off-by: Thomas Guillem +--- + modules/spu/dynamicoverlay/dynamicoverlay_commands.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c +index a93462925e8a..a85f9aafb0b9 100644 +--- a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c ++++ b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c +@@ -899,12 +899,11 @@ static const commanddesc_static_t p_commands[] = + void RegisterCommand( filter_t *p_filter ) + { + filter_sys_t *p_sys = (filter_sys_t*) p_filter->p_sys; +- size_t i_index = 0; + + p_sys->i_commands = ARRAY_SIZE(p_commands); + p_sys->pp_commands = (commanddesc_t **) calloc( p_sys->i_commands, sizeof(commanddesc_t*) ); + if( !p_sys->pp_commands ) return; +- for( i_index = 0; i_index < p_sys->i_commands; i_index ++ ) ++ for( size_t i_index = 0; i_index < p_sys->i_commands; i_index ++ ) + { + p_sys->pp_commands[i_index] = (commanddesc_t *) malloc( sizeof(commanddesc_t) ); + if( !p_sys->pp_commands[i_index] ) return; +-- +GitLab + + +From fda14fc7c013eb75291df10cc8b88336c51328ad Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= +Date: Mon, 26 Feb 2018 20:43:03 +0200 +Subject: [PATCH 5/5] dynamicoverlay: fix memory corruption + +Font alpha is 8-bits, not 32-bits. + +(cherry picked from commit 6f14081af7325d334a53126c4eea52bc30fc08a0) +Signed-off-by: Thomas Guillem +--- + modules/spu/dynamicoverlay/dynamicoverlay_commands.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c +index a85f9aafb0b9..7a71c6f2373a 100644 +--- a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c ++++ b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c +@@ -234,8 +234,12 @@ static int parser_SetTextAlpha( char *psz_command, char *psz_end, + skip_space( &psz_command ); + if( isdigit( (unsigned char)*psz_command ) ) + { +- if( parse_digit( &psz_command, &p_params->fontstyle.i_font_alpha ) == VLC_EGENERIC ) ++ int32_t value; ++ ++ if( parse_digit( &psz_command, &value ) == VLC_EGENERIC ) + return VLC_EGENERIC; ++ ++ p_params->fontstyle.i_font_alpha = value; + } + return VLC_SUCCESS; + } +-- +GitLab + diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/4665.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/4665.patch new file mode 100644 index 0000000000..c9ef33358e --- /dev/null +++ b/meta-multimedia/recipes-multimedia/vlc/vlc/4665.patch @@ -0,0 +1,377 @@ +From 770789f265761fc7ab2de69ca105fec4ad93d9e2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= +Date: Mon, 26 Feb 2018 20:36:29 +0200 +Subject: [PATCH 1/9] chromaprint: missing cast + +(cherry picked from commit 7bd5bab3e43ae187f7219db61ed85d06d2ba0547) +Signed-off-by: Steve Lhomme +Upstream-Status: Backport [https://code.videolan.org/videolan/vlc/-/merge_requests/4665] +Signed-off-by: Khem Raj +--- + modules/stream_out/chromaprint.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules/stream_out/chromaprint.c b/modules/stream_out/chromaprint.c +index 80ec31ba2590..c76cbda3c2bb 100644 +--- a/modules/stream_out/chromaprint.c ++++ b/modules/stream_out/chromaprint.c +@@ -231,7 +231,7 @@ static int Send( sout_stream_t *p_stream, sout_stream_id_sys_t *id, + if ( !p_sys->b_finished && id->i_samples > 0 && p_buf->i_buffer ) + { + if(! chromaprint_feed( p_sys->p_chromaprint_ctx, +- p_buf->p_buffer, ++ (int16_t *)p_buf->p_buffer, + p_buf->i_buffer / BYTESPERSAMPLE ) ) + msg_Warn( p_stream, "feed error" ); + id->i_samples -= i_samples; +-- +GitLab + + +From 6179d6b843f2a93af6a3d51c4244766e3eba9e77 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= +Date: Sun, 14 Apr 2019 09:41:38 +0300 +Subject: [PATCH 2/9] win32: wrap {g,s}etsockopt() + +char * can alias anything, and Winsock relies on that. Unfortunately, +the compiler still issues warnings. This works around that. + +(cherry picked from commit 36715d9b79f34824e126c2bc3aee2f1c1c16af46) +Signed-off-by: Steve Lhomme +--- + include/vlc_network.h | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +diff --git a/include/vlc_network.h b/include/vlc_network.h +index 010454a01c09..e39ffd0bacaa 100644 +--- a/include/vlc_network.h ++++ b/include/vlc_network.h +@@ -183,6 +183,22 @@ VLC_API int vlc_close(int); + + /** @} */ + ++#ifdef _WIN32 ++static inline int vlc_getsockopt(int s, int level, int name, ++ void *val, socklen_t *len) ++{ ++ return getsockopt(s, level, name, (char *)val, len); ++} ++#define getsockopt vlc_getsockopt ++ ++static inline int vlc_setsockopt(int s, int level, int name, ++ const void *val, socklen_t len) ++{ ++ return setsockopt(s, level, name, (const char *)val, len); ++} ++#define setsockopt vlc_setsockopt ++#endif ++ + /* Portable network names/addresses resolution layer */ + + #define NI_MAXNUMERICHOST 64 +-- +GitLab + + +From 3391108f9709f0d77d9297c94371cf9cd30f2cbe Mon Sep 17 00:00:00 2001 +From: Steve Lhomme +Date: Thu, 7 Dec 2023 15:43:04 +0100 +Subject: [PATCH 3/9] netsync: use char for temporary local buffer + +On Windows recvfrom/revc/sendto expects a char*. +--- + modules/control/netsync.c | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/modules/control/netsync.c b/modules/control/netsync.c +index 2a6a1a6a2bf8..8c91034d7cf2 100644 +--- a/modules/control/netsync.c ++++ b/modules/control/netsync.c +@@ -181,7 +181,7 @@ static void *Master(void *handle) + intf_sys_t *sys = intf->p_sys; + for (;;) { + struct pollfd ufd = { .fd = sys->fd, .events = POLLIN, }; +- uint64_t data[2]; ++ char data[16]; + + if (poll(&ufd, 1, -1) < 0) + continue; +@@ -198,8 +198,8 @@ static void *Master(void *handle) + if (master_system < 0) + continue; + +- data[0] = hton64(mdate()); +- data[1] = hton64(master_system); ++ SetQWBE(&data[0], mdate()); ++ SetQWBE(&data[8], master_system); + + /* Reply to the sender */ + sendto(sys->fd, data, 16, 0, +@@ -224,7 +224,7 @@ static void *Slave(void *handle) + + for (;;) { + struct pollfd ufd = { .fd = sys->fd, .events = POLLIN, }; +- uint64_t data[2]; ++ char data[16]; + + vlc_tick_t system = GetPcrSystem(sys->input); + if (system < 0) +@@ -233,7 +233,7 @@ static void *Slave(void *handle) + /* Send clock request to the master */ + const vlc_tick_t send_date = mdate(); + +- data[0] = hton64(system); ++ SetQWBE(&data[0], system); + send(sys->fd, data, 8, 0); + + /* Don't block */ +@@ -244,8 +244,8 @@ static void *Slave(void *handle) + if (recv(sys->fd, data, 16, 0) < 16) + goto wait; + +- const vlc_tick_t master_date = ntoh64(data[0]); +- const vlc_tick_t master_system = ntoh64(data[1]); ++ const vlc_tick_t master_date = GetQWBE(&data[0]); ++ const vlc_tick_t master_system = GetQWBE(&data[8]); + const vlc_tick_t diff_date = receive_date - + ((receive_date - send_date) / 2 + master_date); + +-- +GitLab + + +From 27e584d7b9add8dbbb82b7227228e1ec1e25a089 Mon Sep 17 00:00:00 2001 +From: Steve Lhomme +Date: Tue, 3 Jan 2023 13:23:00 +0100 +Subject: [PATCH 4/9] access/dtv: move the lfind() Windows hack in the module + +So that we don't have to include search.h each time vlc_fixups.h is used. + +The Win32 prototype of lfind() expects an unsigned* for 'nelp', not a size_t*. + +(cherry picked from commit 7c43bcba27b6fe256456d93a9d32e10648f08da8) +Signed-off-by: Steve Lhomme +--- + include/vlc_fixups.h | 3 +++ + modules/access/dtv/access.c | 5 +++++ + 2 files changed, 8 insertions(+) + +diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h +index 37f788933779..861cb4cc5063 100644 +--- a/include/vlc_fixups.h ++++ b/include/vlc_fixups.h +@@ -501,8 +501,11 @@ void *tsearch( const void *key, void **rootp, int(*cmp)(const void *, const void + void *tfind( const void *key, const void **rootp, int(*cmp)(const void *, const void *) ); + void *tdelete( const void *key, void **rootp, int(*cmp)(const void *, const void *) ); + void twalk( const void *root, void(*action)(const void *nodep, VISIT which, int depth) ); ++#ifndef _WIN32 ++/* the Win32 prototype of lfind() expects an unsigned* for 'nmemb' */ + void *lfind( const void *key, const void *base, size_t *nmemb, + size_t size, int(*cmp)(const void *, const void *) ); ++#endif + #endif /* HAVE_SEARCH_H */ + #ifndef HAVE_TDESTROY + void tdestroy( void *root, void (*free_node)(void *nodep) ); +diff --git a/modules/access/dtv/access.c b/modules/access/dtv/access.c +index d9756c7b4885..c6ca5005883c 100644 +--- a/modules/access/dtv/access.c ++++ b/modules/access/dtv/access.c +@@ -32,6 +32,11 @@ + #ifdef HAVE_SEARCH_H + #include + #endif ++#if defined(_WIN32) ++/* the Win32 prototype of lfind() expects an unsigned* for 'nelp' */ ++# define lfind(a,b,c,d,e) \ ++ lfind((a),(b), &(unsigned){ (*(c) > UINT_MAX) ? UINT_MAX : *(c) }, (d),(e)) ++#endif + + #include "dtv/dtv.h" + +-- +GitLab + + +From 5a9ca37a95b6e85e6beaaefba9aa4a886a45411c Mon Sep 17 00:00:00 2001 +From: Steve Lhomme +Date: Mon, 15 Jul 2019 12:41:29 +0200 +Subject: [PATCH 5/9] vlc_common: fix swab() calls on win32 that don't use + const on source pointer + +(cherry picked from commit a9e0b1124e19225b903a2926951781e84002c410) +Signed-off-by: Steve Lhomme +--- + include/vlc_common.h | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/include/vlc_common.h b/include/vlc_common.h +index 8090b277150d..089878581763 100644 +--- a/include/vlc_common.h ++++ b/include/vlc_common.h +@@ -947,6 +947,11 @@ static inline void SetQWLE (void *p, uint64_t qw) + # define O_NONBLOCK 0 + # endif + ++/* the mingw32 swab() and win32 _swab() prototypes expect a char* instead of a ++ const void* */ ++# define swab(a,b,c) swab((char*) (a), (char*) (b), (c)) ++ ++ + # include + #endif /* _WIN32 */ + +-- +GitLab + + +From b758e19479a80604e3feb470b197e4a13a203a85 Mon Sep 17 00:00:00 2001 +From: Steve Lhomme +Date: Wed, 10 Jul 2019 08:23:45 +0200 +Subject: [PATCH 6/9] avcodec: encoder: fix MPEG4 matrix passed as const + +lavc expects a pointer that it will free in avcodec_free_context(). + +(cherry picked from commit d86c4c87aa78130a4fd00294e25df865d0e2b327) +Signed-off-by: Steve Lhomme +--- + modules/codec/avcodec/encoder.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/modules/codec/avcodec/encoder.c b/modules/codec/avcodec/encoder.c +index 2b1c3604713d..4919ccf0e0e4 100644 +--- a/modules/codec/avcodec/encoder.c ++++ b/modules/codec/avcodec/encoder.c +@@ -588,8 +588,14 @@ int InitVideoEnc( vlc_object_t *p_this ) + + if ( p_sys->b_mpeg4_matrix ) + { +- p_context->intra_matrix = mpeg4_default_intra_matrix; +- p_context->inter_matrix = mpeg4_default_non_intra_matrix; ++ p_context->intra_matrix = av_malloc( sizeof(mpeg4_default_intra_matrix) ); ++ if ( p_context->intra_matrix ) ++ memcpy( p_context->intra_matrix, mpeg4_default_intra_matrix, ++ sizeof(mpeg4_default_intra_matrix)); ++ p_context->inter_matrix = av_malloc( sizeof(mpeg4_default_non_intra_matrix) ); ++ if ( p_context->inter_matrix ) ++ memcpy( p_context->inter_matrix, mpeg4_default_non_intra_matrix, ++ sizeof(mpeg4_default_non_intra_matrix)); + } + + if ( p_sys->b_pre_me ) +-- +GitLab + + +From 55be3ce60795a09d13861c5637c1fe7aebc5ce8b Mon Sep 17 00:00:00 2001 +From: Steve Lhomme +Date: Thu, 7 Dec 2023 14:18:22 +0100 +Subject: [PATCH 7/9] smb: fix potential string to wide string copy + +The type of net_resource depends on the UNICODE define. +--- + modules/access/smb.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/modules/access/smb.c b/modules/access/smb.c +index 5fe56f0c9dfe..6add2a3e6278 100644 +--- a/modules/access/smb.c ++++ b/modules/access/smb.c +@@ -524,7 +524,7 @@ static void Win32AddConnection( stream_t *p_access, const char *psz_server, + const char *psz_pwd, const char *psz_domain ) + { + char psz_remote[MAX_PATH]; +- NETRESOURCE net_resource; ++ NETRESOURCEA net_resource; + DWORD i_result; + VLC_UNUSED( psz_domain ); + +@@ -544,7 +544,7 @@ static void Win32AddConnection( stream_t *p_access, const char *psz_server, + + net_resource.lpRemoteName = psz_remote; + +- i_result = WNetAddConnection2( &net_resource, psz_pwd, psz_user, 0 ); ++ i_result = WNetAddConnection2A( &net_resource, psz_pwd, psz_user, 0 ); + + if( i_result != NO_ERROR ) + { +-- +GitLab + + +From 5ae924bf212dce64a6424561d92426dbcc2cf3a0 Mon Sep 17 00:00:00 2001 +From: Steve Lhomme +Date: Wed, 6 Dec 2023 14:45:46 +0100 +Subject: [PATCH 8/9] dxva2: add missing mask initializers + +--- + modules/codec/avcodec/dxva2.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/modules/codec/avcodec/dxva2.c b/modules/codec/avcodec/dxva2.c +index 18b872fe0fe3..2e6809a05410 100644 +--- a/modules/codec/avcodec/dxva2.c ++++ b/modules/codec/avcodec/dxva2.c +@@ -84,12 +84,12 @@ DEFINE_GUID(DXVA_Intel_H264_NoFGT_ClearVideo, 0x604F8E68, 0x4951, 0x4c54, + + /* XXX Preferred format must come first */ + static const d3d9_format_t d3d_formats[] = { +- { "YV12", MAKEFOURCC('Y','V','1','2'), VLC_CODEC_YV12 }, +- { "NV12", MAKEFOURCC('N','V','1','2'), VLC_CODEC_NV12 }, +- //{ "IMC3", MAKEFOURCC('I','M','C','3'), VLC_CODEC_YV12 }, +- { "P010", MAKEFOURCC('P','0','1','0'), VLC_CODEC_P010 }, ++ { "YV12", MAKEFOURCC('Y','V','1','2'), VLC_CODEC_YV12, 0,0,0 }, ++ { "NV12", MAKEFOURCC('N','V','1','2'), VLC_CODEC_NV12, 0,0,0 }, ++ //{ "IMC3", MAKEFOURCC('I','M','C','3'), VLC_CODEC_YV12, 0,0,0 }, ++ { "P010", MAKEFOURCC('P','0','1','0'), VLC_CODEC_P010, 0,0,0 }, + +- { NULL, 0, 0 } ++ { NULL, 0, 0, 0,0,0 } + }; + + static const d3d9_format_t *D3dFindFormat(D3DFORMAT format) +-- +GitLab + + +From 08c7a66780740679ba1b0abe9e30e73afc6bc271 Mon Sep 17 00:00:00 2001 +From: Steve Lhomme +Date: Wed, 6 Dec 2023 07:48:29 +0100 +Subject: [PATCH 9/9] win32/modules: use cast with GetProcAddress function + pointers + +--- + src/text/url.c | 3 ++- + src/win32/plugin.c | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/text/url.c b/src/text/url.c +index b962eb31f849..2eb4b8d10817 100644 +--- a/src/text/url.c ++++ b/src/text/url.c +@@ -892,7 +892,8 @@ static int IdnToAscii(DWORD flags, LPCWSTR str, int len, LPWSTR buf, int size) + int (WINAPI *IdnToAsciiReal)(DWORD, LPCWSTR, int, LPWSTR, int); + int ret = 0; + +- IdnToAsciiReal = GetProcAddress(h, "IdnToAscii"); ++ IdnToAsciiReal = (int (WINAPI *)(DWORD, LPCWSTR, int, LPWSTR, int)) ++ GetProcAddress(h, "IdnToAscii"); + if (IdnToAsciiReal != NULL) + ret = IdnToAsciiReal(flags, str, len, buf, size); + else +diff --git a/src/win32/plugin.c b/src/win32/plugin.c +index 1a65521fca75..b5c336eb99ca 100644 +--- a/src/win32/plugin.c ++++ b/src/win32/plugin.c +@@ -45,7 +45,8 @@ static BOOL WINAPI SetThreadErrorModeFallback(DWORD mode, DWORD *oldmode) + + BOOL (WINAPI *SetThreadErrorModeReal)(DWORD, DWORD *); + +- SetThreadErrorModeReal = GetProcAddress(h, "SetThreadErrorMode"); ++ SetThreadErrorModeReal = (BOOL (WINAPI *)(DWORD, DWORD *)) ++ GetProcAddress(h, "SetThreadErrorMode"); + if (SetThreadErrorModeReal != NULL) + return SetThreadErrorModeReal(mode, oldmode); + +-- +GitLab + diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.20.bb b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.20.bb index 21bc408f6d..2a6b27add0 100644 --- a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.20.bb +++ b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.20.bb @@ -25,6 +25,8 @@ SRC_URI = "https://get.videolan.org/${BPN}/${PV}/${BP}.tar.xz \ file://0006-configure-Disable-incompatible-function-pointer-type.patch \ file://taglib-2.patch \ file://0001-taglib-Fix-build-on-x86-32-bit.patch \ + file://4645.patch \ + file://4665.patch \ " SRC_URI[sha256sum] = "adc7285b4d2721cddf40eb5270cada2aaa10a334cb546fd55a06353447ba29b5" From patchwork Tue May 21 18:10:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 43950 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 8E61CC25B7C for ; Tue, 21 May 2024 18:10:48 +0000 (UTC) Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by mx.groups.io with SMTP id smtpd.web10.3054.1716315038833401542 for ; Tue, 21 May 2024 11:10:38 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=OJii3346; spf=pass (domain: gmail.com, ip: 209.85.214.169, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-1eca195a7c8so105024105ad.2 for ; Tue, 21 May 2024 11:10:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716315038; x=1716919838; darn=lists.openembedded.org; 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=c//ZzFJeKnAzUZXplMXKTmD5aTxBECm7Ei3jf72xFpA=; b=OJii3346/t1OvwQbZKJSrnMSCgRgXoFHsTboH8o+KsW7sh2yZebFUcjU3h90k8yKtO PtJ6kmQQ68hZlCCSuSj0XUhIfDHiGzf98vxHOqTscBKPTmKWtq2dk+poPB0p9a+jTVuU /HdgOgn61jPdWSxdiwVCQM+JkFiHhrSZfto+kwhjpAXxHiUqmdtoyd+WUYQhxlMInnsl CyR99tCEVLp+s7+PELE7SjpLQYPw5bf29ZPjBmHDo1eG5ZVQRw7fXkz2EcZf0HaBbyLV SicID0ZfEL79xHPN+vHRi+6bA2MFU94DeXJCYDGBZvNW048YC2KCVSrBqb9VSIHpJR6z J/Xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716315038; x=1716919838; 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=c//ZzFJeKnAzUZXplMXKTmD5aTxBECm7Ei3jf72xFpA=; b=KDjbG4LYPPB/YXiz+A8FvxRi5odVvmc8ZGxF6fCeWimrKsxB1JTuqujHegTRVAKuhC PCvfNLeQN9jxUDUoAzx+3kErzeYIeNQrwavqTYm9JPnp71RrpXVW8p7xws+4Oik/UfCu kOJnDmQDTvfIgXtU+Dh88WpCNBp9l2vU86pHuC7qrDhzEwnOLXRToVVF1bNsgvkTWcmy cXemex4X9E3b+sKkW3egBISQskx0wLx7uEb+Byj0gp0nuT9OghHrBjkQoiEd1799dYb7 EApaOe8cr8BOEgN4k9mmQIQ5HQwCN4Dri/6ASoDBNi6clFhVXsET0YRwUJ4p7gb5ql5Y E0YQ== X-Gm-Message-State: AOJu0YzV+urXKI29qC6kPlDYTpQXdMpEPeikjryWAir3hvKtRIJzgA6M 22iUfNWKASN6JdWj8NOnmqLYsByjvXF6feyA0hBSZy01LZm10NubLJlIAITqEzI= X-Google-Smtp-Source: AGHT+IFQ0FuPbsHuCNfUgoJh5OU3+3eId0flohFgfe/gJhc2U2qzlaUA/X5Hqie28AQqWVjbLpHXRg== X-Received: by 2002:a17:902:784b:b0:1f3:11ec:cbbd with SMTP id d9443c01a7336-1f311eccdc9mr15573805ad.5.1716315038028; Tue, 21 May 2024 11:10:38 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9d80:4380::e8eb]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1ef0c136354sm224799075ad.244.2024.05.21.11.10.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 May 2024 11:10:37 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-gnome][ 12/22] gnome-font-viewer: Fix build with GCC-14 Date: Tue, 21 May 2024 11:10:13 -0700 Message-ID: <20240521181024.426176-12-raj.khem@gmail.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240521181024.426176-1-raj.khem@gmail.com> References: <20240521181024.426176-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 ; Tue, 21 May 2024 18:10:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/110461 Signed-off-by: Khem Raj --- ...dow-Fix-function-callback-definition.patch | 43 +++++++++++++++++++ .../gnome-font-viewer_46.0.bb | 1 + 2 files changed, 44 insertions(+) create mode 100644 meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer/0001-window-Fix-function-callback-definition.patch diff --git a/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer/0001-window-Fix-function-callback-definition.patch b/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer/0001-window-Fix-function-callback-definition.patch new file mode 100644 index 0000000000..be4c002fc3 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer/0001-window-Fix-function-callback-definition.patch @@ -0,0 +1,43 @@ +From ac4a07e7ef3d9d046a4ca2a803c5b649b6f7ddf4 Mon Sep 17 00:00:00 2001 +From: Matt Turner +Date: Sat, 8 Jul 2023 00:01:07 -0400 +Subject: [PATCH] window: Fix function callback definition + +Without this, the build fails with clang with +CFLAGS=-Werror=incompatible-function-pointer-types + +``` +../src/font-view-window.c:864:77: error: incompatible function pointer types passing 'void (FontViewWindow *)' (aka 'void (struct _FontViewWindow *)') to parameter of type 'GtkWidgetActionActivateFunc' (aka 'void (*)(struct _GtkWidget *, const char *, struct _GVariant *)') [-Wincompatible-function-pointer-types] + gtk_widget_class_install_action (widget_class, "win.toggle-search", NULL, action_toggle_search_cb); + ^~~~~~~~~~~~~~~~~~~~~~~ +/usr/include/gtk-4.0/gtk/gtkwidget.h:956:87: note: passing argument to parameter 'activate' here + GtkWidgetActionActivateFunc activate); + ^ +``` + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gnome-font-viewer/-/merge_requests/54] +Signed-off-by: Khem Raj +--- + src/font-view-window.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/font-view-window.c b/src/font-view-window.c +index 639ac33..24461f7 100644 +--- a/src/font-view-window.c ++++ b/src/font-view-window.c +@@ -758,8 +758,11 @@ font_view_window_show_overview (FontViewWindow *self) + } + + static void +-action_toggle_search_cb (FontViewWindow *self) ++action_toggle_search_cb (GtkWidget *widget, ++ const char *action_name, ++ GVariant *parameter) + { ++ FontViewWindow *self = FONT_VIEW_WINDOW (widget); + + gtk_toggle_button_set_active (self->search_button, + !gtk_toggle_button_get_active (self->search_button)); +-- +2.45.1 + diff --git a/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_46.0.bb b/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_46.0.bb index dbce71d121..ccf8262dcd 100644 --- a/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_46.0.bb +++ b/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_46.0.bb @@ -15,6 +15,7 @@ inherit gnomebase gtk-icon-cache gettext features_check mime-xdg REQUIRED_DISTRO_FEATURES = "x11 opengl" +SRC_URI += "file://0001-window-Fix-function-callback-definition.patch" SRC_URI[archive.sha256sum] = "592f401e485d02cc044d487bb5c8e04c961da6856216768a59f1ff98bd2d537c" FILES:${PN} += " \ From patchwork Tue May 21 18:10:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 43952 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 99BE2C25B78 for ; Tue, 21 May 2024 18:10:48 +0000 (UTC) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mx.groups.io with SMTP id smtpd.web10.3056.1716315039586746913 for ; Tue, 21 May 2024 11:10:39 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=fZcl2k9h; spf=pass (domain: gmail.com, ip: 209.85.214.179, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-1ec69e3dbcfso3613355ad.0 for ; Tue, 21 May 2024 11:10:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716315039; x=1716919839; darn=lists.openembedded.org; 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=QHRUHvIl2jL7NBJ/3Z/wNbfH4ya6PdwLEKK9YlB7KJ4=; b=fZcl2k9h64GX4xLVuwAXdmlQ7w00vJyMHLAdq8NVm5sQ9yCPSCxyfzuy0htpPJpsLG udG9KSHzF+adtLPfHyyXgtQUv69Cibh9SQnE9iC2UIn30Si42YM5O50fDM9nmOvWolT4 W8fePGiE64BZD/GnSBZEtMO87NRjcjfXKaXKRkM2mqGvFYTh1b5W5FCyw8uhXP05Yu2H qkBkxwHp4WMcw+Uj6FgCNDDWPw53iiwSA6ArfFBLj10u2rotZs/IEI8EA5dOa0K3J/SY RY3u+kGN+Bu5CEpbNwyIqjhkcofp6gPuCYJocIx5fGTQ98TU/Sd9PfQZHrcQPri2eivE kQ/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716315039; x=1716919839; 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=QHRUHvIl2jL7NBJ/3Z/wNbfH4ya6PdwLEKK9YlB7KJ4=; b=cQzvVp9fUxCp3LzBn4PrWl5cibWCexW3xbJ2WYh5fRUHKAREJJg6PJff6tgzKhlrqs fmiqCBbO35VMPR3UWCSMzdm3oo3Fw+Vh2lWhnaqFEFTCi3BGGXGY2iIWd2LVh1njEu7I 2NlLH9GVTDJJ3fM/cAcH+WIVxlCfyQ2mc7D44meFwqxA38QRDY9O8pnvsIjgZ5p0K4Nu LfVCpCmaaTXEXbiW6YVlutWZRcxxb8J1Wl7XOSIgP7H7kWtwa+4+svF0sLSnwrAlOCQM EzWU/YXK0MC5RpgPTMU0XqZoVmzH0wh2/s0X1D2p4YrAGsJngN0V2Jg040ateQZ0PGJF VW7w== X-Gm-Message-State: AOJu0Yyx8dn5rFTTRdaVeMFnP0WMUagcCmCAOoosWhd9oDJhh66dgpuM qOYH45g+pqQJXCzLN5DJG5myZqMkJ4j9VLnjW56ddYITmKCHk0Y95JH6ZGsqAXg= X-Google-Smtp-Source: AGHT+IHGy1f9Iamf8IkEUPpywgjMn93hc66PNggjz6ijzOyLzisYFRGkw/WbmrmDJZ8/pDDLJCy8GA== X-Received: by 2002:a17:903:244d:b0:1f3:a5b:9705 with SMTP id d9443c01a7336-1f30a5b9d66mr50501095ad.48.1716315038765; Tue, 21 May 2024 11:10:38 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9d80:4380::e8eb]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1ef0c136354sm224799075ad.244.2024.05.21.11.10.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 May 2024 11:10:38 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-gnome][ 13/22] gtksourceview3: Use -Wno-error=incompatible-pointer-types in cflags Date: Tue, 21 May 2024 11:10:14 -0700 Message-ID: <20240521181024.426176-13-raj.khem@gmail.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240521181024.426176-1-raj.khem@gmail.com> References: <20240521181024.426176-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 ; Tue, 21 May 2024 18:10:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/110462 Fixes build with GCC-14, hopefully we will be able to drop it when it breaks again with newer compiler like GCC15 Signed-off-by: Khem Raj --- .../recipes-gnome/gtksourceview/gtksourceview3_3.24.11.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.11.bb b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.11.bb index e504186b82..0ab9b14692 100644 --- a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.11.bb +++ b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.11.bb @@ -15,6 +15,9 @@ inherit gnomebase lib_package gettext features_check gtk-doc gobject-introspecti REQUIRED_DISTRO_FEATURES = "x11" +EXTRA_OECONF += "--disable-glade-catalog --disable-gtk-doc --disable-Werror" + +CFLAGS += "-Wno-error=incompatible-pointer-types" SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtksourceview/3.24/${PNAME}-${PV}.tar.xz" SRC_URI[md5sum] = "b748da426a7d64e1304f0c532b0f2a67" SRC_URI[sha256sum] = "691b074a37b2a307f7f48edc5b8c7afa7301709be56378ccf9cc9735909077fd" From patchwork Tue May 21 18:10:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 43957 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 DDDC0C25B7E for ; Tue, 21 May 2024 18:10:48 +0000 (UTC) Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by mx.groups.io with SMTP id smtpd.web11.3096.1716315040552100314 for ; Tue, 21 May 2024 11:10:40 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=FNKUHeO+; spf=pass (domain: gmail.com, ip: 209.85.214.182, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-1ecddf96313so94110775ad.2 for ; Tue, 21 May 2024 11:10:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716315040; x=1716919840; darn=lists.openembedded.org; 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=T3r/+7eXM+R0U9mKqtzRrYn6WmyjZWLMSmMRGlJqbxA=; b=FNKUHeO+dzYvC/y3If4IGj5mtiRiiJp3j3LlwSK9iC4C7kIm8sZvsq4R9Km0XA5JPJ aZtnrYVAKbdoNSJSGKG/F1WScTJsmRHlFNuDLBJyCtavY4L6Zk9qvIigH6s/+ZDC9IDG /br+9Kg/CoKiTMS/BEox2pkqsT77dLKXWBYcurqhtyvyGnLSTfVqyOzHEI6DZNAwEJSE i4vC+wFjbW67uEYiR0iYt1hZtlCFIPHwywmG3X6XA6oOtbElzGK2VA4wRQMp+3dmwdwH mnEAYvj1Js9Tt1zz9b0OIkaGitpc0of9R3E8ISsgYzRofILyEPvIQDEZycQKm3gCLsKl Ig0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716315040; x=1716919840; 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=T3r/+7eXM+R0U9mKqtzRrYn6WmyjZWLMSmMRGlJqbxA=; b=EbQoyYoXjwDflFYZidQWTJ1YfnVuho7Tif8c1HpC/ofjV+B7reFyq3v9sauZ8jDK/Z V52ZgQYJCkDXlPzyqzpEiGXDKWZB+krLnOsGp24AKi/lBrlRh86N96SUTFMR+LQ3gn9u NRw36qsgHEypiMxomAwdOgNXNyUGjOsQ9zt57e1kIT3Pmuyal/Edp/qEHEz46JqMFZ/l Gf8zzvdBEKI28aeKjovSHgsRrEHrywvP6kS/whe89ZNbzNYp59iEF+95Lf8Eu6aQvks0 al5qKzAQfxq9J0pRdTVWZYOQPWCaiJ6MejA+k8yuNt+lp3Y0hEASrsielDI01sOYKUcR vwCg== X-Gm-Message-State: AOJu0Yyv+NX2QiuXrWJDjTnp1tobT8VoiKPsNfGLneNF2WIHGu1zGr3M O1Osrc7CnqTQUaokU1HWp0ZutvR7YFr4eUBCacw5DVsPec6PLyePJWl7uK56i+M= X-Google-Smtp-Source: AGHT+IEjjVfjJRxBSGk1bvH1zCQr1zLUkB0gep53mFANYYLI1N8LfJw8udHgMLyTBZs0UQtpkVQyEg== X-Received: by 2002:a17:903:2447:b0:1f2:f6ca:fbd8 with SMTP id d9443c01a7336-1f2f6cb00a5mr123564975ad.8.1716315039817; Tue, 21 May 2024 11:10:39 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9d80:4380::e8eb]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1ef0c136354sm224799075ad.244.2024.05.21.11.10.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 May 2024 11:10:39 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-xfce][ 14/22] menulibre: Upgrade to 2.4.0 Date: Tue, 21 May 2024 11:10:15 -0700 Message-ID: <20240521181024.426176-14-raj.khem@gmail.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240521181024.426176-1-raj.khem@gmail.com> References: <20240521181024.426176-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 ; Tue, 21 May 2024 18:10:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/110463 Switch SRC_URI to github release artifacts Signed-off-by: Khem Raj --- .../menulibre/{menulibre_2.3.2.bb => menulibre_2.4.0.bb} | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) rename meta-xfce/recipes-apps/menulibre/{menulibre_2.3.2.bb => menulibre_2.4.0.bb} (83%) diff --git a/meta-xfce/recipes-apps/menulibre/menulibre_2.3.2.bb b/meta-xfce/recipes-apps/menulibre/menulibre_2.4.0.bb similarity index 83% rename from meta-xfce/recipes-apps/menulibre/menulibre_2.3.2.bb rename to meta-xfce/recipes-apps/menulibre/menulibre_2.4.0.bb index 7491b509cc..71d3ab4d29 100644 --- a/meta-xfce/recipes-apps/menulibre/menulibre_2.3.2.bb +++ b/meta-xfce/recipes-apps/menulibre/menulibre_2.4.0.bb @@ -12,9 +12,8 @@ DEPENDS = " \ inherit setuptools3_legacy gtk-icon-cache features_check REQUIRED_DISTRO_FEATURES = "x11 gobject-introspection-data" -SRC_URI = "git://github.com/bluesabre/menulibre.git;protocol=https;branch=master" -SRCREV = "94bef4060714fa65c7246c25b87410b52a149f94" -S = "${WORKDIR}/git" +SRC_URI = "https://github.com/bluesabre/${BPN}/releases/download/${BP}/${BP}.tar.gz" +SRC_URI[sha256sum] = "d906acf9cc13b0e15b8e342ae9aab8b0680db336a382d0c42f5d5f465f593c9f" do_compile[noexec] = "1" From patchwork Tue May 21 18:10:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 43959 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 EF0ECC27C44 for ; Tue, 21 May 2024 18:10:48 +0000 (UTC) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mx.groups.io with SMTP id smtpd.web11.3097.1716315041792470212 for ; Tue, 21 May 2024 11:10:41 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=SHjWtF5p; spf=pass (domain: gmail.com, ip: 209.85.214.179, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-1eb24e3a2d9so117775125ad.1 for ; Tue, 21 May 2024 11:10:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716315041; x=1716919841; darn=lists.openembedded.org; 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=J+vnGrvCBmOHwK7GpMg1WXyUg3XMXG/lg4oOUcpDSEk=; b=SHjWtF5pdRbM94C/aWwHokOUOdS2mpialYwrKKezbVw1qTY8wcDHl17MgYA6moCYlj UQPeQp1lFX3ejlkaDdQDG5kSD5JnO+cetbx+2loc2WWvlfU9Y4bYYm6P1VO0BCEYhfqK k32EEq4f3wM7cIBUzd9ZCpSmOOxhc8bSJnEUgQYcfYpgtAMvV5H7tHAilx330XiGUE1c KMxcjjJaIXOHA+mZ720PBuA8E52RDPkn9aRwQQl9+uhX7jQ5/LbH/95GBtgBeMLKl9Tw 626BE4K66i2OuypKkNT2S0sCBqQsxygr3/59Dq0CyhZvJfAbo9oKqgCkHuwGy0IcBWeg UajA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716315041; x=1716919841; 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=J+vnGrvCBmOHwK7GpMg1WXyUg3XMXG/lg4oOUcpDSEk=; b=Z6pugmqJZsdEgv+csKnU2xKpXXPqKVoz599/3PrphR0Sot+BqrVps5slEyXb8/wIZS bGVkPLdtJWwBn1S9kLPeT+Vd4I1xSMljf/CAZGdu71RCVv3sh77UWSAs2N6bVzp+sBSa 6o9lDSgrmdpEDYqejuhv1MGoZiFul175KaO2T7qB80Ji4OG9r/lPb+hilVaWp5Jug2/q gjS6Senp7arNW8H0zYAFepb0FA99CDvbL6S1+D1KPJESowSQ0Q+Ob4/sxVCn7MOdFK+t JKoAwTEufl3mXPOfTp2UYOo390gtvqFSCVpS85ZxEmnjFbqJqFhbznwY1CzAUs9glxGR YzMw== X-Gm-Message-State: AOJu0Ywt1UUEZC1om9D13Knh7a7m05FK4rOIu6wK6Nm0CaEU59dhF6BZ TTl0vucsyYxK7+037ysovfwoWRvghISo2gZfrWUrnYK/zcWgMpvO+XlFvouQanE= X-Google-Smtp-Source: AGHT+IFAQjSuD4xpTbmMzQdNtA4uqZVBBtvcYlShPlje02naik3SRflermudtQXE4IViiXffSd4vLg== X-Received: by 2002:a17:903:2350:b0:1f2:f7ea:125c with SMTP id d9443c01a7336-1f2f7ea14ecmr123068665ad.10.1716315041028; Tue, 21 May 2024 11:10:41 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9d80:4380::e8eb]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1ef0c136354sm224799075ad.244.2024.05.21.11.10.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 May 2024 11:10:40 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-gnome][ 15/22] gimp: Upgrade to 2.10.38 Date: Tue, 21 May 2024 11:10:16 -0700 Message-ID: <20240521181024.426176-15-raj.khem@gmail.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240521181024.426176-1-raj.khem@gmail.com> References: <20240521181024.426176-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 ; Tue, 21 May 2024 18:10:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/110464 Fix build with GCC-14 with few backports while here Signed-off-by: Khem Raj --- ...f-load-fix-mismatching-variable-type.patch | 24 +++++++++++++++++++ ...001-metadata-shut-up-a-weird-warning.patch | 22 +++++++++++++++++ .../gimp/{gimp_2.10.36.bb => gimp_2.10.38.bb} | 7 ++++-- 3 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 meta-gnome/recipes-gimp/gimp/gimp/0001-file-tiff-load-fix-mismatching-variable-type.patch create mode 100644 meta-gnome/recipes-gimp/gimp/gimp/0001-metadata-shut-up-a-weird-warning.patch rename meta-gnome/recipes-gimp/gimp/{gimp_2.10.36.bb => gimp_2.10.38.bb} (87%) diff --git a/meta-gnome/recipes-gimp/gimp/gimp/0001-file-tiff-load-fix-mismatching-variable-type.patch b/meta-gnome/recipes-gimp/gimp/gimp/0001-file-tiff-load-fix-mismatching-variable-type.patch new file mode 100644 index 0000000000..13b3dda144 --- /dev/null +++ b/meta-gnome/recipes-gimp/gimp/gimp/0001-file-tiff-load-fix-mismatching-variable-type.patch @@ -0,0 +1,24 @@ +From a2458f1528e5733574bb26ff5452b1329116e6db Mon Sep 17 00:00:00 2001 +From: Simon Budig +Date: Sat, 20 May 2023 18:40:41 +0200 +Subject: [PATCH] file-tiff-load: fix mismatching variable type + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gimp/-/commit/a2458f1528e5733574bb26ff5452b1329116e6db] +Signed-off-by: Khem Raj +--- + plug-ins/file-tiff/file-tiff-load.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- a/plug-ins/file-tiff/file-tiff-load.c ++++ b/plug-ins/file-tiff/file-tiff-load.c +@@ -1301,8 +1301,8 @@ load_image (GFile *file, + + /* any resolution info in the file? */ + { +- gfloat xres = 72.0; +- gfloat yres = 72.0; ++ gdouble xres = 72.0; ++ gdouble yres = 72.0; + gushort read_unit; + GimpUnit unit = GIMP_UNIT_PIXEL; /* invalid unit */ + diff --git a/meta-gnome/recipes-gimp/gimp/gimp/0001-metadata-shut-up-a-weird-warning.patch b/meta-gnome/recipes-gimp/gimp/gimp/0001-metadata-shut-up-a-weird-warning.patch new file mode 100644 index 0000000000..4f04ac8250 --- /dev/null +++ b/meta-gnome/recipes-gimp/gimp/gimp/0001-metadata-shut-up-a-weird-warning.patch @@ -0,0 +1,22 @@ +From 51311f913d9f417d121f59b83d560c7b4b853d1c Mon Sep 17 00:00:00 2001 +From: Simon Budig +Date: Sat, 20 May 2023 22:25:40 +0200 +Subject: [PATCH] metadata: shut up a weird warning + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gimp/-/commit/51311f913d9f417d121f59b83d560c7b4b853d1c] +Signed-off-by: Khem Raj +--- + plug-ins/metadata/metadata-editor.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/plug-ins/metadata/metadata-editor.c ++++ b/plug-ins/metadata/metadata-editor.c +@@ -2140,7 +2140,7 @@ metadata_dialog_editor_set_metadata (GEx + } + else + { +- if (! g_strv_contains (values, equiv_values[evi])) ++ if (! g_strv_contains ((const gchar * const *) values, equiv_values[evi])) + { + gchar *tmpvalue; + diff --git a/meta-gnome/recipes-gimp/gimp/gimp_2.10.36.bb b/meta-gnome/recipes-gimp/gimp/gimp_2.10.38.bb similarity index 87% rename from meta-gnome/recipes-gimp/gimp/gimp_2.10.36.bb rename to meta-gnome/recipes-gimp/gimp/gimp_2.10.38.bb index 4526839ad6..833341f850 100644 --- a/meta-gnome/recipes-gimp/gimp/gimp_2.10.36.bb +++ b/meta-gnome/recipes-gimp/gimp/gimp_2.10.38.bb @@ -46,8 +46,11 @@ SHPV = "${@gnome_verdir("${PV}")}" SRC_URI = "https://download.gimp.org/pub/${BPN}/v${SHPV}/${BP}.tar.bz2 \ file://0001-configure-Keep-first-line-of-compiler-version-string.patch \ - file://0001-libtool-Do-not-add-build-time-library-paths-to-LD_LI.patch" -SRC_URI[sha256sum] = "3d3bc3c69a4bdb3aea9ba2d5385ed98ea03953f3857aafd1d6976011ed7cdbb2" + file://0001-libtool-Do-not-add-build-time-library-paths-to-LD_LI.patch \ + file://0001-file-tiff-load-fix-mismatching-variable-type.patch \ + file://0001-metadata-shut-up-a-weird-warning.patch \ + " +SRC_URI[sha256sum] = "50a845eec11c8831fe8661707950f5b8446e35f30edfb9acf98f85c1133f856e" EXTRA_OECONF = "--disable-python \ --without-webkit \ From patchwork Tue May 21 18:10:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 43958 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 C2D4FC27C43 for ; Tue, 21 May 2024 18:10:48 +0000 (UTC) Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by mx.groups.io with SMTP id smtpd.web10.3057.1716315042737186306 for ; Tue, 21 May 2024 11:10:42 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=DKChAg/T; spf=pass (domain: gmail.com, ip: 209.85.214.182, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-1ec92e355bfso4550535ad.3 for ; Tue, 21 May 2024 11:10:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716315042; x=1716919842; darn=lists.openembedded.org; 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=uGjxXjIdO3/i/aW1nDrInHMsu1mRrFsJths3OaRHbbM=; b=DKChAg/TaCS5el3GbXiW2xUxpYXTPgKJEWKwm4+7DIO3SoYCbP0uOxV5nogjO6DdJs DLI6QA+8sW1OnFsBchyJdaEVeD8QfGbPi1o7u1PSeIsqa/iK197gftusBCGI5TJJeIjS fGM9NX1kzlRCtns63PNKtYCgW02toFFxQAtMyTG/A70BQbrQz3u+7HLtRy/BZC7tUgml 8CuOYyzkoXvVWHKV1HpS+gnUR8tUwZ3R0WWxdCY1UB5sDbKLR5PQ4iSTwbo3Q+UAcXmo 9/+8eoVcOKNDls1ymGAu+0Smmn602q6uou8R277oxFLFVdCoKPwWdga+cqake+PSW+Hs 8H/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716315042; x=1716919842; 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=uGjxXjIdO3/i/aW1nDrInHMsu1mRrFsJths3OaRHbbM=; b=NdkmmoKBRTXGAH03GBc7poRO1GjYt9S/k+pGbNc2aLyIC1xECDUozL9kZDMRo8yy7r FH5PZiQNqBxm6a6MleKnYSRWcqdeFYAFj3LT5jTdGBDQBv0N8s3PInz1Th5D4XMq8Sug ttcSoO/f0aLFInUZJTdJ0q8jVY3PTX0lq17zyRZzUZjaLgLu6eBh5tZmFiYzeHWQk1wt WQ0UGTkAE/4OjIZ3BuE7Ug2sGiAIuk0VRCdpevlPxhwn9E9H0rbA0uqkKFdikXR5mE+g g/75wkkz5Ka6MtIEEyFxieBQ1ptbhuD9N9MJLlO/82hrp0/Vz5ERPDQZu9abzmdYgxmX q0VQ== X-Gm-Message-State: AOJu0Yw3/2oWGL4BrAXVBaDFx3h11/CWu7WySmrEl0c3WsvGsLThIi+X dp1kRyXbDoqjB0rdVmfbQgzjVhCs0fbI+Lkz1kUntFRQ1XdPmwrfvOFuUhaZgjY= X-Google-Smtp-Source: AGHT+IHrr2puydKIPn1WkXu9VCBdEDwuXArspQuOcZDFVD/ZJsSfwhMw5bTQIX8/tzCNIXaA7c9urw== X-Received: by 2002:a17:902:7248:b0:1ee:2a58:cb7c with SMTP id d9443c01a7336-1ef43e26586mr316780905ad.35.1716315041924; Tue, 21 May 2024 11:10:41 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9d80:4380::e8eb]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1ef0c136354sm224799075ad.244.2024.05.21.11.10.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 May 2024 11:10:41 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-networking][ 16/22] nbd: Fix build with GCC14 on musl targets Date: Tue, 21 May 2024 11:10:17 -0700 Message-ID: <20240521181024.426176-16-raj.khem@gmail.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240521181024.426176-1-raj.khem@gmail.com> References: <20240521181024.426176-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 ; Tue, 21 May 2024 18:10:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/110465 Signed-off-by: Khem Raj --- ...1-nbd-client-Fix-build-on-musl-gcc14.patch | 43 +++++++++++++++++++ .../recipes-support/nbd/nbd_3.26.1.bb | 4 +- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 meta-networking/recipes-support/nbd/nbd/0001-nbd-client-Fix-build-on-musl-gcc14.patch diff --git a/meta-networking/recipes-support/nbd/nbd/0001-nbd-client-Fix-build-on-musl-gcc14.patch b/meta-networking/recipes-support/nbd/nbd/0001-nbd-client-Fix-build-on-musl-gcc14.patch new file mode 100644 index 0000000000..15b439e255 --- /dev/null +++ b/meta-networking/recipes-support/nbd/nbd/0001-nbd-client-Fix-build-on-musl-gcc14.patch @@ -0,0 +1,43 @@ +From 909d20a2ee4afecd5ae4cc5950c8ee599f72972d Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 20 May 2024 17:48:13 -0700 +Subject: [PATCH] nbd-client: Fix build on musl + gcc14 + +GCC-14 has promoted incompatible-pointer-types warning into error which is +now flagged especially with when building on musl + +Fixes following error + +| ../nbd-3.26.1/nbd-client.c: In function 'openunix': +| ../nbd-3.26.1/nbd-client.c:345:27: error: passing argument 2 of 'connect' from incompatible pointer type [-Wincompatible-pointer-types] +| 345 | if (connect(sock, &un_addr, sizeof(un_addr)) == -1) { +| | ^~~~~~~~ +| | | +| | struct sockaddr_un * +| In file included from ../nbd-3.26.1/nbd-client.c:25: +| /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux-musl/nbd/3.26.1/recipe-sysroot/usr/include/sys/socket.h:386:19: note: expected 'const struct sockaddr *' but argument is of type 'struct sockaddr_un *' +| 386 | int connect (int, const struct sockaddr *, socklen_t); +| | ^~~~~~~~~~~~~~~~~~~~~~~ + +Upstream-Status: Submitted [https://lists.debian.org/nbd/2024/05/msg00012.html] +Signed-off-by: Khem Raj +--- + nbd-client.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/nbd-client.c b/nbd-client.c +index 8d1101b..7b25c67 100644 +--- a/nbd-client.c ++++ b/nbd-client.c +@@ -342,7 +342,7 @@ int openunix(const char *path) { + return -1; + }; + +- if (connect(sock, &un_addr, sizeof(un_addr)) == -1) { ++ if (connect(sock, (struct sockaddr*)&un_addr, sizeof(un_addr)) == -1) { + err_nonfatal("CONNECT failed"); + close(sock); + return -1; +-- +2.45.1 + diff --git a/meta-networking/recipes-support/nbd/nbd_3.26.1.bb b/meta-networking/recipes-support/nbd/nbd_3.26.1.bb index 15d5f8b36b..a67b087f74 100644 --- a/meta-networking/recipes-support/nbd/nbd_3.26.1.bb +++ b/meta-networking/recipes-support/nbd/nbd_3.26.1.bb @@ -7,7 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "autoconf-archive bison-native glib-2.0 libnl zlib bison-native" SRC_URI = "https://github.com/NetworkBlockDevice/${BPN}/releases/download/${BP}/${BP}.tar.xz \ - file://f0418b0d8b54c21a1e5b0c6dce3277e938d07e7c.patch" + file://f0418b0d8b54c21a1e5b0c6dce3277e938d07e7c.patch \ + file://0001-nbd-client-Fix-build-on-musl-gcc14.patch \ + " SRC_URI[sha256sum] = "f0cf509fa5b20b1a07f7904eb637e9b47d3e30b6ed6f00075af5d8b701c78fef" inherit autotools pkgconfig systemd From patchwork Tue May 21 18:10:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 43954 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 A7207C25B7F for ; Tue, 21 May 2024 18:10:48 +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.3058.1716315044050768976 for ; Tue, 21 May 2024 11:10:44 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Ji+l3CDn; 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 d9443c01a7336-1edf506b216so102127035ad.2 for ; Tue, 21 May 2024 11:10:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716315043; x=1716919843; darn=lists.openembedded.org; 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=S9zpfWYiN6/6IT/Bok99jo8g5ZOxFGz28hCTv/p+p9I=; b=Ji+l3CDnHZpkLi7HNkdUZaus0eyypwQiOA8R86UnECQhuLcQ7nASbHK3gsg1F7O93m tFLK1qRkNdHg3ffaoc7nT8FPeh3xTVXjBQB3BqH5prHhOKsHj06G2/8Fg/9aBR4N2I0z 3ebphQpcmQguzR+RpDCOGUXgxJ+5wD19CnCejxger16h98Isbz6j2lQ2zrK6sJm1Dtuv t6cuAPGEyH2t+1s1hAKyuTNfmtCUhlUpMa8v3Iv/EfTAwLlpcEwCO3SPcmpDn0SFZhXj EOD48u5p/a8N+aKZd9F28M1SNd2OFzBhiGxU5lnx3DBn5goUvfWloEGWVb5dMlcoGJ7Z O83w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716315043; x=1716919843; 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=S9zpfWYiN6/6IT/Bok99jo8g5ZOxFGz28hCTv/p+p9I=; b=YpcQTnBK0c8ODCXiThb0hYNeFnvUWDNsAY4S893zjDakUTOMsUJcaaAdvjwsKEcZt1 nRK6Ypf7N5wGVRayERzU5hUEnvBl1orCxzq0Gf/TLjFFQqeS+P/i/CZu/+6cvSyaY1vW 7mwivrvyAvCB1a6Rt/Ki73L4VRo/SkjqaWwK48BxvOhVKG+F55LH1Xp5tKIlrmilfN13 CWr9gWRBNTKiNuidFqkgyBVGkVYSJgjqINITu3SjNEMUkjf3wxsgjY2GmZocLe3kENvj n1GSTTTg6bccxeIjcOQ7D568yYaK40DGLGiC82KFWbNdR3C90yV1FLIR/8mpu12xnK79 wi9A== X-Gm-Message-State: AOJu0YyZrAkilM2kSgD30JROxNRYPghbLu5HhkGG/A/MzSKsRc4EZFdQ OE8osSMiSIW/3hBFdQ5v8IMCUPQTOcbkyGB93pZu42PBTov3O8Xh83tjqo55wR4= X-Google-Smtp-Source: AGHT+IFVMwPS/MB4Om94mS/eurLQGnnZ++S0ZXlFXJxgy4OV1rvhD9CK0mKe/7c1HTJRbd7/Z1vE6w== X-Received: by 2002:a17:903:1250:b0:1ea:26bf:928 with SMTP id d9443c01a7336-1ef44161501mr394896165ad.50.1716315043152; Tue, 21 May 2024 11:10:43 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9d80:4380::e8eb]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1ef0c136354sm224799075ad.244.2024.05.21.11.10.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 May 2024 11:10:42 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-multimedia][ 17/22] pipewire-0.2: Include time.h for timespec struct signature Date: Tue, 21 May 2024 11:10:18 -0700 Message-ID: <20240521181024.426176-17-raj.khem@gmail.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240521181024.426176-1-raj.khem@gmail.com> References: <20240521181024.426176-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 ; Tue, 21 May 2024 18:10:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/110466 Signed-off-by: Khem Raj --- ...n-idle-Include-time.h-for-struct-tim.patch | 43 +++++++++++++++++++ .../pipewire/pipewire-0.2_git.bb | 4 +- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 meta-multimedia/recipes-multimedia/pipewire/pipewire-0.2/0001-module-suspend-on-idle-Include-time.h-for-struct-tim.patch diff --git a/meta-multimedia/recipes-multimedia/pipewire/pipewire-0.2/0001-module-suspend-on-idle-Include-time.h-for-struct-tim.patch b/meta-multimedia/recipes-multimedia/pipewire/pipewire-0.2/0001-module-suspend-on-idle-Include-time.h-for-struct-tim.patch new file mode 100644 index 0000000000..ce381a78b3 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/pipewire/pipewire-0.2/0001-module-suspend-on-idle-Include-time.h-for-struct-tim.patch @@ -0,0 +1,43 @@ +From b1d911fdab4a583f276d18395037d90bfc305109 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 20 May 2024 18:12:23 -0700 +Subject: [PATCH] module-suspend-on-idle: Include time.h for struct timespec + decl + +This is flagged as error with gcc-14 on musl targets + +In file included from ../git/src/pipewire/loop.h:27, + from ../git/src/pipewire/core.h:44, + from ../git/src/modules/module-suspend-on-idle.c:26: +../git/spa/include/spa/support/loop.h:184:37: warning: 'struct timespec' declared inside parameter list will not be visible outside of this definition or declaration + 184 | struct timespec *value, + | ^~~~~~~~ +../git/src/modules/module-suspend-on-idle.c: In function 'node_state_changed': +../git/src/modules/module-suspend-on-idle.c:110:69: error: passing argument 2 of 'main_loop->utils->update_timer' from incompatible pointer type [-Wincompatible-pointer-types] + 110 | pw_loop_update_timer(main_loop, info->idle_timeout, &value, NULL, false); + | ^~~~~~ + | | + | struct timespec * + +Upstream-Status: Inappropriate [Fixed in latest pipewire differently] + +Signed-off-by: Khem Raj +--- + src/modules/module-suspend-on-idle.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/modules/module-suspend-on-idle.c b/src/modules/module-suspend-on-idle.c +index e5c1fcb30..4dba3be71 100644 +--- a/src/modules/module-suspend-on-idle.c ++++ b/src/modules/module-suspend-on-idle.c +@@ -20,6 +20,7 @@ + #include + #include + #include ++#include + + #include "config.h" + +-- +2.45.1 + diff --git a/meta-multimedia/recipes-multimedia/pipewire/pipewire-0.2_git.bb b/meta-multimedia/recipes-multimedia/pipewire/pipewire-0.2_git.bb index 9895e89761..7c8afd3d51 100644 --- a/meta-multimedia/recipes-multimedia/pipewire/pipewire-0.2_git.bb +++ b/meta-multimedia/recipes-multimedia/pipewire/pipewire-0.2_git.bb @@ -10,7 +10,9 @@ DEPENDS = "alsa-lib dbus udev" SRCREV = "14c11c0fe4d366bad4cfecdee97b6652ff9ed63d" PV = "0.2.7" -SRC_URI = "git://github.com/PipeWire/pipewire;branch=master;protocol=https" +SRC_URI = "git://github.com/PipeWire/pipewire;branch=master;protocol=https \ + file://0001-module-suspend-on-idle-Include-time.h-for-struct-tim.patch \ + " S = "${WORKDIR}/git" From patchwork Tue May 21 18:10:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 43955 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 B5129C27C41 for ; Tue, 21 May 2024 18:10:48 +0000 (UTC) Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by mx.groups.io with SMTP id smtpd.web11.3100.1716315044738958161 for ; Tue, 21 May 2024 11:10:44 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=DfwgA/ze; spf=pass (domain: gmail.com, ip: 209.85.210.179, mailfrom: raj.khem@gmail.com) Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-6f693fb0ab6so1055285b3a.1 for ; Tue, 21 May 2024 11:10:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716315044; x=1716919844; darn=lists.openembedded.org; 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=Ks6615LooyR+fif0H2nKMBq9NzfNifcLbjamwPSKD+Q=; b=DfwgA/zel2PXG0ts5EEA9eJeraQx8z71DfSHyUKJQEwcwGLgWIfwCGox598gNXi+7v 6ZfusyysoAqVPgmi16PNxjB6HrcdSxnhWWcVZbDP/3Tr6RBPklmPYVYuAcwA+xqFwH9A 6jIT/4u57woKYHy2JCSmtKernLq4HLMwZ8t3ju+sQfgeZh0kxpBvdchHZuTGk1R97DO6 6k8l7mnSQrz/2ozJh5jk8nM8mAu6mUekfrEHTA+RNDyg34FRiJXcP111TIhIPwUDLVwz ZxIGxC2UFTtYZoKejfw8S9vEUMs/9m7JBQgZ54tnMgutkVLqFGP5CDM8q2a5BbA/Cljk Y3TQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716315044; x=1716919844; 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=Ks6615LooyR+fif0H2nKMBq9NzfNifcLbjamwPSKD+Q=; b=a2aiWISqXog7Pvhi4pYZCpOrBCNXSqcufOxLlRLk2kYU5N5D1vWZkYSjEzijnBP42l dlUtfWO7LkHpgWnSGC/HAhqj2WVonzw2xQP7VQxJSWpreLFFZFfKBfqk6hVLYbk7fN7l PpLZD7xF3L1JSmq8OctpVrSrI6cd4lhpOPIcMcemuAYv7wNMdQZWCpYstvYI7Xtcw+fp tHZJ4z8jD6LubjzWsE4BxD2jjmQ7kCT5+61RiPKW8Di9OaSOjyhUQhdyoliSPOmnVVOw BSaCzeXm0SFbUP9p9cCAK3f0sYWQbeXeyAvR1zMIMzqyth3XyL1lvbOttaWptVYZ1LpB TFTw== X-Gm-Message-State: AOJu0Yz3El7nSPltgBdLIX8oka1dOUJkH4O2FvaNRDq5VvoyiZM9wjAi +Mv4eJsXuRIeP4EqDZU4QE6w++bRV5QmX20TQAYKEY2/wtzmLZVHZ//67VRxpOI= X-Google-Smtp-Source: AGHT+IFIn0AbvZOm9MSou4D11RoKukZb8JosomL70NDbEGJ9fIcrcSZg/DBdYqmu1mm0OA49YA96Yg== X-Received: by 2002:a05:6a20:dd9d:b0:1ac:fd95:574e with SMTP id adf61e73a8af0-1afde0e2101mr29130310637.28.1716315043941; Tue, 21 May 2024 11:10:43 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9d80:4380::e8eb]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1ef0c136354sm224799075ad.244.2024.05.21.11.10.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 May 2024 11:10:43 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][ 18/22] directfb: Fix build with musl+GCC14 Date: Tue, 21 May 2024 11:10:19 -0700 Message-ID: <20240521181024.426176-18-raj.khem@gmail.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240521181024.426176-1-raj.khem@gmail.com> References: <20240521181024.426176-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 ; Tue, 21 May 2024 18:10:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/110467 Signed-off-by: Khem Raj --- .../recipes-graphics/directfb/directfb.inc | 1 + ...rect-the-signature-of-bind-call-on-m.patch | 36 +++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 meta-oe/recipes-graphics/directfb/directfb/0001-inputdrivers-Correct-the-signature-of-bind-call-on-m.patch diff --git a/meta-oe/recipes-graphics/directfb/directfb.inc b/meta-oe/recipes-graphics/directfb/directfb.inc index 4d38632e25..54aeb06aa9 100644 --- a/meta-oe/recipes-graphics/directfb/directfb.inc +++ b/meta-oe/recipes-graphics/directfb/directfb.inc @@ -24,6 +24,7 @@ SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/DirectFB-${PV}.tar.g file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \ file://0001-os-linux-Fix-build-when-__NR_futex-is-not-available.patch \ file://0001-include-libgen.h-for-basename.patch \ + file://0001-inputdrivers-Correct-the-signature-of-bind-call-on-m.patch \ " S = "${WORKDIR}/DirectFB-${PV}" diff --git a/meta-oe/recipes-graphics/directfb/directfb/0001-inputdrivers-Correct-the-signature-of-bind-call-on-m.patch b/meta-oe/recipes-graphics/directfb/directfb/0001-inputdrivers-Correct-the-signature-of-bind-call-on-m.patch new file mode 100644 index 0000000000..574bba0bc7 --- /dev/null +++ b/meta-oe/recipes-graphics/directfb/directfb/0001-inputdrivers-Correct-the-signature-of-bind-call-on-m.patch @@ -0,0 +1,36 @@ +From 18f4eca291cabf93d87e7c9051268d9c385b8f37 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 20 May 2024 18:23:06 -0700 +Subject: [PATCH] inputdrivers: Correct the signature of bind() call on musl + systems + +Its flagged with GCC14 + +../../../DirectFB-1.7.7/inputdrivers/linux_input/linux_input.c:1551:27: error: passing argument 2 of 'bind' from incompatible pointer type [-Wincompatible-pointer-types] + 1551 | rt = bind(socket_fd, &sock_addr, + | ^~~~~~~~~~ + | | + | struct sockaddr_un * + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + inputdrivers/linux_input/linux_input.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/inputdrivers/linux_input/linux_input.c b/inputdrivers/linux_input/linux_input.c +index 03deebc..207f5a5 100644 +--- a/inputdrivers/linux_input/linux_input.c ++++ b/inputdrivers/linux_input/linux_input.c +@@ -1548,7 +1548,7 @@ udev_hotplug_EventThread(DirectThread *thread, void * hotplug_data) + "/org/kernel/udev/monitor", + sizeof(sock_addr.sun_path) - 1); + +- rt = bind(socket_fd, &sock_addr, ++ rt = bind(socket_fd, (struct sockaddr *)&sock_addr, + sizeof(sock_addr.sun_family)+1+strlen(&sock_addr.sun_path[1])); + if (rt < 0) { + D_PERROR( "DirectFB/linux_input: bind() failed: %s\n", +-- +2.45.1 + From patchwork Tue May 21 18:10:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 43953 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 A7140C25B7D for ; Tue, 21 May 2024 18:10:48 +0000 (UTC) Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) by mx.groups.io with SMTP id smtpd.web11.3101.1716315045649606425 for ; Tue, 21 May 2024 11:10:45 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=K1CshmfG; spf=pass (domain: gmail.com, ip: 209.85.210.180, mailfrom: raj.khem@gmail.com) Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-6f447976de7so1611368b3a.1 for ; Tue, 21 May 2024 11:10:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716315045; x=1716919845; darn=lists.openembedded.org; 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=au6qYTdw+vOSxSNLYj/YJbyijCpp22cIgp0istqAo4Y=; b=K1CshmfGm017qn78xVJaMlIg6NYE/Hcx006+OTLghabzmMHzWDC4i7LcHRy7GJuMce sIhq9KIVlQC2C/1JtqtTGzIX6MU6HLvWxP5VYka61IC1EDBSCG3LxyJP/JXLiA8VI+Py KpLCrb40R4a96tnuzbT4vJrRnHQBAoI2SiHOK8MCLljVa5aGliX3ym9yHKLUP6H6DnCW qMDh+/zPYP5RBzusyYXyDEcIFQkYXOJlFETSIb5ffhIJH+aOqj3iu66OtRFzhmBVLjHe DLX0wMk+j/2N911eMmkjOoBLgKHTBhqt/Co3RRmhmV72rotCx+JyJku+Wa4sQ6KTGBtO BANg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716315045; x=1716919845; 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=au6qYTdw+vOSxSNLYj/YJbyijCpp22cIgp0istqAo4Y=; b=uv5+m2/eUACP7M8HtJkORbrrog/7YMPn6atehLPagmiZ/rGhjm6EBVcGrC5fLVAHYT sevYtx/Sp6Kava1kC8jE0ENglLxx0wvt4FDhct86DqAT5voGKormlYiYpOl+/Xd/4HwC uMqPHGFjubIiYRTEl9oL9Djs/qR18Rw6i8UIEvkwk7sXhNYL/eSQ/OdgEjzYoP/VbFQM 6cGwb9Xt1XPBenRG2tk9uc+6wIlbAAL2bz/awURsbMvX2/ijRPDXkO8uLmas1v9QH/gU b3t1nS0+VmiIvlNSOx11yarGv4LRjwUDgUwlcWkFiqq1E+so7T9E94BkQjut5NBhjF6I QSug== X-Gm-Message-State: AOJu0YwuHhr+Fbici3TQfSeO+NH5E+eTR1/+P6yNARjuPZ3uojXzds9c B7DW6qLbqvfVBg05xSburalUC2c222xnoNhXr3DYEg8AZ7UL/NcxL5SdZpcrFUI= X-Google-Smtp-Source: AGHT+IFIAp0yoxwX7+5LSMwoNpNX4USWwpdXAIfXMvc6pPYMYj1s7zCCPQZfcLjstBl3sQa5a7IaxQ== X-Received: by 2002:a17:902:ec85:b0:1f3:f10:2c8d with SMTP id d9443c01a7336-1f30f102fb3mr25788775ad.65.1716315044840; Tue, 21 May 2024 11:10:44 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9d80:4380::e8eb]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1ef0c136354sm224799075ad.244.2024.05.21.11.10.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 May 2024 11:10:44 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][ 19/22] etcd-cpp-apiv3: Fix build on musl + GCC14 Date: Tue, 21 May 2024 11:10:20 -0700 Message-ID: <20240521181024.426176-19-raj.khem@gmail.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240521181024.426176-1-raj.khem@gmail.com> References: <20240521181024.426176-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 ; Tue, 21 May 2024 18:10:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/110468 Signed-off-by: Khem Raj --- ...1-include-stdint.h-for-int64_t-types.patch | 27 +++++++++++++++++++ .../etcd/etcd-cpp-apiv3_0.15.3.bb | 1 + 2 files changed, 28 insertions(+) create mode 100644 meta-oe/recipes-extended/etcd/etcd-cpp-apiv3/0001-include-stdint.h-for-int64_t-types.patch diff --git a/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3/0001-include-stdint.h-for-int64_t-types.patch b/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3/0001-include-stdint.h-for-int64_t-types.patch new file mode 100644 index 0000000000..373e146b98 --- /dev/null +++ b/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3/0001-include-stdint.h-for-int64_t-types.patch @@ -0,0 +1,27 @@ +From 44f4254fe96c43437400f94a8a2800175ddf3279 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 20 May 2024 21:00:48 -0700 +Subject: [PATCH] include stdint.h for int64_t types + +This is exposed when compiling for musl platforms where this +header is not included indirectly. + +Upstream-Status: Submitted [https://github.com/etcd-cpp-apiv3/etcd-cpp-apiv3/pull/270] +Signed-off-by: Khem Raj +--- + src/Value.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/Value.cpp b/src/Value.cpp +index cbda697..d6f2c9c 100644 +--- a/src/Value.cpp ++++ b/src/Value.cpp +@@ -1,4 +1,5 @@ + #include ++#include + + #include "etcd/Value.hpp" + #include "etcd/v3/KeyValue.hpp" +-- +2.45.1 + diff --git a/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.3.bb b/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.3.bb index 401d53c79c..2e149577dc 100644 --- a/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.3.bb +++ b/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.3.bb @@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=eae7da6a2cd1788a5cf8a9f838cf6450" SRC_URI = " \ git://github.com/etcd-cpp-apiv3/etcd-cpp-apiv3.git;branch=master;protocol=https \ file://0001-cmake-fix-when-cross-compiling.patch \ + file://0001-include-stdint.h-for-int64_t-types.patch \ " SRCREV = "e31ac4d4caa55fa662e207150ba40f8151b7ad96" From patchwork Tue May 21 18:10:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 43956 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 99C36C41513 for ; Tue, 21 May 2024 18:10:48 +0000 (UTC) Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by mx.groups.io with SMTP id smtpd.web10.3060.1716315046992228607 for ; Tue, 21 May 2024 11:10:47 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=LC3/5lyF; spf=pass (domain: gmail.com, ip: 209.85.214.177, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-1ee0132a6f3so3484685ad.0 for ; Tue, 21 May 2024 11:10:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716315046; x=1716919846; darn=lists.openembedded.org; 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=hzqxsUmSppQIW0RouJbSl23ZaL24i4ZbiDCORqw3Hyw=; b=LC3/5lyF7eoHUewWoUeR1DGrqiuMP6yukcpn8UZZWwtMz8gLd6ecDp3TSES/hNUd1m 4nic6eOe8ZiQp56csKvCy+E9y1fAlevKaJbJxI7rXBqp07Y+fNjJSNTGEIoZiOpZNMGC uRSZ3c0W+7o5qLjiPAMLefq2IngZKysI74s7+8m8vjF++osWY0zwU9IKvktfA7qLOgB2 2P1W6NjLqxwRIQsOgJ0562Ef5iGxt/t731AeDYL+EOHnXcM5pUdI8Z+pbEJWCS66Y5Ku h7Qi27FWseeQqPdQ16EmX+X9RRzMIQ4NiEzSQmTjIJk3z30EVqxpl4qMFpUktl5IkXNp qCtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716315046; x=1716919846; 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=hzqxsUmSppQIW0RouJbSl23ZaL24i4ZbiDCORqw3Hyw=; b=UOOeFqukkOJpCtX5FpodzldLzeNFrhObssX364maPQIJeUJo8xi3TfM7oXCbtCKoW/ ERIn8ipMkPHOQNZ5Mo9otXunKwhKlNonJHFyw56Dudiixd035tUoePGm1BQr8xSWx7+c oFp/93fcO8/lgwWzHMWnLxUUADVMOSr6Ecp5gXxCkG9LNlM8aypC5twlBPNQL0mL4ksj 7BsYqACDzJDeRwKLVEtv2njQXogF2asl/pYuI1BawA4Ini1PesyseSjQ3x7lmsruKt/h oC3m+H/1gTzf3v7GOQVU9KO1dB4ebDfIeYjZJzwm9dQxwSXCKvP8fS0/YCLupiSqtalf 3DvQ== X-Gm-Message-State: AOJu0YwzMx8K2op+KHYYwBdDZHsA+fTJSt/JjPj0ZcQtAgKwEgWICm0W uAKVjGNAccjA7JzgNH+BuFhiJFTOPyKzB96Jdepu4R9OVqv1jDcfguyiHa8M/O0= X-Google-Smtp-Source: AGHT+IEZvYLSRlOjrxFjE9CYD/gUe/WGmfbBFpQ5R9ppQJj9b78L2IQJBfLfDgRsclsS5/gHtS8Q4w== X-Received: by 2002:a17:902:8f8b:b0:1e5:3684:6189 with SMTP id d9443c01a7336-1ef4404ccdemr291972435ad.63.1716315046218; Tue, 21 May 2024 11:10:46 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9d80:4380::e8eb]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1ef0c136354sm224799075ad.244.2024.05.21.11.10.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 May 2024 11:10:45 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][ 20/22] etcd-cpp-apiv3: Upgrade to 0.15.4 release Date: Tue, 21 May 2024 11:10:21 -0700 Message-ID: <20240521181024.426176-20-raj.khem@gmail.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240521181024.426176-1-raj.khem@gmail.com> References: <20240521181024.426176-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 ; Tue, 21 May 2024 18:10:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/110469 Drop upstreamed patch Signed-off-by: Khem Raj --- .../0001-cmake-fix-when-cross-compiling.patch | 68 ------------------- ...iv3_0.15.3.bb => etcd-cpp-apiv3_0.15.4.bb} | 3 +- 2 files changed, 1 insertion(+), 70 deletions(-) delete mode 100644 meta-oe/recipes-extended/etcd/etcd-cpp-apiv3/0001-cmake-fix-when-cross-compiling.patch rename meta-oe/recipes-extended/etcd/{etcd-cpp-apiv3_0.15.3.bb => etcd-cpp-apiv3_0.15.4.bb} (84%) diff --git a/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3/0001-cmake-fix-when-cross-compiling.patch b/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3/0001-cmake-fix-when-cross-compiling.patch deleted file mode 100644 index ce12d4270a..0000000000 --- a/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3/0001-cmake-fix-when-cross-compiling.patch +++ /dev/null @@ -1,68 +0,0 @@ -From cb79329010d73e36ce64830914005f1c17f8f53c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= -Date: Sat, 23 Sep 2023 11:32:18 +0200 -Subject: [PATCH] cmake: fix when cross compiling -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -In order to generate protobuf files CMake need to use the protoc -and grpc-cpp-plugin compiled for the host architecture. - -Unfortunately, the protoc and grpc-cpp-plugin in the gRPC CMake -configuration file are the one for the target architecture. - -Fix this by properly finding the correct executable when -CMake is cross compiling. - -Signed-off-by: Clément Péron ---- -Upstream-Status: Pending - - CMakeLists.txt | 28 ++++++++++++++++++++++++++-- - 1 file changed, 26 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5aa1310..80ebad2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -120,10 +120,34 @@ if(Protobuf_PROTOC_EXECUTABLE) - endif() - endif() - -+# When cross compiling we look for the native protoc compiler -+# overwrite protobuf::protoc with the proper protoc -+if(CMAKE_CROSSCOMPILING) -+ find_program(Protobuf_PROTOC_EXECUTABLE REQUIRED NAMES protoc) -+ if(NOT TARGET protobuf::protoc) -+ add_executable(protobuf::protoc IMPORTED) -+ endif() -+ set_target_properties(protobuf::protoc PROPERTIES -+ IMPORTED_LOCATION "${Protobuf_PROTOC_EXECUTABLE}") -+endif() -+ - find_package(gRPC QUIET) --if(gRPC_FOUND AND TARGET gRPC::grpc AND TARGET gRPC::grpc_cpp_plugin) -+if(gRPC_FOUND AND TARGET gRPC::grpc) -+ # When cross compiling we look for the native grpc_cpp_plugin -+ if(CMAKE_CROSSCOMPILING) -+ find_program(GRPC_CPP_PLUGIN REQUIRED NAMES grpc_cpp_plugin) -+ if(NOT TARGET gRPC::grpc_cpp_plugin) -+ add_executable(gRPC::grpc_cpp_plugin IMPORTED) -+ endif() -+ set_target_properties(gRPC::grpc_cpp_plugin PROPERTIES -+ IMPORTED_LOCATION "${GRPC_CPP_PLUGIN}") -+ elseif(TARGET gRPC::grpc_cpp_plugin) -+ get_target_property(GRPC_CPP_PLUGIN gRPC::grpc_cpp_plugin LOCATION) -+ else() -+ message(FATAL_ERROR "Found gRPC but no gRPC CPP plugin defined") -+ endif() -+ - set(GRPC_LIBRARIES gRPC::gpr gRPC::grpc gRPC::grpc++) -- get_target_property(GRPC_CPP_PLUGIN gRPC::grpc_cpp_plugin LOCATION) - get_target_property(GRPC_INCLUDE_DIR gRPC::grpc INTERFACE_INCLUDE_DIRECTORIES) - else() - include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindGRPC.cmake) --- -2.39.3 (Apple Git-145) - diff --git a/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.3.bb b/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.4.bb similarity index 84% rename from meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.3.bb rename to meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.4.bb index 2e149577dc..88a8ba3469 100644 --- a/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.3.bb +++ b/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.4.bb @@ -6,11 +6,10 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=eae7da6a2cd1788a5cf8a9f838cf6450" SRC_URI = " \ git://github.com/etcd-cpp-apiv3/etcd-cpp-apiv3.git;branch=master;protocol=https \ - file://0001-cmake-fix-when-cross-compiling.patch \ file://0001-include-stdint.h-for-int64_t-types.patch \ " -SRCREV = "e31ac4d4caa55fa662e207150ba40f8151b7ad96" +SRCREV = "ba6216385fc332b23d95683966824c2b86c2474e" inherit cmake From patchwork Tue May 21 18:10:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 43951 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 8E005C25B74 for ; Tue, 21 May 2024 18:10:48 +0000 (UTC) Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by mx.groups.io with SMTP id smtpd.web11.3102.1716315048073037429 for ; Tue, 21 May 2024 11:10:48 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=GFLFf/jF; spf=pass (domain: gmail.com, ip: 209.85.214.178, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-1eb24e3a2d9so117776075ad.1 for ; Tue, 21 May 2024 11:10:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716315047; x=1716919847; darn=lists.openembedded.org; 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=zdbX25TNHzNlfb7QkNyyaBGLOMbIEQxwI7SyAqWXFxc=; b=GFLFf/jFt94JpMC7iThCb49hPlR+BIG4RPUP/XvuRpRGcKZWIihVc2N7urImVutdHe PDzjpAFiTmaBn/sbmrm77Q26MiwAvzNEdwWby9DMPQsVbIAI34iHubGPCc0ZeTGrD6eS RBMbgDeObXdngdQPYYoeN2chv5ee7T4DK15C3IQT/pjQ0FlqUtHHVLYb422dHsHLHdKh +z5rd01tJPaEEkHkXsC9Hhu+4RsvXMpPW/tMd6kEOPlJhAS+3CV2JE2ZChgDeQ/1hjYP kFIoIwBpqRpKfdW6toyXbwr2+VLZunIUoCoXpvdWEKH39dznTHuEv6rDWxkor5GKYn7m GxuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716315047; x=1716919847; 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=zdbX25TNHzNlfb7QkNyyaBGLOMbIEQxwI7SyAqWXFxc=; b=GcNnCJEsjnrFgbpYBUHv5yAWlDIktMNlTpFNLIAYRNeN7UdPdLpY2uOq+VXIoMkt/X /2tp4EW3PKVrTypEGU1cw39/BkOhNlS5bGP7Z5pk3JQ+exMm83JkWOx1lbPnj1Yg95l4 mRRwOyaXPYv4digDU+gAqqe9eQH6RGKUuv8huHlzZ99HfIguNt/sPqwUIenJYGXtmr/Y NMYv+nnryOHaJA8srodrk/Ds84dC1WUTP00xymiRb6VevRisjVMzeF17tjPfTiQfnO7P sOqW01i2Gy8axWiJBq17jofqp8v5vccEXO+alSvHAcHb/lhjaUvGPxhq3xpgcifAMW/c 3dGA== X-Gm-Message-State: AOJu0YxKsJcAtwe02GPed9RS6iJQqLLGLu5g90JiAnZqalT2Zz6zNs5n Z4H+chJV/HVta3SZssY5J+Yl6TICSTHEu4OTBoQmdo+n/kHmjmWgrXACfPR/EmQ= X-Google-Smtp-Source: AGHT+IHDf6R7422g7fcJedzDlVaF9YSnXwmPh0I+/mxZ3zco8dy2Wxz9J8PtWKTjfLu0EuEIDJUgkQ== X-Received: by 2002:a17:902:e845:b0:1f2:fd49:9fcc with SMTP id d9443c01a7336-1f2fd49a043mr111243585ad.34.1716315047307; Tue, 21 May 2024 11:10:47 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9d80:4380::e8eb]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1ef0c136354sm224799075ad.244.2024.05.21.11.10.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 May 2024 11:10:46 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][ 21/22] syzkaller: Fix build with musl + gcc14 Date: Tue, 21 May 2024 11:10:22 -0700 Message-ID: <20240521181024.426176-21-raj.khem@gmail.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240521181024.426176-1-raj.khem@gmail.com> References: <20240521181024.426176-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 ; Tue, 21 May 2024 18:10:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/110470 Signed-off-by: Khem Raj --- ...ve-including-error.h-in-test_linux.h.patch | 29 +++++++++++++++++++ .../recipes-test/syzkaller/syzkaller_git.bb | 1 + 2 files changed, 30 insertions(+) create mode 100644 meta-oe/recipes-test/syzkaller/syzkaller/0001-executor-Remove-including-error.h-in-test_linux.h.patch diff --git a/meta-oe/recipes-test/syzkaller/syzkaller/0001-executor-Remove-including-error.h-in-test_linux.h.patch b/meta-oe/recipes-test/syzkaller/syzkaller/0001-executor-Remove-including-error.h-in-test_linux.h.patch new file mode 100644 index 0000000000..8bb19fb72b --- /dev/null +++ b/meta-oe/recipes-test/syzkaller/syzkaller/0001-executor-Remove-including-error.h-in-test_linux.h.patch @@ -0,0 +1,29 @@ +From 648868595cf290e77aab1f271db2a57e1f791301 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 20 May 2024 20:37:07 -0700 +Subject: [PATCH] executor: Remove including in test_linux.h + +it seems to be redundant and moreover it lets us compile on musl which +does not provide this system header + +Upstream-Status: Submitted [https://github.com/google/syzkaller/pull/4822] +Signed-off-by: Khem Raj +--- + executor/test_linux.h | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/executor/test_linux.h b/executor/test_linux.h +index 7cf459569..8c9493539 100644 +--- a/executor/test_linux.h ++++ b/executor/test_linux.h +@@ -1,7 +1,6 @@ + // Copyright 2017 syzkaller project authors. All rights reserved. + // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. + +-#include + #include + #include + +-- +2.45.1 + diff --git a/meta-oe/recipes-test/syzkaller/syzkaller_git.bb b/meta-oe/recipes-test/syzkaller/syzkaller_git.bb index b43207f2a7..639f55de2f 100644 --- a/meta-oe/recipes-test/syzkaller/syzkaller_git.bb +++ b/meta-oe/recipes-test/syzkaller/syzkaller_git.bb @@ -9,6 +9,7 @@ GO_IMPORT = "github.com/google/syzkaller" SRC_URI = "git://${GO_IMPORT};protocol=https;destsuffix=${BPN}-${PV}/src/${GO_IMPORT};branch=master \ file://0001-sys-targets-targets.go-allow-users-to-override-hardc.patch;patchdir=src/${GO_IMPORT} \ file://0001-executor-Include-missing-linux-falloc.h.patch;patchdir=src/${GO_IMPORT} \ + file://0001-executor-Remove-including-error.h-in-test_linux.h.patch;patchdir=src/${GO_IMPORT} \ " SRCREV = "25905f5d0a2a7883bd33491997556193582c6059" From patchwork Tue May 21 18:10:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 43961 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 E4FC2C41513 for ; Tue, 21 May 2024 18:10:58 +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.web11.3103.1716315049045036225 for ; Tue, 21 May 2024 11:10:49 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=XfEL8Lkl; 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 d9443c01a7336-1ee38966529so777185ad.1 for ; Tue, 21 May 2024 11:10:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716315048; x=1716919848; darn=lists.openembedded.org; 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=gpn7v6evRaFusG/WO4BCfLW/GJAjTErGkYh/TPo6FC0=; b=XfEL8LklhtbSiWlTgTGzsysg0RdjePYqMLy9+52/k+QAUVItrlTvC+n/ef566j7R3a DpKV5HVPN8gh+CGhnufKkgHxlXSV6KMolcjjIy0+Z9KtqlaVlglGgPvAeGXsRBuDHpf+ 2ntVjo4M3nfBgYBq5UXsmig6ja+BKW5JDn6UomUMCqR3TyO3KQ5Wpwm4ASuVQEKk/AQb ncU+pwxoqsbkn9geCII2ljsca+Uc/MWCWC9UECaDxpy5+/mU1q/8p0Kw3U30XoYdbY1n 2xGxVt4GQJvkuJ6K/lfw80oCTFMSmcrICTXIyalfhstHUffykkVbC8RGnH6NFEFpcqsh KJ1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716315048; x=1716919848; 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=gpn7v6evRaFusG/WO4BCfLW/GJAjTErGkYh/TPo6FC0=; b=l+ezOUnKReB8lVeMaZYdxhZPmjZ7Pj6j5RG6j+Kz2TP288wt51RA0UlsZjv9oFlgbj MM4OIy56rMT4L2C5NGhYTQ9wTsWZeqx7ajKqfiyjWhXrrif7eWuDrfcuTvMGMt1omx/0 ItJQ5+i8PThMKMjyBvtXbno5DX2Hz7Y6cN+Wb4MTebjWoMOTU9eTRrQ9PZzCOchyb25Z GFopw4N73cDaJQTLTOir48AeTHwkycbYiepFPeiRFNRWBeHIPOkirky3p0IjmhgT8W/q ZjG6pv8OdrIHKdfqq2tbmWHqAUdnFdl5zfb1eaZgc2t7WhSUcJ+lfhHEdBi3nJAqshMs ErqA== X-Gm-Message-State: AOJu0Yx5CSsse89jRhHglukVkl/mY0z5oMUYROpkbdYqQY+Oyo1b2AZV y9I3nISH057bt7D1mPZA5uRWYzAbX06U9fBTCXOj+RnBWbyn+uVcWBYUQYdcMis= X-Google-Smtp-Source: AGHT+IF8OC5VU6b9b6ieCgLncF6QLp2wZTsu+5IfJ0Qre3uoVm3EOP2CYSGI0PcqyNsRRW0VzO40Dw== X-Received: by 2002:a17:903:18d:b0:1f3:62c:247f with SMTP id d9443c01a7336-1f3062c27d8mr64725865ad.11.1716315048114; Tue, 21 May 2024 11:10:48 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9d80:4380::e8eb]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1ef0c136354sm224799075ad.244.2024.05.21.11.10.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 May 2024 11:10:47 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][ 22/22] gsoap: Upgrade to 2.8.134 Date: Tue, 21 May 2024 11:10:23 -0700 Message-ID: <20240521181024.426176-22-raj.khem@gmail.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240521181024.426176-1-raj.khem@gmail.com> References: <20240521181024.426176-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 ; Tue, 21 May 2024 18:10:58 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/110471 Redo musl support patch such that it can always be applied Signed-off-by: Khem Raj --- ...-signature-on-non-glibc-linux-musl-s.patch | 85 ++++++++++++++++ ...1-Simplify-check-for-gethostbyname_r.patch | 96 ------------------- .../{gsoap_2.8.126.bb => gsoap_2.8.134.bb} | 6 +- 3 files changed, 88 insertions(+), 99 deletions(-) create mode 100644 meta-oe/recipes-support/gsoap/gsoap/0001-Provide-strtod_l-signature-on-non-glibc-linux-musl-s.patch delete mode 100644 meta-oe/recipes-support/gsoap/gsoap/0001-Simplify-check-for-gethostbyname_r.patch rename meta-oe/recipes-support/gsoap/{gsoap_2.8.126.bb => gsoap_2.8.134.bb} (87%) diff --git a/meta-oe/recipes-support/gsoap/gsoap/0001-Provide-strtod_l-signature-on-non-glibc-linux-musl-s.patch b/meta-oe/recipes-support/gsoap/gsoap/0001-Provide-strtod_l-signature-on-non-glibc-linux-musl-s.patch new file mode 100644 index 0000000000..df27a59ee7 --- /dev/null +++ b/meta-oe/recipes-support/gsoap/gsoap/0001-Provide-strtod_l-signature-on-non-glibc-linux-musl-s.patch @@ -0,0 +1,85 @@ +From 2b7a51556185539a0f9baef0f109e0814933d6b3 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 19 May 2024 17:11:20 -0700 +Subject: [PATCH] Provide strtod_l signature on non-glibc linux ( musl ) + systems + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + gsoap/stdsoap2.c | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/gsoap/stdsoap2.cpp ++++ b/gsoap/stdsoap2.cpp +@@ -74,6 +74,11 @@ A commercial use license is available fr + + #include "stdsoap2.h" + ++#if defined(__linux__) && !defined(__GLIBC__) ++struct __locale_struct; ++double strtod_l(const char *__restrict, char **__restrict, struct __locale_struct *); ++#endif ++ + #if GSOAP_VERSION != GSOAP_LIB_VERSION + # error "GSOAP VERSION MISMATCH IN LIBRARY: PLEASE REINSTALL PACKAGE" + #endif +@@ -5457,7 +5462,7 @@ tcp_gethostbyname(struct soap *soap, con + { + #if (defined(_AIX43) || defined(TRU64) || defined(HP_UX)) && defined(HAVE_GETHOSTBYNAME_R) + struct hostent_data ht_data; +-#elif (!defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__)) && !defined(SUN_OS) && !defined(__QNX__) && !defined(QNX) && defined(HAVE_GETHOSTBYNAME_R) ++#elif (!defined(__GLIBC__) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__)) && !defined(SUN_OS) && !defined(__QNX__) && !defined(QNX) && defined(HAVE_GETHOSTBYNAME_R) + int r; + char *tmpbuf = soap->tmpbuf; + size_t tmplen = sizeof(soap->tmpbuf); +@@ -5490,7 +5495,7 @@ tcp_gethostbyname(struct soap *soap, con + hostent = NULL; + soap->errnum = h_errno; + } +-#elif (!defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__)) && !defined(SUN_OS) && !defined(__QNX__) && !defined(QNX) && defined(HAVE_GETHOSTBYNAME_R) ++#elif (!defined(__GLIBC__) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__)) && !defined(SUN_OS) && !defined(__QNX__) && !defined(QNX) && defined(HAVE_GETHOSTBYNAME_R) + while ((r = gethostbyname_r(addr, hostent, tmpbuf, tmplen, &hostent, &soap->errnum)) < 0) + { + if (tmpbuf != soap->tmpbuf) +@@ -23192,7 +23197,7 @@ soap_strerror(struct soap *soap) + { + #ifndef WIN32 + # ifdef HAVE_STRERROR_R +-# if !defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && ((!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600))) ++# if !defined(__GLIBC__) || (!(~_GNU_SOURCE+1) && ((!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600))) + err = strerror_r(err, soap->msgbuf, sizeof(soap->msgbuf)); /* XSI-compliant */ + if (err != 0) + soap_strcpy(soap->msgbuf, sizeof(soap->msgbuf), "unknown error"); +--- a/gsoap/stdsoap2.c ++++ b/gsoap/stdsoap2.c +@@ -74,6 +74,11 @@ A commercial use license is available fr + + #include "stdsoap2.h" + ++#if defined(__linux__) && !defined(__GLIBC__) ++struct __locale_struct; ++double strtod_l(const char *__restrict, char **__restrict, struct __locale_struct *); ++#endif ++ + #if GSOAP_VERSION != GSOAP_LIB_VERSION + # error "GSOAP VERSION MISMATCH IN LIBRARY: PLEASE REINSTALL PACKAGE" + #endif +@@ -5490,7 +5495,7 @@ tcp_gethostbyname(struct soap *soap, con + hostent = NULL; + soap->errnum = h_errno; + } +-#elif (!defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__)) && !defined(SUN_OS) && !defined(__QNX__) && !defined(QNX) && defined(HAVE_GETHOSTBYNAME_R) ++#elif (!defined(__GLIBC__) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__)) && !defined(SUN_OS) && !defined(__QNX__) && !defined(QNX) && defined(HAVE_GETHOSTBYNAME_R) + while ((r = gethostbyname_r(addr, hostent, tmpbuf, tmplen, &hostent, &soap->errnum)) < 0) + { + if (tmpbuf != soap->tmpbuf) +@@ -23192,7 +23197,7 @@ soap_strerror(struct soap *soap) + { + #ifndef WIN32 + # ifdef HAVE_STRERROR_R +-# if !defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && ((!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600))) ++# if !defined(__GLIBC__) || (!(~_GNU_SOURCE+1) && ((!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600))) + err = strerror_r(err, soap->msgbuf, sizeof(soap->msgbuf)); /* XSI-compliant */ + if (err != 0) + soap_strcpy(soap->msgbuf, sizeof(soap->msgbuf), "unknown error"); diff --git a/meta-oe/recipes-support/gsoap/gsoap/0001-Simplify-check-for-gethostbyname_r.patch b/meta-oe/recipes-support/gsoap/gsoap/0001-Simplify-check-for-gethostbyname_r.patch deleted file mode 100644 index 6ae02deb24..0000000000 --- a/meta-oe/recipes-support/gsoap/gsoap/0001-Simplify-check-for-gethostbyname_r.patch +++ /dev/null @@ -1,96 +0,0 @@ -From fa923a50790c907725c822b2fc7d63b2da62b4ad Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 12 Mar 2023 13:34:55 -0700 -Subject: [PATCH] Simplify check for gethostbyname_r() - -This helps build fix with musl. - -Imported from Alpine: https://git.alpinelinux.org/aports/tree/community/gsoap/musl-fixes.patch - -Signed-off-by: Khem Raj ---- -Upstream-Status: Pending - - gsoap/stdsoap2.c | 6 ++---- - gsoap/stdsoap2.cpp | 10 ++-------- - 2 files changed, 4 insertions(+), 12 deletions(-) - -diff --git a/gsoap/stdsoap2.c b/gsoap/stdsoap2.c -index 654a1e1..fa31d02 100644 ---- a/gsoap/stdsoap2.c -+++ b/gsoap/stdsoap2.c -@@ -5463,7 +5463,7 @@ tcp_gethostbyname(struct soap *soap, const char *addr, struct hostent *hostent, - hostent = NULL; - soap->errnum = h_errno; - } --#elif (!defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__)) && !defined(SUN_OS) && defined(HAVE_GETHOSTBYNAME_R) -+#elif defined(HAVE_GETHOSTBYNAME_R) - while ((r = gethostbyname_r(addr, hostent, tmpbuf, tmplen, &hostent, &soap->errnum)) < 0) - { - if (tmpbuf != soap->tmpbuf) -@@ -5478,8 +5478,6 @@ tcp_gethostbyname(struct soap *soap, const char *addr, struct hostent *hostent, - if (!tmpbuf) - break; - } --#elif defined(HAVE_GETHOSTBYNAME_R) -- hostent = gethostbyname_r(addr, hostent, tmpbuf, tmplen, &soap->errnum); - #elif defined(VXWORKS) - /* vxWorks compatible */ - /* If the DNS resolver library resolvLib has been configured in the vxWorks -@@ -23112,7 +23110,7 @@ soap_strerror(struct soap *soap) - { - #ifndef WIN32 - # ifdef HAVE_STRERROR_R --# if !defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && ((!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600))) -+# if 1 - err = strerror_r(err, soap->msgbuf, sizeof(soap->msgbuf)); /* XSI-compliant */ - if (err != 0) - soap_strcpy(soap->msgbuf, sizeof(soap->msgbuf), "unknown error"); -diff --git a/gsoap/stdsoap2.cpp b/gsoap/stdsoap2.cpp -index 654a1e1..5fd5fd6 100644 ---- a/gsoap/stdsoap2.cpp -+++ b/gsoap/stdsoap2.cpp -@@ -5430,7 +5430,7 @@ tcp_gethostbyname(struct soap *soap, const char *addr, struct hostent *hostent, - { - #if (defined(_AIX43) || defined(TRU64) || defined(HP_UX)) && defined(HAVE_GETHOSTBYNAME_R) - struct hostent_data ht_data; --#elif (!defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__)) && defined(HAVE_GETHOSTBYNAME_R) -+#elif defined(HAVE_GETHOSTBYNAME_R) - int r; - char *tmpbuf = soap->tmpbuf; - size_t tmplen = sizeof(soap->tmpbuf); -@@ -5463,7 +5463,7 @@ tcp_gethostbyname(struct soap *soap, const char *addr, struct hostent *hostent, - hostent = NULL; - soap->errnum = h_errno; - } --#elif (!defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__)) && !defined(SUN_OS) && defined(HAVE_GETHOSTBYNAME_R) -+#elif defined(HAVE_GETHOSTBYNAME_R) - while ((r = gethostbyname_r(addr, hostent, tmpbuf, tmplen, &hostent, &soap->errnum)) < 0) - { - if (tmpbuf != soap->tmpbuf) -@@ -5478,8 +5478,6 @@ tcp_gethostbyname(struct soap *soap, const char *addr, struct hostent *hostent, - if (!tmpbuf) - break; - } --#elif defined(HAVE_GETHOSTBYNAME_R) -- hostent = gethostbyname_r(addr, hostent, tmpbuf, tmplen, &soap->errnum); - #elif defined(VXWORKS) - /* vxWorks compatible */ - /* If the DNS resolver library resolvLib has been configured in the vxWorks -@@ -23112,13 +23110,9 @@ soap_strerror(struct soap *soap) - { - #ifndef WIN32 - # ifdef HAVE_STRERROR_R --# if !defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && ((!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600))) - err = strerror_r(err, soap->msgbuf, sizeof(soap->msgbuf)); /* XSI-compliant */ - if (err != 0) - soap_strcpy(soap->msgbuf, sizeof(soap->msgbuf), "unknown error"); --# else -- return strerror_r(err, soap->msgbuf, sizeof(soap->msgbuf)); /* GNU-specific */ --# endif - # else - return strerror(err); - # endif --- -2.39.2 - diff --git a/meta-oe/recipes-support/gsoap/gsoap_2.8.126.bb b/meta-oe/recipes-support/gsoap/gsoap_2.8.134.bb similarity index 87% rename from meta-oe/recipes-support/gsoap/gsoap_2.8.126.bb rename to meta-oe/recipes-support/gsoap/gsoap_2.8.134.bb index 6d8b53d308..5528e87e6c 100644 --- a/meta-oe/recipes-support/gsoap/gsoap_2.8.126.bb +++ b/meta-oe/recipes-support/gsoap/gsoap_2.8.134.bb @@ -5,9 +5,9 @@ LICENSE = "GPL-2.0-with-OpenSSL-exception" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4f40a941379143186f9602242c3fb729 \ file://GPLv2_license.txt;md5=a33672dbe491b6517750a0389063508b" -SRC_URI = "https://prdownloads.sourceforge.net/${BPN}2/${BPN}_${PV}.zip" -SRC_URI:append:libc-musl = " file://0001-Simplify-check-for-gethostbyname_r.patch" -SRC_URI[sha256sum] = "b65190ebf8c2517d6fafbdc2000bc7bc650d921a02f4aa53eb1e3df267592c4a" +SRC_URI = "https://prdownloads.sourceforge.net/${BPN}2/${BPN}_${PV}.zip \ + file://0001-Provide-strtod_l-signature-on-non-glibc-linux-musl-s.patch" +SRC_URI[sha256sum] = "63478e555c0ccde0164f055ff605b02805db0abc6712a04bcb14cb617b047218" inherit autotools