From patchwork Wed Dec 27 09:24:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 36952 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 1C31DC4706F for ; Wed, 27 Dec 2023 09:24:40 +0000 (UTC) Received: from mail-lj1-f178.google.com (mail-lj1-f178.google.com [209.85.208.178]) by mx.groups.io with SMTP id smtpd.web11.98329.1703669069687964223 for ; Wed, 27 Dec 2023 01:24:30 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=DMHEgtGg; spf=pass (domain: linaro.org, ip: 209.85.208.178, mailfrom: dmitry.baryshkov@linaro.org) Received: by mail-lj1-f178.google.com with SMTP id 38308e7fff4ca-2ccaf5955aeso32456011fa.0 for ; Wed, 27 Dec 2023 01:24:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1703669067; x=1704273867; 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=oxcy92MxYXpURykacpoQ64DowfJ79jD6rrCLQOmhgV4=; b=DMHEgtGg33AjJPkdrwt9TpuaibBOapF7WFvalrQbR84RMKX3eTB1MeW/G+JZtmbO+Z /HfTZohiL60PxHkptGiNRrK4Hl7o0WznNckZ5R02YVICH+aUhnoBvHcOaZGCKV8jrYF0 80aqqsghoPD/N+wUohrTl50w0z9Eq507U+ogsY2rFpAVBcNbIc18yIrLTLXYZZrD8vrY AsdcaHNZyMWkwpf1fGEAutw/z41vmjMPq1yKK9kuiSJ6VSLsBR4huJr41ae/oC1TxykL LZW51fCan/AXSd5tD02dXp8MuKM/HxrELEV6//7szS8ERSPMGNIHL+WHeUpxF2mnr0pt MVUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703669067; x=1704273867; 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=oxcy92MxYXpURykacpoQ64DowfJ79jD6rrCLQOmhgV4=; b=Y+sep+UKYdLCeL6AaqU3fCLt1sommmW/YYJqDmYV8of68duRIutNa61sBnBBgjuxaf XMF6Y68sr8DgJT7Rmk5OdAFMzulaWRPjqL2jmSUZ/wNMLOhylUytT6b4BDSwrb4zttrP M2GxETto6tqlNSXBefHWWn4FYufWoSjxZO3+DFNOerE+UVUfrkb5wNYbSyHD8qdBJz8X o52X/brjmWqzJw7ogiZr76VWi8j9Kl7VrD8zRgBRnZ1bItfbkYr8RySiI8p1R9DfldsL NDeGc5gIWOz2GDTRvIS8jk3MdgNiN8BcNXmFqIruC9NVFDFuxqhHUdS3vju/q9elS2rx adPw== X-Gm-Message-State: AOJu0YwM7xv+cA+qPaOSOfkg6bqyHs21DGeUPkCNNTJ/hzR+GSc67sCL Csh933RJQA5PJYdupez+EABjvWh+ivnTOeTjd3RpcdyCwiPXkZAe X-Google-Smtp-Source: AGHT+IHOK7mV/gXaZcvULlhW/m7VtRyXxoi1FRgTyWrR40upfQjBBaKDkt0VIFweDhLqXrgALoyTbw== X-Received: by 2002:a2e:b0c8:0:b0:2cc:db17:64af with SMTP id g8-20020a2eb0c8000000b002ccdb1764afmr323313ljl.93.1703669067470; Wed, 27 Dec 2023 01:24:27 -0800 (PST) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id e18-20020a2e9852000000b002cca6703b13sm2131333ljj.99.2023.12.27.01.24.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Dec 2023 01:24:27 -0800 (PST) From: Dmitry Baryshkov To: openembedded-core@lists.openembedded.org Cc: =?utf-8?b?Wm9sdMOhbiBCw7ZzesO2cm3DqW55aQ==?= Subject: [PATCH v4 1/3] mesa: drop -Dopencl-native=true Date: Wed, 27 Dec 2023 11:24:23 +0200 Message-Id: <20231227092425.4002461-2-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231227092425.4002461-1-dmitry.baryshkov@linaro.org> References: <20231227092425.4002461-1-dmitry.baryshkov@linaro.org> 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 ; Wed, 27 Dec 2023 09:24:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/192929 The flag -Dopencl-native=true was dropped in Mesa 22.3, remove it from mesa.inc. Signed-off-by: Dmitry Baryshkov --- meta/recipes-graphics/mesa/mesa.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 5f5c8ceb4c84..efbce5caade5 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -140,8 +140,7 @@ PACKAGECONFIG[gles] = "-Dgles1=enabled -Dgles2=enabled, -Dgles1=disabled -Dgles2 PACKAGECONFIG[egl] = "-Degl=enabled, -Degl=disabled" # "opencl" requires libclc from meta-clang and spirv-tools from OE-Core -OPENCL_NATIVE = "${@bb.utils.contains('PACKAGECONFIG', 'freedreno', '-Dopencl-native=true', '', d)}" -PACKAGECONFIG[opencl] = "-Dgallium-opencl=icd -Dopencl-spirv=true ${OPENCL_NATIVE},-Dgallium-opencl=disabled -Dopencl-spirv=false,libclc spirv-tools python3-ply-native" +PACKAGECONFIG[opencl] = "-Dgallium-opencl=icd -Dopencl-spirv=true,-Dgallium-opencl=disabled -Dopencl-spirv=false,libclc spirv-tools python3-ply-native" PACKAGECONFIG[broadcom] = "" PACKAGECONFIG[etnaviv] = "" From patchwork Wed Dec 27 09:24:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 36954 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 21A6CC46CD2 for ; Wed, 27 Dec 2023 09:24:40 +0000 (UTC) Received: from mail-lj1-f182.google.com (mail-lj1-f182.google.com [209.85.208.182]) by mx.groups.io with SMTP id smtpd.web11.98330.1703669070012068980 for ; Wed, 27 Dec 2023 01:24:30 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=Ld+yWmy6; spf=pass (domain: linaro.org, ip: 209.85.208.182, mailfrom: dmitry.baryshkov@linaro.org) Received: by mail-lj1-f182.google.com with SMTP id 38308e7fff4ca-2ccbaea0a6cso24353461fa.2 for ; Wed, 27 Dec 2023 01:24:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1703669068; x=1704273868; 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=ED8huo6s9B+KiL0es+hmpfiD0vEwkb4dmer5eg/9Cjw=; b=Ld+yWmy6KAmAt58b7l5kzT9IcMXR0HpO8A4BG46sHhcOM7MmwtEC9DFNt1Tf/fB1TC VyH79KDaEnWhiRGQJcEkgcMMIOZsDceH+1/rkaggQDbbGuODuzg+vM+GKuIN1PuzKrRq Q2eQOnfPjQsDL3YJlXAaLnpSvkMoZvXmef2gca9M+9HBxbgC/Rk3kO74t92Ckb8muLDW 0ovadtfIjs5oI9MBDdeQKbV0W6jD33Xl9trjcVO2Kb3jD0eJq+ua76nwECwbnq1nju0d hYwEhKm0TrB2SaCukNIC+UcxL4351NzLEokZnUVEh31TuQAQpyLosnYUq5II+qXpkiEO EN+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703669068; x=1704273868; 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=ED8huo6s9B+KiL0es+hmpfiD0vEwkb4dmer5eg/9Cjw=; b=lSO8NJx2b5y5ZU+cqJmXHkPrBIG8SG01ycLpb84sS82u2j5YX1OKBAUhpsOgWFz0hN UNB3EJaChOsy8V+BCnmaWi7Ih03yeAamXAL/9oU+tz+4yNdjBYB9dxsRnKzYrTh/MKr8 Su7+kY9aeF9wtV89B0hPnGK1LYsgWTdXZ8tS+c4SaUSx4GmdCSurSo4eEI1vxzPjHzoP GI64yABJK7CabsWY56jZ/qiC/L/uaGfWzHSNzC7QjL/2LPi+mWwpXPjU6XzkihEYPSM4 BINhYwMJGyTf9rElnP+XfUN/ltdKkZ7XAiZRuPj6ONKo/vA4uf6MblJ+aiHAtKfbI81M OAow== X-Gm-Message-State: AOJu0Yy7T3Usye5Djzl6cxsiByT458bCVA+D0JhFxnTJX5+43tqYhc7/ yRQr0ZuMMrFyUQZmgb3+VzkgPWd4BK2Ru6n1izDJTVpUacgIoa84 X-Google-Smtp-Source: AGHT+IF0Ku4N+mO4NwF+JTeDmgWTpqYVsOh0/sqUVDRZrKPZLU0se3p1CrxTmx9AV6UCHLc+DbAZIw== X-Received: by 2002:a2e:9d93:0:b0:2cc:d294:7df with SMTP id c19-20020a2e9d93000000b002ccd29407dfmr1105639ljj.49.1703669068056; Wed, 27 Dec 2023 01:24:28 -0800 (PST) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id e18-20020a2e9852000000b002cca6703b13sm2131333ljj.99.2023.12.27.01.24.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Dec 2023 01:24:27 -0800 (PST) From: Dmitry Baryshkov To: openembedded-core@lists.openembedded.org Cc: =?utf-8?b?Wm9sdMOhbiBCw7ZzesO2cm3DqW55aQ==?= Subject: [PATCH v4 2/3] mesa: add support for RustiCL under PACKAGECONFIG "opencl" Date: Wed, 27 Dec 2023 11:24:24 +0200 Message-Id: <20231227092425.4002461-3-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231227092425.4002461-1-dmitry.baryshkov@linaro.org> References: <20231227092425.4002461-1-dmitry.baryshkov@linaro.org> 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 ; Wed, 27 Dec 2023 09:24:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/192930 From: Zoltán Böszörményi Mesa now has two OpenCL implementations: Clover (older one) and RustiCL (newer one). Extend the "opencl" package config to include both implementations into the libopencl-mesa (-dev) packages. As the Clover implementation is in maintenance mode and is expected to be removed at some point, it doesn't make sense to split the packages or to provide two config options. Signed-off-by: Zoltán Böszörményi [DB: reworked rust class inheritance] [DB: merged "rusticl" and "clover" back to "opencl"] Signed-off-by: Dmitry Baryshkov --- meta/recipes-graphics/mesa/mesa.inc | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index efbce5caade5..a192562a7935 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -48,6 +48,12 @@ PROVIDES = " \ inherit meson pkgconfig python3native gettext features_check +# We can not include rust conditionally, otherwise it can not be overriden by +# the bbappends. Instead always include it, but remove the dependencies by +# default. +inherit rust +INHIBIT_DEFAULT_RUST_DEPS = "${@bb.utils.contains('PACKAGECONFIG', 'opencl', '', '1', d)}" + BBCLASSEXTEND = "native nativesdk" ANY_OF_DISTRO_FEATURES = "opengl vulkan" @@ -139,8 +145,13 @@ PACKAGECONFIG[gles] = "-Dgles1=enabled -Dgles2=enabled, -Dgles1=disabled -Dgles2 # "egl" requires "opengl" PACKAGECONFIG[egl] = "-Degl=enabled, -Degl=disabled" -# "opencl" requires libclc from meta-clang and spirv-tools from OE-Core -PACKAGECONFIG[opencl] = "-Dgallium-opencl=icd -Dopencl-spirv=true,-Dgallium-opencl=disabled -Dopencl-spirv=false,libclc spirv-tools python3-ply-native" +# "clover" requires libclc from meta-clang and python3-ply-native and spirv-tools from OE-Core +# "rusticl" requires libclc, spirv-llvm-translator and bindgen-cli-native from meta-clang and spirv-tools from OE-Core +PACKAGECONFIG[opencl] = "\ + -Dgallium-opencl=icd -Dopencl-spirv=true -Dgallium-rusticl=true -Drust_std=2021, \ + -Dgallium-opencl=disabled -Dopencl-spirv=false -Dgallium-rusticl=false, \ + libclc spirv-tools bindgen-cli-native python3-ply-native" +#PACKAGECONFIG[opencl] = ",,spirv-llvm-translator" PACKAGECONFIG[broadcom] = "" PACKAGECONFIG[etnaviv] = "" @@ -221,7 +232,7 @@ DEV_PKG_DEPENDENCY = "" # development package of libgles3. RDEPENDS:libgles3-mesa-dev += "libgles2-mesa-dev" -RDEPENDS:libopencl-mesa += "${@bb.utils.contains('PACKAGECONFIG', 'opencl', 'libclc spirv-tools', '', d)}" +RDEPENDS:libopencl-mesa += "${@bb.utils.contains('PACKAGECONFIG', 'opencl', 'libclc spirv-tools spirv-llvm-translator', '', d)}" PACKAGES =+ "libegl-mesa libegl-mesa-dev \ libosmesa libosmesa-dev \ @@ -332,7 +343,7 @@ FILES:libgles1-mesa = "${libdir}/libGLESv1*.so.*" FILES:libgles2-mesa = "${libdir}/libGLESv2.so.*" FILES:libgl-mesa = "${libdir}/libGL.so.*" FILES:libglx-mesa = "${libdir}/libGLX*.so.*" -FILES:libopencl-mesa = "${libdir}/libMesaOpenCL.so.* ${libdir}/gallium-pipe/*.so ${sysconfdir}/OpenCL/vendors/mesa.icd" +FILES:libopencl-mesa = "${libdir}/lib*OpenCL.so.* ${libdir}/gallium-pipe/*.so ${sysconfdir}/OpenCL/vendors/*.icd" FILES:libglapi = "${libdir}/libglapi.so.*" FILES:libosmesa = "${libdir}/libOSMesa.so.*" FILES:libxatracker = "${libdir}/libxatracker.so.*" @@ -346,7 +357,7 @@ FILES:libglapi-dev = "${libdir}/libglapi.*" FILES:libgles1-mesa-dev = "${libdir}/libGLESv1*.* ${includedir}/GLES ${libdir}/pkgconfig/glesv1*.pc" FILES:libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc" FILES:libgles3-mesa-dev = "${includedir}/GLES3" -FILES:libopencl-mesa-dev = "${libdir}/libMesaOpenCL.so" +FILES:libopencl-mesa-dev = "${libdir}/lib*OpenCL.so" FILES:libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/GL/osmesa.h ${libdir}/pkgconfig/osmesa.pc" FILES:libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/libxatracker.la \ ${includedir}/xa_tracker.h ${includedir}/xa_composite.h ${includedir}/xa_context.h \ From patchwork Wed Dec 27 09:24:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 36953 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 1B100C46CD4 for ; Wed, 27 Dec 2023 09:24:40 +0000 (UTC) Received: from mail-lj1-f173.google.com (mail-lj1-f173.google.com [209.85.208.173]) by mx.groups.io with SMTP id smtpd.web10.98730.1703669070733716218 for ; Wed, 27 Dec 2023 01:24:31 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=FjNATIBQ; spf=pass (domain: linaro.org, ip: 209.85.208.173, mailfrom: dmitry.baryshkov@linaro.org) Received: by mail-lj1-f173.google.com with SMTP id 38308e7fff4ca-2ccae5719cfso31858291fa.1 for ; Wed, 27 Dec 2023 01:24:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1703669068; x=1704273868; 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=ZpfymWXb8ZQ1F3+YaBrzMLR0bhF0g8P8148N0zUMMKs=; b=FjNATIBQTGl9FmnJ+8/ba759f6VR6dd7TX8MTfjlrO/WlzmgTPWDeasekJyigmkXnf CzPIcVk4dSucg5zu4iR5nhFAb4awehIyf6CzyrO7thpPzy9PYuIjqO3YnafnbtSmV7U+ N6OgAapCWZgJuoux7lmMpI59e02d8UEOtF9ig7lOTofEQhsHw15B0R9V3wzEPBgxFT+f Mq5lLJBuXeXbKb6+VqbvX+opnlraJ9l1bKmAQVGqkT5/Lrk/8MqiGGlIgjPBkLmvD1AQ 0klmj1DVDKMdCHN1jPtzN0xsrw6hiX1fph2y9hi0UFDTn9cDdwMyJ1ayNt4JFT1xAM0o Tx2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703669068; x=1704273868; 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=ZpfymWXb8ZQ1F3+YaBrzMLR0bhF0g8P8148N0zUMMKs=; b=srJ4PMRG0ZBVAQ1xgpwznYjft0RRgr72nN6DuFTBXzGxUoElOsvF5mMUo2x5cR1N0r bSXut7/STiOX05SufWeDXIfi9ned4VG1WPd+faC4G+SdF42j0PWBngRCJIP9VDIRbUQd AE/EsS+PxpV64gmUBIzNPrpP7YOeFjByhuht7Dl+jM91jZ7bFjnUkndeUZt0XyqUz1yE +mvkVhZvUpwT4lGjvShi83hEa8BpIR1LlhqN4WsGtHNDzCRUqvrAKxlqW4YlowXBtOqF 7o4GMww944At3u5RRk2Byd2w5wGVtL5iW82+6JMJfPNrQjtdI5tanKVEN9O6TVmKqZju 6SsQ== X-Gm-Message-State: AOJu0YxFv5eiGDNu0cL7oG4s/AWwkaG58Ffj7DKvPNpK4Ad7GCPy+Cnh B1KCA+Ro5vlxo5dTF8v6rZtKRVjw/RAws3E1GXKlgPNbZ19VitfN X-Google-Smtp-Source: AGHT+IG8dZhWJaQuDC7pRxIn1Ycsly2aJC+8QNxCCUVZpo39l5ZE8tmr7wPf5dlHXb3lELX2iSG2rw== X-Received: by 2002:a05:651c:544:b0:2cc:c677:4f8e with SMTP id q4-20020a05651c054400b002ccc6774f8emr894012ljp.47.1703669068663; Wed, 27 Dec 2023 01:24:28 -0800 (PST) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id e18-20020a2e9852000000b002cca6703b13sm2131333ljj.99.2023.12.27.01.24.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Dec 2023 01:24:28 -0800 (PST) From: Dmitry Baryshkov To: openembedded-core@lists.openembedded.org Cc: =?utf-8?b?Wm9sdMOhbiBCw7ZzesO2cm3DqW55aQ==?= Subject: [PATCH v4 3/3] mesa: fix building of RustiCL + nouveau Date: Wed, 27 Dec 2023 11:24:25 +0200 Message-Id: <20231227092425.4002461-4-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231227092425.4002461-1-dmitry.baryshkov@linaro.org> References: <20231227092425.4002461-1-dmitry.baryshkov@linaro.org> 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 ; Wed, 27 Dec 2023 09:24:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/192931 Incorporate a patch by Karol Herbst, fixing nouveau / libgalliumvl dependency. Signed-off-by: Dmitry Baryshkov --- .../mesa/files/fix-nouveau-vl.patch | 55 +++++++++++++++++++ meta/recipes-graphics/mesa/mesa.inc | 1 + 2 files changed, 56 insertions(+) create mode 100644 meta/recipes-graphics/mesa/files/fix-nouveau-vl.patch diff --git a/meta/recipes-graphics/mesa/files/fix-nouveau-vl.patch b/meta/recipes-graphics/mesa/files/fix-nouveau-vl.patch new file mode 100644 index 000000000000..bcc1e274b6f8 --- /dev/null +++ b/meta/recipes-graphics/mesa/files/fix-nouveau-vl.patch @@ -0,0 +1,55 @@ +From 91039ec8e866ac870e237d265dd993c05c8e22e0 Mon Sep 17 00:00:00 2001 +From: Karol Herbst +Subject: [PATCH] gallium: fix linkink with libgalliumvl + +Upstream-Status: Pending [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26680] + +diff --git a/src/gallium/drivers/d3d12/meson.build b/src/gallium/drivers/d3d12/meson.build +index a2ed8b3981d..f73fc11de58 100644 +--- a/src/gallium/drivers/d3d12/meson.build ++++ b/src/gallium/drivers/d3d12/meson.build +@@ -135,5 +135,5 @@ libd3d12 = static_library( + + driver_d3d12 = declare_dependency( + compile_args : '-DGALLIUM_D3D12', +- link_with : [libd3d12, libgalliumvl], ++ link_with : [libd3d12], + ) +diff --git a/src/gallium/drivers/r600/meson.build b/src/gallium/drivers/r600/meson.build +index 023719a3a16..974b59d4594 100644 +--- a/src/gallium/drivers/r600/meson.build ++++ b/src/gallium/drivers/r600/meson.build +@@ -185,7 +185,6 @@ libr600 = static_library( + inc_src, inc_mapi, inc_mesa, inc_include, inc_gallium, inc_gallium_aux, inc_amd_common, + inc_gallium_drivers, + ], +- link_with : [ libgalliumvl ], + dependencies: [dep_libdrm_radeon, dep_elf, dep_llvm, idep_nir, idep_nir_headers], + ) + +diff --git a/src/gallium/drivers/radeonsi/meson.build b/src/gallium/drivers/radeonsi/meson.build +index 29afa87c0b6..c89c417b02c 100644 +--- a/src/gallium/drivers/radeonsi/meson.build ++++ b/src/gallium/drivers/radeonsi/meson.build +@@ -168,7 +168,7 @@ libradeonsi = static_library( + driver_radeonsi = declare_dependency( + compile_args : '-DGALLIUM_RADEONSI', + link_with : radeonsi_gfx_libs + [ +- libradeonsi, libradeonwinsys, libamdgpuwinsys, libamd_common, libamd_common_llvm, libgalliumvl ++ libradeonsi, libradeonwinsys, libamdgpuwinsys, libamd_common, libamd_common_llvm + ], + dependencies : idep_nir, + ) +diff --git a/src/gallium/targets/rusticl/meson.build b/src/gallium/targets/rusticl/meson.build +index b2963fe6dfa..e1acaca7e68 100644 +--- a/src/gallium/targets/rusticl/meson.build ++++ b/src/gallium/targets/rusticl/meson.build +@@ -42,6 +42,7 @@ librusticl = shared_library( + ], + link_whole : librusticl, + link_with : [ ++ libgalliumvl_stub, + libpipe_loader_static, + libswdri, + libswkmsdri, + diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index a192562a7935..885d45af5684 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -18,6 +18,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \ file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ file://0001-gallium-Fix-build-with-llvm-17.patch \ + file://fix-nouveau-vl.patch \ " SRC_URI[sha256sum] = "6e48126d70fdb3f20ffeb246ca0c2e41ffdc835f0663a03d4526b8bf5db41de6"