From patchwork Wed Sep 13 09:43:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mingyu Wang (Fujitsu)" X-Patchwork-Id: 30391 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 0B469CA5531 for ; Wed, 13 Sep 2023 09:44:34 +0000 (UTC) Received: from esa9.hc1455-7.c3s2.iphmx.com (esa9.hc1455-7.c3s2.iphmx.com [139.138.36.223]) by mx.groups.io with SMTP id smtpd.web11.7839.1694598265241252408 for ; Wed, 13 Sep 2023 02:44:25 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: fujitsu.com, ip: 139.138.36.223, mailfrom: wangmy@fujitsu.com) X-IronPort-AV: E=McAfee;i="6600,9927,10831"; a="120253484" X-IronPort-AV: E=Sophos;i="6.02,142,1688396400"; d="scan'208";a="120253484" Received: from unknown (HELO yto-r1.gw.nic.fujitsu.com) ([218.44.52.217]) by esa9.hc1455-7.c3s2.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Sep 2023 18:44:21 +0900 Received: from yto-m1.gw.nic.fujitsu.com (yto-nat-yto-m1.gw.nic.fujitsu.com [192.168.83.64]) by yto-r1.gw.nic.fujitsu.com (Postfix) with ESMTP id A64C4DB3C1 for ; Wed, 13 Sep 2023 18:44:20 +0900 (JST) Received: from kws-ab4.gw.nic.fujitsu.com (kws-ab4.gw.nic.fujitsu.com [192.51.206.22]) by yto-m1.gw.nic.fujitsu.com (Postfix) with ESMTP id E3C84CFAB6 for ; Wed, 13 Sep 2023 18:44:19 +0900 (JST) Received: from localhost.localdomain (unknown [10.167.225.33]) by kws-ab4.gw.nic.fujitsu.com (Postfix) with ESMTP id 9BD8C40A49; Wed, 13 Sep 2023 18:44:18 +0900 (JST) From: wangmy@fujitsu.com To: openembedded-core@lists.openembedded.org Cc: Wang Mingyu Subject: [OE-core] [PATCH] wayland-utils: upgrade 1.1.0 -> 1.2.0 Date: Wed, 13 Sep 2023 17:43:49 +0800 Message-Id: <1694598229-22044-1-git-send-email-wangmy@fujitsu.com> X-Mailer: git-send-email 1.8.3.1 X-TM-AS-GCONF: 00 X-TM-AS-Product-Ver: IMSS-9.1.0.1417-9.0.0.1002-27872.006 X-TM-AS-User-Approved-Sender: Yes X-TMASE-Version: IMSS-9.1.0.1417-9.0.1002-27872.006 X-TMASE-Result: 10--5.675400-10.000000 X-TMASE-MatchedRID: h8nmbN2t+rqjz0nOeth/yW/6CCblACLhTfK5j0EZbyt/iZ1aNsYG7oFa KsEtPT2W+BtDYmoqPpY9qsdubtvoYewTP3JxbBsK7T+j7/gPsPOCmGLk45dvJVQuGn5b9r2Z9Dp INHy2DL1NyZo5o8L48Em2yRLiv91151YHJ+FKPkDNudzzRwUjo4KMU5VqphqV31GU/N5W5BCWL4 FqozBM2jWAgc88bFJ72eXjdXiTHaVaQiLka9EcSj9B1SHosSXQwTlc9CcHMZdH8jOVX4IxttPQ+ kcNsyKz8at4sWE5hgtn3l13x3unW2GNYA+aLtzK194/5X9VfCzjLrHqvAiSy/4DDXoaCqk7MVBV b5kin5ENUccATRyd1IXX0y6oAIj5H9B97WCZlj07Cl8sx4HBGyBfZe3im9iRcih6NiIScoJgUHK GsfRQd7F9uGobEuT7gDLqnrRlXrZ8nn9tnqel2DsAVzN+Ov/sn3uS0CQD0Ewxg52gJSZ6z+7r+C Pf9zi7RqIkLyVVE2hZa3kJjocESA== X-TMASE-SNAP-Result: 1.821001.0001-0-1-22:0,33:0,34:0-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 ; Wed, 13 Sep 2023 09:44:34 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/187579 From: Wang Mingyu 0001-wayland-info-Fix-build-without-libdrm.patch removed since it's included in 1.2.0 Changelog: =========== -wayland-info: Fix spurious tab/space -wayland-info: add drm-lease-v1 support -meson: improve protocol generation -wayland-info: Destroy zwp_linux_dmabuf_feedback_v1 proxy on exit -wayland-info: Readd support for linux_dmabuf versions < 3 -wayland-info: Add a cmdline option for interface -wayland-info: print DRM device paths -build: turn on -Wundef -wayland-info: move libdrm version constraint to dependency() -wayland-info: include system headers with angle brackets -wayland-info: Fix build without libdrm -1build: reopen main for regular development Signed-off-by: Wang Mingyu --- ...ayland-info-Fix-build-without-libdrm.patch | 42 ------------------- ...-utils_1.1.0.bb => wayland-utils_1.2.0.bb} | 6 +-- 2 files changed, 2 insertions(+), 46 deletions(-) delete mode 100644 meta/recipes-graphics/wayland/files/0001-wayland-info-Fix-build-without-libdrm.patch rename meta/recipes-graphics/wayland/{wayland-utils_1.1.0.bb => wayland-utils_1.2.0.bb} (77%) diff --git a/meta/recipes-graphics/wayland/files/0001-wayland-info-Fix-build-without-libdrm.patch b/meta/recipes-graphics/wayland/files/0001-wayland-info-Fix-build-without-libdrm.patch deleted file mode 100644 index 86c44d4480..0000000000 --- a/meta/recipes-graphics/wayland/files/0001-wayland-info-Fix-build-without-libdrm.patch +++ /dev/null @@ -1,42 +0,0 @@ -From c79a3fb51718c4286b74edf0f758df9219994844 Mon Sep 17 00:00:00 2001 -From: Olivier Fourdan -Date: Wed, 14 Sep 2022 09:07:10 +0200 -Subject: [PATCH] wayland-info: Fix build without libdrm - -wayland-info can optionally use libdrm to provide a description of the -dmabuf format modifiers. - -When not using libdrm however, the build fails because "dev_t" is not -defined. - -The definition of "dev_t" comes from which is included -from , which is not included without libdrm support, hence the -build failure. - -Simply include unconditionally to make sure "dev_t" is -defined regardless of libdrm support, to fix the build failure. - -Closes: https://gitlab.freedesktop.org/wayland/wayland-utils/-/issues/6 -Signed-off-by: Olivier Fourdan -Fixes: 240cb739 - "Add support for linux_dmabuf version 4" -Reviewed-by: Simon Ser -Reviewed-by: Pekka Paalanen - -Upstream-Status: Backport [https://gitlab.freedesktop.org/wayland/wayland-utils/-/commit/baa65ba9f62e6a05c32b9202b524158a21f24245] -Signed-off-by: Alexander Kanavin ---- - wayland-info/wayland-info.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/wayland-info/wayland-info.c b/wayland-info/wayland-info.c -index 53cd04b..98ff205 100644 ---- a/wayland-info/wayland-info.c -+++ b/wayland-info/wayland-info.c -@@ -34,6 +34,7 @@ - #include - #include - #include -+#include - - #include - #if HAVE_HUMAN_FORMAT_MODIFIER diff --git a/meta/recipes-graphics/wayland/wayland-utils_1.1.0.bb b/meta/recipes-graphics/wayland/wayland-utils_1.2.0.bb similarity index 77% rename from meta/recipes-graphics/wayland/wayland-utils_1.1.0.bb rename to meta/recipes-graphics/wayland/wayland-utils_1.2.0.bb index 48e1409be8..657f67fb09 100644 --- a/meta/recipes-graphics/wayland/wayland-utils_1.1.0.bb +++ b/meta/recipes-graphics/wayland/wayland-utils_1.2.0.bb @@ -9,10 +9,8 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=548a66038a77415e1df51118625e832f \ " -SRC_URI = "https://gitlab.freedesktop.org/wayland/wayland-utils/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz \ - file://0001-wayland-info-Fix-build-without-libdrm.patch \ - " -SRC_URI[sha256sum] = "9e685863025b4feade36d53bbc8e31b43e26498be743dea84c7a84912959410a" +SRC_URI = "https://gitlab.freedesktop.org/wayland/wayland-utils/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz" +SRC_URI[sha256sum] = "d9278c22554586881802540751bcc42569262bf80cd9ac9b0fd12ff4bd09a9e4" UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html"