From patchwork Mon Nov 20 01:35:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ron Eggler X-Patchwork-Id: 34843 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 5ED91C072A2 for ; Mon, 20 Nov 2023 01:35:54 +0000 (UTC) Received: from mail-yw1-f179.google.com (mail-yw1-f179.google.com [209.85.128.179]) by mx.groups.io with SMTP id smtpd.web10.41464.1700444144601085264 for ; Sun, 19 Nov 2023 17:35:44 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@mistywest-com.20230601.gappssmtp.com header.s=20230601 header.b=Bd8t7OwT; spf=pass (domain: mistywest.com, ip: 209.85.128.179, mailfrom: ron.eggler@mistywest.com) Received: by mail-yw1-f179.google.com with SMTP id 00721157ae682-5cade8466f7so75507b3.1 for ; Sun, 19 Nov 2023 17:35:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mistywest-com.20230601.gappssmtp.com; s=20230601; t=1700444143; x=1701048943; darn=lists.yoctoproject.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=iB4LjalsZViKEu3YpF4aQDuRckws8M8x0mq2q1DC+RQ=; b=Bd8t7OwT5h5bghSQnt9rMuj+KVul2mXtw4BgWFQ/KAg3Ha84xCjvmbagbJ3GQKIWiE tslTY7xj2W2S4Q2KF1ZykoFj5rttnofMdJLCteJdZYixAjwzz7IqOBzNLpEa9aTZ//9/ 0sy+h7GLs9lvVCiOoxlHRv9SPhbhW6NIGFZPJd9uj9bB/Ju3uxzSS7YmEETTh/C8XJxM qcgE+X+dyk6BxD9AHR7QUXYI05My80UI96b/uKoAIyCIQ2HiC2pln58kTF+yJlMSoSr6 bjNvU2pWk4U5Ry/IlEUGZXc7J24uKBHCto6p66E5RlPAq83vHKsxlAEF3MvUcfvRZ4Ev aHcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700444143; x=1701048943; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=iB4LjalsZViKEu3YpF4aQDuRckws8M8x0mq2q1DC+RQ=; b=rl3p942y+m4tG0DABEGGUInult45rV5Wn/xBbMfrLLoborhbD+hVEq4oGRNvM4A/z1 ccxHLBFAyAfiLl++KuFCRuY53IrlXLPjquUR8RII9NGBUQeloghVUzBji0sbmv/LZEmx YFhOUU4MulXwV7g0A3ezfmq10Xe5fnWG6JXpl0b8aMwCQFEabdbMqjg38wsn4vq2cvta F/LKFi3AdySAAWeFLTjooYXsntE0oaBTfWmGEBuTblBGzQeFB8WvdF4bcLvKOGF6IJec ZXvhOdCABjOMM8rHqIuoaKA6PK5AbiTA1fh6FipqqRlmN41PtMippM1IszZOXCahuXb1 6gyA== X-Gm-Message-State: AOJu0YyA4mRlLX4avTsQMik7CyftpPAdRFH970NaVPkFwKLyTcbakcaX M32MOppef4zVxjtaKPlFJkXRTUPtyy/3JI+zAEOkVRWeAjWErJtxXXuKGw== X-Google-Smtp-Source: AGHT+IHvyZMYQNmiP/5sb5l85Z/uLbCe2nwhk7arcqWnDvXZ1xiuolquiej6g5wXIj1UZi1gWAwvcWeYi1jFhopJEI0= X-Received: by 2002:a05:690c:3249:b0:5ca:8f2c:28c5 with SMTP id fg9-20020a05690c324900b005ca8f2c28c5mr543675ywb.8.1700444143401; Sun, 19 Nov 2023 17:35:43 -0800 (PST) MIME-Version: 1.0 From: Ron Eggler Date: Sun, 19 Nov 2023 17:35:32 -0800 Message-ID: Subject: wlroots needs 'gbm' ['>=17.1.0']? To: yocto@lists.yoctoproject.org 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, 20 Nov 2023 01:35:54 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/61718 Hi, I would like to include wlroots in my build but it requires gbm >=17.1.0 which appears to be a problem, as seen on https://github.com/cran/gbm/tags the release numbers are far below 17. The output I'm getting more particularly looks like: | Run-time dependency libdrm found: YES 2.4.101 | Dependency gbm found: NO found 1.0.0 but need: '>=17.1.0' | Found CMake: NO | Run-time dependency gbm found: NO | | meson.build:106:0: ERROR: Invalid version of dependency, need 'gbm' ['>=17.1.0'] found '1.0.0'. | | A full log can be found at /home/yocto/rzv_vlp_v3.0.0/build/tmp/work/aarch64-poky-linux/wlroots/0.12.0-r0/build/meson-logs/meson-log.txt | ERROR: meson failed | WARNING: exit code 1 from a shell command. | ERROR: Execution of '/home/yocto/rzv_vlp_v3.0.0/build/tmp/work/aarch64-poky-linux/wlroots/0.12.0-r0/temp/run.do_configure.340360' failed with exit code 1 ERROR: Task (/home/yocto/rzv_vlp_v3.0.0/build/../meta-mistysom/recipes-display/wlroots/wlroots.bb:do_configure) failed with exit code '1' Where the wlroots.bb recipe looks like: $ cat ../meta-mistysom/recipes-display/wlroots/wlroots.bb SUMMARY = "Modules for building a Wayland compositor" HOMEPAGE = "https://github.com/swaywm/wlroots" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=7578fad101710ea2d289ff5411f1b818" DEPENDS = " \ wayland-native \ wayland \ wayland-protocols \ virtual/egl \ virtual/libgles2 \ libdrm \ virtual/libgbm \ libinput \ libxkbcommon \ udev \ pixman \ " inherit meson features_check REQUIRED_DISTRO_FEATURES = "wayland opengl" PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES','x11','xwayland x11-backend','',d)}" PACKAGECONFIG[xwayland] = "-Dxwayland=enabled,-Dxwayland=disabled,xserver-xorg,xserver-xorg-xwayland" PACKAGECONFIG[x11-backend] = "-Dx11-backend=enabled,-Dx11-backend=disabled,xserver-xorg" SRC_URI = " \ git://github.com/swaywm/${BPN}.git \ file://0001-Adjust-meson.build-to-meson-0.54.patch \ " SRCREV = "238d1c078fb03338e9f271d98f7bf6b1fc399285" PV = "0.12.0" S = "${WORKDIR}/git" and the meson patch: $ cat ../meta-mistysom/recipes-display/wlroots/wlroots/0001-Adjust-meson.build-to-meson-0.54.patch From df8a70b2db61a395bb424d4f4942434544e3ef43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Tue, 8 Dec 2020 01:57:15 +0100 Subject: [PATCH] Adjust meson.build to meson < 0.54 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * meson.override_dependency is not required here. It requires meson >= 0.54 * we set min version to what dunfell ships Upstream-Status: Inappropriate[Configuration] Signed-off-by: Andreas Müller --- meson.build | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- 2.26.2 Can anyone help me out on how to resolve this conflict? diff --git a/meson.build b/meson.build index 835e0195..b07760ab 100644 --- a/meson.build +++ b/meson.build @@ -3,7 +3,7 @@ project( 'c', version: '0.12.0', license: 'MIT', - meson_version: '>=0.54.0', + meson_version: '>=0.53.2', default_options: [ 'c_std=c11', 'warning_level=2', @@ -172,8 +172,6 @@ wlroots = declare_dependency( include_directories: wlr_inc, ) -meson.override_dependency('wlroots', wlroots) - summary({ 'systemd': conf_data.get('WLR_HAS_SYSTEMD', 0), 'elogind': conf_data.get('WLR_HAS_ELOGIND', 0),