From patchwork Mon Aug 15 02:26:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 11385 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 7349EC25B06 for ; Mon, 15 Aug 2022 02:26:48 +0000 (UTC) Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by mx.groups.io with SMTP id smtpd.web08.12169.1660530407798784580 for ; Sun, 14 Aug 2022 19:26:47 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=DrYXN/oU; spf=pass (domain: gmail.com, ip: 209.85.210.178, mailfrom: raj.khem@gmail.com) Received: by mail-pf1-f178.google.com with SMTP id k14so5678750pfh.0 for ; Sun, 14 Aug 2022 19:26:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc; bh=7x2xT+WGWMVRrbUlb+Ur5A/wXjhGK4il64ZrTSPSMr4=; b=DrYXN/oUxppywlPCvTXrtNrYsN4t5njTZTpkmpGzVAOqMSm+py0WuZLatY9vG8XV7D Kddo3bcHTd/ZZvNI3bvEZzzIpQqkRzVhNGs0dJ6j+coSR2m2mRrkXt3pfZ+285kJZgYm IK08ONZtIhOa33DkcbW5SuPYNdpjG7zoebp+9IrJSCVQCq1IiB5+HNQznzjv4MXQOYZM D4jQhkkpxsGJsHxZJNxB+BCXbqXJbUHHELZJwQsJAuKVhi6CSAk0HiIeeyLmvxPH3WO5 slbk6farVPGYO028dwilXg6JlKytaP+FW8ONOTGX0HGY56B9xz+31pmJEYtYweZTEv5m 4Wvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc; bh=7x2xT+WGWMVRrbUlb+Ur5A/wXjhGK4il64ZrTSPSMr4=; b=qoMftoUWWacezLemp0lvWU3e/zBHMcoC0vh12xunR6YBIj3IPt/ZVBrTwsvxlPux/q rsqkh6C+MUUwsCxdYq5N1pDD+PiTrgtQeRLjoPf9mRS62bp+4WRxIF2h+E4xXmh0IFyc IuzMf4HvjaepcvEMO3gTqkfaViIlH+wFdzOa2WXMAFQcXtXxuJ6w9CJSY4T8iG8B93He aYkxNLdPewlgTrwYiZSYzdKEPhEBL+ixoNf5FTZ0Ci85RnOMG9jj+ly9PXvaWRlVFh9m f3mLPOdgXs9YlzyN4bSGJe06/c54w4xTTFGOfiPtSxXoGt0gte//ytnx6JeMlMakgW6M yslg== X-Gm-Message-State: ACgBeo3Al6EIAwj2XvLt0z6w5qJjvcBBDBrb7I5zAtjctzPi2/oZU56P hyl7x4WIU1VFh5T1G3v7OuJeIl0OewE/6Q== X-Google-Smtp-Source: AA6agR5OStru3abemiYvwwtLW62vtHZsQZ30JAxCiTzLfYle7Oo8WsrxXcKcTVGLVQNvvY7i/Voc1g== X-Received: by 2002:a63:484e:0:b0:429:411b:1d8c with SMTP id x14-20020a63484e000000b00429411b1d8cmr2166746pgk.623.1660530406731; Sun, 14 Aug 2022 19:26:46 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::bb7a]) by smtp.gmail.com with ESMTPSA id h11-20020a170902f54b00b0016db0d877e4sm6026608plf.221.2022.08.14.19.26.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Aug 2022 19:26:46 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Cc: Khem Raj Subject: [PATCH 1/4] json-c: Fix function prototypes Date: Sun, 14 Aug 2022 19:26:41 -0700 Message-Id: <20220815022644.1665539-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.2 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 ; Mon, 15 Aug 2022 02:26:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169342 This is flagged with clang 15 Signed-off-by: Khem Raj --- .../json-c/0001-Fix-build-with-clang-15.patch | 34 +++++++++++++++++++ meta/recipes-devtools/json-c/json-c_0.16.bb | 2 +- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/json-c/json-c/0001-Fix-build-with-clang-15.patch diff --git a/meta/recipes-devtools/json-c/json-c/0001-Fix-build-with-clang-15.patch b/meta/recipes-devtools/json-c/json-c/0001-Fix-build-with-clang-15.patch new file mode 100644 index 00000000000..215f4d829a2 --- /dev/null +++ b/meta/recipes-devtools/json-c/json-c/0001-Fix-build-with-clang-15.patch @@ -0,0 +1,34 @@ +From 0145b575ac1fe6a77e00d639864f26fc91ceb12f Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 13 Aug 2022 20:37:03 -0700 +Subject: [PATCH] Fix build with clang-15+ + +Fixes +json_util.c:63:35: error: a function declaration without a prototype is deprecated in all versions of C [-We +rror,-Wstrict-prototypes] +const char *json_util_get_last_err() + ^ + void + +Upstream-Status: Backport [https://github.com/json-c/json-c/pull/783] +Signed-off-by: Khem Raj +--- + json_util.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/json_util.c b/json_util.c +index 952770a..83d9c68 100644 +--- a/json_util.c ++++ b/json_util.c +@@ -60,7 +60,7 @@ static int _json_object_to_fd(int fd, struct json_object *obj, int flags, const + + static char _last_err[256] = ""; + +-const char *json_util_get_last_err() ++const char *json_util_get_last_err(void) + { + if (_last_err[0] == '\0') + return NULL; +-- +2.37.2 + diff --git a/meta/recipes-devtools/json-c/json-c_0.16.bb b/meta/recipes-devtools/json-c/json-c_0.16.bb index 50431081bba..3aba41dfcf6 100644 --- a/meta/recipes-devtools/json-c/json-c_0.16.bb +++ b/meta/recipes-devtools/json-c/json-c_0.16.bb @@ -6,9 +6,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=de54b60fbbc35123ba193fea8ee216f2" SRC_URI = " \ https://s3.amazonaws.com/json-c_releases/releases/${BP}.tar.gz \ + file://0001-Fix-build-with-clang-15.patch \ file://run-ptest \ " - SRC_URI[sha256sum] = "8e45ac8f96ec7791eaf3bb7ee50e9c2100bbbc87b8d0f1d030c5ba8a0288d96b" UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/tags" From patchwork Mon Aug 15 02:26:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 11388 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 5E785C25B06 for ; Mon, 15 Aug 2022 02:26:58 +0000 (UTC) Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by mx.groups.io with SMTP id smtpd.web10.12136.1660530408930822992 for ; Sun, 14 Aug 2022 19:26:49 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=BiVs1cZv; spf=pass (domain: gmail.com, ip: 209.85.210.178, mailfrom: raj.khem@gmail.com) Received: by mail-pf1-f178.google.com with SMTP id a22so5076671pfg.3 for ; Sun, 14 Aug 2022 19:26:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=QyiukIExWnp8nn97eS2F1XSbzpCmeq+r0B0VtEFNhNw=; b=BiVs1cZv5+E9bafEjQTOYF4KivTceWYoTRyxU6oyEHY5dgkm4rQ17cfr4OjjSi5s0i AeCs0YrkL01KhSpejtHufF+E3Wlh8iYiRXHSw3UsVAhrQu9XiD//o4lwXtbpzSx6Sx2m rrfHG0JN3ycfWzvccHHWXR0MBB28kMKejcgE5/tSPbocdMSdgVWSEhBZom8D8sgrzmZx edXH8wmaHyrsUyLh7ryRjAj0FVRqZDfl3pBzfVmMfpbKDaHiB1PSlU+7J0Z4mK4wDpla J/02m2+fBTV1EWp3+j3FbDuoY1y5zjKbf11BySRSglBexkv4sf/FXWqTFyZ0YhH33GnO AyFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=QyiukIExWnp8nn97eS2F1XSbzpCmeq+r0B0VtEFNhNw=; b=QSMsGDS+AJGM8cp8pYzDuGIFRsRwYqlQZCSnJQ8K/mQMe4mIL6c30yeDmhoa6GggRv ilanEh9E7/bjeknM0zmJFiMMCBPdzdu/6WBGLruE9bDm64PTMb7cNqukmxSDel43XE3H yEL23EGzJsAhdLyi/9KN5vbK0xHt8azC4mICTDkW48m8pjZ69DPjUlv9K1+8sNcsFT+S cZDKi840WFWVbC0t8Mm1QE9hIcL4DrQVW3fVdlub2ShsftWz01e//I37CKxq/5ZwJL4U twUf3gmaZXLltrKG8qqxDw5PKNLA26ta323wZXtzCAcDUXUWD7wpwbjtXHOOrcbcsu5M yHVA== X-Gm-Message-State: ACgBeo2u4lElmVbnSMbRFSsomZrmyWMxDideKOcQNIwjXjS/NAWXxtLi BpMhoqvgeHN1UTMax+w/QlYlod1s1wepGg== X-Google-Smtp-Source: AA6agR6bwz3EdHystPhipaoLEekKZ4Sk/GwnlKKVXGKDlpOqzWs7dWta0QZG8vA/7o6jbh5fKai6ZA== X-Received: by 2002:a63:d108:0:b0:422:6972:61e6 with SMTP id k8-20020a63d108000000b00422697261e6mr10105407pgg.169.1660530408032; Sun, 14 Aug 2022 19:26:48 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::bb7a]) by smtp.gmail.com with ESMTPSA id h11-20020a170902f54b00b0016db0d877e4sm6026608plf.221.2022.08.14.19.26.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Aug 2022 19:26:47 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Cc: Khem Raj Subject: [PATCH 2/4] xmlto: Update to use upstream tip of trunk Date: Sun, 14 Aug 2022 19:26:42 -0700 Message-Id: <20220815022644.1665539-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220815022644.1665539-1-raj.khem@gmail.com> References: <20220815022644.1665539-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 ; Mon, 15 Aug 2022 02:26:58 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169343 There are several fixes which are done to fix builds with newer compilers after 0.0.28 was releases in 2015 a long time ago. Add a patch to fix manpages builds not trying to access network during build Regenerate xmlif from lex files, before configuring the build Signed-off-by: Khem Raj --- .../0001-Skip-validating-xmlto-output.patch | 29 +++++++++++++++++++ ...rop-the-test-of-xmllint-and-xsltproc.patch | 6 ++-- meta/recipes-devtools/xmlto/xmlto_0.0.28.bb | 16 +++++++--- 3 files changed, 44 insertions(+), 7 deletions(-) create mode 100644 meta/recipes-devtools/xmlto/xmlto/0001-Skip-validating-xmlto-output.patch rename meta/recipes-devtools/xmlto/{xmlto-0.0.28 => xmlto}/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch (91%) diff --git a/meta/recipes-devtools/xmlto/xmlto/0001-Skip-validating-xmlto-output.patch b/meta/recipes-devtools/xmlto/xmlto/0001-Skip-validating-xmlto-output.patch new file mode 100644 index 00000000000..e1c24aba4ab --- /dev/null +++ b/meta/recipes-devtools/xmlto/xmlto/0001-Skip-validating-xmlto-output.patch @@ -0,0 +1,29 @@ +From 3deb7a0eded04ab08a9cb2d88526cb1c7b440061 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 14 Aug 2022 00:23:29 -0700 +Subject: [PATCH] Skip validating xmlto output + +Avoids network access + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 50fa279..6a2da62 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -68,7 +68,7 @@ EXTRA_DIST = xmlto.spec \ + doc/xmlif.xml \ + xmlto.mak + +-GEN_MANPAGE = FORMAT_DIR=$(top_srcdir)/format $(BASH) ./xmlto -o $(@D) man $< ++GEN_MANPAGE = FORMAT_DIR=$(top_srcdir)/format $(BASH) ./xmlto --skip-validation -o $(@D) man $< + man/man1/xmlto.1: doc/xmlto.xml ; $(GEN_MANPAGE) + man/man1/xmlif.1: doc/xmlif.xml ; $(GEN_MANPAGE) + +-- +2.37.2 + diff --git a/meta/recipes-devtools/xmlto/xmlto-0.0.28/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch b/meta/recipes-devtools/xmlto/xmlto/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch similarity index 91% rename from meta/recipes-devtools/xmlto/xmlto-0.0.28/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch rename to meta/recipes-devtools/xmlto/xmlto/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch index 6d547a6c994..7cc3cbe0fb2 100644 --- a/meta/recipes-devtools/xmlto/xmlto-0.0.28/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch +++ b/meta/recipes-devtools/xmlto/xmlto/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch @@ -9,9 +9,9 @@ Signed-off-by: Hongxu Jia configure.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/configure.in b/configure.in ---- a/configure.in -+++ b/configure.in +diff --git a/configure.ac b/configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -42,10 +42,10 @@ AC_ARG_VAR([LOCALE], [Name and path of the `locale' program.]) AC_PATH_PROG([LOCALE], [locale], [locale]) diff --git a/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb b/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb index 5cb9a4c57be..dcb760dd930 100644 --- a/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb +++ b/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb @@ -6,17 +6,21 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" -SRC_URI = "https://releases.pagure.org/xmlto/xmlto-${PV}.tar.gz \ +SRCREV = "6fa6a0e07644f20abf2596f78a60112713e11cbe" + +SRC_URI = "git://pagure.io/xmlto.git;protocol=https;branch=master \ file://configure.in-drop-the-test-of-xmllint-and-xsltproc.patch \ + file://0001-Skip-validating-xmlto-output.patch \ " -SRC_URI[md5sum] = "a1fefad9d83499a15576768f60f847c6" -SRC_URI[sha256sum] = "2f986b7c9a0e9ac6728147668e776d405465284e13c74d4146c9cbc51fd8aad3" +S = "${WORKDIR}/git" + +PV .= "+0.0.29+git${SRCPV}" inherit autotools CLEANBROKEN = "1" -DEPENDS = "libxml2-native" +DEPENDS = "libxml2-native libxslt-native flex-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" RDEPENDS:${PN} = "docbook-xml-dtd4 \ docbook-xsl-stylesheets \ @@ -36,6 +40,10 @@ BBCLASSEXTEND = "native" EXTRA_OECONF:append = " BASH=/bin/bash GCP=/bin/cp XMLLINT=xmllint XSLTPROC=xsltproc" +do_configure:prepend() { + flex -o ${S}/xmlif/xmlif.c ${S}/xmlif/xmlif.l +} + do_install:append:class-native() { create_wrapper ${D}${bindir}/xmlto XML_CATALOG_FILES=${sysconfdir}/xml/catalog } From patchwork Mon Aug 15 02:26:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 11387 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 6366FC25B0F for ; Mon, 15 Aug 2022 02:26:58 +0000 (UTC) Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) by mx.groups.io with SMTP id smtpd.web08.12171.1660530410549895925 for ; Sun, 14 Aug 2022 19:26:50 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=W3jT2gF4; spf=pass (domain: gmail.com, ip: 209.85.215.169, mailfrom: raj.khem@gmail.com) Received: by mail-pg1-f169.google.com with SMTP id bh13so5498002pgb.4 for ; Sun, 14 Aug 2022 19:26:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=hBbsZCdXCnaRcvKtdoNonL1JS/BODT23GGm55vqsWZI=; b=W3jT2gF49Q9GJS1MlKjdAPYScbcHiCfu4wr7aMr8HBHefT7kOc5JbtHdlH3wmSwQmR O0scJMvAA1TWvfrdllJQ47rWCJtMD6+V5JcQQuIxkGamKCiwRar0svKOe3rh2Ff8zBAy TDKrLhQG+0bm/9G8J/OTb8+WUAOdPfoFA/OSmL6ZgYYPMcTnSM/9fboyKHR2aNZwKPWH lfZ1AZvisfvdUGu9CVf0QvKQxah90XOJY/SKT/EUy40Q+rMOJeEwWhvqMhR6bHNpVQL9 co2faAxst+BueOeZbgw7RaxPS2uBmi0YXA8OMTwmxAZwiney5dZPs67ZTpuK/ZreoiMf taBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=hBbsZCdXCnaRcvKtdoNonL1JS/BODT23GGm55vqsWZI=; b=a9yTvHsno8OFbgdBN1zX5VDCXsJVW1dcEpAojgTPIUuaFe7PkWROyBC2TmBt4AcXXk QM/bZCMSmN4FSYwX8xgfDEfwz2eRUBWTFRyYcfYOv0OJIuVukLxSg9JXtENBuLGpt0B6 BO0Lba9Wr7TINHAcfQHtJmC7F5u/MzqDd9btz0NntrtxqXtmq2iczpxbfq5VDfVvQdAX PW4eHHAE1rJKueq0kA9XsuLfBwi8YTL/dL3hdz5zO1hWnacA/ZrqCfEuJfut9Okq6anp Pi/l4EmYlZ8b+VpdUv9ClbmqSyupTgWRKAB3aGDix0YBEdfko8sgtKnbVlqxQ7478+Wb 3Byw== X-Gm-Message-State: ACgBeo31mMbA/vLL60MHiTZUNFSp1sBXK2n6i9mHbBFNBbLiIe31ulcC wbWA9WnkG9oLfhP01HKO3SpWruKspLpO+g== X-Google-Smtp-Source: AA6agR73BDkLtSBJF1mbb++a7gThICBmX9KX+PHP/j2n8d+JbRa77c12rithhPVIXFns50cLHAHozw== X-Received: by 2002:a62:a21a:0:b0:532:4191:610a with SMTP id m26-20020a62a21a000000b005324191610amr14314312pff.75.1660530409486; Sun, 14 Aug 2022 19:26:49 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::bb7a]) by smtp.gmail.com with ESMTPSA id h11-20020a170902f54b00b0016db0d877e4sm6026608plf.221.2022.08.14.19.26.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Aug 2022 19:26:48 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Cc: Khem Raj Subject: [PATCH 3/4] boost: Compile out stdlib unary/binary_functions for c++11 and newer Date: Sun, 14 Aug 2022 19:26:43 -0700 Message-Id: <20220815022644.1665539-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220815022644.1665539-1-raj.khem@gmail.com> References: <20220815022644.1665539-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 ; Mon, 15 Aug 2022 02:26:58 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169344 These base classes are deprecated/removed from libcpp15 Signed-off-by: Khem Raj --- ...y-binary_function-base-classes-are-d.patch | 34 +++++++++++++++++++ meta/recipes-support/boost/boost_1.79.0.bb | 1 + 2 files changed, 35 insertions(+) create mode 100644 meta/recipes-support/boost/boost/0001-The-std-lib-unary-binary_function-base-classes-are-d.patch diff --git a/meta/recipes-support/boost/boost/0001-The-std-lib-unary-binary_function-base-classes-are-d.patch b/meta/recipes-support/boost/boost/0001-The-std-lib-unary-binary_function-base-classes-are-d.patch new file mode 100644 index 00000000000..49603348eee --- /dev/null +++ b/meta/recipes-support/boost/boost/0001-The-std-lib-unary-binary_function-base-classes-are-d.patch @@ -0,0 +1,34 @@ +From f9b55f5a1fab85bf73c95e6372779d6f50f75e84 Mon Sep 17 00:00:00 2001 +From: jzmaddock +Date: Mon, 11 Jul 2022 18:26:07 +0100 +Subject: [PATCH] The std lib unary/binary_function base classes are + deprecated/removed from libcpp15. Fixes + https://github.com/boostorg/container_hash/issues/24. + +Upstream-Status: Backport [https://github.com/boostorg/config/pull/440/commits/f0af4a9184457939b89110795ae2d293582c5f66] +Signed-off-by: Khem Raj +--- + boost/config/stdlib/libcpp.hpp | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/boost/config/stdlib/libcpp.hpp b/boost/config/stdlib/libcpp.hpp +index bc8536ead..0e9f2445e 100644 +--- a/boost/config/stdlib/libcpp.hpp ++++ b/boost/config/stdlib/libcpp.hpp +@@ -168,4 +168,13 @@ + # define BOOST_NO_CXX14_HDR_SHARED_MUTEX + #endif + ++#if _LIBCPP_VERSION >= 15000 ++// ++// Unary function is now deprecated in C++11 and later: ++// ++#if __cplusplus >= 201103L ++#define BOOST_NO_CXX98_FUNCTION_BASE ++#endif ++#endif ++ + // --- end --- +-- +2.37.2 + diff --git a/meta/recipes-support/boost/boost_1.79.0.bb b/meta/recipes-support/boost/boost_1.79.0.bb index dd5d6eadd61..09e25567903 100644 --- a/meta/recipes-support/boost/boost_1.79.0.bb +++ b/meta/recipes-support/boost/boost_1.79.0.bb @@ -5,4 +5,5 @@ SRC_URI += "file://boost-CVE-2012-2677.patch \ file://boost-math-disable-pch-for-gcc.patch \ file://0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \ file://0001-dont-setup-compiler-flags-m32-m64.patch \ + file://0001-The-std-lib-unary-binary_function-base-classes-are-d.patch \ " From patchwork Mon Aug 15 02:26:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 11386 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 657B8C3F6B0 for ; Mon, 15 Aug 2022 02:26:58 +0000 (UTC) Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by mx.groups.io with SMTP id smtpd.web09.12177.1660530412208834862 for ; Sun, 14 Aug 2022 19:26:52 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=OJIL3ZIN; spf=pass (domain: gmail.com, ip: 209.85.216.50, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f50.google.com with SMTP id gj1so5876803pjb.0 for ; Sun, 14 Aug 2022 19:26:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=zV2J1wmdypdKCpDtsdI9Z67FTy+9PhG8U9/GlbPw1ro=; b=OJIL3ZINbSZmHwsXcWjEcVFXC/vQ/JGdGb4RHy/5+0srUbQV4+f4GKYdLIdBZMBDRT rj0JA+q8gVg7R4G7re2BJ1K0bLMDEW2Sg0NJuEgMeciCUatoJ8ReqXweg3NdGLxzvA5o a03+5+C/oA4CX0HBmZctn0Uv4oL/7+LuqGzGjYdW9ly9344rQi+uCacpCqLuiY7VHiFB SxsdXb7mnzSbVGMUXLHC9vuQjfXpD9KOyvTQ1A6TYZhR/Oy+I26WfKL5V7XUMCmrq11A w3Tt6uHLZ+ZNesIY7MEGuaTrOtuMv3G6lcelUO4zaVWB73Iv6OAwfNPKGE+aNbSR8ZgJ 7HEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=zV2J1wmdypdKCpDtsdI9Z67FTy+9PhG8U9/GlbPw1ro=; b=de69AS4D8fEZw5MdrXlMf7NU5kVvgi/qR/g30IcPe+ZSF+7z7LsTuZ2Ad8PV7uHbvO UM64vXRsdFwcxlYtC+Qs5TESd1x1sWNsZy1YmciBpndbuu4gMbjj5HGruuULvjtydpol ZLukekqF0bHV919iisiOo/k72SLTNaBaMVBXMLFy9TSg8ZZWUlZXf34BhzN4RCnxYMeA WMFoku1zI5dj7D0YE5q4Zq1ozBPxMoH/r9jQ6SWnY5WfyNP2jfk0CLRLa2XF5InCn37O Lm9N1dp6LU8/0oWb1QoikX8/HZmiTg52AwxtpP/LwvaBURK8fwlPO6kSPwL05g73oGb1 Q6LQ== X-Gm-Message-State: ACgBeo2TlA/5VlrZHauRAxJ7y8o9/DK3aCHrlGJ3ATTbIXYdQM1D4Cqq iAb9ZYxsVypVgb+TkM7GnyWBAC4gQjmhVg== X-Google-Smtp-Source: AA6agR7EUYGb7//bJYYb0KaRmQofVMKaKmrTpeij1jf9EzukY7ewOdE+pV01Nv9UBc4eNU/3Fl7fvQ== X-Received: by 2002:a17:902:a40c:b0:172:728a:3637 with SMTP id p12-20020a170902a40c00b00172728a3637mr1043206plq.24.1660530410855; Sun, 14 Aug 2022 19:26:50 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::bb7a]) by smtp.gmail.com with ESMTPSA id h11-20020a170902f54b00b0016db0d877e4sm6026608plf.221.2022.08.14.19.26.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Aug 2022 19:26:50 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Cc: Khem Raj Subject: [PATCH 4/4] vulkan-samples: Qualify move as std::move Date: Sun, 14 Aug 2022 19:26:44 -0700 Message-Id: <20220815022644.1665539-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220815022644.1665539-1-raj.khem@gmail.com> References: <20220815022644.1665539-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 ; Mon, 15 Aug 2022 02:26:58 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169345 Fixes build with clang Signed-off-by: Khem Raj --- .../0001-Qualify-move-as-std-move.patch | 405 ++++++++++++++++++ .../vulkan/vulkan-samples_git.bb | 1 + 2 files changed, 406 insertions(+) create mode 100644 meta/recipes-graphics/vulkan/vulkan-samples/0001-Qualify-move-as-std-move.patch diff --git a/meta/recipes-graphics/vulkan/vulkan-samples/0001-Qualify-move-as-std-move.patch b/meta/recipes-graphics/vulkan/vulkan-samples/0001-Qualify-move-as-std-move.patch new file mode 100644 index 00000000000..80ee521499f --- /dev/null +++ b/meta/recipes-graphics/vulkan/vulkan-samples/0001-Qualify-move-as-std-move.patch @@ -0,0 +1,405 @@ +From 9e061b12b9305eee96a4d3129b646c244cc02347 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 14 Aug 2022 19:16:45 -0700 +Subject: [PATCH] Qualify move as std::move + +Seeing errors like below with clang-15 + +spirv_common.hpp:692:19: error: unqualified call to std::move + +squashed Backport of following upstream commits + +https://github.com/KhronosGroup/SPIRV-Cross/commit/44c3333a1c315ead00c24f7aef5fa8a7ccf49299 +https://github.com/KhronosGroup/SPIRV-Cross/commit/0eda71c40936586ea812d0d20d93c11a3e9af192 + +Upstream-Status: Backport [https://github.com/KhronosGroup/SPIRV-Cross/commit/0eda71c40936586ea812d0d20d93c11a3e9af192] +Signed-off-by: Khem Raj +--- + main.cpp | 38 +++++++++++++++++++------------------- + spirv_common.hpp | 2 +- + spirv_cpp.hpp | 2 +- + spirv_cross.cpp | 18 +++++++++--------- + spirv_glsl.cpp | 2 +- + spirv_glsl.hpp | 2 +- + spirv_hlsl.cpp | 4 ++-- + spirv_hlsl.hpp | 2 +- + spirv_msl.cpp | 2 +- + spirv_parser.cpp | 4 ++-- + spirv_reflect.hpp | 2 +- + 11 files changed, 39 insertions(+), 39 deletions(-) + +diff --git a/main.cpp b/main.cpp +index 78991094..581c5e3b 100644 +--- a/main.cpp ++++ b/main.cpp +@@ -65,7 +65,7 @@ struct CLICallbacks + struct CLIParser + { + CLIParser(CLICallbacks cbs_, int argc_, char *argv_[]) +- : cbs(move(cbs_)) ++ : cbs(std::move(cbs_)) + , argc(argc_) + , argv(argv_) + { +@@ -722,7 +722,7 @@ static int main_inner(int argc, char *argv[]) + auto old_name = parser.next_string(); + auto new_name = parser.next_string(); + auto model = stage_to_execution_model(parser.next_string()); +- args.entry_point_rename.push_back({ old_name, new_name, move(model) }); ++ args.entry_point_rename.push_back({ old_name, new_name, std::move(model) }); + }); + cbs.add("--entry", [&args](CLIParser &parser) { args.entry = parser.next_string(); }); + cbs.add("--stage", [&args](CLIParser &parser) { args.entry_stage = parser.next_string(); }); +@@ -731,20 +731,20 @@ static int main_inner(int argc, char *argv[]) + HLSLVertexAttributeRemap remap; + remap.location = parser.next_uint(); + remap.semantic = parser.next_string(); +- args.hlsl_attr_remap.push_back(move(remap)); ++ args.hlsl_attr_remap.push_back(std::move(remap)); + }); + + cbs.add("--remap", [&args](CLIParser &parser) { + string src = parser.next_string(); + string dst = parser.next_string(); + uint32_t components = parser.next_uint(); +- args.remaps.push_back({ move(src), move(dst), components }); ++ args.remaps.push_back({ std::move(src), std::move(dst), components }); + }); + + cbs.add("--remap-variable-type", [&args](CLIParser &parser) { + string var_name = parser.next_string(); + string new_type = parser.next_string(); +- args.variable_type_remaps.push_back({ move(var_name), move(new_type) }); ++ args.variable_type_remaps.push_back({ std::move(var_name), std::move(new_type) }); + }); + + cbs.add("--rename-interface-variable", [&args](CLIParser &parser) { +@@ -757,18 +757,18 @@ static int main_inner(int argc, char *argv[]) + + uint32_t loc = parser.next_uint(); + string var_name = parser.next_string(); +- args.interface_variable_renames.push_back({ cls, loc, move(var_name) }); ++ args.interface_variable_renames.push_back({ cls, loc, std::move(var_name) }); + }); + + cbs.add("--pls-in", [&args](CLIParser &parser) { + auto fmt = pls_format(parser.next_string()); + auto name = parser.next_string(); +- args.pls_in.push_back({ move(fmt), move(name) }); ++ args.pls_in.push_back({ std::move(fmt), std::move(name) }); + }); + cbs.add("--pls-out", [&args](CLIParser &parser) { + auto fmt = pls_format(parser.next_string()); + auto name = parser.next_string(); +- args.pls_out.push_back({ move(fmt), move(name) }); ++ args.pls_out.push_back({ std::move(fmt), std::move(name) }); + }); + cbs.add("--shader-model", [&args](CLIParser &parser) { + args.shader_model = parser.next_uint(); +@@ -788,7 +788,7 @@ static int main_inner(int argc, char *argv[]) + cbs.default_handler = [&args](const char *value) { args.input = value; }; + cbs.error_handler = [] { print_help(); }; + +- CLIParser parser{ move(cbs), argc - 1, argv + 1 }; ++ CLIParser parser{ std::move(cbs), argc - 1, argv + 1 }; + if (!parser.parse()) + { + return EXIT_FAILURE; +@@ -808,14 +808,14 @@ static int main_inner(int argc, char *argv[]) + auto spirv_file = read_spirv_file(args.input); + if (spirv_file.empty()) + return EXIT_FAILURE; +- Parser spirv_parser(move(spirv_file)); ++ Parser spirv_parser(std::move(spirv_file)); + + spirv_parser.parse(); + + // Special case reflection because it has little to do with the path followed by code-outputting compilers + if (!args.reflect.empty()) + { +- CompilerReflection compiler(move(spirv_parser.get_parsed_ir())); ++ CompilerReflection compiler(std::move(spirv_parser.get_parsed_ir())); + compiler.set_format(args.reflect); + auto json = compiler.compile(); + if (args.output) +@@ -831,13 +831,13 @@ static int main_inner(int argc, char *argv[]) + + if (args.cpp) + { +- compiler.reset(new CompilerCPP(move(spirv_parser.get_parsed_ir()))); ++ compiler.reset(new CompilerCPP(std::move(spirv_parser.get_parsed_ir()))); + if (args.cpp_interface_name) + static_cast(compiler.get())->set_interface_name(args.cpp_interface_name); + } + else if (args.msl) + { +- compiler.reset(new CompilerMSL(move(spirv_parser.get_parsed_ir()))); ++ compiler.reset(new CompilerMSL(std::move(spirv_parser.get_parsed_ir()))); + + auto *msl_comp = static_cast(compiler.get()); + auto msl_opts = msl_comp->get_msl_options(); +@@ -850,13 +850,13 @@ static int main_inner(int argc, char *argv[]) + msl_comp->set_msl_options(msl_opts); + } + else if (args.hlsl) +- compiler.reset(new CompilerHLSL(move(spirv_parser.get_parsed_ir()))); ++ compiler.reset(new CompilerHLSL(std::move(spirv_parser.get_parsed_ir()))); + else + { + combined_image_samplers = !args.vulkan_semantics; + if (!args.vulkan_semantics) + build_dummy_sampler = true; +- compiler.reset(new CompilerGLSL(move(spirv_parser.get_parsed_ir()))); ++ compiler.reset(new CompilerGLSL(std::move(spirv_parser.get_parsed_ir()))); + } + + if (!args.variable_type_remaps.empty()) +@@ -867,7 +867,7 @@ static int main_inner(int argc, char *argv[]) + out = remap.new_variable_type; + }; + +- compiler->set_variable_type_remap_callback(move(remap_cb)); ++ compiler->set_variable_type_remap_callback(std::move(remap_cb)); + } + + for (auto &rename : args.entry_point_rename) +@@ -1019,7 +1019,7 @@ static int main_inner(int argc, char *argv[]) + { + auto active = compiler->get_active_interface_variables(); + res = compiler->get_shader_resources(active); +- compiler->set_enabled_interface_variables(move(active)); ++ compiler->set_enabled_interface_variables(std::move(active)); + } + else + res = compiler->get_shader_resources(); +@@ -1034,7 +1034,7 @@ static int main_inner(int argc, char *argv[]) + + auto pls_inputs = remap_pls(args.pls_in, res.stage_inputs, &res.subpass_inputs); + auto pls_outputs = remap_pls(args.pls_out, res.stage_outputs, nullptr); +- compiler->remap_pixel_local_storage(move(pls_inputs), move(pls_outputs)); ++ compiler->remap_pixel_local_storage(std::move(pls_inputs), std::move(pls_outputs)); + + for (auto &ext : args.extensions) + compiler->require_extension(ext); +@@ -1101,7 +1101,7 @@ static int main_inner(int argc, char *argv[]) + for (uint32_t i = 0; i < args.iterations; i++) + { + if (args.hlsl) +- glsl = static_cast(compiler.get())->compile(move(args.hlsl_attr_remap)); ++ glsl = static_cast(compiler.get())->compile(std::move(args.hlsl_attr_remap)); + else + glsl = compiler->compile(); + } +diff --git a/spirv_common.hpp b/spirv_common.hpp +index aa32142d..0daf5ad5 100644 +--- a/spirv_common.hpp ++++ b/spirv_common.hpp +@@ -536,7 +536,7 @@ struct SPIRExpression : IVariant + + // Only created by the backend target to avoid creating tons of temporaries. + SPIRExpression(std::string expr, uint32_t expression_type_, bool immutable_) +- : expression(move(expr)) ++ : expression(std::move(expr)) + , expression_type(expression_type_) + , immutable(immutable_) + { +diff --git a/spirv_cpp.hpp b/spirv_cpp.hpp +index bcdb669b..b4da84b9 100644 +--- a/spirv_cpp.hpp ++++ b/spirv_cpp.hpp +@@ -27,7 +27,7 @@ class CompilerCPP : public CompilerGLSL + { + public: + explicit CompilerCPP(std::vector spirv_) +- : CompilerGLSL(move(spirv_)) ++ : CompilerGLSL(std::move(spirv_)) + { + } + +diff --git a/spirv_cross.cpp b/spirv_cross.cpp +index 19bac301..d21dbd41 100644 +--- a/spirv_cross.cpp ++++ b/spirv_cross.cpp +@@ -28,16 +28,16 @@ using namespace spirv_cross; + + Compiler::Compiler(vector ir_) + { +- Parser parser(move(ir_)); ++ Parser parser(std::move(ir_)); + parser.parse(); +- set_ir(move(parser.get_parsed_ir())); ++ set_ir(std::move(parser.get_parsed_ir())); + } + + Compiler::Compiler(const uint32_t *ir_, size_t word_count) + { + Parser parser(ir_, word_count); + parser.parse(); +- set_ir(move(parser.get_parsed_ir())); ++ set_ir(std::move(parser.get_parsed_ir())); + } + + Compiler::Compiler(const ParsedIR &ir_) +@@ -47,12 +47,12 @@ Compiler::Compiler(const ParsedIR &ir_) + + Compiler::Compiler(ParsedIR &&ir_) + { +- set_ir(move(ir_)); ++ set_ir(std::move(ir_)); + } + + void Compiler::set_ir(ParsedIR &&ir_) + { +- ir = move(ir_); ++ ir = std::move(ir_); + parse_fixup(); + } + +@@ -716,7 +716,7 @@ unordered_set Compiler::get_active_interface_variables() const + + void Compiler::set_enabled_interface_variables(std::unordered_set active_variables) + { +- active_interface_variables = move(active_variables); ++ active_interface_variables = std::move(active_variables); + check_active_interface_variables = true; + } + +@@ -2163,7 +2163,7 @@ void Compiler::CombinedImageSamplerHandler::push_remap_parameters(const SPIRFunc + unordered_map remapping; + for (uint32_t i = 0; i < length; i++) + remapping[func.arguments[i].id] = remap_parameter(args[i]); +- parameter_remapping.push(move(remapping)); ++ parameter_remapping.push(std::move(remapping)); + } + + void Compiler::CombinedImageSamplerHandler::pop_remap_parameters() +@@ -3611,7 +3611,7 @@ void Compiler::analyze_image_and_sampler_usage() + + CombinedImageSamplerUsageHandler handler(*this, dref_handler.dref_combined_samplers); + traverse_all_reachable_opcodes(get(ir.default_entry_point), handler); +- comparison_ids = move(handler.comparison_ids); ++ comparison_ids = std::move(handler.comparison_ids); + need_subpass_input = handler.need_subpass_input; + + // Forward information from separate images and samplers into combined image samplers. +@@ -3650,7 +3650,7 @@ void Compiler::build_function_control_flow_graphs_and_analyze() + CFGBuilder handler(*this); + handler.function_cfgs[ir.default_entry_point].reset(new CFG(*this, get(ir.default_entry_point))); + traverse_all_reachable_opcodes(get(ir.default_entry_point), handler); +- function_cfgs = move(handler.function_cfgs); ++ function_cfgs = std::move(handler.function_cfgs); + + for (auto &f : function_cfgs) + { +diff --git a/spirv_glsl.cpp b/spirv_glsl.cpp +index a8855987..fabbb105 100644 +--- a/spirv_glsl.cpp ++++ b/spirv_glsl.cpp +@@ -6876,7 +6876,7 @@ void CompilerGLSL::emit_instruction(const Instruction &instruction) + bool ptr_chain = opcode == OpPtrAccessChain; + auto e = access_chain(ops[2], &ops[3], length - 3, get(ops[0]), &meta, ptr_chain); + +- auto &expr = set(ops[1], move(e), ops[0], should_forward(ops[2])); ++ auto &expr = set(ops[1], std::move(e), ops[0], should_forward(ops[2])); + + auto *backing_variable = maybe_get_backing_variable(ops[2]); + expr.loaded_from = backing_variable ? backing_variable->self : ops[2]; +diff --git a/spirv_glsl.hpp b/spirv_glsl.hpp +index caf0ad3b..aac1196e 100644 +--- a/spirv_glsl.hpp ++++ b/spirv_glsl.hpp +@@ -138,7 +138,7 @@ public: + } + + explicit CompilerGLSL(std::vector spirv_) +- : Compiler(move(spirv_)) ++ : Compiler(std::move(spirv_)) + { + init(); + } +diff --git a/spirv_hlsl.cpp b/spirv_hlsl.cpp +index a5b6d2dc..0933017e 100644 +--- a/spirv_hlsl.cpp ++++ b/spirv_hlsl.cpp +@@ -2028,7 +2028,7 @@ void CompilerHLSL::emit_function_prototype(SPIRFunction &func, const Bitset &ret + out_argument += " "; + out_argument += "SPIRV_Cross_return_value"; + out_argument += type_to_array_glsl(type); +- arglist.push_back(move(out_argument)); ++ arglist.push_back(std::move(out_argument)); + } + + for (auto &arg : func.arguments) +@@ -4553,7 +4553,7 @@ void CompilerHLSL::require_texture_query_variant(const SPIRType &type) + + string CompilerHLSL::compile(std::vector vertex_attributes) + { +- remap_vertex_attributes = move(vertex_attributes); ++ remap_vertex_attributes = std::move(vertex_attributes); + return compile(); + } + +diff --git a/spirv_hlsl.hpp b/spirv_hlsl.hpp +index b2b60fca..3503c674 100644 +--- a/spirv_hlsl.hpp ++++ b/spirv_hlsl.hpp +@@ -63,7 +63,7 @@ public: + }; + + explicit CompilerHLSL(std::vector spirv_) +- : CompilerGLSL(move(spirv_)) ++ : CompilerGLSL(std::move(spirv_)) + { + } + +diff --git a/spirv_msl.cpp b/spirv_msl.cpp +index 0e1e733d..fbfcdba5 100644 +--- a/spirv_msl.cpp ++++ b/spirv_msl.cpp +@@ -32,7 +32,7 @@ static const uint32_t k_aux_mbr_idx_swizzle_const = 0u; + + CompilerMSL::CompilerMSL(vector spirv_, vector *p_vtx_attrs, + vector *p_res_bindings) +- : CompilerGLSL(move(spirv_)) ++ : CompilerGLSL(std::move(spirv_)) + { + if (p_vtx_attrs) + for (auto &va : *p_vtx_attrs) +diff --git a/spirv_parser.cpp b/spirv_parser.cpp +index 1725b4ca..0fcd7691 100644 +--- a/spirv_parser.cpp ++++ b/spirv_parser.cpp +@@ -24,7 +24,7 @@ namespace spirv_cross + { + Parser::Parser(std::vector spirv) + { +- ir.spirv = move(spirv); ++ ir.spirv = std::move(spirv); + } + + Parser::Parser(const uint32_t *spirv_data, size_t word_count) +@@ -223,7 +223,7 @@ void Parser::parse(const Instruction &instruction) + case OpExtension: + { + auto ext = extract_string(ir.spirv, instruction.offset); +- ir.declared_extensions.push_back(move(ext)); ++ ir.declared_extensions.push_back(std::move(ext)); + break; + } + +diff --git a/spirv_reflect.hpp b/spirv_reflect.hpp +index 13b5b431..f5c6a6ff 100644 +--- a/spirv_reflect.hpp ++++ b/spirv_reflect.hpp +@@ -34,7 +34,7 @@ class CompilerReflection : public CompilerGLSL + + public: + explicit CompilerReflection(std::vector spirv_) +- : Parent(move(spirv_)) ++ : Parent(std::move(spirv_)) + { + options.vulkan_semantics = true; + } +-- +2.37.2 + diff --git a/meta/recipes-graphics/vulkan/vulkan-samples_git.bb b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb index 41cb4a437d3..54994c683d2 100644 --- a/meta/recipes-graphics/vulkan/vulkan-samples_git.bb +++ b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb @@ -9,6 +9,7 @@ SRC_URI = "gitsm://github.com/KhronosGroup/Vulkan-Samples.git;branch=master;prot file://0001-CMakeLists.txt-do-not-hardcode-lib-as-installation-t.patch \ file://debugfix.patch \ file://0001-framework-core-hpp_vulkan_resource.h-add-header-incl.patch \ + file://0001-Qualify-move-as-std-move.patch;patchdir=third_party/spirv-cross \ " UPSTREAM_CHECK_COMMITS = "1"