From patchwork Thu May 22 14:45:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 63522 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 2A62BC54E65 for ; Thu, 22 May 2025 14:46:10 +0000 (UTC) Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by mx.groups.io with SMTP id smtpd.web11.25716.1747925169734409063 for ; Thu, 22 May 2025 07:46:09 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@qualcomm.com header.s=qcppdkim1 header.b=dG0GYivi; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: oss.qualcomm.com, ip: 205.220.180.131, mailfrom: dmitry.baryshkov@oss.qualcomm.com) Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 54M7xxIO001325 for ; Thu, 22 May 2025 14:46:09 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:date:from:message-id:mime-version :subject:to; s=qcppdkim1; bh=0A4qlLMrDFf7AjHzA3rBpt3YWH2K67rsxc1 GJyvgZrQ=; b=dG0GYivixNOelRDWYYulyjptq74HpEX1f5QPJczlhVBQMu2dOju xmcu9Mbh7K1J1pYSQOqjnNhwg597uKyT2qtXC4HvYN+wEIvEw33fGhslAj+KetYW mgLxqYSV3ayZW7iZHD30rFL2nshFj1wQVmek+DSKEpY5DiFhI649HEZ/Ru41z1xx McqpQ3qbfzXmUrqnT5AmijIVXjuWraT2d283oN/DMFVcKcDA7fQcZGB5hTkB7LiE tcmiUyxYG9WGdUUzFMXQrCqYQHH2UReSIJ4ahmhARAGyADHjA5Db718EYfCRoKoB ScQWeTjfHZTVFFjqwOGuc7JU2h/45pEvlyA== Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 46s95tn1t4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 14:46:08 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-7c5c9abdbd3so819179685a.1 for ; Thu, 22 May 2025 07:46:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747925168; x=1748529968; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=0A4qlLMrDFf7AjHzA3rBpt3YWH2K67rsxc1GJyvgZrQ=; b=VRM+BnCimiPsa7Bl5U7tQ9cbo+PEL0YjiIxAVAoVOfoxWu60Uftrn/77cuOI9eWH91 5HzMTkOtCJMLLVAi500trV8PrkK7t5jzApKeuGN/H8kWm0cRXRoyBqIQqBtAC9740pKD 3pLZBDVoGhEGUUXD3NJDc0VaSXc8RpO+dAm2n7ZLnGf2G22hLpCz9xJX1/yIMFkFX5AI MxeqmnC3Q0sr5ghCg4USiClkHLpdVg/gnofLITpdNAgki1wp+fnSlwRzCoVTxSXqW/fY ja44F0bgBFPjEXYBTFcyg9oJcsfMhWECfznyE6ljDWkH8pOy8le+UuvAnyZSphkHd4ax oNgQ== X-Gm-Message-State: AOJu0YzPOJx1s6ug4WH0EWbF056q2/ezZD1avELpzT7TgGv34VS2XA+P wzS+jMQCg2YMHImrWnuYL8DQzC6vrfosWA5fFPqlgfBdF3rdwKLsTxrXOa/yO5mUmLWn6sV1ViF 2ixSZ/SG2b8h4JDkimqEOtDCQhHF2cVuooC6/yDNZkOFY+aWPVkBEcHDK1FW64WUWpMFobzxc4+ hlurMdhT5SH8vLdu4= X-Gm-Gg: ASbGncsqmunMlmAHTw5gm7fcMgdpndt99x96S+zYgmS3KLFtb7XhT1Rwj0PkUKOECIi SlmOFzZsyMzDUhZ5lEEDTjp8g9mjrNDZQZhExNVYqnWu3CbNuru46C1rO4ac9/XEZUznGwwnWys 53pu9KvzjfNAnl7WALPrk9/seiIkR3YB8MEiiB4MRugcbDulG8bFlC+MfpjxFcocFzT7Y2R0My5 WWoR8imY4t+WEo4p9/ETff8Sbu29wN/mZsAa8a75MeZY7AWNRhoqFhict8bvunIYbD7RzRyvceP fYPogaJAKQrN0/RRnXrP1RuKzFoPKwvBapGzwwBf973BRN7Fj8zrPvM+eCiokNCqxX3mm0wNWJK Hwn6Vky1EPRxUABRQOh24xVy1 X-Received: by 2002:a05:620a:4091:b0:7c5:55f9:4bb2 with SMTP id af79cd13be357-7cd467241efmr3138536385a.22.1747925167712; Thu, 22 May 2025 07:46:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGCpY7oKjFYzNKDbwwtxtEw7rJDQvvvKwx+yH/uhv75Wqy+5NC+S1Nplw8afKGP1Pp962RmNg== X-Received: by 2002:a05:620a:4091:b0:7c5:55f9:4bb2 with SMTP id af79cd13be357-7cd467241efmr3138531785a.22.1747925167138; Thu, 22 May 2025 07:46:07 -0700 (PDT) Received: from umbar.lan (2001-14ba-a0c3-3a00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a0c3:3a00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-328084cabdasm33031551fa.44.2025.05.22.07.46.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 07:46:06 -0700 (PDT) From: Dmitry Baryshkov To: openembedded-core@lists.openembedded.org Subject: [PATCH v2 01/12] mesa: remove OSMesa support Date: Thu, 22 May 2025 17:45:54 +0300 Message-Id: <20250522144605.2876771-1-dmitry.baryshkov@oss.qualcomm.com> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 X-Authority-Analysis: v=2.4 cv=QKBoRhLL c=1 sm=1 tr=0 ts=682f38b0 cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=xqWC_Br6kY4A:10 a=dt9VzEwgFbYA:10 a=EUspDBNiAAAA:8 a=ZSQEBjlZUM_vgJQqOsUA:9 a=NFOGd7dJGGMPyQGDc5-O:22 X-Proofpoint-ORIG-GUID: e2jymtS3NH5HyD8P-kw9NIiOVL922_6a X-Proofpoint-GUID: e2jymtS3NH5HyD8P-kw9NIiOVL922_6a X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE1MCBTYWx0ZWRfX7FOS0/ZeQunA UaQAcU24NRVm1xO6KrHLlknOZYuSSvheRe38oEpVzZtHrAYhbiAau2O72Fh9pWPYMQ6YYOCEkUY 0wE+roaC6RrDY4w0+Vt0WgOr1YMZsDHwTSnK4uq4s8/4gUEssNBlI9F5YUPmFxhlGvD0uHrFa78 gbdqvmYbaTxjM439Y3T6nYVr/u8iFq1m1WNqzd4MFCQhID49lokqMtxumw+8BwhpgwER5Cj32vU Cg5R0ggzQrs2+TEKEpGUv9V4GN3/kZq5tJQMP7FsyndsYycvZAI7k+B5JlC0GOQLsX7/4SM2HDM AY781jx/9QC1i0dT2QKGTwDVkBodIScH+6vS2s3qvje2SA+Li1E3eF26tzOXxCBEe1Yl8pFU7K/ U3Wuj+0L6zywDg+2+J9thJCVB3EWGO3d5zH02TnVFeqkD6AX4fd00FkhfNiZdO7S1kWrO/KA X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-22_07,2025-05-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 spamscore=0 clxscore=1015 phishscore=0 lowpriorityscore=0 adultscore=0 mlxlogscore=999 suspectscore=0 bulkscore=0 impostorscore=0 priorityscore=1501 malwarescore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000 definitions=main-2505220150 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 ; Thu, 22 May 2025 14:46:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/217112 Mesa 25.1 has dropped OSMesa support. Remove corresponding bits from the recipe. Signed-off-by: Dmitry Baryshkov --- meta/recipes-graphics/mesa/mesa.inc | 5 ----- 1 file changed, 5 deletions(-) diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 07a57b11c80b..2ff69c3ace2c 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -219,8 +219,6 @@ GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'tegra', ',tegra, PACKAGECONFIG[vulkan-beta] = "-Dvulkan-beta=true,-Dvulkan-beta=false" -PACKAGECONFIG[osmesa] = "-Dosmesa=true,-Dosmesa=false" - PACKAGECONFIG[perfetto] = "-Dperfetto=true,-Dperfetto=false,libperfetto" PACKAGECONFIG[unwind] = "-Dlibunwind=enabled,-Dlibunwind=disabled,libunwind" @@ -254,7 +252,6 @@ ALLOW_EMPTY:libgles3-mesa = "1" RDEPENDS:libopencl-mesa += "${@bb.utils.contains('PACKAGECONFIG', 'opencl', 'libclc spirv-tools spirv-llvm-translator', '', d)}" PACKAGES =+ "libegl-mesa libegl-mesa-dev \ - libosmesa libosmesa-dev \ libgallium \ libgl-mesa libgl-mesa-dev \ libglx-mesa libglx-mesa-dev \ @@ -353,7 +350,6 @@ FILES:libgl-mesa = "${libdir}/libGL.so.*" FILES:libglx-mesa = "${libdir}/libGLX*.so.*" 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.*" FILES:${PN}-dev = "${libdir}/pkgconfig/dri.pc ${includedir}/vulkan ${libdir}/vdpau/*.so" @@ -366,7 +362,6 @@ FILES:libgles1-mesa-dev = "${libdir}/libGLESv1*.* ${includedir}/GLES ${libdir}/p FILES:libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc" FILES:libgles3-mesa-dev = "${includedir}/GLES3" 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 \ ${libdir}/pkgconfig/xatracker.pc" From patchwork Thu May 22 14:45:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 63524 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 2B32DC54ED0 for ; Thu, 22 May 2025 14:46:20 +0000 (UTC) Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by mx.groups.io with SMTP id smtpd.web11.25718.1747925171135651270 for ; Thu, 22 May 2025 07:46:11 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@qualcomm.com header.s=qcppdkim1 header.b=BK36NDC2; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: oss.qualcomm.com, ip: 205.220.180.131, mailfrom: dmitry.baryshkov@oss.qualcomm.com) Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 54M8Z4st011354 for ; Thu, 22 May 2025 14:46:10 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=elJqMBc9h1G bsz8olAfOeI01UNJlANvzu3hWGIEsjc4=; b=BK36NDC26U6G9DDpCHP22k/0nhk TQqfgGlpvXMA5OsNcIRWeb/UDx0XIZzklfCaL22A8Nv0sflCS8Ep1iddpSC5ESOT 2YAaaxS8yJKRwi2WZzASicC/nG6cB8akWcT7UkLbqAZ39VF/sbQoR82kjEWj0e+1 5HtBp/5x3CgsmTNgR7qbDOuuHH1LuVSn5l4jrx56ERCrXqKU0J0PHDo+B3i0kDwj gVa0rTffK5wbnFmtKyXmUvDg5iTqz0SfjnDxfX5qSF+m80u5f44enxOalpkRmGA5 3/Ul3KIFLE+uVGMSbAyN2m6L5MVfotqX1XH5fihZ0+CBFNa5j6AWM87g28w== Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 46rwfb6jjd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 14:46:10 +0000 (GMT) Received: by mail-qv1-f72.google.com with SMTP id 6a1803df08f44-6f8bdbd9174so206538606d6.0 for ; Thu, 22 May 2025 07:46:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747925169; x=1748529969; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=elJqMBc9h1Gbsz8olAfOeI01UNJlANvzu3hWGIEsjc4=; b=u1XYhBJrZeF1JsyO/tFmK0yum9lFmME+A+bMObZA48C7eme+AYO3Ao+fyW0+/Sh1hh +KMw9d+XHhYKoX9rOvZ5iyouaYuHSf/hNSx+79mPWb+AY9wpaT3YO1EG8SaQ7Fb2b6Jg uYIyGRd6eYzHdP+rFUbXil23XiWkbuClxw08eB7w+qjSEbIsynXmaGOs1rh7aYOqiajx 60wZsZcKot3EyPk18gStq0A321s8A8IUQkOQqqRovCRd1Pzyc1+yltmNR03pkidpwRN0 JhVXLUDj0MeooOfC6qaySSnZF80z6ZyfZtCfWakU2OHe0gHtblgyzmy/vMhTw/qMywEd yBiw== X-Gm-Message-State: AOJu0YyBEFr0m+7hxIhtude9pU04dAFtB7vj4dySOOl7ck9J0LjFqCGL TDpoL2Yka0qS5BLeJEtVJHYhB/Zd8Cvkvq9dAQyLIdGEtJBWt68/va7ECMb7P9+yXlkI7S0VhiU psGkLqwMioO/BubM6oBBzSBcmJViyA+lCla2TGIlInvoTg+R6rahV2I1F0Lps5qbgMOJlheUi9S 32eZ9RITCe1GiQDPs= X-Gm-Gg: ASbGncuknZj3SwmK4Os8fdjHQQZCbgqIkOfXBAYW8NVA17xG7irbTnllY13WTxVtPIR lI1WxCLCdjvLn3VPU/UaxeKuARp7LfIFhJCO/XhfkeE5w7Urh/3+Wb5ge1iTpW38qaIFi05wiPj VVfE+4xRF8HrB3soueaIAynoUR0DTbR+DVJ3iyYWqfk6HAYK+tw1qSthxGEIicCBG33ZAi4pHKL 2OriEtoQLh9Gd+LEuF8HBDfSalbK2VT0SaVUTnaxgrIJVPy0HOrn2cd51Z3cISpg7nJ2pxuvruf xrymAvjNkK4TTHh0k+cG9vhUYkwsC7Jy9j4HwBidv2842AKeVc5mHDXOKgrRSt1hxGjsg6DwdDx Q8L+rBRfX4SCBjGNSkqua7AX3 X-Received: by 2002:a05:6214:402:b0:6f2:d25e:8f60 with SMTP id 6a1803df08f44-6f8b2c91d64mr423456086d6.22.1747925169010; Thu, 22 May 2025 07:46:09 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFDoGIiu0RbHoJKWplF5fQhlNaONs2vX90TrWNDr2cuacgE0HckqK0Nk2a7ihcm9fNGQEu+BQ== X-Received: by 2002:a05:6214:402:b0:6f2:d25e:8f60 with SMTP id 6a1803df08f44-6f8b2c91d64mr423455616d6.22.1747925168611; Thu, 22 May 2025 07:46:08 -0700 (PDT) Received: from umbar.lan (2001-14ba-a0c3-3a00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a0c3:3a00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-328084cabdasm33031551fa.44.2025.05.22.07.46.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 07:46:07 -0700 (PDT) From: Dmitry Baryshkov To: openembedded-core@lists.openembedded.org Subject: [PATCH v2 02/12] mesa: drop useless -Dshared-glapi flag Date: Thu, 22 May 2025 17:45:55 +0300 Message-Id: <20250522144605.2876771-2-dmitry.baryshkov@oss.qualcomm.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250522144605.2876771-1-dmitry.baryshkov@oss.qualcomm.com> References: <20250522144605.2876771-1-dmitry.baryshkov@oss.qualcomm.com> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: TZL79hjMMezeiOFGqkBSnDLL0Cif0nSl X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE1MCBTYWx0ZWRfX4p87YS6poSY2 r+qWHrJMNT/pzD+GHGhArtBpwGLmKd9z+IALdEgCcRl9/KsfMwfhAq8Qp3K9S3dvluHbED0/qRa fNkgLJhfJj+DHn2Eg/zpEsE9/fz8kam6RYiFyRhRF4SCl0/w3TTDWltaoJNnm3lZOJErXY/hgvQ mmmm1YTAgV92LfLVdCpGGkFXK4zAL8QjCsiFRjtMlpnD1QjLYApEZQj0sgUaazVZPYL9nPu1dzE v51NvhXfJkVy7XODYKs/QDnGDO36QP2KRdZZB6ZQErQgtCkDj9PUdvt8TcoALeclZoV16zMafvb 2bxfY7M6jTHo9LTWYIgsxvxUvACQWEoM7JO5tvfJhGUOU+t/ikk35GV+ldqEk8ayMK7xvlCAl19 +hn+fDGSZFkP8FP0bzKVaPq0OdsgFcIFjs0vXHakSAUjQ9hIoA4OJZysSOkUQ8+dXSKo83GI X-Proofpoint-GUID: TZL79hjMMezeiOFGqkBSnDLL0Cif0nSl X-Authority-Analysis: v=2.4 cv=dLCmmPZb c=1 sm=1 tr=0 ts=682f38b2 cx=c_pps a=7E5Bxpl4vBhpaufnMqZlrw==:117 a=xqWC_Br6kY4A:10 a=dt9VzEwgFbYA:10 a=EUspDBNiAAAA:8 a=OQp4uNaVuwmCJKMus2EA:9 a=pJ04lnu7RYOZP9TFuWaZ:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-22_07,2025-05-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 clxscore=1015 adultscore=0 bulkscore=0 phishscore=0 suspectscore=0 impostorscore=0 malwarescore=0 lowpriorityscore=0 mlxlogscore=875 spamscore=0 priorityscore=1501 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000 definitions=main-2505220150 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 ; Thu, 22 May 2025 14:46:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/217113 Mesa 25.1 dropped support for static glapi, making this switch deprecated (and useless). Drop it from the build options. Signed-off-by: Dmitry Baryshkov --- meta/recipes-graphics/mesa/mesa.inc | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 2ff69c3ace2c..7fc306156dad 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -68,7 +68,6 @@ def check_buildtype(d): MESON_BUILDTYPE = "${@check_buildtype(d)}" EXTRA_OEMESON = " \ - -Dshared-glapi=enabled \ -Dglx-read-only-text=true \ -Dplatforms='${@",".join("${PLATFORMS}".split())}' \ " From patchwork Thu May 22 14:45:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 63527 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 47D0DC54F32 for ; Thu, 22 May 2025 14:46:20 +0000 (UTC) Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by mx.groups.io with SMTP id smtpd.web10.25574.1747925172757665494 for ; Thu, 22 May 2025 07:46:12 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@qualcomm.com header.s=qcppdkim1 header.b=fhxlOQVC; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: oss.qualcomm.com, ip: 205.220.180.131, mailfrom: dmitry.baryshkov@oss.qualcomm.com) Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 54M8J2dN011346 for ; Thu, 22 May 2025 14:46:12 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=tq1rNWl0d6H 7kdK9oMfNdTVx5iWEh9Lz2+tSVLcy7Ys=; b=fhxlOQVCMvLpAtI/JbAQiCJkr98 9VvZpzoR5HXqUwOvNGyi0L9F05IfykNwMA1WZkfuNfOsAUVVha8JDfQvN3eecUzQ Pz8a/jRBpQGip8OZ9daOnI7rUJlRT38vLepZIRslTdwfS0w8fKM1t+8cuyk9foGp QAJNmlPM0eH73ESm/g/BPV88XYEQxnuZc1rAi8WmxSQ1B2SrU57sTPFOaEkmHHNN 9oP1YRG/BFaXhISMvl+juNkLJ3yuFfUN1K3pFv7VtHpKFtLGvqVW73tAe0bCZqqA kFNuNTbqe5tcymajlQOxs9qfP9CbUI5Hjfd28Vx8osP0g6fR3h3NZogfBVA== Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 46rwfb6jjf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 14:46:11 +0000 (GMT) Received: by mail-qv1-f70.google.com with SMTP id 6a1803df08f44-6f8c8a36d8eso109510266d6.0 for ; Thu, 22 May 2025 07:46:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747925170; x=1748529970; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tq1rNWl0d6H7kdK9oMfNdTVx5iWEh9Lz2+tSVLcy7Ys=; b=bClfrEVFuLZgrfl+6kLAFO5ehyXlrTG4a9gTmCru75z9twODSGz6mzv9U1Uvpaq972 YitHsEb+vNwM6Be6I3gM3YuW1jm8kOJLrJirO6PvMlljRr4FDxFcJ5Bxm+31pVBXzuKR uF+GQHnCV4OseMj5E/to/BJsYJTofK6Wt0Nahr7RAx62mz5k16y/DGmTFfCDbyTBtO+u 5ioAQspg3D8IycA8421PwdgkscTnQRieAi0A7fBCyBFzf5PfIB0QifME4Wsa2Pg74wIW y/NbjQZUkp3hIBsAOPEQB0KbavBq+Qz4W2QZE3Acmz/4MCxq1gcWpJqixIlZpFz4tfXJ jxKw== X-Gm-Message-State: AOJu0YzyTz5IWMcnhuRspMQ9m32AmALsCBQRB/Wn+AyO2DqGqfYZL2oP HNa2/fOtdpVlbmAqlyZQA1cZFS7qm+DpCmY5WDNVpi7GrElCufsWP6Db5OIH7Qw32uQOQPKiEsY 0Y/B7jmLY7OXzyOhIIOuW7jAecM9SQ83SpnYqXAOUIlGr3iFTQ37k++gVyeQpEnzdfqn/Jw0DXi ZuMFIO4IgqLgsdQM4= X-Gm-Gg: ASbGncuSAooXY9dgJJ8VZoXQ16pK0b0HNIW/AgDzYhM2qo5vS4n6ljpI/gux5zelBzu xwG4A+o+ks4Lnl/CBXi9emf6j6a+A/hUJq0md3QmTUxObHxk0JNL8TKNrUAA3Q0y9b2mQ13Ymyh XVs25lAGcrEv4z52Es/YY60bNSEk83rWuNDxge2sOzKV1EO5UEo0OHSrsZ0n1tU/OS0LBrwzhQ4 qLGWMoNvgVnqLg0PaLQ6VOwMIB0tQ4HJWPlT5J9N/HSrhireu8OWjni/OcF3equq9su8A2GsSJZ yd6KQKmnfqSHUjlpuVtrNYefYZJP/vZRfAjMNafUJsvp6V0O2NL7H7jXlQsMtZz4TJ2nlr5x7TV IOyMO1R9q40Uuqa5414Mj6EXw X-Received: by 2002:ad4:5f8e:0:b0:6ef:3de:5ff7 with SMTP id 6a1803df08f44-6f8b0866722mr426583006d6.15.1747925170418; Thu, 22 May 2025 07:46:10 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHtAmfgIbaKmNlj9LOxj2WhzwH3vtPqmWKqc/inBMW+V5I4bQqWLKISPckYXzUiaY/RXxNneg== X-Received: by 2002:ad4:5f8e:0:b0:6ef:3de:5ff7 with SMTP id 6a1803df08f44-6f8b0866722mr426582686d6.15.1747925170043; Thu, 22 May 2025 07:46:10 -0700 (PDT) Received: from umbar.lan (2001-14ba-a0c3-3a00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a0c3:3a00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-328084cabdasm33031551fa.44.2025.05.22.07.46.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 07:46:08 -0700 (PDT) From: Dmitry Baryshkov To: openembedded-core@lists.openembedded.org Subject: [PATCH v2 03/12] mesa: drop -Dgallium-opencl flag Date: Thu, 22 May 2025 17:45:56 +0300 Message-Id: <20250522144605.2876771-3-dmitry.baryshkov@oss.qualcomm.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250522144605.2876771-1-dmitry.baryshkov@oss.qualcomm.com> References: <20250522144605.2876771-1-dmitry.baryshkov@oss.qualcomm.com> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: AaMFtr18EIJ87PtsJMPOiu6Ikxaz7RZc X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE1MCBTYWx0ZWRfX68Lvq7aqcYbM V1ASTdTp6tAh1n+97mEnJDl+6iNRmqgPOYqnUo/w1vXmfzQcW3VqccZ+oHCna6Z8URuxXTtfeRp b7HNjfgwJXg8sQmps9+IKJaoRCoiIeHlzZlP6NqqAbsMF2safk20lofh9qY1FjwOJGIZdVmiFry y7A0oc+vvlES/LlG3Rs2seDlUvYNUuooml+7uDk3uJTtw+dgzDzzrEbfq2n3dBM6ck6c+oItGUR +xvWuU5EiukMR/tdGDEtl1K5aehXG4Qer7tGQwsLLh2PtErRIfJPR0m2HTipy7yCuggrcVODru3 EDXsZfA0ROMdzIoKwXpWpMh/yZyol9hYIWN+SHfMau+vcukCuNk1yoR9Pcexn26ovHhAwmZX5tg pfvGcirniLRUzRGMBNREoPTr4Et03QZgfR43YzFYTE30NohjQLQMRtYAGqDCMsoSRCDmIhe/ X-Proofpoint-GUID: AaMFtr18EIJ87PtsJMPOiu6Ikxaz7RZc X-Authority-Analysis: v=2.4 cv=dLCmmPZb c=1 sm=1 tr=0 ts=682f38b3 cx=c_pps a=oc9J++0uMp73DTRD5QyR2A==:117 a=xqWC_Br6kY4A:10 a=dt9VzEwgFbYA:10 a=EUspDBNiAAAA:8 a=ljLuNc_75jdkrf6jWyIA:9 a=iYH6xdkBrDN1Jqds4HTS:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-22_07,2025-05-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 clxscore=1015 adultscore=0 bulkscore=0 phishscore=0 suspectscore=0 impostorscore=0 malwarescore=0 lowpriorityscore=0 mlxlogscore=949 spamscore=0 priorityscore=1501 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000 definitions=main-2505220150 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 ; Thu, 22 May 2025 14:46:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/217114 The Clover support has been deprecated upstream and got explicitly disabled by the 0001-dont-build-clover-frontend.patch patch. Drop it from the build flags. Signed-off-by: Dmitry Baryshkov --- meta/recipes-graphics/mesa/mesa.inc | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 7fc306156dad..89fa19a5668f 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -145,11 +145,7 @@ PACKAGECONFIG[egl] = "-Degl=enabled, -Degl=disabled" # "opencl" also requires libclc and gallium-llvm to be present in PKGCONFIG! # Be sure to enable them both for the target and for the native build. -PACKAGECONFIG[opencl] = " \ - -Dgallium-opencl=icd -Dgallium-rusticl=true, \ - -Dgallium-opencl=disabled -Dgallium-rusticl=false, \ - bindgen-cli-native \ -" +PACKAGECONFIG[opencl] = "-Dgallium-rusticl=true, -Dgallium-rusticl=false, bindgen-cli-native" PACKAGECONFIG[broadcom] = "" PACKAGECONFIG[etnaviv] = ",,python3-pycparser-native" From patchwork Thu May 22 14:45:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 63529 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 54E65C54FC6 for ; Thu, 22 May 2025 14:46:20 +0000 (UTC) Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by mx.groups.io with SMTP id smtpd.web10.25575.1747925173862123918 for ; Thu, 22 May 2025 07:46:14 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@qualcomm.com header.s=qcppdkim1 header.b=RaJ/ccXQ; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: oss.qualcomm.com, ip: 205.220.180.131, mailfrom: dmitry.baryshkov@oss.qualcomm.com) Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 54M9FqVk004048 for ; Thu, 22 May 2025 14:46:13 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= UB2pvuuH/OpgDeOjGaS/PfvbG+PXqbZyKZicP6HY34Y=; b=RaJ/ccXQgAHH85R9 L4nNE2DryiFURPiE4p4/0QL3yawMqlN4O+J4O/RoCPcuhGgXDkJyZyt8KGndBDWs 8t+H8IOOAxN6ZkZoTYf8s93iL7B1tGLIs80ajotT87DaK6bePe78pI5W8TyefMSi AY9vOz3r3qAhpoI9wgX62uv9+d4ibdgnkMSbmTSXhEBqcI7pmdk78SLdUtZNDd0C oVZsHE5eDS5Wth7/hWZtZlxl9o0ZfLDf9JfY6Z2MD2x4pLkZ0RgA1Ny2UtR0N172 7+eSaNOvo0d6bd+PpTvWnCzEU8QNoQflMLiFJnxY/a0qdQxV84n688AWTHBuXDNU liu7+w== Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 46rwf4xmmg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 14:46:12 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-7caef20a527so1198668285a.3 for ; Thu, 22 May 2025 07:46:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747925172; x=1748529972; 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=UB2pvuuH/OpgDeOjGaS/PfvbG+PXqbZyKZicP6HY34Y=; b=AIrasRJQWhTn41AoaDPTc7wClHX+3k7DDmBLlrA+1OcwVsV8tBcsAsdrSI6icuHpwT AK9zQZBGnVQ4s8spugmXp9nXBJIaqrgZZmb814FJeQDP0Zg2tR29aWkSmdsAMpKZ8sM0 ccsHQpAUnqDEz2vMjeiQuQkg0t7oEIYzIb1rJXAd7S38Qjje7vZ99/bW2XUm5/owfOUY r5F97hZVTKL06cROLzi4BIKF64VgNKIHRCHTfNsefVPZco5doR0ngSp2/fFrdmVQ36TS ShJZzfWSMsJg3QzzoRP/cOaibmjDnswD2h78kdSRucoH2cXtF4gtwdqRcDjTnWxnRC8+ O2Fg== X-Gm-Message-State: AOJu0Yw5+Cu6mUz9Oc+qGQiVOrVHvFlX9tCvE+WUblA9t+jISBG68vmp kUqRcDXV7YjtE83Q9WuodScewOzRUVHd/VLwiWcB32JJtPkzcQ5KWdZbhZMnL2FnLYXL+3khOsu AIaKWmTTrPkCnVzspBBQA47MZSHwiPg63L7oQTRlJ5hcFKVOZL1MJ8Yj4rHe8+fka1DoBl8veXs 7j6+Wmqqjb4S2o5a4= X-Gm-Gg: ASbGncsceURiz+CVogCe0EJFwr5jH+seQDsND4J/6c2FsBe+ysuiKtO+bDXCyl+1xez mBhK2TAEUo5GNq+gqiDE/xCi87Axi1KPZcPk44kxyvCewMItYJwuxuZN26GYxXTjBQ2WmdGqjxt eL2uI5x9C1dnAFlYpoOl5wFLKX2bhtGlkedyzjLcWozOAFA4GJe7xO9dQafbEQib/yzrfhmHIgf eKN2sOpp+ANEOXKy7FaJPK78v1hKMqjhLE8dMPe8xSfkb5r9NwlBLT7ASFobWBqF0zjTIIcE56f QFWCs+mhvvuBpPk5tj1hMAoKcrvtBvLZjKesyggKuz4n0e0mJ7hm/nzeLX3JypSSUnibHIMuMPO Ag1aOR1niv5ODYryGTGBB1uW5 X-Received: by 2002:a05:620a:d87:b0:7c5:3d60:7f91 with SMTP id af79cd13be357-7cd47f11736mr3138282685a.15.1747925171733; Thu, 22 May 2025 07:46:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IECvROoLVxuU86D9THiw71B9xxTWprNSUwgjMxN3F2RbTQThQ4NNnd9XAKqaKTnWDBzTnqbkg== X-Received: by 2002:a05:620a:d87:b0:7c5:3d60:7f91 with SMTP id af79cd13be357-7cd47f11736mr3138279785a.15.1747925171371; Thu, 22 May 2025 07:46:11 -0700 (PDT) Received: from umbar.lan (2001-14ba-a0c3-3a00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a0c3:3a00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-328084cabdasm33031551fa.44.2025.05.22.07.46.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 07:46:10 -0700 (PDT) From: Dmitry Baryshkov To: openembedded-core@lists.openembedded.org Cc: =?utf-8?b?QsO2c3rDtnJtw6lueWkgWm9sdMOhbg==?= Subject: [PATCH v2 04/12] mesa: fold GL ES 3 packages into GL ES 2 ones Date: Thu, 22 May 2025 17:45:57 +0300 Message-Id: <20250522144605.2876771-4-dmitry.baryshkov@oss.qualcomm.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250522144605.2876771-1-dmitry.baryshkov@oss.qualcomm.com> References: <20250522144605.2876771-1-dmitry.baryshkov@oss.qualcomm.com> MIME-Version: 1.0 X-Proofpoint-GUID: WSo2-T9QRerwcFt-FMDaDB_Nj_DNUZpt X-Proofpoint-ORIG-GUID: WSo2-T9QRerwcFt-FMDaDB_Nj_DNUZpt X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE1MCBTYWx0ZWRfX33LtMzLPhY1g 8YAOiVusJtK7F2kjXCKoQAbOl5dHZlQ1CEYlrJ+qRt9VMzXGdFyI8owZyq2Ry9narmTdEmWbEE6 iPSxnhnaDQSwS4no9LDyC+6Oif2AewsYqzVHlc2hrz0wziLwRacSUwASY6Mdi4buO4ZR/Cf2koI 8vFBgRuTRMvpPw5UnTNeFq0r512Y0mIJr6PmZ0NVwz7LWjquEEaz49xnj+1SOJEzQ30emdFAwjk AOGHWjm5QKiaKlfWe60ypyVIDjB3QZL8CBzRSTx9U8/vHsUnRH4NvdkDnOgYeemx+kzSzv+aRXu dz53G3e6EsVip3BiAjm58K4EwXzxjlgrMHQRPSfDtqvaMUVeXcQbze3bpLqNUJEcXGmxkSJ2YCV UxZNyLDey/HGfXX+iIhbIhUzOEsKb+p6TwvXC9vBKHvvEmxB+S5AwdreBdNSflf16xZDuXiA X-Authority-Analysis: v=2.4 cv=R7UDGcRX c=1 sm=1 tr=0 ts=682f38b4 cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=dt9VzEwgFbYA:10 a=pGLkceISAAAA:8 a=EUspDBNiAAAA:8 a=Wm-pHqCzE9DZxLNbtkMA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=PEH46H7Ffwr30OY-TuGO:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-22_07,2025-05-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 clxscore=1015 mlxlogscore=765 priorityscore=1501 spamscore=0 bulkscore=0 lowpriorityscore=0 malwarescore=0 suspectscore=0 mlxscore=0 impostorscore=0 adultscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000 definitions=main-2505220150 X-MIME-Autoconverted: from 8bit to quoted-printable by mx0a-0031df01.pphosted.com id 54M9FqVk004048 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 ; Thu, 22 May 2025 14:46:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/217115 OpenGL ES 3 is closely tied to the OpenGL ES 2: there is no separate library, one can use GL ES 2 headers for GL ES 3 app, etc. Instead of having separate packages, merge GL ES 3 packages into GL ES 2 ones. Suggested-by: Böszörményi Zoltán Signed-off-by: Dmitry Baryshkov --- meta/recipes-graphics/mesa/mesa.inc | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 89fa19a5668f..a856d11e0734 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -232,17 +232,10 @@ CFLAGS:append:armv6 = " -DMISSING_64BIT_ATOMICS" # Remove the mesa dependency on mesa-dev, as mesa is empty DEV_PKG_DEPENDENCY = "" -# Khronos documentation says that include/GLES2/gl2ext.h can be used for -# OpenGL ES 3 specification as well as for OpenGL ES 2. -# There can be applications including GLES2/gl2ext.h instead of GLES3/gl3ext.h -# meaning we should probably bring in GLES2/gl2ext.h if someone asks for -# development package of libgles3. -RDEPENDS:libgles3-mesa-dev += "libgles2-mesa-dev" - # GLES2 and GLES3 implementations are packaged in a single library in libgles2-mesa. # Add a dependency so the GLES3 dev package is associated with its implementation. -RDEPENDS:libgles2-mesa += "libgles3-mesa" -ALLOW_EMPTY:libgles3-mesa = "1" +RPROVIDES:libgles2-mesa += "libgles3-mesa" +RPROVIDES:libgles2-mesa-dev += "libgles3-mesa-dev" RDEPENDS:libopencl-mesa += "${@bb.utils.contains('PACKAGECONFIG', 'opencl', 'libclc spirv-tools spirv-llvm-translator', '', d)}" @@ -254,7 +247,6 @@ PACKAGES =+ "libegl-mesa libegl-mesa-dev \ libgbm libgbm-dev \ libgles1-mesa libgles1-mesa-dev \ libgles2-mesa libgles2-mesa-dev \ - libgles3-mesa libgles3-mesa-dev \ libopencl-mesa libopencl-mesa-dev \ libxatracker libxatracker-dev \ mesa-megadriver mesa-vulkan-drivers \ @@ -279,8 +271,7 @@ python __anonymous() { ("opengl", "libgl", "libgl1"), ("glvnd", "libglx",), ("gles", "libgles1", "libglesv1-cm1"), - ("gles", "libgles2", "libglesv2-2"), - ("gles", "libgles3",), + ("gles", "libgles2", "libglesv2-2", "libgles3"), ("opencl", "libopencl",)): if not p[0] in pkgconfig: continue @@ -354,8 +345,7 @@ FILES:libgl-mesa-dev = "${libdir}/libGL.* ${includedir}/GL ${libdir}/pkgconfig/g FILES:libglx-mesa-dev = "${libdir}/libGLX*.*" 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:libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${includedir}/GLES3 ${libdir}/pkgconfig/glesv2.pc" FILES:libopencl-mesa-dev = "${libdir}/lib*OpenCL.so" FILES:libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/libxatracker.la \ ${includedir}/xa_tracker.h ${includedir}/xa_composite.h ${includedir}/xa_context.h \ From patchwork Thu May 22 14:45:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 63526 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 2C0FAC54E90 for ; Thu, 22 May 2025 14:46:20 +0000 (UTC) Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by mx.groups.io with SMTP id smtpd.web11.25719.1747925175554882477 for ; Thu, 22 May 2025 07:46:15 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@qualcomm.com header.s=qcppdkim1 header.b=dGQGBZZ4; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: oss.qualcomm.com, ip: 205.220.168.131, mailfrom: dmitry.baryshkov@oss.qualcomm.com) Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 54M7L6Si029063 for ; Thu, 22 May 2025 14:46:15 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=ip1I2hfJETY wmuoFzaoz4Y0mZ3RoR/aZUIxhZX+ulJ4=; b=dGQGBZZ4yBhvzBqYAI6LGtJ8R/L Wuvz0N8zRqs6SJQkeLOeThv3QRqJI83h8SYeNp7Ge0WLutreJWtiMxyJ/ToOLV68 WBzU9YetQQmltEjsP0hiPW9K7hxCasCnTXdQ2F1phRKRcQ8N7TWjGopGpkC5WahA SBneFDqLYvR/BNlie49FZWoVeqAgxd3GBFP4wBBqnm8bivxlQohphuPtrpRXBo3X gIawdCN6yASRjXC1Aiug8MYW5HFaB7Q1F/a8W6RyENGHLUM+/HIsF9cjoBYUijT2 sA8Pt7Ci9Ky5HQX8NFW+X3EjK9ndlcH+2g5Zs+uYzmSf7FUmuo4OjBJXUVQ== Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 46rwf46spw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 14:46:14 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-7c5b9333642so982059685a.3 for ; Thu, 22 May 2025 07:46:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747925173; x=1748529973; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ip1I2hfJETYwmuoFzaoz4Y0mZ3RoR/aZUIxhZX+ulJ4=; b=eLR4ZB+Z/f36KfuoB70v+JyzOOZxqO/+BiFslTfpLlZmaZgty1YLa1J7R7VLeN6qAH ddeNlyAU5Fj0tRgxEwY6JG0Bc1GhQDe9JhiVRwRKONfv5vuenuIkelwg0XZ23qy/9MLO p2YcG0Ir6Wk4jrOvmzBCGA8ys5klVfVwCXh6b/QwgEsT7BSR5Y/tBbWMI/+veRDItzJt siy0hpe+9tLrZmGpao3qADXSIise8SWul+020KSJ7lm13jfjy3qV3NOIRhWB3U76Fyct 6L4ZQPEyw5OzP6tCb2Blbu9BAMAtH7Z4fhyxIA7IGA4BNgKfv2ObmZi+X8jyIWgpcuFh kpUQ== X-Gm-Message-State: AOJu0YxJ8E08x52UcQwORnJdt+JqAGONVeDD0xsGURITSzfgfxLSQX6Y aC1AJDjjAHuYX7roDRVWd2NQnpWULUX9bjAF0gtPB2VNu/uLFB4aotFcka8JhntLV2u+ZE+hUFR fsGoyQMK9hKl90L8RfISfruNrQl3gbtzw88AVeRAIVXe6wOJzHr16ATUOu0cMWuhboTbZ0XzbqM 5+FtmMwo3CDNSQa10= X-Gm-Gg: ASbGncvT9Ie8NwkMbvxEUPhJ9I073GfO1fQtUc+k9c8tYEZteik8ttGUe0Wz0iBfdF0 TVEwB52ADVkLAuoVfMKfHs4TR5SvM5hP3bR/mdls+G++fTc/MjOPYYawPsowMa7OK7W1hJdl64z dUo7Bpfp66dqhbRvaP5aYCeBP0zkFAKbjPeZvtzWwcRX9FY0tbUP6y1b+B1HfVLOH1eyU87Q0A9 qMCXzEdVCY/4l98xevKus09aIrRRS1Mb+dwGrxGVg+svGYCTbDcl5S9H45gChpPJzyvbvBV7xtC 4GildPYQzaaHTlBtFQytq7PVneJS+UeVWSEzuV++uQhy7HAOES/MtaPCkHnDjunFZHRNG3hw6iW B+VhC6S/90KAwVi6z6v/+ehxj X-Received: by 2002:a05:620a:9176:b0:7cd:53d7:4f8e with SMTP id af79cd13be357-7cd53d750demr3584008085a.8.1747925173311; Thu, 22 May 2025 07:46:13 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFXB58C1LJ3QdmxU6nNCn7onm//4emgW6g/7Np7t0rZY2aXgiiiKzyMhnqAUxMHM3MlL2UasA== X-Received: by 2002:a05:620a:9176:b0:7cd:53d7:4f8e with SMTP id af79cd13be357-7cd53d750demr3584004185a.8.1747925172887; Thu, 22 May 2025 07:46:12 -0700 (PDT) Received: from umbar.lan (2001-14ba-a0c3-3a00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a0c3:3a00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-328084cabdasm33031551fa.44.2025.05.22.07.46.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 07:46:11 -0700 (PDT) From: Dmitry Baryshkov To: openembedded-core@lists.openembedded.org Subject: [PATCH v2 05/12] mesa: drop the libopencl-mesa-dev package Date: Thu, 22 May 2025 17:45:58 +0300 Message-Id: <20250522144605.2876771-5-dmitry.baryshkov@oss.qualcomm.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250522144605.2876771-1-dmitry.baryshkov@oss.qualcomm.com> References: <20250522144605.2876771-1-dmitry.baryshkov@oss.qualcomm.com> MIME-Version: 1.0 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE1MCBTYWx0ZWRfX9VmIsUlMNOUu BzSfdzTRC4udygS8uJTTP6fk3tRooInY/ZshYHu8huemZOHTVd9025ccOHsBOgtlB7tUhdkMOq0 Vaso+oKYDcZhwtkKbyfTy2rS6yy/voaAVQy/8YkV7Sej8VGvTTtI7K3F3jQaRPtIfp9D2o9wrwo TtlEp/lV7Yy05AwKq2fVjH+fut3/csePJw+IckOlRboKwQ83Dn5VVs2qHdmP989Q5JkR2p/VeU9 pwrq72ds7gJzJbnVGzpSQSU4TywEtSL+1lK6QAsi8xbHZiKP/mU9SndjJJx4mLTJFSSDCQpehhI 1X2rd5MY5AYALD/e303H4a6Rq5AEmeg2oa5CnOyGMv+qNxtS9vO5MGNdKskv2FhNkWnU4Cwm5Oy fAl63ZHFJtee2jTdgcZSk8sYjrpxLGBwKODdGvnfXGgAebxVVpK51NH54cMn/KIKa7NYN5SC X-Proofpoint-GUID: n5Tby2j1cnPI1duTBKu2DdDjq3zJh0B4 X-Authority-Analysis: v=2.4 cv=Ws8rMcfv c=1 sm=1 tr=0 ts=682f38b6 cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=xqWC_Br6kY4A:10 a=dt9VzEwgFbYA:10 a=EUspDBNiAAAA:8 a=Mg_RanN_8yc205Ew7dQA:9 a=NFOGd7dJGGMPyQGDc5-O:22 X-Proofpoint-ORIG-GUID: n5Tby2j1cnPI1duTBKu2DdDjq3zJh0B4 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-22_07,2025-05-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 malwarescore=0 clxscore=1015 suspectscore=0 mlxscore=0 bulkscore=0 phishscore=0 priorityscore=1501 impostorscore=0 lowpriorityscore=0 mlxlogscore=812 adultscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000 definitions=main-2505220150 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 ; Thu, 22 May 2025 14:46:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/217116 Thre is no "development" package for libopencl-mesa. The main package contains Installable Client Drivers, for which there are no headers and the extra .so file isn't supposed to be linked with anything. Drop the useless and confusing libopencl-mesa-dev package. Signed-off-by: Dmitry Baryshkov --- meta/recipes-graphics/mesa/mesa.inc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index a856d11e0734..a309c8023bd2 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -247,7 +247,7 @@ PACKAGES =+ "libegl-mesa libegl-mesa-dev \ libgbm libgbm-dev \ libgles1-mesa libgles1-mesa-dev \ libgles2-mesa libgles2-mesa-dev \ - libopencl-mesa libopencl-mesa-dev \ + libopencl-mesa \ libxatracker libxatracker-dev \ mesa-megadriver mesa-vulkan-drivers \ mesa-vdpau-drivers mesa-tools \ @@ -334,7 +334,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}/lib*OpenCL.so.* ${libdir}/gallium-pipe/*.so ${sysconfdir}/OpenCL/vendors/*.icd" +FILES:libopencl-mesa = "${libdir}/lib*OpenCL.so* ${libdir}/gallium-pipe/*.so ${sysconfdir}/OpenCL/vendors/*.icd" FILES:libglapi = "${libdir}/libglapi.so.*" FILES:libxatracker = "${libdir}/libxatracker.so.*" @@ -346,7 +346,6 @@ FILES:libglx-mesa-dev = "${libdir}/libGLX*.*" 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 ${includedir}/GLES3 ${libdir}/pkgconfig/glesv2.pc" -FILES:libopencl-mesa-dev = "${libdir}/lib*OpenCL.so" FILES:libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/libxatracker.la \ ${includedir}/xa_tracker.h ${includedir}/xa_composite.h ${includedir}/xa_context.h \ ${libdir}/pkgconfig/xatracker.pc" @@ -357,6 +356,9 @@ ALLOW_EMPTY:${PN}-tools = "1" # All DRI drivers are symlinks to libdril_dri.so INSANE_SKIP:${PN}-megadriver += "dev-so" +# OpenCL ICDs package also ship correspondig .so files, there is no -dev package +INSANE_SKIP:libopencl-mesa += "dev-so" + # Fix upgrade path from mesa to mesa-megadriver RREPLACES:mesa-megadriver = "mesa" RCONFLICTS:mesa-megadriver = "mesa" From patchwork Thu May 22 14:45:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 63523 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 322FCC54F30 for ; Thu, 22 May 2025 14:46:20 +0000 (UTC) Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by mx.groups.io with SMTP id smtpd.web10.25577.1747925176879668479 for ; Thu, 22 May 2025 07:46:17 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@qualcomm.com header.s=qcppdkim1 header.b=XlHGxmzj; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: oss.qualcomm.com, ip: 205.220.180.131, mailfrom: dmitry.baryshkov@oss.qualcomm.com) Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 54M75Apg016577 for ; Thu, 22 May 2025 14:46:16 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=nKY3g5hE05U ZNhjzOfe+hgir+955SGgECrcXtfbB+Hc=; b=XlHGxmzjjPAzUiG5fc3vlsefTop KbPsZs1b9arz+jhgp9D8lhvBC+AXF6c7KeIOVoxBj+Bcdyuz42QrX0Y4FhN7q1ZI Z+Is+CnlvU9jKZ3zPbeI4URrs2YcWWHxr0rb6mMGlPYczkKlBMJzLnIG7wkuujVq 1ufHENdZ1Qs8RnuzALlQXYmhhSXKB213z5GDAWMlwCN7uwW+IbpxGD75aQlL3yhu /4vxqAPb3Y7gzqYzsVVt0qU75kOORZDKD+Dssw8+qZS4ILi5h+PrDtllY3j2pVcx ssmK31RH4ebi3BeVFMu32lbtDZvaHPG96oQQRfzWg8MwPLu7aGsWK2yDBBQ== Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 46rwf9xpjv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 14:46:15 +0000 (GMT) Received: by mail-qv1-f70.google.com with SMTP id 6a1803df08f44-6f8c8a36d8eso109511456d6.0 for ; Thu, 22 May 2025 07:46:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747925175; x=1748529975; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nKY3g5hE05UZNhjzOfe+hgir+955SGgECrcXtfbB+Hc=; b=rh6So6eF64kPAD+L0PPDUQ1ICo7ptN4SxST7Aiy9AfGIB+1ZjGy4pcxTHuLAm0OVEG ddT8GlgwmAqrkPF6v/OIOoXQuede2OX/NrncsdxHQ4iWCj1iw6TUu/dOJ+4YI4q7TkWc 8rI2FoEGcvZ1ee2b95IfowyMEVlqwlw/HV0dXD+JWOpl++LLYBLaIKR0UVaNCmog3AmY p2K9gV82CXw++1PY2b1syztLlmUFItP2vTLUafmsrEipQFZgWsuGaHyqa7SG6u00Dr5V hmmTXmVItx3nnJrPYusUmF/zt/cTsao6OKcooH1RknIgg+JnMSbpFSpXviYGfLsFtpaG E5jQ== X-Gm-Message-State: AOJu0YzM3vYK2XFZqhpfqK0b29euF8faO7p9gBRY8ixzdrtSA/qVNjES fLyzgl9kgZOGYJv8DqF1LkmkneFKOMaw58vRkKPTU0N+FYjZp/zrRPGtuJgxK0ZCrPI2QTmrkvD cL/RPl3UjjFRXICYIHZzzo2drFgopUbeQj4fqxj+D2Ntc49DFV43EQ6KTV8ninlzAwESD3eW5bt D+598OJEX+aK9nJl8= X-Gm-Gg: ASbGncuIV14wQh0r+rEQ2QzVfnDMvtDbAdUSh5ikmGMH/gVwwfptSkpelnxQKCnfxPf pAfGxGP8rgkYtFP71zTRsxwgNbH9FMWkU+g5sLDZ9xrELDTvoXi/MYPmr3gNjVDVhMOzO6nB5El j+8jRQGTn2fy7foRLOMYRIvMuuROByqG8O9GiGCkduzxqEpd9H1AzK23gITG2vWk4ebtejc0oA/ ndz6dKTPlUICFEdfnyg1gjGCp0QKlIaCTDHPc3BDhsvqJjC9wcITEJE1OZTCfYhLeJR6BW+HAqb ve+rwKMUNJlsbOXNm0gMCGpwIrhlWR/EtSizvxcxqtbV3k/kV6V3KJ/6PZtvvOUwlXq8/s8L3Im +0ThbMTKQtawHoHWskif/A3mh X-Received: by 2002:a05:6214:1c09:b0:6f8:a827:5847 with SMTP id 6a1803df08f44-6f8b0828745mr419392716d6.7.1747925174721; Thu, 22 May 2025 07:46:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE4gZtg3/QBsMeXO7ev97bqyuY/3LsDeWd1gD22sXu4E3Cjz3cn86VqTEOlIZmHc7DeF459vg== X-Received: by 2002:a05:6214:1c09:b0:6f8:a827:5847 with SMTP id 6a1803df08f44-6f8b0828745mr419392346d6.7.1747925174217; Thu, 22 May 2025 07:46:14 -0700 (PDT) Received: from umbar.lan (2001-14ba-a0c3-3a00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a0c3:3a00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-328084cabdasm33031551fa.44.2025.05.22.07.46.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 07:46:13 -0700 (PDT) From: Dmitry Baryshkov To: openembedded-core@lists.openembedded.org Subject: [PATCH v2 06/12] mesa: don't add extra tags to the libopencl-mesa package Date: Thu, 22 May 2025 17:45:59 +0300 Message-Id: <20250522144605.2876771-6-dmitry.baryshkov@oss.qualcomm.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250522144605.2876771-1-dmitry.baryshkov@oss.qualcomm.com> References: <20250522144605.2876771-1-dmitry.baryshkov@oss.qualcomm.com> MIME-Version: 1.0 X-Authority-Analysis: v=2.4 cv=V9990fni c=1 sm=1 tr=0 ts=682f38b7 cx=c_pps a=oc9J++0uMp73DTRD5QyR2A==:117 a=xqWC_Br6kY4A:10 a=dt9VzEwgFbYA:10 a=EUspDBNiAAAA:8 a=jzjW0sQIQVclgA_JvjMA:9 a=iYH6xdkBrDN1Jqds4HTS:22 X-Proofpoint-ORIG-GUID: wSTjuEu_tG_EJo6MZ3dWzd-2OM9Hu09x X-Proofpoint-GUID: wSTjuEu_tG_EJo6MZ3dWzd-2OM9Hu09x X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE1MCBTYWx0ZWRfX5zK8NCQAeFH3 c8HsQv1laAUiI/fgzRPadtgFbhHQubGxP9lvmMOBmkIiMVhlwKcphMzLmx2W81SmydD7GTHcM5A n6c13DdUU3dpmLrqY732BxXuOo8EBCERSfSQAfWjlYv6z2NnIpr+EztaLJ30qaU9ErUu1y9stie DVciBb9EDImmvGuvVn48MeAKgLQN2cOriFGyk/GWy0GIv9DbV5CAoy6vTHrOutKq+gWsIOcR4M8 amscVbxnurlcvUdTXnOAGygiXH41O3EM5ZFSzd620DheQ4/QVmWJcO3OcsElhs6smNFvBKwLfYT 0ckvzWwg+HY1NzvcO3Q2f/ujjtMMbsLloZ8ooD5igAZbcitF03RXzizz7Nr6yGBFbmfdIAMUZeM 7toDhpIzprgCv4ex8dhei/IlHyxBKaP9iruxRGm+ncw0Q28bYNWFxZ3/YjSLSdrAuaMprHsC X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-22_07,2025-05-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=948 bulkscore=0 impostorscore=0 clxscore=1015 priorityscore=1501 lowpriorityscore=0 mlxscore=0 spamscore=0 phishscore=0 suspectscore=0 adultscore=0 malwarescore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000 definitions=main-2505220150 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 ; Thu, 22 May 2025 14:46:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/217117 The libopencl-mesa package provides OpenCL ICDs (Installable Client Drivers). As such, there is no conflict between several packages providing ICDs for different vendors. Split the loop that modifies package metadata and stop adding extra RPROVIDES / RCONFLICTS / RREPLACES tags to the libopencl-mesa package. Signed-off-by: Dmitry Baryshkov --- meta/recipes-graphics/mesa/mesa.inc | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index a309c8023bd2..98860a0d7d15 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -264,28 +264,31 @@ do_install:append () { # RPROVIDEs/RCONFLICTs on the generic libgl name. python __anonymous() { pkgconfig = (d.getVar('PACKAGECONFIG') or "").split() + mlprefix = d.getVar("MLPREFIX") suffix = "" if "-native" in d.getVar("PN"): suffix = "-native" + + for p in ("libegl", "libgl", "libglx", "libgles1", "libgles2", "libgles3", "libopencl"): + fullp = mlprefix + p[1] + "-mesa" + suffix + d.appendVar("RRECOMMENDS:" + fullp, " ${MLPREFIX}mesa-megadriver" + suffix) + + d.setVar("DEBIAN_NOAUTONAME:%slibopencl-mesa%s" % (mlprefix, suffix), "1") + for p in (("egl", "libegl", "libegl1"), ("opengl", "libgl", "libgl1"), ("glvnd", "libglx",), ("gles", "libgles1", "libglesv1-cm1"), - ("gles", "libgles2", "libglesv2-2", "libgles3"), - ("opencl", "libopencl",)): + ("gles", "libgles2", "libglesv2-2", "libgles3")): if not p[0] in pkgconfig: continue - mlprefix = d.getVar("MLPREFIX") fullp = mlprefix + p[1] + "-mesa" + suffix - mlprefix = d.getVar("MLPREFIX") pkgs = " " + " ".join(mlprefix + x + suffix for x in p[1:]) d.setVar("DEBIAN_NOAUTONAME:" + fullp, "1") d.appendVar("RREPLACES:" + fullp, pkgs) d.appendVar("RPROVIDES:" + fullp, pkgs) d.appendVar("RCONFLICTS:" + fullp, pkgs) - d.appendVar("RRECOMMENDS:" + fullp, " ${MLPREFIX}mesa-megadriver" + suffix) - # For -dev, the first element is both the Debian and original name fullp = mlprefix + p[1] + "-mesa-dev" + suffix pkgs = " " + mlprefix + p[1] + "-dev" + suffix From patchwork Thu May 22 14:46:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 63525 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 3AF26C54EDA for ; Thu, 22 May 2025 14:46:20 +0000 (UTC) Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by mx.groups.io with SMTP id smtpd.web10.25579.1747925178331564657 for ; Thu, 22 May 2025 07:46:18 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@qualcomm.com header.s=qcppdkim1 header.b=URmEWmhT; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: oss.qualcomm.com, ip: 205.220.168.131, mailfrom: dmitry.baryshkov@oss.qualcomm.com) Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 54M7IuBO013436 for ; Thu, 22 May 2025 14:46:18 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=qGioBWIlzu4 shvsODepTsbBy2dUbWGvv14mzb+KMyqQ=; b=URmEWmhTiOybPVdh4JsbsIXQCSl eC91guMOdxecU9P9lzqB4kbrwgmOutXdL4ymnjXtm+uLDzd4F/kB10kNGXU5pgNg IojbI3t5J5JiGjo6DrCYgPM07fqIBtSqF/4oZAV/KvGs3V93wE2Z4lssY62mLdTO Y99Q6Tuai72Df4EXJ3kU1EjhkfQYbDX//gsi7HrE9tOzRR63rX8sFmf0MbfrRkN7 GjK2sVQPWrjoaBRoFE0i3gN+HXVpVx4bPGM4y7V5K6e0dUYT98U6l3IyGuU2LaJ4 lqTijPcoxUpYksix7LKBl6OxYajuq1OcqBPaIgrXId1CYFECfP/Tm0H/E1A== Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 46rwh5euw1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 14:46:17 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-7c54e7922a1so1716019585a.2 for ; Thu, 22 May 2025 07:46:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747925176; x=1748529976; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qGioBWIlzu4shvsODepTsbBy2dUbWGvv14mzb+KMyqQ=; b=jhTkOIVoEY3kGZCbWb7t2cqHk9zUIcPPRoNDFpkMYF/a012cQtPdYdxPYYmm/kOCFV 7/yAZly2iQwe6jELg7X9rfKh/Bdpaw+HqTOHlTQKhItr59hZefvBeMNF5tVe7+NpwURB A0kDGabfuqcYPtkKZAJZc7NPiR0tYyvQGA2mYQ5Vm99YdClGAjRpF9nlfX5pJYngKyv0 1PJNdF3PCalEshUUf2qjr+UI/4rbSMmjdZJi/tOm7n2VQSJ/LfpjA7z8olOdUKgmgdHb WLWvhJ6gn+LVm/xG+S7s1PQWgkZjVmbgCOXi80aoe2aPfpQKFDI3xScwowgphFlOHK+T ZtPw== X-Gm-Message-State: AOJu0YzHUshm2Q1axBUi3GQpCz1Xi6x0xALUbBonIw6jwCVDYiW+lzdA xKwMYvvchL5yFFuPn90pa+qy1b6f9B7trStocSiq09d/TtYDEFVQHkjAXcAQsVVCKBsGZP7KtPV TMyd8ps+d3zSe/oI2f/I13ax5EM/VponIUFtOEaIox8Q42WskfAOc6We68y/V/1pHc4x87nBCQh FVGW+Z+JzyTJbqjd8= X-Gm-Gg: ASbGncurEvbP0Qd43x4fiNqZBvmJKilaFQEDuCQZEHnhapGVlzaTiAf0NDL6lY/oUpO sDbmuVFvVY8ZGIG3jdy/AYcZMJ9WpjVMp0YUhoII9fKEefoK1X7NQE6QYqxd4tN0PclVbC40v9R Vy70o9gTv9eHat3pQZX1dSNJV9sGA91Nly+qbA/VmW2D+hFQ6Tt1DtRrteyabWAqLCO7wjmflNx hblfoYx65m8AlpaHh1W9wXYepM8RCSbdD+TmQv3+6Z4E3OYdHhETEdulnBtJYHrl7j/a3bnyet4 rfneJogpk/U9FKxPcgKM3daEj9J9jiNYgepyR7u9TE4AXwvc2TMnjMt5eun/hAl9vNzcTjhT/fL ohRIMBhbROR33Wck6c4ZfisKY X-Received: by 2002:a05:620a:4407:b0:7c0:c046:7c6b with SMTP id af79cd13be357-7cd47fd2579mr4160909985a.53.1747925175959; Thu, 22 May 2025 07:46:15 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHcQsHBGwKYtBS6l58W3i8wATYlIJOo9XfVqXR2n6CKNPOOVQHLfpCTQqAGCNU2rTl5QgIdpA== X-Received: by 2002:a05:620a:4407:b0:7c0:c046:7c6b with SMTP id af79cd13be357-7cd47fd2579mr4160905185a.53.1747925175472; Thu, 22 May 2025 07:46:15 -0700 (PDT) Received: from umbar.lan (2001-14ba-a0c3-3a00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a0c3:3a00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-328084cabdasm33031551fa.44.2025.05.22.07.46.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 07:46:14 -0700 (PDT) From: Dmitry Baryshkov To: openembedded-core@lists.openembedded.org Subject: [PATCH v2 07/12] mesa: drop gallium-pipe support Date: Thu, 22 May 2025 17:46:00 +0300 Message-Id: <20250522144605.2876771-7-dmitry.baryshkov@oss.qualcomm.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250522144605.2876771-1-dmitry.baryshkov@oss.qualcomm.com> References: <20250522144605.2876771-1-dmitry.baryshkov@oss.qualcomm.com> MIME-Version: 1.0 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE1MCBTYWx0ZWRfXw+tR9ZQ1fK6+ xMMXVzTr8hbOX3GbIWXGpOEOlKxo6E2P0oCAj7IIu9Oj40xGRTt+s6Gn/3z2NL7CZ03YxA5rMJn q57OFD3+5K90fGNqzdc1Xzx8HVO0k+oZPdXQvNwU00pG0nYsvlV6Siazw5FU7D3SfF7p4qCkoqH Kw12F2TWkU8wp164LWxH0TQm1Y8wlp4MRo8vCj5ExGiuhFK7jQ4Ty+LeHCoqgYgWM5qJXctRqU/ QYXeTXyL9FyoD7Y77Eec0RqnaSBglEcdYhWbMF4QSvr/fT/YDt/pE1Xu8CrqYUaPLYHx3l/UCMh 2i8hVSFyS+/o1KtSGevOSqWX0UUwpFuFZaWCypj/Td6IiEuOFfLBjLk/nlTbXYK2BCXxAmbXDxS rBz/Ci71yl72dwolamV4rr7mLMxYi5EN3lSc5lcfAMrIVVzCvdaGYU3ev9l9XdIJcejXAJc2 X-Authority-Analysis: v=2.4 cv=XeWJzJ55 c=1 sm=1 tr=0 ts=682f38b9 cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=xqWC_Br6kY4A:10 a=dt9VzEwgFbYA:10 a=EUspDBNiAAAA:8 a=UHK4iJJ_pXMy7vzKq9IA:9 a=bTQJ7kPSJx9SKPbeHEYW:22 X-Proofpoint-GUID: 8Vlx1fWCLMrMLA8vZkRaRkXcepP6Sy83 X-Proofpoint-ORIG-GUID: 8Vlx1fWCLMrMLA8vZkRaRkXcepP6Sy83 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-22_07,2025-05-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 clxscore=1015 mlxlogscore=999 mlxscore=0 bulkscore=0 spamscore=0 suspectscore=0 impostorscore=0 adultscore=0 malwarescore=0 lowpriorityscore=0 priorityscore=1501 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000 definitions=main-2505220150 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 ; Thu, 22 May 2025 14:46:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/217118 With Clover being gone, there are no more separate gallium-pipe libraries. Drop corresponding parts of the recipe. Signed-off-by: Dmitry Baryshkov --- meta/recipes-graphics/mesa/mesa.inc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 98860a0d7d15..c97df9471505 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -317,9 +317,6 @@ python mesa_populate_packages() { d.appendVar("RPROVIDES:%s" % lib_name, pkg_name) d.appendVar("RCONFLICTS:%s" % lib_name, pkg_name) d.appendVar("RREPLACES:%s" % lib_name, pkg_name) - - pipe_drivers_root = os.path.join(d.getVar('libdir'), "gallium-pipe") - do_split_packages(d, pipe_drivers_root, r'^pipe_(.*)\.so$', 'mesa-driver-pipe-%s', 'Mesa %s pipe driver', extra_depends='') } PACKAGESPLITFUNCS =+ "mesa_populate_packages" @@ -337,7 +334,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}/lib*OpenCL.so* ${libdir}/gallium-pipe/*.so ${sysconfdir}/OpenCL/vendors/*.icd" +FILES:libopencl-mesa = "${libdir}/lib*OpenCL.so* ${sysconfdir}/OpenCL/vendors/*.icd" FILES:libglapi = "${libdir}/libglapi.so.*" FILES:libxatracker = "${libdir}/libxatracker.so.*" From patchwork Thu May 22 14:46:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 63528 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 48028C54FB3 for ; Thu, 22 May 2025 14:46:20 +0000 (UTC) Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by mx.groups.io with SMTP id smtpd.web11.25722.1747925179825502568 for ; Thu, 22 May 2025 07:46:19 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@qualcomm.com header.s=qcppdkim1 header.b=KA2jMS5a; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: oss.qualcomm.com, ip: 205.220.168.131, mailfrom: dmitry.baryshkov@oss.qualcomm.com) Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 54M7kcFO031694 for ; Thu, 22 May 2025 14:46:19 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=zLOGEMHCAY2 x5LpgdfRla/OEDCFqlorCe1VG7ahPS70=; b=KA2jMS5aNzWgWInJu4JXA4YioqD g4CSAGMzqq7dzDWtvcGcsVV01jPMp/I+gr22CvV8Lpqx1jzxCJo0UFyOKhCb/bLv ZwKB5u0osyW7pmutjcdnfUDWCcrRIW89E772mSao9L154PMqutRsokUWbhHGPLbS BjHNASy4VFBq7IZF4Hcqo40EtAn3AqrllfqUVo2zOd9lWFeUTifwFL5Fa1yZXZoL kTBILpZobkOOEQc6UIL9ljOWCx/iDyU9P9SMMqIDZzYzhHb0fiYjv3r0MqX6IJUi lAQ0t05a0nfVW3xTmnkV3JGOvGHgakqcUZoZCuBFqvtv29PlZDQ33ZA4RBQ== Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 46s8c25an4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 14:46:19 +0000 (GMT) Received: by mail-qv1-f72.google.com with SMTP id 6a1803df08f44-6f8e114ef64so72463616d6.1 for ; Thu, 22 May 2025 07:46:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747925178; x=1748529978; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zLOGEMHCAY2x5LpgdfRla/OEDCFqlorCe1VG7ahPS70=; b=HstF401eVBL+ucIeyXTMgNSovfqh/IBeu1no0Xft8FMj1YMG+kGC5TWcJHShPTAKN6 UTbjUUFdT34+yAkeiEHB0q4pSdlHb3cBWH7kJ4FTyJXgVw8KGuyEtOFTKIbFI3+V0TAc Ll4FnzGVqn5Ikq5ADHVlM5ocwHrF2Unk3m84/ALEut+J5DRwFAGnMF33iMhISoiuuhe+ fxRrV/svN4I2DSwNXVzExfbiS1yx15UnViPg3u7ghKca0oFHfujNcmarp48t8+lh9KIO +6i8TLjm0Si2rWB188NSMTXdwN+YvhtRtFXcjEEz5BUZF2ChIWqBJTHblxCEsKpPh2aV kP8A== X-Gm-Message-State: AOJu0YycAHAuCp673jHfYy/qAIa4Gt4ign71gx1sFZaixMK4nE9N7TNK AP5vhnosR/D0CQKM2KsVeDIOihHSiFhLGGATCIsWUwIfVUo008mj0LhxCc3J+TLVxKdQ78chYRM e2y6zJmKJR9K77WTZmZPv5wibQxtQIXwV68jgdNlHsFlLRDmpCDPxAmdxESRTApm1PvJKrwMmd4 Q8Ud7nFxf52tPkcQ4= X-Gm-Gg: ASbGncsL5i/+8haw1vTseBtMuxaytoqg2jGCfHB6ELyfI2Wwevjfw19ieL3ZAmSzfvP E3110kRGzzLHldu9AinfST5JNrKRBRBw3SVgsJ2x4R/06Y8HLF9oDLHwjmNSbCZpccdcE354J/6 s4Nhg0ivdm+92xyKnxjiDayxlaI2GEA0WuyJ14flhuu5xisPl0asFuin8OD558x2zwQwQDhUzLI eyfy6sxq3PoUhP2Ifegpw/cYYlhJeBkDA1hjKg3DyY6cWp/t6mxIu+3zdQP1uIhvUg6ztY4kpKQ iZ/9FKynKr1bEHJV02CafZ4NP+pcVAmmTK4HCWABSoSyQvS1clvCxqzJAc3pF7JFCW5sradKYRP ig78aAgL8NpL77/i67y7W3dxc X-Received: by 2002:ad4:5ec8:0:b0:6e8:f91a:c5a with SMTP id 6a1803df08f44-6f8b2d3f4ccmr411938916d6.22.1747925177581; Thu, 22 May 2025 07:46:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGcrnIoJSq0BpHjPs/uAQMsv1SM4N1QnUjkl6ElHNGPlUvrznv8eK5IRoWVrAKDoh7gb81gvA== X-Received: by 2002:ad4:5ec8:0:b0:6e8:f91a:c5a with SMTP id 6a1803df08f44-6f8b2d3f4ccmr411938406d6.22.1747925177110; Thu, 22 May 2025 07:46:17 -0700 (PDT) Received: from umbar.lan (2001-14ba-a0c3-3a00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a0c3:3a00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-328084cabdasm33031551fa.44.2025.05.22.07.46.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 07:46:15 -0700 (PDT) From: Dmitry Baryshkov To: openembedded-core@lists.openembedded.org Subject: [PATCH v2 08/12] mesa: don't set RCONFLICTS / PROVIDES if glvnd is enabled Date: Thu, 22 May 2025 17:46:01 +0300 Message-Id: <20250522144605.2876771-8-dmitry.baryshkov@oss.qualcomm.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250522144605.2876771-1-dmitry.baryshkov@oss.qualcomm.com> References: <20250522144605.2876771-1-dmitry.baryshkov@oss.qualcomm.com> MIME-Version: 1.0 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE1MCBTYWx0ZWRfX4QFFG/eBYpag oegKLoq5K6Mhgs2rkDSDLqaRJ58vmRfSQKIFT7SWAqocCgQGhhDJMma6dv1MY2cB9nXxYjjVzIC 8WfjjJI3mkA2M84oO5xOpUeh3y/tYBhwe9al25vS+XapyZ5+yaXXII6wrmGYLX3J+HZ1n44r3+o W/2wnWUF183oD5xWVQAh8X7PTzlL1HpIuVRBx05pzdzvdmF6bDbOK/l+AplmoyxTDIc9joMLOzK 0rXKJtciv2MlsClI/otBdme0fWm6dnFDfLy3YPE45bzfuAPUID7AmXVMh2+fmIOwQ3RSIDGzef9 V4K0ZHdE3JRROu3EFUyZOiiPBBj84Tk3JlthqGtaaNeTw4OnWh4ZRSHO0mc6hkeK1YZJe/i+7tZ wkkvWlTlBcwrqHk1X+DmFuNCVr6apRXIAGDU+IWX0JyENedR59qxAGov6yhxMHSSbCks+nfX X-Authority-Analysis: v=2.4 cv=RIuzH5i+ c=1 sm=1 tr=0 ts=682f38bb cx=c_pps a=7E5Bxpl4vBhpaufnMqZlrw==:117 a=xqWC_Br6kY4A:10 a=dt9VzEwgFbYA:10 a=EUspDBNiAAAA:8 a=3twMZPdHqkYPyOBvze0A:9 a=pJ04lnu7RYOZP9TFuWaZ:22 X-Proofpoint-ORIG-GUID: 0Rys2xR-VV4hOLUUJRY78fmFlscLkOSd X-Proofpoint-GUID: 0Rys2xR-VV4hOLUUJRY78fmFlscLkOSd X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-22_07,2025-05-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 phishscore=0 suspectscore=0 malwarescore=0 bulkscore=0 mlxlogscore=999 spamscore=0 lowpriorityscore=0 mlxscore=0 priorityscore=1501 adultscore=0 impostorscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000 definitions=main-2505220150 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 ; Thu, 22 May 2025 14:46:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/217119 If glvnd is enabled, mesa packages do not provide full library implementations (instead it provides two ICDs, one for EGL, one for GLX). This means that there is no more conflict between mesa packages and other vendor packages. Stop setting those extra tags for mesa packages. Signed-off-by: Dmitry Baryshkov --- meta/recipes-graphics/mesa/mesa.inc | 42 ++++++++++++++--------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index c97df9471505..f5d5539a1f99 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -275,27 +275,27 @@ python __anonymous() { d.setVar("DEBIAN_NOAUTONAME:%slibopencl-mesa%s" % (mlprefix, suffix), "1") - for p in (("egl", "libegl", "libegl1"), - ("opengl", "libgl", "libgl1"), - ("glvnd", "libglx",), - ("gles", "libgles1", "libglesv1-cm1"), - ("gles", "libgles2", "libglesv2-2", "libgles3")): - if not p[0] in pkgconfig: - continue - fullp = mlprefix + p[1] + "-mesa" + suffix - pkgs = " " + " ".join(mlprefix + x + suffix for x in p[1:]) - d.setVar("DEBIAN_NOAUTONAME:" + fullp, "1") - d.appendVar("RREPLACES:" + fullp, pkgs) - d.appendVar("RPROVIDES:" + fullp, pkgs) - d.appendVar("RCONFLICTS:" + fullp, pkgs) - - # For -dev, the first element is both the Debian and original name - fullp = mlprefix + p[1] + "-mesa-dev" + suffix - pkgs = " " + mlprefix + p[1] + "-dev" + suffix - d.setVar("DEBIAN_NOAUTONAME:" + fullp, "1") - d.appendVar("RREPLACES:" + fullp, pkgs) - d.appendVar("RPROVIDES:" + fullp, pkgs) - d.appendVar("RCONFLICTS:" + fullp, pkgs) + if 'glvnd' not in pkgconfig: + for p in (("egl", "libegl", "libegl1"), + ("opengl", "libgl", "libgl1"), + ("gles", "libgles1", "libglesv1-cm1"), + ("gles", "libgles2", "libglesv2-2", "libgles3")): + if not p[0] in pkgconfig: + continue + fullp = mlprefix + p[1] + "-mesa" + suffix + pkgs = " " + " ".join(mlprefix + x + suffix for x in p[1:]) + d.setVar("DEBIAN_NOAUTONAME:" + fullp, "1") + d.appendVar("RREPLACES:" + fullp, pkgs) + d.appendVar("RPROVIDES:" + fullp, pkgs) + d.appendVar("RCONFLICTS:" + fullp, pkgs) + + # For -dev, the first element is both the Debian and original name + fullp = mlprefix + p[1] + "-mesa-dev" + suffix + pkgs = " " + mlprefix + p[1] + "-dev" + suffix + d.setVar("DEBIAN_NOAUTONAME:" + fullp, "1") + d.appendVar("RREPLACES:" + fullp, pkgs) + d.appendVar("RPROVIDES:" + fullp, pkgs) + d.appendVar("RCONFLICTS:" + fullp, pkgs) } python mesa_populate_packages() { From patchwork Thu May 22 14:46:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 63531 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 4DAD6C54E65 for ; Thu, 22 May 2025 14:46:30 +0000 (UTC) Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by mx.groups.io with SMTP id smtpd.web10.25580.1747925181170575007 for ; Thu, 22 May 2025 07:46:21 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@qualcomm.com header.s=qcppdkim1 header.b=j64l0T2D; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: oss.qualcomm.com, ip: 205.220.168.131, mailfrom: dmitry.baryshkov@oss.qualcomm.com) Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 54M7IPcA013417 for ; Thu, 22 May 2025 14:46:21 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=YkKaOkKmq7e r3ZblHaxH7uQS1imbKEW7NGUW3VwdgoY=; b=j64l0T2DIi5GAa9hMHjaa3jUp0D UnZbZGjCz+0uewiCf5yy94On8nhKWw1odx3og2np9yco8juf5SrRt2aWuqXe4Lfr XAtF0Hyl6TVy+Ar2BkHeKeq0XI/485kZA8Qe9IP/dGeRGe3c+IRRVhd0/DzV0mfq 9FkfyCLOspvNy4LFQGqhlS5/t8qOdn/cFlymYpJxfCEvlVYhZGZU262LDuD8Rnhx eYv/CJVlMH5pcwu3X7bBREyvJ2vmkFU+DrxEIQgsoaS2CzQgcIeUzzB2XKTvUnQE TZbRlrAw24F8bpyRHilqG3OoaO3NFMYER/KeHAgY9RAewO7mT3xp4L1bvdQ== Received: from mail-ot1-f70.google.com (mail-ot1-f70.google.com [209.85.210.70]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 46rwh5euw9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 14:46:20 +0000 (GMT) Received: by mail-ot1-f70.google.com with SMTP id 46e09a7af769-72bbb1899b4so3574726a34.1 for ; Thu, 22 May 2025 07:46:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747925179; x=1748529979; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YkKaOkKmq7er3ZblHaxH7uQS1imbKEW7NGUW3VwdgoY=; b=YEfQ7tjZWyes2/NHha1F0e1AHkHtj1iLzloCFK7rdHy6glSD7pAnjnuDpdAx1limoR wufymOnYAYzqRjgBpnigyyYdshIB5yl/2vePiz/TI/1aEG9kAu0habjZqpfKOLt60bdb /NoBvx1zr7CoornrRG2keCJ+X+LSR7k8PoDyqvhEJqXrHVA28xzahUmVmBuSFf7mugo/ x1co2Nb5oKbPkSwe7J0WUiNfi3RbGR83g/Pa76WBJHiAjZXcFwvGgBmamNNhxi70sPDg 8UmcI0QXDH9mAIsvZp18IK/qcdOlPynL8T0InUPENIxfaZzb9ghgAI4jByUFUpgEuoJZ eiew== X-Gm-Message-State: AOJu0YxA3iZfooZu0rpm0Kc57xVkLCs5lhD7ej8bp6oyIKSY2LP8MsW2 uamk5IpRn9QatKCHndRHGLhggydqZgXZI55MdpK+NXlgu8M5cWYap/e3kjdYHutgTUTIb4jKwdU J0dpXYr2/e5F9C8ievt8EiCRS+yhzLyzv6yT7wmmmUW6mwrcIcKea7xPCwlV4kKmEm++/KbhYsO seumGAoG9RHjv6lKw= X-Gm-Gg: ASbGncs4CaJ8SQhIwXVKAC9rDteZvu08h9mHhSy7bAu/jAouONwVuZqFB1itjIHEhBL kxCU4dMLY00SjQ0KK5EQJnjn02UHD3WEZV/o3okXe98WpCAKu8kJs87uf5YA9hSNqRG2oGubQ+b yxUuga9NpQrIBi0rbXyd/MARwzLTLwj4dvBfOeRaV9tc6GFQmrpzJHwloPeL7vW0+FoMeqZWx/P nNJ9xvGNWhWnNjOsZDn2R2UkKlCxOPSbtq/fFtO/F9RVSb1E0nW2gIz2vwxuoMUIG5x9EgX2Pvn Frw/L5GUy0D1aSepf1TDjr0PPYKdSJefRXNRbbxE7FXyAop/Qks43L1VLK0lam2gbJgYqOtK3P3 XwShGGfbqb2fCkwTnNDYFip8n X-Received: by 2002:a05:6808:4490:b0:403:3660:4130 with SMTP id 5614622812f47-404d87b89fbmr16498264b6e.27.1747925179104; Thu, 22 May 2025 07:46:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF1kux06NLqNRUyTt21JlUdOVG/PSuZ0y064dN+VbEb6cSvNPCk6KoiWSU5ZxqB5Ri+1XNKUA== X-Received: by 2002:a05:6808:4490:b0:403:3660:4130 with SMTP id 5614622812f47-404d87b89fbmr16498243b6e.27.1747925178581; Thu, 22 May 2025 07:46:18 -0700 (PDT) Received: from umbar.lan (2001-14ba-a0c3-3a00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a0c3:3a00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-328084cabdasm33031551fa.44.2025.05.22.07.46.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 07:46:17 -0700 (PDT) From: Dmitry Baryshkov To: openembedded-core@lists.openembedded.org Subject: [PATCH v2 09/12] mesa: sort out PROVIDES for the glvnd case Date: Thu, 22 May 2025 17:46:02 +0300 Message-Id: <20250522144605.2876771-9-dmitry.baryshkov@oss.qualcomm.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250522144605.2876771-1-dmitry.baryshkov@oss.qualcomm.com> References: <20250522144605.2876771-1-dmitry.baryshkov@oss.qualcomm.com> MIME-Version: 1.0 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE1MCBTYWx0ZWRfXzkECWquakBem cfIBFTrPmTKVGJhjn8yv73ihMlqxBbydfHiJspRa72saBuWDAtjJYRQ9VdfG2KzcxL+lVGWFXH1 lN2jpcRJbfDhUqI3il99gREdh4aetCQe2LDdB1Oo8OrFxx3J92nBtepRtw6Is4pHPwxSv2a9xTu KXRRAOMUmzHSWOybJGSidWN7FNIeLePOBtwkstWcB9/9ZfHev2FEHq8cmbeVVLs7ZfxSgA5JpeL x8s2p1lC9gzBtvgCbSsl+FtAt1NMPhFyLaB7oxjg3xIVUdrbx9UxQaQUB1HDSoNF3ibP8kwQ8a3 ZuM5i7cgJVy47C5ppun4gqD3Iz3+z1Q5hLHMPPX/tJDVJE98cIB1ZUGbWTk7z38P+vtLQyQttFr pugiqcx37kfEUexMpAisdtc53EpoKmexRWrZ0t1jIjkUz9taGdxJ2dUBMfV/Sb5Wng1LIZHJ X-Authority-Analysis: v=2.4 cv=XeWJzJ55 c=1 sm=1 tr=0 ts=682f38bc cx=c_pps a=7uPEO8VhqeOX8vTJ3z8K6Q==:117 a=xqWC_Br6kY4A:10 a=dt9VzEwgFbYA:10 a=EUspDBNiAAAA:8 a=ukfi0iLRH52kbOtYnoMA:9 a=EXS-LbY8YePsIyqnH6vw:22 X-Proofpoint-GUID: BVjhaqGPf56LfFPcMm_g4X703nEvxq9h X-Proofpoint-ORIG-GUID: BVjhaqGPf56LfFPcMm_g4X703nEvxq9h X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-22_07,2025-05-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 clxscore=1015 mlxlogscore=999 mlxscore=0 bulkscore=0 spamscore=0 suspectscore=0 impostorscore=0 adultscore=0 malwarescore=0 lowpriorityscore=0 priorityscore=1501 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000 definitions=main-2505220150 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 ; Thu, 22 May 2025 14:46:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/217120 If mesa is built with GLVND enabled, it doesn't provide GL / GL ES / EGL libraries directly. Instead it provides two ICD libraries: libEGL_mesa.0 and libGLX_mesa.so.0. Remove virtual provides from the glvnd case (dropping incorrect virtual/libglx provider while we are at it) and replace those with runtime providers (to be used by libglvnd in order to pull corresponding ICDs). Signed-off-by: Dmitry Baryshkov --- meta/conf/distro/include/default-providers.inc | 3 ++- meta/recipes-graphics/mesa/mesa.inc | 12 +++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc index ee91af87968f..4f094163546c 100644 --- a/meta/conf/distro/include/default-providers.inc +++ b/meta/conf/distro/include/default-providers.inc @@ -7,8 +7,9 @@ PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg" PREFERRED_PROVIDER_virtual/libsdl2 ?= "libsdl2" PREFERRED_PROVIDER_virtual/libsdl2-native ?= "libsdl2-native" PREFERRED_PROVIDER_virtual/egl ?= "mesa" +PREFERRED_PROVIDER_virtual/libegl-icd ?= "mesa" PREFERRED_PROVIDER_virtual/libgl ?= "mesa" -PREFERRED_PROVIDER_virtual/libglx ?= "mesa" +PREFERRED_PROVIDER_virtual/libglx-icd ?= "mesa" PREFERRED_PROVIDER_virtual/libgl-native ?= "mesa-native" PREFERRED_PROVIDER_virtual/nativesdk-libgl ?= "nativesdk-mesa" PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index f5d5539a1f99..2d3846ff8f0f 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -37,11 +37,13 @@ do_install:append() { DEPENDS = "expat makedepend-native flex-native bison-native libxml2-native zlib chrpath-replacement-native python3-mako-native gettext-native python3-pyyaml-native" EXTRANATIVEPATH += "chrpath-native" -PROVIDES = " \ +GLPROVIDES = " \ ${@bb.utils.contains('PACKAGECONFIG', 'opengl', 'virtual/libgl', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'glvnd', 'virtual/libglx', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'gles', 'virtual/libgles1 virtual/libgles2 virtual/libgles3', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'virtual/egl', '', d)} \ +" +PROVIDES = " \ + ${@bb.utils.contains('PACKAGECONFIG', 'glvnd', '', d.getVar('GLPROVIDES'), d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'gbm', 'virtual/libgbm', '', d)} \ virtual/mesa \ " @@ -275,7 +277,11 @@ python __anonymous() { d.setVar("DEBIAN_NOAUTONAME:%slibopencl-mesa%s" % (mlprefix, suffix), "1") - if 'glvnd' not in pkgconfig: + if 'glvnd' in pkgconfig: + for p in ("libegl", "libglx"): + fullp = mlprefix + p + "-mesa" + suffix + d.appendVar("RPROVIDES:" + fullp, '%s-icd' % p) + else: for p in (("egl", "libegl", "libegl1"), ("opengl", "libgl", "libgl1"), ("gles", "libgles1", "libglesv1-cm1"), From patchwork Thu May 22 14:46:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 63533 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 5B37FC54EDA for ; Thu, 22 May 2025 14:46:30 +0000 (UTC) Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by mx.groups.io with SMTP id smtpd.web11.25723.1747925182342822913 for ; Thu, 22 May 2025 07:46:22 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@qualcomm.com header.s=qcppdkim1 header.b=PNLlMl/C; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: oss.qualcomm.com, ip: 205.220.168.131, mailfrom: dmitry.baryshkov@oss.qualcomm.com) Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 54M7MKNb031754 for ; Thu, 22 May 2025 14:46:22 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=Zo+IAkII/q1 bjeeyvHXEaa8fCwFyPboI6oeN/Rg6sp0=; b=PNLlMl/C+sSg6nbbanpZLxyBSgK Xr55JJbUt4glc4s1L249Q5C/NhWmPKROj4zWc/P5y/m1WE7LsWYIRTrQB0hzZAwO 4+yMxbpULBIRf0Bsqxp3niND1UaHkG1n4alLAUNVBmrwzHm3U9L/GjEfp2j73EP9 J1UWWa+aHQk2aDExTiJXZaBoXzgEd6gYeOXoYMw8nq3sMDSjXZzaak2PGHo/mOAH J/pOuxbIQk8mkS1Fu9M7RqsWKU1F4Frv1JLDsujol/+AaXOqqdEl1s9cOd+n0eZh oyR2/XXaVKy6j9C2cbxKxEAF4Jd1Ic9g61zsEt1a5fBX23uAbBaoMN/q6eQ== Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 46s8c25an9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 14:46:21 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-7c5e28d0cc0so1330963385a.3 for ; Thu, 22 May 2025 07:46:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747925180; x=1748529980; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Zo+IAkII/q1bjeeyvHXEaa8fCwFyPboI6oeN/Rg6sp0=; b=Sa2WeZ2B8ye6VKNvAdM4bcz8QCksO7wiFN7dy4JFu67Zv3dBYWjfUPeIS+yFDwoPjI 04vKU8ugmJg88efpUopa9wUJrr8ufGqSPdInT1CSpbPVj/inqsiZQ7W+WsfWHXAVnMF5 hQrrrJMydpXxkDAAAHq3kIRBv1+w/zdvuQqzZl9CnJy0W9///PIXetljtQQdlXa2LdqS 92CZ7UM5o4AC2lVlHayjAoRnshECp5s8AQF/A/W7rBSLbgJ6mcsCD3BSjyLviotPPw6q CLiNk9JMOtoxRPbL4ZZGP/ReYFQTvXv977MSfMcUtTam951Vxs06RHxAlX2NURJTUf4b J5RQ== X-Gm-Message-State: AOJu0YzKA11qiboS2pkrDlOiK9JpjzmqF+kNbD/CVxG1DzcnUCZ8Sp/B hYfbyMMamt5PpfMEhfRft/LATE4t6ty0IitzsunrGI/sY+3gqWp+FPmg28vW4MhsbTx/XcSfkdu URpfioJ0hGwVovrRVVV22azzJ/FqbSiItExMVI5V3WYORdqd/+wt+xgUP1XFOAQyeGmywjQLZG1 H3D3JYeUHXSsLxRuU= X-Gm-Gg: ASbGnctZWXZyI090MaV8K9kREHj3PAkwNczxiqjPn9a5r8LMtLrwEpBkGRo3nxwOyuQ L99sYF1Etsw+Hc7KBc/6O7dBucGrKmjlJ0Ch1S7MtAOSSVB8RCU/crIAcHJfW2Gc5p2szuXNknZ Pso/LKi0jiA6ZATTSvUVKD4Apw52DDRWBPpzqAbp9eMC5aTW+0ebHV7JpGVKq+Bk3qtNR4DP7iC vfPZXwv0kvjNIINkDR2b5gFYHPRWIX7MjqTUi6LSdC8RTxW/IGwEAGdi1PHKimWiuM14WeM5YUD EVLHzDBGKjE/yQCP8YL06eqnfC4uzrHKql325Y3lCvHxGflSCCwsJBYLxZtLfEooiC6UXPQthjd qJIcY6uqdW8Wy2KrOztexA8Oa X-Received: by 2002:a05:620a:1984:b0:7c7:70dc:e921 with SMTP id af79cd13be357-7cd4677d645mr3910834685a.36.1747925180295; Thu, 22 May 2025 07:46:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHw2X3SjGw5nPxjU+25HIL17QILQK+E/mmlwKB/zIIr4mfnUv+3Ky96fdedmRawavFn9ryoqg== X-Received: by 2002:a05:620a:1984:b0:7c7:70dc:e921 with SMTP id af79cd13be357-7cd4677d645mr3910830685a.36.1747925179885; Thu, 22 May 2025 07:46:19 -0700 (PDT) Received: from umbar.lan (2001-14ba-a0c3-3a00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a0c3:3a00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-328084cabdasm33031551fa.44.2025.05.22.07.46.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 07:46:18 -0700 (PDT) From: Dmitry Baryshkov To: openembedded-core@lists.openembedded.org Subject: [PATCH v2 10/12] mesa: drop .so files for GLVND ICD libraries Date: Thu, 22 May 2025 17:46:03 +0300 Message-Id: <20250522144605.2876771-10-dmitry.baryshkov@oss.qualcomm.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250522144605.2876771-1-dmitry.baryshkov@oss.qualcomm.com> References: <20250522144605.2876771-1-dmitry.baryshkov@oss.qualcomm.com> MIME-Version: 1.0 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE1MCBTYWx0ZWRfX+JYbIL05HDm3 fADR1pEEMXd5adLCT3XDV0Rhuj+/bDLPND12OixXIQa80nyL/kmYrei6UNH/FS1ytoBk+QLcEL7 bW6TYTzibnEp0mT1CHYBkHe18+KgcinBy81h4ywlTkpczY/wFJSfSbsXwIJCDU3f4iNnHdw0gr/ 2EV6KyIAs0plh7VZxtBg1FWRRCpOf+njAfy4tik2IApqNWZ/41d9Y7v1kpAk4n6xQNEVNbJ3E6Z 6x25cfF0hH6JkdGWUlDxoxJ5zUK1O65pjP217IxmtxED8/YXNY0ETYOkRM/gu+QLHqt743/SDIY Xgmb4C0XCjiYV6UrQjkyNrjcOh9pzJZftLOJMHlzmeP36u22bRbBfeGdXMcCIsIoEwo4k839J6a kNPmIj6Vz62YKCZCH2NK5ijUedQsoZdibuNZs8mGOCMobR9Z/8gYtxaz6peR3/mHuppb1tpR X-Authority-Analysis: v=2.4 cv=RIuzH5i+ c=1 sm=1 tr=0 ts=682f38bd cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=xqWC_Br6kY4A:10 a=dt9VzEwgFbYA:10 a=EUspDBNiAAAA:8 a=e0qsWOJ7BfgThjmG3noA:9 a=NFOGd7dJGGMPyQGDc5-O:22 X-Proofpoint-ORIG-GUID: n64qE0UdXuL9PpmgzMTB-Nxj2wL2brtY X-Proofpoint-GUID: n64qE0UdXuL9PpmgzMTB-Nxj2wL2brtY X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-22_07,2025-05-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 phishscore=0 suspectscore=0 malwarescore=0 bulkscore=0 mlxlogscore=931 spamscore=0 lowpriorityscore=0 mlxscore=0 priorityscore=1501 adultscore=0 impostorscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000 definitions=main-2505220150 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 ; Thu, 22 May 2025 14:46:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/217121 If GLVND is enabled, Mesa provides two ICD libaries, libEGL_mesa.so.0 and libGLX_mesa.so.0. During the installation it also creates two extra symlinks, libEGL_mesa.so and libGLX_mesa.so, however those symliks are unnecessary and useless as nothing will ever link to those ICD archives. Remove them from the install dir, which also makes package libglx-mesa-dev disappear (it contained only this symlink). Signed-off-by: Dmitry Baryshkov --- meta/recipes-graphics/mesa/mesa.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 2d3846ff8f0f..0ed6b8a38d8c 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -33,6 +33,10 @@ do_install:append() { if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)} && [ -f ${D}${includedir}/EGL/eglplatform.h ]; then sed -i -e 's/^#elif defined(__unix__) && defined(EGL_NO_X11)$/#elif defined(__unix__) \&\& defined(EGL_NO_X11) || ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h fi + # These are ICDs, apps are not supposed to link against them + if ${@bb.utils.contains('PACKAGECONFIG', 'glvnd', 'true', 'false', d)} ; then + rm -f ${D}${libdir}/libEGL_mesa.so ${D}${libdir}/libGLX_mesa.so + fi } DEPENDS = "expat makedepend-native flex-native bison-native libxml2-native zlib chrpath-replacement-native python3-mako-native gettext-native python3-pyyaml-native" @@ -348,7 +352,6 @@ FILES:${PN}-dev = "${libdir}/pkgconfig/dri.pc ${includedir}/vulkan ${libdir}/vdp FILES:libegl-mesa-dev = "${libdir}/libEGL*.* ${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc" FILES:libgbm-dev = "${libdir}/libgbm.* ${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h" FILES:libgl-mesa-dev = "${libdir}/libGL.* ${includedir}/GL ${libdir}/pkgconfig/gl.pc" -FILES:libglx-mesa-dev = "${libdir}/libGLX*.*" 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 ${includedir}/GLES3 ${libdir}/pkgconfig/glesv2.pc" From patchwork Thu May 22 14:46:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 63532 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 6213BC54ED0 for ; Thu, 22 May 2025 14:46:30 +0000 (UTC) Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by mx.groups.io with SMTP id smtpd.web10.25581.1747925183710423453 for ; Thu, 22 May 2025 07:46:23 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@qualcomm.com header.s=qcppdkim1 header.b=fC6lkVhE; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: oss.qualcomm.com, ip: 205.220.180.131, mailfrom: dmitry.baryshkov@oss.qualcomm.com) Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 54M7RnHn000716 for ; Thu, 22 May 2025 14:46:23 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=7byshJKm+hY 1PNV4t8aDe741l1o5C1Z7Xrxhqh64KVs=; b=fC6lkVhEmCpfjNyOVEF+qa9nzka W4qfW1DezH1Cqj9PLp+3aatOEk6cEnJJKQ6wj+HNKvAU5UN1Q4WPsZBkf/dFWUS8 2W95FXGX+dLQKoNMu10FDIBudtlel+rjfWZE2HYKqff3Myp0bnLHcnIkJBf0OsjE IbvjkdPwVvHKLYltnJC3XIPmmznZbUkLSacWGZhKhwOD4LUpwZeerDqkZ3PGTW3I 4BBrWXHJIlSI2XsEFsep3x/fsOs5SPH9SvUBZFHZNl6tlDImgZO0IlGMTO7n8xck CND7Cs+7nf8D/CNk0bJW3qvF7E/h5mLNkZcV1zHj2whgSrj9/cZhPDIZ1hA== Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 46s95tn1u1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 14:46:22 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-7caef20a528so2087001185a.0 for ; Thu, 22 May 2025 07:46:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747925182; x=1748529982; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7byshJKm+hY1PNV4t8aDe741l1o5C1Z7Xrxhqh64KVs=; b=MaX0M+kyBEwTvyLj1x5yD5jH/fS9/6w6XFfNxaYf6W60QDaRAa4oxSZmJBik9qDIph pf0fJniOreMiF0sUmAdYEvwZBx0eHqoOXEFQyv2C5eI/Jusr7RZl2TkDQb3k/6dCyDiC +BbbtVR6LuIS83QBraLRkgl0JHiiblqiUHk6q8xqX7FiL1ois0a6XGyQ7g20963qllbn N0j6mSHG6SGV6CL590pqR2So6F89OGNeZ3PPRAL3l6tZPy4Cn4V/1HoPIIFNn2xKtfe6 mcgHelJPcd4helROKZkv528FA1AqNwzuYtfo7f2lfaU27dGAs5bZbwm0VDHhtfD5lfB8 C34w== X-Gm-Message-State: AOJu0Yz4KKwwwobkHLINB5pssHKV9o0IDxJ4mUfzx241Hq53lt8f4doA ahaw59vCjKIiOs7iqu6DTIkHJap99EOpGWLcKw+UM9Md3ya8VtNhK7fMEkVEb0v8FB2q4M+J5+s MvKUjSQ45j6u55aKWrhbIa+f3LluKRzr7sf8GJ0NQB1r1u0Glk4JGCjjMfru3gz3+CJmml8KzC0 vC02GJywfY9uqBAo0= X-Gm-Gg: ASbGncsjoulteFzRHzN3IWpXloYf5xc0eFWY+q4e9byvfE+YGo6xhbx/y9LnnI8AGAx 8jgCdjlPQ3Tz3CMDfBjiywTiSbP9kC7Nm5vi2OlKcalfqbnOXo77+YBz6kzNwWk+hNs6Vo+2BXQ 0/0NxCkYn1sIlOsKOQP7KmEOxVWUMSytRRjCp0r2Oy+6hB0smSKDjzj+aJ8y8nytBhBPa+/P+Ik 3Bl8p+fcqxMaJ9o33gygBOXxtY//Slifv3AaYmpvxbCzMrvStqu/QCfcYNCj3qo3v7xeX0xNwgt FqHm/gl4gr/ZB7C57T3ySFKBFc08BxhQ+NZT2b5Z+Qsc+GPl+/meU3uzxoo52ZSGcmSviKRDgcA EIxjGLOHKu86T77g3Baiz1ip5 X-Received: by 2002:a05:620a:471e:b0:7c3:d5a4:3df3 with SMTP id af79cd13be357-7cd47f4f1damr2854554985a.34.1747925181537; Thu, 22 May 2025 07:46:21 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGEVNJoVqIk+zJMaOLExPpwzHOK7fI4mDg4zfn6uG23eqOL/Qc1Y32ghbz0utaBddUyyM3bBQ== X-Received: by 2002:a05:620a:471e:b0:7c3:d5a4:3df3 with SMTP id af79cd13be357-7cd47f4f1damr2854552385a.34.1747925181166; Thu, 22 May 2025 07:46:21 -0700 (PDT) Received: from umbar.lan (2001-14ba-a0c3-3a00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a0c3:3a00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-328084cabdasm33031551fa.44.2025.05.22.07.46.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 07:46:20 -0700 (PDT) From: Dmitry Baryshkov To: openembedded-core@lists.openembedded.org Subject: [PATCH v2 11/12] mesa: move dri_internal header to mesa-dev Date: Thu, 22 May 2025 17:46:04 +0300 Message-Id: <20250522144605.2876771-11-dmitry.baryshkov@oss.qualcomm.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250522144605.2876771-1-dmitry.baryshkov@oss.qualcomm.com> References: <20250522144605.2876771-1-dmitry.baryshkov@oss.qualcomm.com> MIME-Version: 1.0 X-Authority-Analysis: v=2.4 cv=QKBoRhLL c=1 sm=1 tr=0 ts=682f38be cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=xqWC_Br6kY4A:10 a=dt9VzEwgFbYA:10 a=EUspDBNiAAAA:8 a=xIXOYJDBqi0fscj7eiwA:9 a=bTQJ7kPSJx9SKPbeHEYW:22 X-Proofpoint-ORIG-GUID: 4dYoWv852TZDE2ZMC1mCzApGBzKivO-M X-Proofpoint-GUID: 4dYoWv852TZDE2ZMC1mCzApGBzKivO-M X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE1MCBTYWx0ZWRfX4nEfuX9Cba4j M9NPy/gxsaRmowlCYUi5QssGSsuOZ7qXcdR9/njJgrrSq64YqWdbLmCzZgovaAMoHZzNItzxjw9 P+o03cvFkIOBT+if01fuYHJqkJmsN+MSn0g9ZvDGqDaKQrLUcshZ1LNrAwYCdKP1ixxKYFigJxE fHR+bftOxQhd74lPOrZDta2yiCHFhIKiLmLAr+62VwKZiJNhZRN3WNXDCMf9ZVdgEKxonPkkwYf SJaMHC/t6EAl+EY82nDpS803KOmB/VKiN+BR1hOY1K7MXbcKYhQ7BzGKCV0yvuF8TNiLng+1bE3 2UFKNx2v6O+hICIdh5pTXcKvNCmnWCjxocKhS/7+365UNZaoJH+SFjiVeG6ZIkSlSza6Rgd8fUk nVFseTxJOfIZdJPAhQyugaUvW16qX7QmWIKh93+bNaoyhd0wsmD6Vudjtvz6enToddwMP0xw X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-22_07,2025-05-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 spamscore=0 clxscore=1015 phishscore=0 lowpriorityscore=0 adultscore=0 mlxlogscore=999 suspectscore=0 bulkscore=0 impostorscore=0 priorityscore=1501 malwarescore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000 definitions=main-2505220150 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 ; Thu, 22 May 2025 14:46:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/217122 The GL/internal/dri_internal.h header is not a part of the OpenGL API. Instead it defines Mesa interface with DRI drivers. Move it to mesa-dev package to reside next to dri.pc. Signed-off-by: Dmitry Baryshkov --- meta/recipes-graphics/mesa/mesa.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 0ed6b8a38d8c..7bc7c2faf7f0 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -348,10 +348,10 @@ FILES:libopencl-mesa = "${libdir}/lib*OpenCL.so* ${sysconfdir}/OpenCL/vendors/*. FILES:libglapi = "${libdir}/libglapi.so.*" FILES:libxatracker = "${libdir}/libxatracker.so.*" -FILES:${PN}-dev = "${libdir}/pkgconfig/dri.pc ${includedir}/vulkan ${libdir}/vdpau/*.so" +FILES:${PN}-dev = "${libdir}/pkgconfig/dri.pc ${includedir}/GL/internal/dri_interface.h ${includedir}/vulkan ${libdir}/vdpau/*.so" FILES:libegl-mesa-dev = "${libdir}/libEGL*.* ${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc" FILES:libgbm-dev = "${libdir}/libgbm.* ${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h" -FILES:libgl-mesa-dev = "${libdir}/libGL.* ${includedir}/GL ${libdir}/pkgconfig/gl.pc" +FILES:libgl-mesa-dev = "${libdir}/libGL.* ${includedir}/GL/*.h ${libdir}/pkgconfig/gl.pc" 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 ${includedir}/GLES3 ${libdir}/pkgconfig/glesv2.pc" From patchwork Thu May 22 14:46:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 63530 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 4DB11C54E90 for ; Thu, 22 May 2025 14:46:30 +0000 (UTC) Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by mx.groups.io with SMTP id smtpd.web11.25726.1747925185398060227 for ; Thu, 22 May 2025 07:46:25 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@qualcomm.com header.s=qcppdkim1 header.b=ZSi+jo7v; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: oss.qualcomm.com, ip: 205.220.168.131, mailfrom: dmitry.baryshkov@oss.qualcomm.com) Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 54M81xdY029164 for ; Thu, 22 May 2025 14:46:25 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=kvJVZM23pgL 63mpkWl7LFhIGTGbepwmDpcYxuN393cQ=; b=ZSi+jo7voDFnkOTcfsWgOD0d0Nd v7Izr0ew2AJRTb8uI/yP0FPBcZCNdPssMu7ZolAAxllM37eYAV2hHYyadT8JJWzx +re+vZx7CMudfMyvL7EHb9XCaVzVaXU8U4yDVP8ACI/t1Pm2eZCcFpDMMeNhXvQY QtS9uDZFxh+heePkQv7p7q1UZWxX2jEdsTXOf94eKYetm4Sw07EdHH8PJPkdQ5rO DKfooEz2088XARR/D9ZpCZTcUTzZmx/2FpbqpzGML6EEp43Z0iIIFCqykJOiD/Nu uEL+4k18tD/AGL22hC0ZsKHU9Cr27hb1HrOi6KI6GZ1bceHaiBVnMzFWYLw== Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 46rwf46sqe-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 14:46:24 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-7c95e424b62so1661530385a.1 for ; Thu, 22 May 2025 07:46:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747925183; x=1748529983; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kvJVZM23pgL63mpkWl7LFhIGTGbepwmDpcYxuN393cQ=; b=g3WELHp3bPASzToJj0niPYUJpTl6gr6DEARq2cQetLTUyNsB8NJDt9oL3pkQ4wTAKy uoga3fr5wGQb6NBNhfL4bwv/eKL6h5EYnqyaZTuB3Plr8piarNZEcoUhwL9/3m8712hc 6rxTxju96f5fcYOAVPYGAjXMaqxp54SRQAR2rV/cnT0QGC3/TNp3SIBq+C+nqAuOyAs2 +0Vr+yW2XGk8NHDPT4u/Pz80xVSCANWy77RcqEYnJbwLrW8UdeOfoZmW717wSryR0pQl pmsH5Ew3gXiCioGRQ1eFcKmtJi4sXsnJgv2+8pXtPo4Yn44g/Z+zJMG0DGQhG4BXdDQl 43uA== X-Gm-Message-State: AOJu0YxAW4fHp63b0tbYgfVf/+Tb4xj1RmhLkN87guGHZ1a/ZQuiZfUP A4RZh/k1UkdoVXg8nB9D94cC3/78fl7aiqfYvckg8TIKosmNM1s5WeG4GabPVNaTJdf2txzDhB+ 7Th10qED7NuHOADfK+Tbgby4EVHT+xFoc7hCf8tz9ONQ0knNBRcei6k/OlRirMmtcVAwfO+tiIS 2dW+XeetsUcw0q/FA= X-Gm-Gg: ASbGncuWsZA4+RRepTWFFxiUb4bB5q3dL9YkbphJYI5/hEjv6m3x+g/vefzS5NHsfW6 MjcaIUq2Ucph6tBNfDJHkkdewWGm4hrEB2TEjIIjpYc3bQFHeqOzMsuUIhkByW25qr/HKByjgZy lIFU+dBVJbev8GPk2c2AAYzNgPruhCCgeTBFfpTI2C0n4PY7EOvtI+kamnIf6bO3FYHQSwPoVJn ZrXBlVB9aHlwTmjAuPn6uruSAf8zdwEHgYyWr2SMrPthmQn7cATUx/4M6f4xwmBopgd9rd8rWqO kw+XX8p0Yh4KCznEM/dAdHjKab1+n4GMyu/80EotqCqGNM/8L5giQDTmTd2Hncr8z0D71ieydmF 8o+PMfPR54zLaKp4H/wqs4B7B X-Received: by 2002:a05:620a:6082:b0:7c3:c9e5:e4ba with SMTP id af79cd13be357-7cd39e3717emr4977058285a.29.1747925183206; Thu, 22 May 2025 07:46:23 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGjHjEakDl9rlcUznTtyCaQo7XqXIDP0swjyV1URvdnmnccRFiQ65CLFqJKA2wDOmaxE+Ni1Q== X-Received: by 2002:a05:620a:6082:b0:7c3:c9e5:e4ba with SMTP id af79cd13be357-7cd39e3717emr4977053485a.29.1747925182732; Thu, 22 May 2025 07:46:22 -0700 (PDT) Received: from umbar.lan (2001-14ba-a0c3-3a00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a0c3:3a00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-328084cabdasm33031551fa.44.2025.05.22.07.46.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 07:46:21 -0700 (PDT) From: Dmitry Baryshkov To: openembedded-core@lists.openembedded.org Subject: [PATCH v2 12/12] mesa: remove XA tracker support Date: Thu, 22 May 2025 17:46:05 +0300 Message-Id: <20250522144605.2876771-12-dmitry.baryshkov@oss.qualcomm.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250522144605.2876771-1-dmitry.baryshkov@oss.qualcomm.com> References: <20250522144605.2876771-1-dmitry.baryshkov@oss.qualcomm.com> MIME-Version: 1.0 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE1MCBTYWx0ZWRfX4xn6e9L5T6aN LlNDe/C3q6qgerdIv6BqTqdkd+iR2oonUpG7CyMi80KaEP2Dbj5NNoNSQyga9AuspwRGNRfocgV lUoU4h0jJaPdzHhaF5lJYfu1FGqLKJa9+B6qSLTYXmtZ2yHjuz61/k5CGRuBCJl3zQ9AgQOo0MK iF0HwQ2LgKQ/dlUy/kfuv833P/yg0qcOBuf73SK+jLx5ivx9H/5BBxAPJP59pHwKXoqbqfhmQle sV7Q8DRsXJ54lwWMqjWW6MO0bnm29ChS1PTTNruNqRwWrys0ArZW9KktklnK9nE5LHgWBX6u7HQ 5MA0rhKc5Qmc0VGiEkVU0W+xt8eG0tJUorl6v8X5euQH1Fz/OPqmHeWtWD1aa8DZC4SKJ8wYZV9 KFW5jC/KG13Y0yUxZTFGuQ8Tw6ka6lD8ZRpig/e+SstaKOs2fjxDS8nUdj2yevlSYTx3MnVq X-Proofpoint-GUID: BB6qlTKCkNF_bLF5HkF2LhMYDjyeprA5 X-Authority-Analysis: v=2.4 cv=Ws8rMcfv c=1 sm=1 tr=0 ts=682f38c0 cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=xqWC_Br6kY4A:10 a=dt9VzEwgFbYA:10 a=EUspDBNiAAAA:8 a=TiM0kDGdWyhykQ6Ep7wA:9 a=PEH46H7Ffwr30OY-TuGO:22 X-Proofpoint-ORIG-GUID: BB6qlTKCkNF_bLF5HkF2LhMYDjyeprA5 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-22_07,2025-05-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 malwarescore=0 clxscore=1015 suspectscore=0 mlxscore=0 bulkscore=0 phishscore=0 priorityscore=1501 impostorscore=0 lowpriorityscore=0 mlxlogscore=999 adultscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000 definitions=main-2505220150 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 ; Thu, 22 May 2025 14:46:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/217123 XA tracker is unmaintained and dedprecated. It is scheduled for removal in Mesa 25.2. Be slightly more proactive and disable it now. Signed-off-by: Dmitry Baryshkov --- meta/recipes-graphics/mesa/mesa.inc | 6 ------ 1 file changed, 6 deletions(-) diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 7bc7c2faf7f0..7e658679f5bc 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -198,7 +198,6 @@ MESA_NATIVE:class-native = "" PACKAGECONFIG[gallium] = "-Dgallium-drivers=${@strip_comma('${GALLIUMDRIVERS}')}, -Dgallium-drivers='', libdrm" PACKAGECONFIG[gallium-llvm] = "-Dllvm=enabled -Dshared-llvm=enabled, -Dllvm=disabled, llvm llvm-native elfutils" PACKAGECONFIG[libclc] = "-Dmesa-clc=${MESA_CLC} -Dinstall-mesa-clc=${INSTALL_MESA_CLC} -Dmesa-clc-bundle-headers=enabled,,libclc spirv-tools spirv-llvm-translator ${MESA_NATIVE}" -PACKAGECONFIG[xa] = "-Dgallium-xa=enabled, -Dgallium-xa=disabled" PACKAGECONFIG[va] = "-Dgallium-va=enabled,-Dgallium-va=disabled,libva-initial" PACKAGECONFIG[vdpau] = "-Dgallium-vdpau=enabled,-Dgallium-vdpau=disabled,libvdpau" @@ -254,7 +253,6 @@ PACKAGES =+ "libegl-mesa libegl-mesa-dev \ libgles1-mesa libgles1-mesa-dev \ libgles2-mesa libgles2-mesa-dev \ libopencl-mesa \ - libxatracker libxatracker-dev \ mesa-megadriver mesa-vulkan-drivers \ mesa-vdpau-drivers mesa-tools \ " @@ -346,7 +344,6 @@ FILES:libgl-mesa = "${libdir}/libGL.so.*" FILES:libglx-mesa = "${libdir}/libGLX*.so.*" FILES:libopencl-mesa = "${libdir}/lib*OpenCL.so* ${sysconfdir}/OpenCL/vendors/*.icd" FILES:libglapi = "${libdir}/libglapi.so.*" -FILES:libxatracker = "${libdir}/libxatracker.so.*" FILES:${PN}-dev = "${libdir}/pkgconfig/dri.pc ${includedir}/GL/internal/dri_interface.h ${includedir}/vulkan ${libdir}/vdpau/*.so" FILES:libegl-mesa-dev = "${libdir}/libEGL*.* ${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc" @@ -355,9 +352,6 @@ FILES:libgl-mesa-dev = "${libdir}/libGL.* ${includedir}/GL/*.h ${libdir}/pkgconf 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 ${includedir}/GLES3 ${libdir}/pkgconfig/glesv2.pc" -FILES:libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/libxatracker.la \ - ${includedir}/xa_tracker.h ${includedir}/xa_composite.h ${includedir}/xa_context.h \ - ${libdir}/pkgconfig/xatracker.pc" # catch all to get all the tools and data FILES:${PN}-tools = "${bindir} ${datadir}" ALLOW_EMPTY:${PN}-tools = "1"