From patchwork Thu May 22 17:13:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 63535 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 2F0B5C54ED0 for ; Thu, 22 May 2025 17:13:41 +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.29161.1747934018526169297 for ; Thu, 22 May 2025 10:13:38 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@qualcomm.com header.s=qcppdkim1 header.b=j+TAksjF; 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 54MFfxic032698 for ; Thu, 22 May 2025 17:13:38 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=j+TAksjFFEuEFxCmRZuF5QavWpNmFuKv68DMVQfw15Wy8L3+nQa T5F6goBAvtEeIHlrHGE3iIUcabKPr3vZhs7lYryxbFqGXL66MxjWwi08MUnSs4Qi M+4SdkAsMuvzaGEiwEBrjb+Eh0CdXusvuX5G9ZZLXhQuwwg46UG78ky+jN9FzeIw ruJZO3XnWALgmE06PI770X/4ozOvnMcH6ERcVRavmUJns6BHM8vY5xqFHMIF3txx FvD6UN+hzmAi0/wwAc0qmS7KxA5ct+mgFtF/KLqbX3QHn9jkB+/325eIHDtuHzUB dsY3AxmmJggjRf57+szaYe+boAW0AA7JHqg== 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 46s8c25s8a-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 17:13:38 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-7caee988153so1494252985a.1 for ; Thu, 22 May 2025 10:13:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747934016; x=1748538816; 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=K+MCsR4JgtGvSrRLm96br+Fqe9rItVIlyLs4bhcmVBNeb/d2/+0rii6MElaQHPHmaj op10FgvFm5j4ypCbAESWDg9/Q2hX8ajQfVZIeM9prQFbtoTjIA9imUaE/FB+HdC/AoVD hssyyxLXBomJVDHXAD0UsEg789Ok6Jy7iWj7ga+ojcmAhki+Kvxcz7mVE/fzCHG0mC6i Q04Mw+l/bCUw6i5lzbCzBV7Yf2o9JftCqoqIU/9qacv/XEoueBD8nPf5NuMtqgAT9wRU hEHMTmXlkSZkkWC98W37yB4FJE2vcCkTbfClT910PEYtwknMmwYyHU+Tu6gOp35PBa5q pQPA== X-Gm-Message-State: AOJu0YyJ58lVf81gRRA7Ee9vdJaTWxqYdUO8U1z2qKFld3Hw7/CFfJLL OOaTSkaefDKUUAcLFwhhFS4e9u3nbK8VKKbB639u07/Ih2tzQJqm3y1Hoi9KPh/1ELLKhEJGtwL qecWl/Ws9+IxBeM70ss3ieTf9JEnjRT72Owfo6x7T6g0Py+wKHuijl+ATldiTve8iMXUt2Orpzu 96K7vwBmt/aQHkMlc= X-Gm-Gg: ASbGnctaMZN5iLOTSN3ZpTnCIK8V9NW6bzAnDSxTCCsS3YLSg6IpW7eCcjHxmKCLRv+ bikG6dlPjY/3qnxQLShR31a2E3IvWJi+KyWVtOVj4OUuC5GmvM0j2q3Wr/Le+0ULwfW/Yh10Ipl OLlJuSdnc2kY6uG+4F3tmJ2/1PeqJKalRR4gj+nQAykHSKJ2chcaDG38l5LjdJG0EdkPyCtFJs7 d7sttL22QHf51Jwah9+nps82agzYhthWBnC6XSf0eVMcAsV+5rSrcNWPA5cOTU4Yg3lyxFNH2pH B01iLyRTCpts8Mpz+rLmH2baH8MId0MpfkfBvbMEKsUH0U+s64jgh/xszUutaGPZM7Lr4vkG8Pe 4O4oMXy0kxwcJTmEC8FtJm77X X-Received: by 2002:a05:620a:24cb:b0:7ca:c584:7beb with SMTP id af79cd13be357-7cd4671fdfamr3835830885a.16.1747934016503; Thu, 22 May 2025 10:13:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFwj5yIHiU9q2VV80hPdhtweMr0A2ZP965IEf/zWQgN8TMVmEK5KLPVePECksWWOfd33Q/gKw== X-Received: by 2002:a05:620a:24cb:b0:7ca:c584:7beb with SMTP id af79cd13be357-7cd4671fdfamr3835826785a.16.1747934015990; Thu, 22 May 2025 10:13:35 -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 2adb3069b0e04-550e6f165c7sm3501438e87.32.2025.05.22.10.13.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 10:13:35 -0700 (PDT) From: Dmitry Baryshkov To: openembedded-core@lists.openembedded.org Subject: [PATCH v3 01/11] mesa: remove OSMesa support Date: Thu, 22 May 2025 20:13:24 +0300 Message-Id: <20250522171334.3040820-1-dmitry.baryshkov@oss.qualcomm.com> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE3NCBTYWx0ZWRfX0UwcZeJpjGSr El5nBo5eVKGbC7AxlB4hK7vrg/2GkPEbFpcyNq0Lzl7eXPsKAkZKA9cFIB4fpJI1KZ4TZqSLOBw LTRl01Xn3mzhcKVKekLgBMMDfoVD1U/mwIyzKSrkhzWVlxqNlHr0s1Af9DAJMFkK93sju70hjus jRqX4ovgipQw6aI5CLnPrfx6/dzKUtqHlVMPJb8BZYT9YTVV3ntMFZmFZCpQkw1MbZHOrbI6q4S glwyb38jhJq3lj/euZdfylFdPPr7DhkQ3Lqjwft8U5OegIyyYYQPX2+L0VzRC8Wz0hcdWdJfori tIsHVQD9ICQz6Qqx+ug7l22xeU4QyyF/oL+JWAXIOy8foyTOw56eXdB37WpHOsE2SO91lxc1i80 iEe7xqqwiAsTPtqdv/dUlJQGZrqAhSczkWf0fD8beuj/WvBExS6DmF7zwnInE21VljakM73A X-Authority-Analysis: v=2.4 cv=RIuzH5i+ c=1 sm=1 tr=0 ts=682f5b42 cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=xqWC_Br6kY4A:10 a=dt9VzEwgFbYA:10 a=EUspDBNiAAAA:8 a=ZSQEBjlZUM_vgJQqOsUA:9 a=bTQJ7kPSJx9SKPbeHEYW:22 X-Proofpoint-ORIG-GUID: eBQw_1yS6woFJRODwGqyK-5QN_OZfMd- X-Proofpoint-GUID: eBQw_1yS6woFJRODwGqyK-5QN_OZfMd- 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_08,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=990 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-2505220174 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 17:13:41 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/217133 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 17:13:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 63534 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 2E1BCC54E65 for ; Thu, 22 May 2025 17:13:41 +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.29575.1747934019786334691 for ; Thu, 22 May 2025 10:13:39 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@qualcomm.com header.s=qcppdkim1 header.b=MKTF5V5A; 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 54M9jsgt021071 for ; Thu, 22 May 2025 17:13:39 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=MKTF5V5ALGtK1Zk/IMD+xPN542y cPP4T7WoxnbkGweoRsngnFiYnv5sljHK9y0ZRGAd2QBGRfEn2pRchuNH0OJGct4t K6yYxRybEDnAZ63OFdLFsQuSM7MjXWh4mma62ARDs0hiMN9xFMnLmWzWVeROaHEx Qr40iV4RSZiWA7t80fNRpM/ghYaoLwgB+Xp53sjz/wgynLQA5OARfjMFwA9ZxGFV CdE9NPMcV7GAEzB4rp7K6YRVRm6y+wCSB+Q5moBIRQTqbb3/DueD1fnzExt9dZyC i5fwNnafvTdFv7i8MehIPbwPoU13AeZwzP9zkXOVBn7V7Ereh04ErnebHNQ== 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 46rwf9y4cb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 17:13:38 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-7c5c9abdbd3so837099585a.1 for ; Thu, 22 May 2025 10:13:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747934017; x=1748538817; 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=qnfKwlZLaZvnihGsdEC4QtOlu2CzjHyagz8e3h/9IJ34lOHhyuwEw2RLhuMAcFT3qg 3XJXjEUqbxShPBdCi/Thx/jHiW8TIln1ZObzJZiP0VcvvZCt6Ho2GCb7A7sQKkVgUumU RcEvzj7Al7kmTuNU1EnlcYwPkHKuX135LL1rOB1y1mBIZWjyZVDZjnDrTDOGEeCw0mcr +T0O7isTzKRX5v638nEBCMgB9pZZkcJyXyJm3Z+TS9yqRALlDxBtMthNxWioEmVqfTrn eN+bkl0LHwid6oapoOdZocYzkZmPcyrygCFaGFtLLw/NxXxCd9dtk7z98g8fE/wY10iJ 9y2g== X-Gm-Message-State: AOJu0Yzky5brtTAJS4Kva2yRIh+f9sIYEwNH/V5HFBrln4am6prZiK47 p96dNqMAAInKhzhTMzOuKzV4jraH3nu2hVDfHTBfFiS8oqRGnd5Y3Pnl3T785yMHnFZ/bVGlC/V ECugVhua6utidfCu4ku0v7CICVg0ifo0pDRCOfBuULQNwpU89FawnJEipGGleMDLVy0sWcn5LMJ xOQJmOwkOB3+kyZF0= X-Gm-Gg: ASbGncvbRbSsrJ5+EMXPzuKstVRuErbvhuJURqWjRXcyY+mF9he/i00ECFqMkqp0nvp kMs4CkBBcjd3JtdTz6Jq8EnToHwKUmXytOk5Hlp5qBO8SlpEYvNZWRCXEp5vY9TEX+9ZJ8XT+il YRccj+JJEuzIOihvwuDYINStODUJIeOk/j5SDIoQPw4RCAmzrP9BclryU7tedmOoxc33yq6iv1A AHrNVj2S9oqTc5ZY/RmKNyQgvUhDMEQ25UY9sh33B/YcIsKcCTTZoLkso2ijJVtW+8niA8TnHwJ W1+SMfNlq2vnwy605h0voYwy8FCWD9Vi5+oMVuIyz6Z8abVYy6Y9+oZjzm2FV0dGEeuh5P9htzp siy0vm2HO0OvFkjDenjBaXqQy X-Received: by 2002:a05:620a:400f:b0:7c5:9c12:fc8 with SMTP id af79cd13be357-7cd4677d606mr3500487485a.38.1747934017372; Thu, 22 May 2025 10:13:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFDBpH0DA171fyZl4XwKK5qczuujewwc1rRJXUOcMptmD8R1cTpeiDAVkckJqTOHw4y/BilQA== X-Received: by 2002:a05:620a:400f:b0:7c5:9c12:fc8 with SMTP id af79cd13be357-7cd4677d606mr3500484885a.38.1747934017014; Thu, 22 May 2025 10:13:37 -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 2adb3069b0e04-550e6f165c7sm3501438e87.32.2025.05.22.10.13.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 10:13:36 -0700 (PDT) From: Dmitry Baryshkov To: openembedded-core@lists.openembedded.org Subject: [PATCH v3 02/11] mesa: drop useless -Dshared-glapi flag Date: Thu, 22 May 2025 20:13:25 +0300 Message-Id: <20250522171334.3040820-2-dmitry.baryshkov@oss.qualcomm.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250522171334.3040820-1-dmitry.baryshkov@oss.qualcomm.com> References: <20250522171334.3040820-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=682f5b42 cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=xqWC_Br6kY4A:10 a=dt9VzEwgFbYA:10 a=EUspDBNiAAAA:8 a=OQp4uNaVuwmCJKMus2EA:9 a=NFOGd7dJGGMPyQGDc5-O:22 X-Proofpoint-ORIG-GUID: KJQHviWyuBcu0cW_kp4i6ONOrv5UR9Kn X-Proofpoint-GUID: KJQHviWyuBcu0cW_kp4i6ONOrv5UR9Kn X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE3NCBTYWx0ZWRfXx9LCsBbzD4sl ef4NLZpue+AAME6MXlBiPWAG4qAQHNACnufGAbnoc2NgnymjzEE3Xbj/+JFP1RkqKSUT8GnPgnJ k1h1CQ6yrXY9Lss2xDsRsshLwfXmUJBrH6sYgGSDzxIrvN67v3aivzmf5X8kzvLZDjQxzuJTKWH B2TpYd5AKQkSWoANLBTY4N+Xtj/GqNAxaRAaaJPGI2IlLEg7j+8nA81hLPVb/t5PTK9mk02dNxx D6UhHzxSprQ0Ti2iwIbU+m1kiB2WY2tpMrGI+R7wmN6PHMxYZilSkhBE+e1g377HeES7YJeYOXy aIMNVDeC3CeKQuhG9DIbhgnhALJcE89allHGXMEoyZJm5ldAzo04Ef/6+3bDoHg/kBCGKbeOXro CStOV4aZGKrwwP8ubN6jQV3vnJRPyLKaEqAkmbUFsjaTlWcQU29seRRGGmBsdxXdPURpa6zx 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_08,2025-05-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=836 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-2505220174 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 17:13:41 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/217134 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 17:13:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 63537 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 13F98C54E65 for ; Thu, 22 May 2025 17:13:51 +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.29163.1747934021886804818 for ; Thu, 22 May 2025 10:13:41 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@qualcomm.com header.s=qcppdkim1 header.b=c2fJgVW/; 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 (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 54MFM1AZ021305 for ; Thu, 22 May 2025 17:13:41 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=c2fJgVW/EgVUYCr/Ul4khGOP16B Z90JjmXj3mGhm1FC2sWx9pS2n6wsRdWMk7kKyr7ufMCva3EMtp2FO6VkiH4CJX5W y2/33uJY/pfsU0NcsO9IwdWDC5YQE47VsWt/2I5YX7GDpOfhwyk6HV/tZX9xyl8f AMMFzJNGf9/mDhP2l7EYf40MjNQpmcJrnSSrZcaND2ED6GxNzh0OTcRP307sBlDF QEwdRE7YcVs0T5uERusuqdQdBcxqAx8YC6csXv8vh2Ay1v9C6pOWcIZ6hl34sjlo TR84ehtDFT+JRZzpCCxY8Z8Wy3ZGHzvK+kX+B247Xxt00wN0jby+AZXf6zg== 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 46s9pb5h0e-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 17:13:41 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-7c5750ca8b2so1198928885a.0 for ; Thu, 22 May 2025 10:13:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747934019; x=1748538819; 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=LYsQoNE5sJOxplaYAVZOs4+JbNa7jCQuS68+KYxYxg71bpNKQK6YzdLerZqUHE6hoT 561kRoecG2AaNQE1ECcoh6gWZor1ZyLw335Wh9eMkfph0GIYZUl+B2lY6cgUzjwlq4/i UkgVr+Grup1OqzDrNEHT5lOahHg5Xvszorv8Vkv71BP5Dor6U+lBoKceJcVac959gBR9 2T4LT4+vPRQjSTxs5G41LcCVouA5W3J/JMdc9zS8OZSD7vfOBLb4Hz0r7puQyc8yKFmU cSLhr6Evrapeuw42hb7aUsSRnKaiUlIUPLMidQNfc3gDiSPABW3Wnt1dRDjnTkaRQrrC tH3A== X-Gm-Message-State: AOJu0YyG9i3iIP5ada8vH4M2Ey+BJ1kotOfKkpyLd1QW9TxoLi5HaVRl U3ObZcutR+hhyrHOzC2n0x+gXi8PRjWS8PeL9nPu5nxxir1iQyS+8MHb7V6UDpbXZpLePR1Jb+a TbSGlxCXGCz0fpW0zO3Nizkw+/wu753Nwtosl4jbXtg4Z3tjPcLXYfdzbluapn93u438FpePXwG tVBZrbuRtaKTgTntc= X-Gm-Gg: ASbGncuIYMnyBY1ibu1DvQhVLhH36b4lGr+X4gOPwt3ER8rmAVgaybSqC/X24sBVu4F q6F8Hn5Xc9Ph4NxmFtc5qt+0Feyt4cj17JmKvZNRLZWev0nAegg/JarOHKVNkaxHFFBZseBsmF8 yKZMvDKbJqS+aFWtW0oHdrAAG+XK03JFXPic2guSExzEA9VsBBQxE0H0KYpmujhgrRiRdIrKk8w 5OphJemCuCW1LxqxLCBVffNzzmOcUg3yoc80gPQaRGxL+Wn0yVPTFwSJZIPWGVF3hcst90kLgHT hYXakKPHlc0+WluBery8z5SvTeou9vFSltmYbCDHz2OgUPS2penZYCqHDf2XDA8qWlygja+qNAp r1Mr0g+sDcog1TGynIi1i9PQ3 X-Received: by 2002:a05:620a:459f:b0:7ca:f349:4265 with SMTP id af79cd13be357-7cd4670aa2emr3603284485a.4.1747934019682; Thu, 22 May 2025 10:13:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEklVQY9u5/QXy+s0ZxxnC+/l35LeV+kN4AiqcZMXzwWqYzYu8THOLt2rT/5nIBCGXCbPjLLg== X-Received: by 2002:a05:620a:459f:b0:7ca:f349:4265 with SMTP id af79cd13be357-7cd4670aa2emr3603279985a.4.1747934019253; Thu, 22 May 2025 10:13:39 -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 2adb3069b0e04-550e6f165c7sm3501438e87.32.2025.05.22.10.13.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 10:13:38 -0700 (PDT) From: Dmitry Baryshkov To: openembedded-core@lists.openembedded.org Subject: [PATCH v3 03/11] mesa: drop -Dgallium-opencl flag Date: Thu, 22 May 2025 20:13:26 +0300 Message-Id: <20250522171334.3040820-3-dmitry.baryshkov@oss.qualcomm.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250522171334.3040820-1-dmitry.baryshkov@oss.qualcomm.com> References: <20250522171334.3040820-1-dmitry.baryshkov@oss.qualcomm.com> MIME-Version: 1.0 X-Authority-Analysis: v=2.4 cv=WJl/XmsR c=1 sm=1 tr=0 ts=682f5b45 cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=xqWC_Br6kY4A:10 a=dt9VzEwgFbYA:10 a=EUspDBNiAAAA:8 a=ljLuNc_75jdkrf6jWyIA:9 a=NFOGd7dJGGMPyQGDc5-O:22 X-Proofpoint-ORIG-GUID: mytPrOG8uBpj0Bf7qmTEM28FfyqWHGYr X-Proofpoint-GUID: mytPrOG8uBpj0Bf7qmTEM28FfyqWHGYr X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE3NCBTYWx0ZWRfXytLtpJ0K0c7x PAmxmxwB9FKZ71eP43sK5az0kM7ueUNwqs4ixzpfYWMUPnSxXMNg7mq6IXvdvllc4J17C0FshHr 8f6J+DZkyc7bKpHVeTM0YLBAzCJJDnzwt3BPsL1lqv3XjufVfxce8GxaymhZPjCkflAQjPflo23 B6TOQ79dXSxuetKn09BhrHa9cPUKQNanDU9T9OTLM5Pn8q6uDNlIDQx9LkqA+1eu/MNMw9PM+Gs HRzSTQ8vCXmnvSqhhwVDQghkjEPZkP4F+p/nUH7WWdxb+mkmWmt87AQNztBgsoV9khfBt5GNS1m CHIxqKz5ckgHWmw2hcEe5sYeJJi6H8/qL0Cvn5CnezQ7gbrVervQXcsLcwEcabiQVZBuAY/o71Q MW89EIbzbYBERJLsqwujEZGaVSMG1wFJRYmqshFtZey6Y5SsThPPKU53zdP7Vj2Pcw7gJCNU 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_08,2025-05-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 lowpriorityscore=0 clxscore=1015 suspectscore=0 bulkscore=0 malwarescore=0 impostorscore=0 mlxscore=0 adultscore=0 phishscore=0 mlxlogscore=911 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-2505220174 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 17:13:51 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/217135 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 17:13:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 63539 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 2E84FC54F32 for ; Thu, 22 May 2025 17:13:51 +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.29164.1747934023098405546 for ; Thu, 22 May 2025 10:13:43 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@qualcomm.com header.s=qcppdkim1 header.b=bp8DzBrz; 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 54MFTGjF000720 for ; Thu, 22 May 2025 17:13:42 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=bp8DzBrzeRlwt5+3 O5bsMZhW5gsI7fou9CQvOVftf4paaZ6w5xOLNRWuDhDGcLJbat4yrMe66jxR1cd8 HYdDfodHL22KM1eSHfV9BIPpZ2eL1KIZockiTN/nLsIp9Iq3NNC2mSmg4fHZptl3 5daxfcDYy3qSr3c9x9BFziebFwaoCbtd4lxPhHgBuXyJykKEimvEoAVIQo98+CzU +Az8DplSv8gtthvGw5ZULq/8VP/NU6iDqX/xq6Mx9nM/LvY7rnUpLdzc1uC0JYnH wHXcgAtbZfBsCzLulSZ5Khm6k1eS++gIBF3cSXORyjrvim6177Fkka4rNsrzjcoK Op7vUg== 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 46s95tnfb8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 17:13:42 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-7caee990715so2229440485a.3 for ; Thu, 22 May 2025 10:13:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747934021; x=1748538821; 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=icEt202EpxrIso3YoB5qN3h4rMgtSHeKrVEnhe3gRTQdrkHT1ND1t5+7zO8hFIHt5v K4hzNAe//BigOswbV829EcrN6gusor9y8MAY+0b0fdjWRECLcKpAbVHqKgDX/OTglq5C Gm4FHous8g8y7GQpuY9xHtZlBLkoGlKGwNlm9i2f1MFdmpOSziiOlcQ+RvbrlH3SVPgu lGDUAqKTclMDdv6majRCggFA3F9GaU3t33AVUQMxas/kjo7QV/woSus8wdt06MkAdJcS aqDdTP+Jn3HdVW4NA+Z08rcCG7rM0R2czJ2Rs+YMgIPkZypGMnzZ+r+bu59ESO4ewWy1 Xi5Q== X-Gm-Message-State: AOJu0Yw6PK8zhsac3jDk9Tk0Oe43sx1KjZD34cxcz/VAVIRs3wyZC4Bz 3boKndiozBGsmfaLQ+sqfdhTsaAja7/qMgrCrAF/DdXMHUD1Nq4CAswGdxSTiD0suv8IVUNCGXu v8BAarBCdIDmTgBMnFEXHPn63SSaTlsPpxTP6wQmAMxGfG2p0+qGNfziBdNYWa2acysPUtLnPgc hw4ZnEyIQ1MY4+lXE= X-Gm-Gg: ASbGnctM4H6DhTeSJlbpkFkw2yLaTccIDBNR4CXs+BhNiZsY7YVnxgXqXVjf3cae6BG +PmiNaLSaOgNgyWWYWjZg28j3uCloa814GhoZAuUl+AbN2ov3tbUYFkVmDxGOcwiHhXHGR1lRke ekAcIvIOG3qTBTHgDdEbMjMGSNNO6CZegPf05Z6By1gJ28x2/rRpuDat9aWRZ2jx+E3eiW9fjeb hSqsByYf8bVbx4kNVO15UQXNNT9MoqJRjQRuVgSTh3czmTTSH8IXr6/7PhjGFa4rsT0WvsUhHa1 eAXqAZ5EeMMltUkxPJ60L0c3TflrW+TUfFyIBsJLEpeZqJEun0BFq1QXqBXg+wS/bTPt2tA0TFI V8OwHB76skygqR0JFpXREkoOu X-Received: by 2002:a05:620a:2584:b0:7c7:a62f:341b with SMTP id af79cd13be357-7cd46718a72mr4700705785a.8.1747934021047; Thu, 22 May 2025 10:13:41 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEZv1DF1vcuRXRKljn3DaweWoNxNuGCs93lL6QK3SMNBc+VkrX1vyv9kenclmDbFot2e6fjOQ== X-Received: by 2002:a05:620a:2584:b0:7c7:a62f:341b with SMTP id af79cd13be357-7cd46718a72mr4700702985a.8.1747934020710; Thu, 22 May 2025 10:13:40 -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 2adb3069b0e04-550e6f165c7sm3501438e87.32.2025.05.22.10.13.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 10:13:39 -0700 (PDT) From: Dmitry Baryshkov To: openembedded-core@lists.openembedded.org Cc: =?utf-8?b?QsO2c3rDtnJtw6lueWkgWm9sdMOhbg==?= Subject: [PATCH v3 04/11] mesa: fold GL ES 3 packages into GL ES 2 ones Date: Thu, 22 May 2025 20:13:27 +0300 Message-Id: <20250522171334.3040820-4-dmitry.baryshkov@oss.qualcomm.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250522171334.3040820-1-dmitry.baryshkov@oss.qualcomm.com> References: <20250522171334.3040820-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=682f5b46 cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==: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=bTQJ7kPSJx9SKPbeHEYW:22 X-Proofpoint-ORIG-GUID: m6_KFjg0jMC15GJUmAu8RwJEafU4yOPn X-Proofpoint-GUID: m6_KFjg0jMC15GJUmAu8RwJEafU4yOPn X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE3NCBTYWx0ZWRfX0ALRBVN5p2ck j4M4swrPek2t3IleEvExd4ghcaub6DfiErs+3u6acm5yHhnLIaoIdjpaS2PbpHLyyflw59Y2px5 2x9OTOPbtxeQhzyzEm07WtvEf0/zYFb09WxHNgb1qV0cbIjJR8B9koV7KxFjAB2vM+iI9tC4qkR zds3mRzQ2owHLA0evfV9KkDkws+gYHTY92P37bcaVqP0I5+ITixH2mZGG9Zd80nTV9Wm7plaPbA mJ+Bp/rb2/VXvrqqw9IewjXAr5IbYwn1IEM1U4o03YiyVcXwYM/DAMpUsO0r8AkEkztplYfT0M5 gQGzvkRVnJdZ2dQTMx4OQ9cQ10hAa297qaniTy3+treed0IpGyTpqrTmnC4aI05JYw681Jem7Xt ceb+lN17fbr9IzeCSxZ/dRECSNmpeyrMD5Uf3wPkD0bVYBvYdyEThy3yecuSa3lhseDAb5rt 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_08,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=727 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-2505220174 X-MIME-Autoconverted: from 8bit to quoted-printable by mx0a-0031df01.pphosted.com id 54MFTGjF000720 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 17:13:51 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/217136 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 17:13:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 63544 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 2A4DEC54E90 for ; Thu, 22 May 2025 17:14:11 +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.29594.1747934046162129983 for ; Thu, 22 May 2025 10:14:06 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@qualcomm.com header.s=qcppdkim1 header.b=oASGeMcc; 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 54MFTGjM000720 for ; Thu, 22 May 2025 17:14:05 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=oASGeMccwLvTmaDJaBXYvIsR39O cxCJpomDi9YDPnfA3T/nQQZjmSlX/v+6dBMzItpBGX5CQ/Z+94J3SLRTNqUY/WCi wbxMBH29V+kxXKSn0aB6QYU4UC9tipiM/4SIs+fafCNGH1Bc/tTqGN1+LK7L6q9z JvVx0VFPDUfVfcNBps2Drq1AEJcg1+shD5TKQUPQC8QmNrBfKsLxCf6vGJ3Wuvi1 v2S/P4UFD37/9yf7UgLKXDTW3PUuvuwtqPOulyhJBvPzDsyN13VRkMneeZTe8ibQ 77gtTRfbmUWqREjw2r+/C5D7jgY8ieiN4VSUWw1IYSX53hq3J8+zNzcYzHA== Received: from mail-ot1-f69.google.com (mail-ot1-f69.google.com [209.85.210.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 46s95tnfde-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 17:14:05 +0000 (GMT) Received: by mail-ot1-f69.google.com with SMTP id 46e09a7af769-72b9d553722so75561a34.0 for ; Thu, 22 May 2025 10:14:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747934044; x=1748538844; 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=EXGPR+Qsc0W/RWybvuvIUfDPlv3ifC9s7CnQU+nI47a9ez5jLbnCOLJaOGoI82+Gun yWt7qMJsFE4Il+n9wvvkcExi3jpVv3BVIqMC++d2likB471BrULCibY+8c/T6T6J6VlS ePIUiAVkkxv1xd6L8JQ82ysqIz/Bgt4ZxJSmGlFtMoDjcL+G39rgU2y7ttFlQGVkaKpS be5RCVXHTv9P8GVFaq2ZylR7ArXRo0snzXqrlY0tdJ63Rl0FzHk4lyRVC74sd0jpKtqO UaA1Fc8qp01fB17d91ADuBip2js7z8mRqWtGwUctQ+MBQLHh/2dNtakTkDnNsw7hrkN9 hUWg== X-Gm-Message-State: AOJu0YzLB1VRTgxq8KXO+K9GZin0CJJ9uS0AE3HMMTgyuiC1V1VRrHil fn1rGR6pHls7AadMSpnK1MXXZmZtDzw0nNEtKwG1xPEfaur+4XCzauAl30AvMN1ACHYqZG5rR8b wEVMuH/b0ql6YSQQx+qYRce2veSccOfvztcapJ7cX18o1goKWYMebR8wZj9uz4TCkvr6ttIxwxD YM5brlP6Cc/mS4BGQ= X-Gm-Gg: ASbGnctUZduozx4BphHo3iWgDf3IGKswrTp2BBlaP17APSpj8jWczB+dqrVz75qdKrp aeyMzLpn3FRUsQLJ86OkvgjoYk8DZmNWVEFKbZCbCUCyF8gt6i6+4WJE++UW7ux/kgGWWew6FzJ GF2oilw5lNFyxhuz0f1g1Z17xFX/djWll8V8CkA29IeboTYIIfw4KbsVj+pIRmY9D+iLjz7P2si vRD9CqLDuGqXsNEzxoMOg8U8827Vee3s6TMSvmhEz8w7S5BjZUvTGgD+t2dzPbg4nHArNTcac8o n+4/J1TyCcRBihZR0qlN7eId8ViuX4wlo4feqTVNrwDwOkABurKGoEwrZ1+UVavIbT+eV6/bYQc PVa1f2p0Ch+PNoAfa1bKWso0u X-Received: by 2002:a05:6102:18cd:b0:4e0:c6ae:4043 with SMTP id ada2fe7eead31-4e2f07607efmr352954137.6.1747934033740; Thu, 22 May 2025 10:13:53 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGYn4PVrqfxlRKeq26Sqo6+8ecYjWqybfnR3iAbGIGXJdWw0aAXAMQjeDf2+KLmkadFZUG1hQ== X-Received: by 2002:a05:620a:26a3:b0:7c2:f39d:d0e0 with SMTP id af79cd13be357-7cee225016dmr52535585a.3.1747934022430; Thu, 22 May 2025 10:13:42 -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 2adb3069b0e04-550e6f165c7sm3501438e87.32.2025.05.22.10.13.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 10:13:41 -0700 (PDT) From: Dmitry Baryshkov To: openembedded-core@lists.openembedded.org Subject: [PATCH v3 05/11] mesa: drop the libopencl-mesa-dev package Date: Thu, 22 May 2025 20:13:28 +0300 Message-Id: <20250522171334.3040820-5-dmitry.baryshkov@oss.qualcomm.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250522171334.3040820-1-dmitry.baryshkov@oss.qualcomm.com> References: <20250522171334.3040820-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=682f5b5d cx=c_pps a=z9lCQkyTxNhZyzAvolXo/A==:117 a=xqWC_Br6kY4A:10 a=dt9VzEwgFbYA:10 a=EUspDBNiAAAA:8 a=Mg_RanN_8yc205Ew7dQA:9 a=EyFUmsFV_t8cxB2kMr4A:22 X-Proofpoint-ORIG-GUID: hflt19uyjeCnSPn-cxHWLmKflqKycP45 X-Proofpoint-GUID: hflt19uyjeCnSPn-cxHWLmKflqKycP45 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE3NCBTYWx0ZWRfX/YqPaKxwQ9Ta XwA1Wte7ogKu+mkcMesDM3ThLcRyCOnkHREGWdjlLeRq0O54BzDRssPN6V3A094tndQJl1qNqTD bc2UJK8CXSazN4AIuJqVfVTh4LIihUXGe7fJxFkqZ4kWHhj1+czRXzgQofOKilL7z5YEnKX0pIr rQHXuvLfwIe+qWXIjrSyFkgjINWcgQiAsjB/h8W1AZp11bTY+S9A5s8CYa2NSvpyzwoib8dhXCV UYfNAHjTmTQHMxKyRFj3yH1w54Fk/uEDSZgx5XSTst8SS+PwnvUio4Uj4a8Ba7MYHjhZNsZNwM0 R2kYcEuEws9PQ9P1De0N5S1g61XOiVtWpALI4UnRu2OS32FKUCrz5lsL+utSsuRTPwqmJOM6wWh El2P9r67HJNZhkazBNa4cqJLQbJILkSuSKghFFlz2Od05a5QfMdfGLGV9/aCxMUNIVX89meq 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_08,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=774 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-2505220174 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 17:14:11 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/217143 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 17:13:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 63543 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 31365C54ED0 for ; Thu, 22 May 2025 17:14:01 +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.29170.1747934036753185590 for ; Thu, 22 May 2025 10:13:56 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@qualcomm.com header.s=qcppdkim1 header.b=H2CrQGNJ; 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 (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 54MFkNjq020598 for ; Thu, 22 May 2025 17:13:56 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=Iwa3NKQBwKX CciC7+UrcE0b3oKWGzdLSWuq7XgVVq7w=; b=H2CrQGNJuhb2lUBFlzpFvVEPoUD jjIy6jTu2iVN5rZ09qXvIFSO7xxisZZyRycUXV3KhkSBroAoV5/5QeJVEd2R2S/H /rz4Cjq+1/GWJLOL/ebp3lVec5QZrMshUSQdNU+filz5GwSV/ihBzdrsGYa1gEEl LfKuJ9mCdl0fkd8IbuPORwjULg6TNsVQfclqdDX/pII6xuM8JNLXDEFFryuDeUol bBV5ZRnxFiVcMWqCbuvppv+/9yxcs+ti25SzrKAABQvrgVT9B2aOlQQ9ktDiXOu0 ZU3HbURMIx+e1018jUs+JQENspeaJoXbPcQmqVmv/hMkOyuBRElgnA0T1jQ== Received: from mail-ua1-f69.google.com (mail-ua1-f69.google.com [209.85.222.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 46s9pb5h1f-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 17:13:56 +0000 (GMT) Received: by mail-ua1-f69.google.com with SMTP id a1e0cc1a2514c-87bfc9a21bdso61637241.0 for ; Thu, 22 May 2025 10:13:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747934034; x=1748538834; 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=Iwa3NKQBwKXCciC7+UrcE0b3oKWGzdLSWuq7XgVVq7w=; b=Jcin5GzNExgKBQAWiUlNXxSsDsf3psq880nlPduT4S84fhNTUvGHB9/nbhriDKLdPH AFiLfvp3bNTrJjNTV1J0JAA8Q/PN3U9UNAJ/hVxzieHD+pIDPC4Wlar+HhrnGTsT5aI2 td0Kyx2I1oEQAk+Pa+8aNYZxI3iIGAP/UVwirvxX2IFMh0frWIuGqu1aTTmUArfGk2mC UhavsOViGir3+3xGA3fyvPcPCyEJm+IE2dB01g9NVrrghVSi/N91wZBtC5NZ4min22Ml RlX21cdkkRqaQXuhB10t6jmZsPg6OMa5IkaMHJIbdE9DHcXmFV2wHvNOF5dzgkJL6pOd O3/Q== X-Gm-Message-State: AOJu0Ywu10nM1qLjmPVUNaYcDn+1veX8Ah1KFjs7MAbZx0K5foUhM32j lDvvBtZ6qTHo2NWK9B+/buvV71XAO/HTKrP0M/d5BltDP2PA+jMKOLkrpNpppTHIPEQwOtBRHcq IosP+ZnFcniRDDQ74lphsMg11Izl+8Ff+xyIENHMl/N92AaE612Qhr5CLcRqGwHMsn7JTsiAe0I SOkx7hXVkMoer1eAM= X-Gm-Gg: ASbGncvwe4xuKYqbTtwvFly1a9kX/GjV3B8i2501XAUrsJXkVT11EfnoDuBd6fpF2+b BVcxW/jw3fgiak2MLNpcigMhdVZg5sFJL1keHc7t0jkWzRSG28sWAslO21mF51kdLdOk/UsPaTU BFqjL56TZf0E18HQJd3KcEaeVUvbVRLNDd57e+GkXIpq32qEpOAaU+XN/6x7v4veNR4xGgEvPY8 ocuCiGVuFdV3qKrbkpxU02pxuwApSGTEB8OXGnh1veeRD66LSN+AJODBLyvI2SkZftuMaApqH3H n4AY7tOsOIKDO5NF8WNzIp4B8ijc0EHULs0/5bZn+Ybb3CTZkFQp93cd9/a35RceDeGsib0Dj+a 8/EwL2Bsd9gUwthoiulqTEwah X-Received: by 2002:a05:6102:55ca:b0:4df:995c:1c33 with SMTP id ada2fe7eead31-4e2f08e78c5mr288074137.10.1747934034571; Thu, 22 May 2025 10:13:54 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGaTq3UQVQr7KN6WkNkWDEX92wPs5knkleYvawkuqx2KfxjYXmlzBkxhMdDE2fJKtfHg5+hcw== X-Received: by 2002:a05:620a:6089:b0:7c9:574d:a344 with SMTP id af79cd13be357-7cee22ef854mr45157785a.25.1747934023480; Thu, 22 May 2025 10:13:43 -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 2adb3069b0e04-550e6f165c7sm3501438e87.32.2025.05.22.10.13.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 10:13:42 -0700 (PDT) From: Dmitry Baryshkov To: openembedded-core@lists.openembedded.org Subject: [PATCH v3 06/11] mesa: don't add extra tags to the libopencl-mesa package Date: Thu, 22 May 2025 20:13:29 +0300 Message-Id: <20250522171334.3040820-6-dmitry.baryshkov@oss.qualcomm.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250522171334.3040820-1-dmitry.baryshkov@oss.qualcomm.com> References: <20250522171334.3040820-1-dmitry.baryshkov@oss.qualcomm.com> MIME-Version: 1.0 X-Authority-Analysis: v=2.4 cv=WJl/XmsR c=1 sm=1 tr=0 ts=682f5b54 cx=c_pps a=UbhLPJ621ZpgOD2l3yZY1w==:117 a=xqWC_Br6kY4A:10 a=dt9VzEwgFbYA:10 a=EUspDBNiAAAA:8 a=jzjW0sQIQVclgA_JvjMA:9 a=TOPH6uDL9cOC6tEoww4z:22 X-Proofpoint-ORIG-GUID: 6mkYgbBOwr2vx1Lwl6Q6HHBzO8D64PIg X-Proofpoint-GUID: 6mkYgbBOwr2vx1Lwl6Q6HHBzO8D64PIg X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE3NCBTYWx0ZWRfX9O50UrdX3rYj 7s7yhNJN5kxffYWUg1u6uQeAmAKGAUTYuqFRxZKSPVE1HevPrIxGCWH2uBjVBPd/tBCllC5V/ls Au0OIvPlfbTJCid8i6kdZcXRF7Tj+SmnKNJssUcyAvkjJes5b2AlzkBvQBcAyJLl/k5ZC17v1kV +stHVT0H+EiFvdWMZI0SGRMtoOpdZLiYOGsED/qOxov90pvutIp1mS8FreKeknML+nLLe4XMzMJ hajAZJKUzhVUQkg/uPjm49V1i4eZkgCRiA7nP+nlIzH6yXJmJ4ewWObxF3tU4+oCTMJR/PP2LVL shVqnNUcAc9/4kez6RG+zsqVGtTzxA8yfiBr4B0lsHNMRdoj8LujHhbX8v8hUp1mr4hGni8YIow VxwKgFRJAe0urhudPzHjVVVBAtKrmqjGQS4E7qqdbYe26HvlOES77E/ELMzcyrsPSo1EDcxy 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_08,2025-05-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 lowpriorityscore=0 clxscore=1015 suspectscore=0 bulkscore=0 malwarescore=0 impostorscore=0 mlxscore=0 adultscore=0 phishscore=0 mlxlogscore=910 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-2505220174 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 17:14:01 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/217141 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..3d2914a66fbe 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 + "-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 17:13:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 63538 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 21BAEC54EDA for ; Thu, 22 May 2025 17:13:51 +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.29165.1747934026822783609 for ; Thu, 22 May 2025 10:13:46 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@qualcomm.com header.s=qcppdkim1 header.b=m4vGH3J2; 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 (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 54MFTZmx020957 for ; Thu, 22 May 2025 17:13:46 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=KlW02JWfISQ M4la5wAGqEg92q2mkats/s6js+66vY24=; b=m4vGH3J25AVk7jy3Z24rQdGyirR YYKq06CRoiV/Y6qTwPqcfo6DvRRMsWhTQ6F0AQHp3ChHRcjxeUOmNn49nmFogCI+ gLV4bkx7FSRgsDTFKG2narvi8Aj+CQDMl6w7ni3wKbrvdpZrU5MCAPo9A2jDWIbx QZn/RzaTjKoIeXp6CPGyI1XY4m0M9fYqEkIJoszouTDnWXwLbFCvEKeFPAH0h76/ W15czA2sB6FWkUWgRLa2ULwOYZcUK+eBbKOsfLz0pkFnzDCA6bKNPXl4+2Ssgg1+ 3YSpvIamf9FyPOQZ4xTRCqGBcAuMdeQotqeFjCI+9KaYFmZG7egoh8E6AGg== 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 46rwf07b0a-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 17:13:46 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-7c54a6b0c70so740863685a.0 for ; Thu, 22 May 2025 10:13:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747934025; x=1748538825; 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=KlW02JWfISQM4la5wAGqEg92q2mkats/s6js+66vY24=; b=xB6cToNIgR2oTbfMxb+cdggTURXwoL5D4NGCfoyuDran/I6y1enL1t5VjgtXKJ6G8t VtosXmOyAWsQPOTF8i2GtmEx6xrFQokbrB+wwrFjrW3uqZKrBZpw4m6+6FucSUhn4uhQ sNSp3h3QSZ5X4F7nqPcqkCAr/ngPxF1wyKgwPXZHfIIYClznNoAErji7ypsY8Cmg8giF trcRx2wpVx6Ie50g5Q+1AWc4uHSn3e1siuRpnUsZ+VIelCMLunDAoNGZUEijpQMVwyjU LJqJjV92nUyo8PwsnGlLTtWDMkhzX9apiNlpn360c95Tu/9i4mA7kQbjwd9wOIq+fMgp LEVQ== X-Gm-Message-State: AOJu0YzwVMDXuyZzRuE0TJleivyDJ7IywytghzZBUyaFEgnkRT1vi9/5 Mv5RgkLlMbjo/lZLkk6GRV/Rwj6OLis0MUkTP3V5pntsONpo08ISXXqMfxV4elm1fAHIINYlGtd y2trM0ruDi/DuRMeKXcDebtRvSNBnrVpSVDGy7Zed17hWdCqF416reUJpAhepDYKIPA/kW4zta8 WQj9iqH6BvxyYpzKk= X-Gm-Gg: ASbGncuoq8aC1Wawc1KdGzQ7/hLf1hnPal+kjg8E+RYN+8B2sKKQHaT1sEA7qxbhLuH WZghuw+MeOhrbxCL/cBm1kAHW8hv8pVPXhfEnz2h3bsotf4t9flV0yifiuZGYfbilirX80bKBa3 v6Rsf6zGK30mSVaoP6Qas8HAJ+JZEtWqeM1D6XqqgyLz1CKCcYyhnF+eauhPyyQMYV9Rx0Yiv1J 9NZAlUVMNlm3FiD53gHnaoh+2SCqDnIwUi5BKLzeN94Ll1VcvfVkko3H71fWyp8mxzMeKUIYBTz KOUuDMqtXLEBxhqskMEDmIRmn+xVN5mZofCDu5D0udDHmZtpzTEyK6sPu0t2NInGYwD1c4inf1Q Hcqh32798SIwiyoeUx/kww0J0 X-Received: by 2002:a05:620a:394e:b0:7c5:4088:e48c with SMTP id af79cd13be357-7cd46731a86mr3750375385a.29.1747934024865; Thu, 22 May 2025 10:13:44 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFWX8KT2MTW7NleGSRhvTrHn38ZRmdhPRoIwZrcsOVVG85XmXPTSJ/SZb7GPfP0QyWTpJ1jjQ== X-Received: by 2002:a05:620a:394e:b0:7c5:4088:e48c with SMTP id af79cd13be357-7cd46731a86mr3750371985a.29.1747934024485; Thu, 22 May 2025 10:13:44 -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 2adb3069b0e04-550e6f165c7sm3501438e87.32.2025.05.22.10.13.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 10:13:43 -0700 (PDT) From: Dmitry Baryshkov To: openembedded-core@lists.openembedded.org Subject: [PATCH v3 07/11] mesa: drop gallium-pipe support Date: Thu, 22 May 2025 20:13:30 +0300 Message-Id: <20250522171334.3040820-7-dmitry.baryshkov@oss.qualcomm.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250522171334.3040820-1-dmitry.baryshkov@oss.qualcomm.com> References: <20250522171334.3040820-1-dmitry.baryshkov@oss.qualcomm.com> MIME-Version: 1.0 X-Proofpoint-GUID: sxk6TJXa8l_HE-960u7Tp0DVjFWgCjRJ X-Proofpoint-ORIG-GUID: sxk6TJXa8l_HE-960u7Tp0DVjFWgCjRJ X-Authority-Analysis: v=2.4 cv=ZP3XmW7b c=1 sm=1 tr=0 ts=682f5b4a 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-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE3NCBTYWx0ZWRfX83ebF7qBggNo 2gC/1NQ989Yj+tPVJ0pFYuHKwcDGHY5KKc2HPP8ZVkgF7flL7P2Yyt2klI5nr3Ikrrtt9LzvhV6 3SdacxzhW1XL4+8eP1fCmlbS3mU/pji9GO98Mr/zCyqZBvBifCewK5K98ANxQWiek1cTuJFWTSl KkdaHU3TBkeUP/HpT3ZA5+BITW4zAGVSXsofyB1bfjF9NwF6GMPiou9vcueeapro13X3LXhmBSB /VDXArD2xocQGDWq2gOUTGwEItnX2CXdyyBV8bFqk1/NfHQ27olwn5pp/xHngAeuIzn5AePMIXn tdnpu/jPImCH8J5jGmXB4KN316/KWjNdWJSmXixcoZfJfOWynjjyzEGe+tSxzXh9eJhHtBJNmM7 sUdK7FnSQ+/Y9X8accqWJAkEjRSpfw2jTEwr7EW0bNh06QS9QP3020Tk6jBtWLnQPr9O2+5K 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_08,2025-05-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 adultscore=0 mlxlogscore=999 suspectscore=0 bulkscore=0 impostorscore=0 phishscore=0 spamscore=0 mlxscore=0 lowpriorityscore=0 clxscore=1015 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-2505220174 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 17:13:51 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/217137 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 3d2914a66fbe..78747c8e6cf5 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 17:13:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 63542 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 2B117C54E90 for ; Thu, 22 May 2025 17:14:01 +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.29585.1747934039247366705 for ; Thu, 22 May 2025 10:13:59 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@qualcomm.com header.s=qcppdkim1 header.b=FGO4BAct; 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 54MFekcI031754 for ; Thu, 22 May 2025 17:13:59 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=GjRqES3fPZx bWN6eYrVipMMzcx5DHVff2NN2N6Rfp1U=; b=FGO4BActwddB4OeEpvz5D5nle/L XYL+Kghf8t8fKvk/6zEBDn4EtvpL9JmaPX9k8QBQ/wlUPrUk8tvIcOctsATXBzCL 0bwj95wwPJap/2n6gXTxBMom9Xy7mbLv/Mqh2ajQDdYnhLHOwZ3GAlQBfonGrulb o0A1mruEKxcdVxgR+thwe4QtRyuW46jlxKiZzkqGKLOM8Wkr2imcnHA+T+SwS+7A w3xx8aut3gLedvHQL8YzmOsVqoePXUuTid6xmrZ1auR3D/3dh8fvMhQAQOOlGCoX 47kgZiIij6gpopjTaZ0876CmjKzasoX2Kka9oH8cL9hBW0sDiRt6NVTwCQQ== 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 46s8c25sa5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 17:13:58 +0000 (GMT) Received: by mail-qv1-f70.google.com with SMTP id 6a1803df08f44-6f8e7b78eebso72713206d6.2 for ; Thu, 22 May 2025 10:13:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747934037; x=1748538837; 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=GjRqES3fPZxbWN6eYrVipMMzcx5DHVff2NN2N6Rfp1U=; b=PovpbKMzSyEzAxcXmpQ2szryhYoOyLAnkWVVXbQ6I6/HLlAu+Hd8B9dLN2vEk0mrzD HXyNb5qta5rZphsM8PBdQEHC8CQaLtQkmaLLZiwB4Y121ACasblIeuETgq1QgF0ZbgMz JrUEalYQoh7DjvVt8i/4Wf2thCSpb3J9sPLQ/oy/6n3fm51zX1q03IpMmc2fUXrnbxf9 HYp4SvYSJ4oQGn3fLa2m9ObBIyXpImZ+t5zLC0uwbIKI7bkZEdKKkVxVn+xOS7LS8du1 OJypjwuKHVmqfXVX84mLPgfCyciSKh9Sjo1Jw3d/Gsx9IZwMbQXaCKpm3D3i6ZRQ6oyi ssDQ== X-Gm-Message-State: AOJu0YwyS7lLdxpeBSeXoIkdRmZ5fCpz1d1dMDSGVQ4YhLGwOXQLDJMr B7ar8xFXjoWF+Bj0QGdas7FUNsCmp8p/FFjMAs6gCsrgai86tGZoTocU5aFsNXBYLEJQ3uMKytZ EiHnMSCCl9mQe2yy81V73BFwKIfWmZmBQkGN6PMeCKIfTt9rd9KtapXWAItO9tG7jYu+HGeFPrE LghrgUUGp5kUpfuLs= X-Gm-Gg: ASbGncubNFybIQ1eBsh7TJjMN2VEvP9l+pUsYAVKvlbbivHyxmnOy8hzwSI9NHDoNVA zbkiai1tl1j8c8awdGJhhu6jkS0A5Br4h2XYKOjLV6hsMcd/8j5oGaUrxf9hrK25aJf5Jg3DGOa scp5FudFwiy26INuG5apejd3OzVRm4/f1Fe5vXBAq8caEy9kKYLm0eYe7CPCJlrHT4LYc/H7MbI Tr0Ehmz65sunffzfAMiZDILCqha4Ek+6ep5BcjqZFx5Y+YbFQqZ+hBlE6BWH237aTfGItliAHH3 TWcSdXw+wtqccilKilCJe2Gxbh8KpqlpIOFdQkcyUg32xFBOWOiozVP+UjCvgltG4xJkIF3fnqn ibOHO3DkYMlEVSjMudKnnUh6l X-Received: by 2002:ac8:5ccd:0:b0:476:739a:5cf3 with SMTP id d75a77b69052e-494b074d0c6mr451634211cf.1.1747934037036; Thu, 22 May 2025 10:13:57 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFqNZ+9pHu1p3z0IUVlWbTANE+UFgBVQQYFdC2uQAIrmAEWCEW5dACu3Ccpo9Ojli7j3lRUOA== X-Received: by 2002:ad4:5943:0:b0:6f8:d76c:5869 with SMTP id 6a1803df08f44-6f8d76c6114mr254147116d6.0.1747934025677; Thu, 22 May 2025 10:13:45 -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 2adb3069b0e04-550e6f165c7sm3501438e87.32.2025.05.22.10.13.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 10:13:44 -0700 (PDT) From: Dmitry Baryshkov To: openembedded-core@lists.openembedded.org Subject: [PATCH v3 08/11] mesa: don't set RCONFLICTS / PROVIDES if glvnd is enabled Date: Thu, 22 May 2025 20:13:31 +0300 Message-Id: <20250522171334.3040820-8-dmitry.baryshkov@oss.qualcomm.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250522171334.3040820-1-dmitry.baryshkov@oss.qualcomm.com> References: <20250522171334.3040820-1-dmitry.baryshkov@oss.qualcomm.com> MIME-Version: 1.0 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE3NCBTYWx0ZWRfX3F/Xqi1zNgss 2HI+fSiVIk4F5DaEYd9lL4FPBeCsx135AgLqPeggaLL1YZW1jbp6RkOL8DlDAUb1y98yAz7yRnI LmEp6Z9P3j+lL6dsqmgyOZH8/kzVHGQUXqKrV+a2I0l1v+G+UdiID26i4iIHuako4lHmwUfYWx7 xs3SbB9g1hjL/0C1yYshkQjiHkV/PLUagft0KUG8o/SNB5O5MxLIilAIq6O6opVtBNJwv/oQNDV S83Rpj26gn/wXAU9xFM+fyf3SgbVZOIz3cl8puxsd92+Lm0hfIthoMCvAw20Bbgpn175mDjAK7x MiAKAdAxEKcd10FxGlGo1GjJQC+5Cejch81zDD2AUd3fGqW+wLrbkaloMW9oWOt8Ozk5nIsgnpg rIOkDuS7GDUC1UdtVlL3wXSMloAwl9NyN5EWweNjdNRi9bU/gDg/wpSlRJQoQP2ZbQGaAQkU X-Authority-Analysis: v=2.4 cv=RIuzH5i+ c=1 sm=1 tr=0 ts=682f5b56 cx=c_pps a=oc9J++0uMp73DTRD5QyR2A==:117 a=xqWC_Br6kY4A:10 a=dt9VzEwgFbYA:10 a=EUspDBNiAAAA:8 a=3twMZPdHqkYPyOBvze0A:9 a=iYH6xdkBrDN1Jqds4HTS:22 X-Proofpoint-ORIG-GUID: UR11e0tE33jq6dBa9AjmAsfS3TXoHrDm X-Proofpoint-GUID: UR11e0tE33jq6dBa9AjmAsfS3TXoHrDm 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_08,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-2505220174 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 17:14:01 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/217142 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 78747c8e6cf5..4c61447031e3 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 17:13:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 63540 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 14115C54ED0 for ; Thu, 22 May 2025 17:13:51 +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.29167.1747934029580601589 for ; Thu, 22 May 2025 10:13:49 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@qualcomm.com header.s=qcppdkim1 header.b=LnNn9Mdx; 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 54MGjVL8024810 for ; Thu, 22 May 2025 17:13:48 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=stlsmVwydXu gHvLLsuRb0qCzrwWHYOWG7LeZ5vjEoKk=; b=LnNn9MdxX++tv9OeU/2fozum03q cyB4N1I8HTheboi5nMdKEtX3SgM1DdIubaxObJicIgIiNJn02ksefNUBnbRl3I3O LXqio5Olo6M2gfaVP5JkhOjigB7LOwHfZinUlVwtNUaS8Ayxt7KP61pT265Ig9qn KfHctucqFKCyU4DOR02p0/QnutiPn1nH0ltCVLFjhK2pFbUaNy5xCcFe2YuZa/Yu XIPuE7WnEDFRzh0kblfce5Ilzt62hMYeBLF6M+0lZAOmhydXV+FRigUGvpvy79Jg jKQQlS1IxFhyy3yrFy67+gOSuw4OwzkIdPQ2FL3PYwd3rkxx+3Fz1uMyZzw== Received: from mail-oi1-f200.google.com (mail-oi1-f200.google.com [209.85.167.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 46rwf4y242-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 17:13:48 +0000 (GMT) Received: by mail-oi1-f200.google.com with SMTP id 5614622812f47-4049dfd823aso3551359b6e.1 for ; Thu, 22 May 2025 10:13:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747934027; x=1748538827; 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=stlsmVwydXugHvLLsuRb0qCzrwWHYOWG7LeZ5vjEoKk=; b=X8uLNneinXhoQWkR5JTwowPqHbDwTqv3KNLOD+tXi2sZTG5QtbMqFkyiTHj0syFhdW nTnMugekeazeVIcEr4VWmp36Z5dG60HmrkvahW+SFZ0l/s2zJUEu4mrel6vM5ymnw7Hj Ec51s0KDt1hS/SgEIRGWY4fLptzz82zhsXIbYvLWPTBt3gHW92c6+CxtdEjjQ4PVsBBW Tr7OkRKf0lVGFeB/z2ay+2Z30UPwEyvkZu2RuHHb9iE/oGzkBFyAeIbNLhtofdXxal8s JkPLfIE8rbPRlHryOuE+PDligMPeYiBE30PMgAmI9+Z9+tnuKIsknsK1mtHM/ho4LXtS NE+g== X-Gm-Message-State: AOJu0YyE7yRJzAs1regg0dLNWV3kipz1UFInmila5bw/+am74WUlDPx9 R3O3ICJT2/v/8FNBGjzmXN4J5JJ+siRoH6psEvrHVRM1PuGN39pHLQZRD8nXQx5FqA0NxktL8TH 6OWN55tAXbdyBtBz+HOWOo2/TRl12eAk7qt7cbqZrXdnmSSHW9Gi5BZvl7xXqLB9IVLjR/Fwy48 /WKKN1WwMLZvTMs1g= X-Gm-Gg: ASbGnctkthnWVeUR/H+xt3hC0m6PSYibEIDtNSJbdrtH+MJTMHKp/YsNZA8IXegb3Zs XnhpIA+S9MV6yegZESD12PBxbczKi0M7eRH802IPqWyVfbdQJx+tivcIoVEgSc+SeLIQwLsyWih WvOaPZXHUssz3efRKJhq+XvvMdGfYgHo/bvx6Xm/hCEQoJwljPTp2ny+Vu7xyXzHULBsScPxA14 /VFOO3Zyf/LEy/KuAjXbLe7fiuHUBR28WIjaODhfAlmWVwus0Qwyk7t16rul6xCE0HKFQiPCE7X Q0NT82mYgZ3FEZb703yBAkHlScRUFIs8uDwvGo+14kfBh6DsqYriLSFbl1ARmFIEiBz/onzuExt Q31PwptElE9gcP9zoEfncBt1u X-Received: by 2002:a05:6808:1b9a:b0:401:e933:5dd9 with SMTP id 5614622812f47-404d86db192mr20086409b6e.20.1747934027282; Thu, 22 May 2025 10:13:47 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFLCKUlmgXpC/rDEfZYt7hVCFlWn8W2VaO93CYCjRF5UZdf9PRaewpuFEVf9DDYxC0RZdQPvg== X-Received: by 2002:a05:6808:1b9a:b0:401:e933:5dd9 with SMTP id 5614622812f47-404d86db192mr20086375b6e.20.1747934026752; Thu, 22 May 2025 10:13:46 -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 2adb3069b0e04-550e6f165c7sm3501438e87.32.2025.05.22.10.13.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 10:13:46 -0700 (PDT) From: Dmitry Baryshkov To: openembedded-core@lists.openembedded.org Subject: [PATCH v3 09/11] mesa: sort out PROVIDES for the glvnd case Date: Thu, 22 May 2025 20:13:32 +0300 Message-Id: <20250522171334.3040820-9-dmitry.baryshkov@oss.qualcomm.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250522171334.3040820-1-dmitry.baryshkov@oss.qualcomm.com> References: <20250522171334.3040820-1-dmitry.baryshkov@oss.qualcomm.com> MIME-Version: 1.0 X-Proofpoint-GUID: tmY4HntrBL5nfBjRGi06EFET54TCyqJB X-Proofpoint-ORIG-GUID: tmY4HntrBL5nfBjRGi06EFET54TCyqJB X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE3NCBTYWx0ZWRfX3V3nahL6jceb E8KjUPqGT9xlUsiq+SUtWv7PACuSPolCPfnL4xmV1xClM7IBuFYYBbt+xzgF5GPBykVzoAHUdsJ 4IvyMrj8H/yahVNyC8MVtVcE65BYCl7RdIz1jfOapoBv09aeg0vI7ixDri2eq1vyEW4ud2zZyf0 Ki4QUHKHujsgY2DAOaJc01cXUrV7AP6ZQo8veQoFq5CaU2OXx0cPsz5MTMKbNpbmRDFvEdsA4+r RnasMgx1JKPKPchV2Ybwf74Cg5m4UwOuvp7MB7GNwjoK7N6tNmozwScN240tvHZHpFD/2WXhS5V 9xe36d/JASSW1e8CsyBjSkpncy9lP02WuZR8BLCq093jZzHgzEHKxv5JvveS3Ua/cQa5fPb+sDh h+aTmPKo0bCk3TnTw59fbZ4/6AhN27VAIC7u6Fcb/WeiCK3y/tCaXfoXw6TD66OFaD2wFvIw X-Authority-Analysis: v=2.4 cv=R7UDGcRX c=1 sm=1 tr=0 ts=682f5b4c cx=c_pps a=AKZTfHrQPB8q3CcvmcIuDA==:117 a=xqWC_Br6kY4A:10 a=dt9VzEwgFbYA:10 a=EUspDBNiAAAA:8 a=ukfi0iLRH52kbOtYnoMA:9 a=pF_qn-MSjDawc0seGVz6: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_08,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 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-2505220174 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 17:13:51 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/217138 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 4c61447031e3..ab8c22681fe8 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 17:13:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 63536 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 18512C54E90 for ; Thu, 22 May 2025 17:13:51 +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.29579.1747934030367099630 for ; Thu, 22 May 2025 10:13:50 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@qualcomm.com header.s=qcppdkim1 header.b=oZli8eD5; 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 54MG0OCV016599 for ; Thu, 22 May 2025 17:13:49 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=0r6u1FLerGx Q29Bxx5ZKI1NIuavcoPmbQE6aN5udYWc=; b=oZli8eD5DCxF6Ukyys4Lx2s/mHA 4BppIknV6ylwt+ktnZnwv08mPRAxG0bXT6t0q9lrCeNpBdpq5WG4NMBGsCLe1B8r BBgjygTwhpLIw95XYccHHdxyKVzdB65rukKsjqwEzVyFhM/rtK6vr/6+Gj+OAfNM yOeErCLMwk8hbeKl/t99e4q7mD5y1lreEmehW94f4FgS50ILunFRn0Yb6pidCM6b Rjq7mttDlESVGo3q5AjKJqPpEx3fEz0SpXwRwTuiu5RbWmodHJYcdOM6HKRTaCPB KevK+QWMBDqiq0pyzzOc8YTgZ5lgh8+5J81+SI3m0A4Nnm1bhbnV4FrBQAQ== Received: from mail-oi1-f200.google.com (mail-oi1-f200.google.com [209.85.167.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 46rwf9y4da-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 17:13:49 +0000 (GMT) Received: by mail-oi1-f200.google.com with SMTP id 5614622812f47-404d4a4a2fcso3265414b6e.0 for ; Thu, 22 May 2025 10:13:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747934028; x=1748538828; 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=0r6u1FLerGxQ29Bxx5ZKI1NIuavcoPmbQE6aN5udYWc=; b=RSwywUYHjW3Shxp2CgKvS4z0/2aiTWCO0IPNVh8wEFL+BOC0x1Lvm0Xghh1eeIJQBS C4g7HO0IaRx3e8VpFe0JJq5qZ9XAslzYYqDkUTFB/Zd0+aC30DzGhlYx4Jk3DXmn+6h/ CWRhhChxnmpuUBuOKIfI3HlfkliZJTiLuDf8PYhBlFSQZhYhxIzw8GzcLsVkyV8UttXB gHdlQYCgtPmuQFFIv+r3swBVUYAqej2N0bzNg/PR9w/NWt0HksK77h3siroIjfnxW87s bNEW3V+ab9ukF7QI0r8RXkjR1JSgfKZ/VPovIakYR4QGNF4XNBfgbboq+TTSzfPnsgF9 b+9A== X-Gm-Message-State: AOJu0YxRzQvW0IBw/aJKGuAHKiIO8vanw3Jcpyk4AbfKGDsFrYGg8wni tPamz243MEbmw0FuDT0Gj1uQyctbHoQ3DOCwwQ/YDhbiCySpKomVAELk1Nb4drBaBT9HM9OSXko v4Xx2osPX4wrab6BeDcUXhl6R9Q7P7TmP9RMobbxd7XToqb81yWv9E2TANjBxqdfDfpv46jCl3P DIsSPOV7wvNAexNwo= X-Gm-Gg: ASbGncuMCzxIAreR7q+j6U0yXrjOuQBBxynIlDzCk9KQhE8jvFWO0ynAt/v+VqCxYpg eMPpaOitP3us5SqezmeBgEeXXMFEmIgkf7Jr1fzBDhMC0OjVHriwqjHe3DlidtRQlT+Xh9vDpYz SbqnUO55HULzJg+DZZqdmSsYbl4DqJ7IbtENcGiQ/e8EQDk1ysZ0jeBVT0kZL6SEcsYoJYHdfIw Gnb+0+Kdx+zaZ+NTYSdBg7hMJ2Sy1HIMo3m/dxC47a1GQTaNpefFcrQLbedSRdxoYYFQk6Q8oHw 2JTFrZRNXmJ+NsSpGKbksxS4Uk5q/hBS+N1Gr0qIscb2uJrOVR2Oeq927y8yyztWFQE21oZyLpP vg0oNWAYid9U9cyuy+yyhQOiZ X-Received: by 2002:a05:6808:6281:b0:3f8:1df6:400 with SMTP id 5614622812f47-404d8659dc5mr14138570b6e.10.1747934028216; Thu, 22 May 2025 10:13:48 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF5inPUdWBj79qZXUryDupI7B/it9tf3f4ue6QqDm+s+ecrusHK/av1MVad243N2BAVD4Lnkg== X-Received: by 2002:a05:6808:6281:b0:3f8:1df6:400 with SMTP id 5614622812f47-404d8659dc5mr14138553b6e.10.1747934027803; Thu, 22 May 2025 10:13:47 -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 2adb3069b0e04-550e6f165c7sm3501438e87.32.2025.05.22.10.13.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 10:13:47 -0700 (PDT) From: Dmitry Baryshkov To: openembedded-core@lists.openembedded.org Subject: [PATCH v3 10/11] mesa: drop .so files for GLVND ICD libraries Date: Thu, 22 May 2025 20:13:33 +0300 Message-Id: <20250522171334.3040820-10-dmitry.baryshkov@oss.qualcomm.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250522171334.3040820-1-dmitry.baryshkov@oss.qualcomm.com> References: <20250522171334.3040820-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=682f5b4d cx=c_pps a=AKZTfHrQPB8q3CcvmcIuDA==:117 a=xqWC_Br6kY4A:10 a=dt9VzEwgFbYA:10 a=EUspDBNiAAAA:8 a=e0qsWOJ7BfgThjmG3noA:9 a=pF_qn-MSjDawc0seGVz6:22 X-Proofpoint-ORIG-GUID: 8PndnOaJ9fhwpL3LqwmszIvWmqyGgIiy X-Proofpoint-GUID: 8PndnOaJ9fhwpL3LqwmszIvWmqyGgIiy X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE3NCBTYWx0ZWRfXxnXuWByFf8Qx fawsh877DC+2Aab5s/7oV4yz4f06kCc5aJUZPc4Tfuf72PIHtuGcsSWuTmtDcuAl8HzYnGtIKtH l1NOMvvw9TCcsCHKR1icYUScyRH8TRWs7Eqgo/Tx0SUmMjFj2DfIs1FdCpgOwHR3wEe4Rz/gusy 21+CLiCtCJrMUQQbHgDgnOVYbbX4e3h8pbnoUG6CXyMdjIPnTlH9VZ6o+gompydsK5GrQ4fPXtK mdoW54b7NrnhzWcB5uN/b632cSEcTMtaiZ7xRC9UQY9VFrrI+C9iome1A0xHaUP9jygyHAKfEPW ag2iZztbYwkNrEyu3MX1I33e7qn4rfLUBSP2zVxoc657K8x7vt21uPGJCs71nd7u8iUnOfYKEma v8Qg85Zx6+FZEn+D5nIsnReRI22gd0QDmWTHS/5E1MjOOplgsVppFHq2TA4jodas5SqbNzMH 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_08,2025-05-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=893 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-2505220174 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 17:13:51 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/217139 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 ab8c22681fe8..210c7295c05c 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 17:13:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 63541 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 2B055C54E65 for ; Thu, 22 May 2025 17:14:01 +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.29580.1747934031228550130 for ; Thu, 22 May 2025 10:13:51 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@qualcomm.com header.s=qcppdkim1 header.b=Lab5kd/Q; 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 (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 54MGGv59006639 for ; Thu, 22 May 2025 17:13:51 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=WJFcwzSUvCl X9dPqzVSjet4JyBrB8MpumgPoqmRm42k=; b=Lab5kd/QY+noYpxZE2KjKm1joVK WSXU6lkr3cS3LSIoVyN4Xm1p0AoaxKJfqR4F6hDE9WR8hG7s1uxHUWNYlV5nJJ6J h0XzQWVvPKRIONxVUyor8C+vVqlMgWPgnUMAK5DVFmQsaKKffcNlz74vOdH1QnKe BUTZEw/REjy9qnM1GYFb7kjCuHS+X+9Ey/XhyV6wkmhWKxfrMq5a8eI7gpE78qX9 HJk29e7SeNVmUFHiFc9EPhszTbwe+3cm1Kn+jo8UGjC9YctfVeveiHMPzYVAgibb WRwWmEpD2CwtV0eCZHUPdtmzd8Yk1M/6DdMNs1Ie3ipqfRcyvQ/WP4I3cqQ== 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 46rwf0q8tc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 17:13:50 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-7caee990722so57787785a.2 for ; Thu, 22 May 2025 10:13:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747934029; x=1748538829; 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=WJFcwzSUvClX9dPqzVSjet4JyBrB8MpumgPoqmRm42k=; b=KzdeGijKlmB/clDzCVWdCo3aub/ZRiND4RILg9Pe2wPetFUOcDs3gIaA7qChcoxbHR 7IVzm2cHVduJyD4lQbJYUd3apNzFQK6dTSQ86CR9+ZtS3bZ5nQssaP1BhJS1AJjvyurq b/mVauHmRAoze8E4qrNMEmFm9XFfY0z4RE5Hg2K4J4/NrmoGvE4jxDDzq0popFG7lq4r SLmcCEDYxzGSdJ+B2UK4jLSiV0R7fQeBqsngXm/zHc2YIMcfYE9WAHFbWNHcLLWIAMQv qVUztVxwWpa8k0WP1PuH9UzjxTtuHIXSQqZD4f0E1M35BBl8Lw2DXSO5XsqM5E0xcgvU QYjg== X-Gm-Message-State: AOJu0YyVEw0n+AtNJizRhDm7gdyX+nJb7cpFSIkqA4ZsASigK6TjrTiv Ptzsa0WM1MDXpzHc8mz9EG6yJGyQ3RxJCm5/XaQC8J5anBTiHZT0S3jzUZxkUsit/K2KGjylwis hD21aFGvOzmQR1sZWVkcouAjqJ7rVYactue10VEyYM05imFWKzs9JoqaPgaupvr+F7llU42x3b9 Mu+QLEgFOKntD52oo= X-Gm-Gg: ASbGncvLXRbvtimhFwbSzsp/dsmfP66X1VCdznPJDs6feAEUSOlPLpULUYMg3uRO6eW A6qHq6D81yoH4iPUMP39cO+f361EcE1mDG1VzsDmoedFFb8pF2NgSf0SuOKIHLNW6UcZvuZ4tpI gvtH8Ou8Tn/Uy0k0nNDlLsdJQbB1ZsZyyz740ZvDBhh2jhEqmOPbFbd9vDiJ5IzXm9b05HNhysB ICpMUhMmwSq9L0LEgN73nWFPZIfu1isf+D+WM4hukjtC2XAO74rB8af0A4tE2avwgjkYhSgq6Yu mUm3fB332mVJBuWvSKdleJzGXuJWtsrRiHiE/XflHRjKO92PpZ3xL5Lla8IQva8SpdyxcdQuoxu 2G9JOtUMlpIS0/86vCKKApzcw X-Received: by 2002:a05:620a:2454:b0:7c7:c77a:81c with SMTP id af79cd13be357-7cd47fede86mr3549949585a.51.1747934029278; Thu, 22 May 2025 10:13:49 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE2a+MkrTsQvE3xyvUeVLL/kSEZH6AmZGBt8/AUOb88TNbCjMM+bdQ1hC3AozM8sRQVbCww+Q== X-Received: by 2002:a05:620a:2454:b0:7c7:c77a:81c with SMTP id af79cd13be357-7cd47fede86mr3549946585a.51.1747934028839; Thu, 22 May 2025 10:13:48 -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 2adb3069b0e04-550e6f165c7sm3501438e87.32.2025.05.22.10.13.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 10:13:48 -0700 (PDT) From: Dmitry Baryshkov To: openembedded-core@lists.openembedded.org Subject: [PATCH v3 11/11] mesa: move dri_internal header to mesa-dev Date: Thu, 22 May 2025 20:13:34 +0300 Message-Id: <20250522171334.3040820-11-dmitry.baryshkov@oss.qualcomm.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250522171334.3040820-1-dmitry.baryshkov@oss.qualcomm.com> References: <20250522171334.3040820-1-dmitry.baryshkov@oss.qualcomm.com> MIME-Version: 1.0 X-Proofpoint-GUID: Xu3gmdcvSf_foIH3ferN3c_kN6YCKd5a X-Authority-Analysis: v=2.4 cv=J/Sq7BnS c=1 sm=1 tr=0 ts=682f5b4e 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: Xu3gmdcvSf_foIH3ferN3c_kN6YCKd5a X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE3NCBTYWx0ZWRfX2G+deu+XAaw/ /uKSGEoPb5+L/YZ38xTtAVTyDG66Ud6t8dyLVebFrQ6lUxTY0cBTFkwgrpjgziyHgXRoZKdsDfh QFayUdJ+RhkclD2BZp4Qb9tKvk22geBKA+3kWUDVBAPIlDIi+yQU3TYgp4/slXKbB0wU+cb9QpI mIMVv2X+VNcmZjtiVm0B2RbRz9AlvAdAm6vHXYvYsI1ScP0AXnSATiBn/BmipPIWZPMQdYxELt+ Fb799HmBwnXdfEC7Ni8YK1i3N3jsZrxkBR1ihP1xhL1KmAMmewwElvesnauB9SBRaP/22xSW8mR To6uE3K4PfbE66zjaiwp5ICA9BFv8hAsr1kmaboUrQ0yrPqvVtEXFWOOxOsa6Oo7JNWQIbPMOOz UMPanRi14zMJLarDY5K4xGkrO/lFnmyDj0JhqXkVH7KADGiZMUV8z6YU05fw87KxFzef0zLb 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_08,2025-05-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 clxscore=1015 mlxlogscore=972 suspectscore=0 spamscore=0 priorityscore=1501 bulkscore=0 phishscore=0 impostorscore=0 lowpriorityscore=0 malwarescore=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-2505220174 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 17:14:01 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/217140 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 210c7295c05c..2166809bb747 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"