From patchwork Tue May 20 17:45: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: 63326 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 427A8C3DA6D for ; Tue, 20 May 2025 17:45:34 +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.27411.1747763133632501500 for ; Tue, 20 May 2025 10:45:33 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@qualcomm.com header.s=qcppdkim1 header.b=e3is2pfB; 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 54KGjtSc019327 for ; Tue, 20 May 2025 17:45:32 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=MakHxBw5yqAxwv0ZZf03UqzpZ8oa6YUEETQ THYx1fVI=; b=e3is2pfB/HGFT0LVWzl3v49wbUntPC3xI0O1Qe1xSm36698o6Vd sRyhPHDrz1/EGF8O2/yxS8PtYeoeaw4lPWdM+SplOXO0/DE52TEGd9EUaZVAvIu5 15S3DyTnOP/H3wCR01+wuw0ubOvYVuR5royFRybpaUCVpL4gt8O5BdPov47Nr31Q vHIukYa5+d8zZNtFHfuWsSm1Kz6tHsLkZ5JjNxFU4qqUNgB73Zpjn6MfOxkJ82n7 mNDXYGQ5ZBZZJ7lsu2/MaqGuxpbZOxmM/nXnR7IRgu58tYBeYKW1KeTEZ7HI8iaQ mHKTPm0b4uZAXT7djuGiOn2+kZazrvcQ1iw== 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 46rwf6g66y-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 20 May 2025 17:45:32 +0000 (GMT) Received: by mail-qv1-f70.google.com with SMTP id 6a1803df08f44-6f8bdbd9174so143913446d6.0 for ; Tue, 20 May 2025 10:45:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747763131; x=1748367931; 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=MakHxBw5yqAxwv0ZZf03UqzpZ8oa6YUEETQTHYx1fVI=; b=gVDoamq1wQc4RQ3ISbyNUyDI1RKB0+7lzA12RP4r8QiLqUgFsBfDRSDmLgX8wSvVjJ v2dQIpaEDaigM+LTB4iAqxgMbjAcQRKBZgoegFpdPUxf/OTYKnl4p7pfMqZHx4BjD1M3 dpTiBbi63Rl0wYul5mYbLtd4Xoim/9HOt4YJWl+arCgQ4TPVZ/PA4BT84EOwMEPO0wus HYwTBriW8CUVOMD89hP7xtywimt7J1JnNw3hDyPFBAJ4Bqj4BIgYkkqIWgwvgqF/ECEY nMTxXrIFmNlvUvhoSQqdr/rVHG6CKY8Kcpnnn1poOamSYL4ZL3TjToeT20larWkhhW4n mTLg== X-Gm-Message-State: AOJu0Yw0NnMZv0fUH7XgG2Kf+vqhm2TT/yh+sSzVWpxYxbwCzOWEPu+q IWTCKZUvT8jI2DCIg0fQo3d4b3g37Lrx06PeUXQaOmcLgXmhDO37pjYGrOLXBeG012sB3KD1DNT 8CZ5L+dtut0n6c46Y/v/79S5zfj5ftfQ+B1A4D5pnHqvvioBGSByqsSsd6q4PuM6szyCkgfFVCG vtJJyyzt/zgG32GxSRlQ== X-Gm-Gg: ASbGnct+hVb9Io/mUiCR8T1D2+nJleCvbI1n6Qo3P8D6rPfhCMW6rEJ8bqcLnLn6GHK COpID/djnKtuWbW3pcshnzfrZC1exPzuuvGiLyhzJp+7yqQ2y4aTMITK6zjJr8vFMdfhA4pVp+2 quEA9D3Qd4Md52tuQXJqKY7e6Dd/KPyVuwJiKqYwJ0B6w0RCEGjV1T47AMDhPxxrs39VzzyzRtp zd6JICbUZsFrZbZWWJIZBVsGV+gIK40bJsJdV4krfNY6ok86jMQRRIwLoLjlOhmkSwR5pceQajL xs3wHOoBf8iAiuDiqmfce/M155jrGKDqVX44116sJk+v7VdzbyVAIDOJlumhQ49Z4cV+MY57TvR ecrJyEorrsQ+62FyAlvaRgsuq X-Received: by 2002:a05:6214:2a8e:b0:6f8:aebb:71af with SMTP id 6a1803df08f44-6f8b2c31e4emr296798406d6.9.1747763131215; Tue, 20 May 2025 10:45:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFdf8QlXrsQhwX4duHGh16Foe9fR1nvyMMVAOZQzbafeFWT8PcAYkuBJ0N7Pu9BAwWwRyYR0A== X-Received: by 2002:a05:6214:2a8e:b0:6f8:aebb:71af with SMTP id 6a1803df08f44-6f8b2c31e4emr296797996d6.9.1747763130759; Tue, 20 May 2025 10:45:30 -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-550e6f2fcb3sm2437225e87.86.2025.05.20.10.45.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 May 2025 10:45:29 -0700 (PDT) From: Dmitry Baryshkov To: openembedded-core@lists.openembedded.org Subject: [PATCH 1/5] mesa: don't build empty libgles3-mesa in GLVND case Date: Tue, 20 May 2025 20:45:25 +0300 Message-Id: <20250520174529.1173460-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=VL/dn8PX c=1 sm=1 tr=0 ts=682cbfbc cx=c_pps a=oc9J++0uMp73DTRD5QyR2A==:117 a=xqWC_Br6kY4A:10 a=dt9VzEwgFbYA:10 a=EUspDBNiAAAA:8 a=YgZi_eNTi6ztWEiN674A:9 a=iYH6xdkBrDN1Jqds4HTS:22 X-Proofpoint-GUID: wONW8indTVIM900tVMLCz43xrZL63euF X-Proofpoint-ORIG-GUID: wONW8indTVIM900tVMLCz43xrZL63euF X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIwMDE0OCBTYWx0ZWRfX5/ufTfwVffAG bLxF/DGJf1QMI4xqlbEkH9ssUonbfabPh9ZPS5qc07/JanoQ/MKbUSd+MLUTanHzL9Wz8p2XE1f 567nb3XnfdZLb3/eUHEfS2vwzKUKoH7cn23QzqR+IQYkFs4BfEtSnd8ShuKU1Qn17K6kd1R7Re6 H73XDrC8t+fUwSPkrePjm/OaXKuLSxibqBppgTVqTQQQYDz7E5A3jlwBCl7NazVcgOE+YZG6nxf BkThCK+QLC+elHH1DZgcuZ6cxsQVhfRexkIGXYYavFeXRUw7nSBeS3IE6Dqh74OBRy5/Fp8k4VN Yye7DBT92I47dJkWp7kIMYi28k27+3vKK1S8MiXUz1SsUV3UIL2b7e6fdTfD4CW+z8lqR9xLRGi fhfnBKsMDLBAGesZbYeEnJxPECc+jSzGslPMvHGU8HXcVS2JKHCM6X+D8AcK5nMYFSUAqrg9 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-20_08,2025-05-20_03,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 mlxlogscore=803 clxscore=1015 bulkscore=0 spamscore=0 malwarescore=0 suspectscore=0 impostorscore=0 priorityscore=1501 adultscore=0 mlxscore=0 lowpriorityscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000 definitions=main-2505200148 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 ; Tue, 20 May 2025 17:45:34 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/216926 If GLVND is enabled, there is no libgles2-mesa package to depend on libgles3-mesa. Stop building unused empty package in this case. Signed-off-by: Dmitry Baryshkov --- meta/recipes-graphics/mesa/mesa.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 288027bbb996..89ae71595991 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -247,7 +247,7 @@ 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" +ALLOW_EMPTY:libgles3-mesa = "${@bb.utils.contains('PACKAGECONFIG', 'glvnd', '', '1', d)}" RDEPENDS:libopencl-mesa += "${@bb.utils.contains('PACKAGECONFIG', 'opencl', 'libclc spirv-tools spirv-llvm-translator', '', d)}" From patchwork Tue May 20 17:45: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: 63328 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 29C3AC3DA6D for ; Tue, 20 May 2025 17:45:54 +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.27224.1747763146802904543 for ; Tue, 20 May 2025 10:45:46 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@qualcomm.com header.s=qcppdkim1 header.b=AGu+LxMh; 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 54KGeETU007695 for ; Tue, 20 May 2025 17:45: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=lBUpChlxmXZ RgkNGA/HoXqKsbpiQZi4oNKvCV+PxEX4=; b=AGu+LxMhY1ToOvh7DVPtTFnkUN8 0/IMA7ge92dVJEiRcOZSiAbZRjuR2sCUPawC11b9pnidaRu2Ry9fU8FP6yxFYfjm WIsv1Td538pjVRtMTc45oRnDw+9vvx5jtJixOr2ZjYp04nf0ifznfnqFfCeGLTJi Leg0TEBE9raKRky7M8EgSVQBYq7DyFcVfGDAKpYFWTY6npWSEDYuqaglYI/J2eF8 t5M2GzqxZYv5wUjDGRCEPz9AhZ0Fi8LwpbR2rGAuNxrZqhBXFyxvFTNj7FnvAdky NZDQXKjjZe7BXR5WadkHsuJTADzvD1LlZ1i8DtN540kWYKJnQg3DOowMzLQ== 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 46rwf6g67g-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 20 May 2025 17:45:45 +0000 (GMT) Received: by mail-ot1-f69.google.com with SMTP id 46e09a7af769-72bc266dc24so8688128a34.2 for ; Tue, 20 May 2025 10:45:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747763144; x=1748367944; 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=lBUpChlxmXZRgkNGA/HoXqKsbpiQZi4oNKvCV+PxEX4=; b=WJm6YJZPXpQcAVnMrE7VBFrojgaXKYcGGdEGqOjcqI9fjowZCI6K3/5pCvZOOGFpbY hPVpAb9AeEg71Jph+/BqB6hkPgNVu90zdYBUohbLhF4WQVOsM24lruvJhEIVvYf1ldhu y+cT6y+hWCHBuJWZegOZxGQu9njWXvQhKKJi4Ap4881yGdHYIIIhJq8OzI4JRVog1GUY Vauqi+R6qlYEpwaYYHb9J2G1b5ZC8bYa89LziQOXMw11NEVPE/JmMKIci94CQ8uI+m9Z df6DPqxN4RI5Iu0d9O5IOYR33O0xSHiLEGnfsjQs1wH+PvdqXOlDrdYa4a38qeBTEPBZ kxuQ== X-Gm-Message-State: AOJu0YzufIq5n76jeEI/kVOMu3pmMvNDi1lJA8t9LDC4HFGPGRd1xiph tU2eTbLJae9gkvAG+M6k3+ctTdaHrBrE5K/n8l6V4k713TAvCUx2rmhe/6zS4JaaMOKCiDQ0WUc tQeXfaY7UG5UUb+Epj6U7s/kFAG37Abi5RR7ya1aK6JNOhzAs/J1TTW3Syskkna7QfBlxsvqJFl DAjz2pCh8gnQwZ5JNAww== X-Gm-Gg: ASbGncuAwiWmXa0f/YsmSk3cfnV7mPIVPnVVQ771ZbVkrUXzd1X+ElGkDosbdZXRpzK KguqSU4/pkFjP+8VieW5gb66nyAA1iPlDfbG2ITTuyL6NI83C+wpQJzT2bW+OCoznAesO6heAsI m5/Vd8HmexBVvECGkbvW/fYCO2jgHcbVaAGoxM4Hm8TXvihUhrsJi4zZOZtZV7LS7J3wPln57Zp rAZjaMnohavi4OfbMwxPU9tCaG3jyi1MamdTrQ0giJNMArbPa8NfEwHAKY4UaT2iyqnTswtjii7 fTPPbnmGtsS8OBa76NOIdN0akLHuyTBAeVYmlbbilQmIiIbkQ4otOQI2zE0k1ubd85L7Q1i4cP/ sA3SN7VXzR1V5+vbfRAxqL2mD X-Received: by 2002:a05:6830:6105:b0:72a:47ec:12da with SMTP id 46e09a7af769-734f6ae93b1mr12803844a34.10.1747763144649; Tue, 20 May 2025 10:45:44 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH3AWJ9uAeCfw9sar35d33Ek9MAdyx896ipM5BBAfGt/Pzfhale/EDKFdfP05r9NlGFw+T6hw== X-Received: by 2002:a05:6214:1c8a:b0:6f8:997d:fc70 with SMTP id 6a1803df08f44-6f8b088f5efmr279993176d6.27.1747763133101; Tue, 20 May 2025 10:45:33 -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-550e6f2fcb3sm2437225e87.86.2025.05.20.10.45.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 May 2025 10:45:31 -0700 (PDT) From: Dmitry Baryshkov To: openembedded-core@lists.openembedded.org Subject: [PATCH 2/5] mesa: drop the libopencl-mesa-dev package Date: Tue, 20 May 2025 20:45:26 +0300 Message-Id: <20250520174529.1173460-2-dmitry.baryshkov@oss.qualcomm.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250520174529.1173460-1-dmitry.baryshkov@oss.qualcomm.com> References: <20250520174529.1173460-1-dmitry.baryshkov@oss.qualcomm.com> MIME-Version: 1.0 X-Authority-Analysis: v=2.4 cv=VL/dn8PX c=1 sm=1 tr=0 ts=682cbfc9 cx=c_pps a=z9lCQkyTxNhZyzAvolXo/A==:117 a=xqWC_Br6kY4A:10 a=dt9VzEwgFbYA:10 a=EUspDBNiAAAA:8 a=ens0q7-39xlkVPUaklMA:9 a=EyFUmsFV_t8cxB2kMr4A:22 X-Proofpoint-GUID: 4e1BeG8eoFCVPvhxuu2i-3ccv-og6sCw X-Proofpoint-ORIG-GUID: 4e1BeG8eoFCVPvhxuu2i-3ccv-og6sCw X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIwMDE0OCBTYWx0ZWRfX5uklVl1p4pCq 3m02VudLYgP8QI1vT9UAR8SK09ehxFkRTAkp0Im7TFs8BIQjkZlwFdDsL2PKkvtMmswDXhMvCC0 7Yz+3jdlHZwOfkWeVSn9B9fa3DphCuB5KGNEVaD8RY0X2joCjD7d7h11w+SW8u/aPueqRRj1fUl pmbs6pptomj4yfv9wEBGmRejhfk6T5kVXaWn+8Qts/PJL5v2Ij0C/aH0z51sHLnkl3Q9QGpohle YnwWgv5U7tmX2+GgUTwkVex5dDKfex4AoERdIWjs2I5JuFQO31B+yp1UkqUG6Pe2W41zQ8J7R98 o+Jd7kbldtUvkfGgujHM92/baQpjW/BRSEz2pRKsgIzePTO9G15q7SdhNFAUsi7DaLCMFBNd4Fg 3Ho4mVM8agwmXF9q2MAxqJihQouvVcFw+V/fYq93HvVnwnnarlJMrxZx8GMbcp5UJoxto8CX 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-20_08,2025-05-20_03,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 mlxlogscore=774 clxscore=1015 bulkscore=0 spamscore=0 malwarescore=0 suspectscore=0 impostorscore=0 priorityscore=1501 adultscore=0 mlxscore=0 lowpriorityscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000 definitions=main-2505200148 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 ; Tue, 20 May 2025 17:45:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/216928 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 89ae71595991..02e502e58737 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -261,7 +261,7 @@ PACKAGES =+ "libegl-mesa libegl-mesa-dev \ libgles1-mesa libgles1-mesa-dev \ libgles2-mesa libgles2-mesa-dev \ libgles3-mesa libgles3-mesa-dev \ - libopencl-mesa libopencl-mesa-dev \ + libopencl-mesa \ libxatracker libxatracker-dev \ mesa-megadriver mesa-vulkan-drivers \ mesa-vdpau-drivers mesa-tools \ @@ -349,7 +349,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:libosmesa = "${libdir}/libOSMesa.so.*" FILES:libxatracker = "${libdir}/libxatracker.so.*" @@ -363,7 +363,6 @@ FILES:libglapi-dev = "${libdir}/libglapi.*" FILES:libgles1-mesa-dev = "${libdir}/libGLESv1*.* ${includedir}/GLES ${libdir}/pkgconfig/glesv1*.pc" FILES:libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc" FILES:libgles3-mesa-dev = "${includedir}/GLES3" -FILES:libopencl-mesa-dev = "${libdir}/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 \ @@ -375,6 +374,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 Tue May 20 17:45:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 63330 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 2A50DC3ABDD for ; Tue, 20 May 2025 17:46:04 +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.27419.1747763159040456777 for ; Tue, 20 May 2025 10:45:59 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@qualcomm.com header.s=qcppdkim1 header.b=L6vzTZtu; 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 (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 54KGe8su026466 for ; Tue, 20 May 2025 17:45:58 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=H6UrbhzjRnU 3uMFpyoo32DxRdNe3OSatEA2Do1k1S7w=; b=L6vzTZtu8UKhfJuUvPFx7Ltwm1F zqN2LB+gDL7TP2YjlJlLpRHRGeg5KMC8eurzWYUhLOp9LS9zzn1rkqATOZfA200W 2PPqCgT+JBBbhAcNyWaLpjtcvu19fvSskviLNSjzIUG1sj3He/wqgPofnL8AOlFL Kq0AyP6d95lSQlHMm6rbDA3STu6xIvboHv6ncawznJFIn3Hwoo2SWsauJ1caO9OX bdLJn72NEkdags2jnMpJNwzNF4PGAPQ8t0gTrlpgTZZaGNhrgZ1RJQMmY4me1fd8 5344QasrCOzpUjF9056ORxqh/RJRiyGi7rZMDQKZPfr6jLDPLlDNyEsuiPw== Received: from mail-vk1-f197.google.com (mail-vk1-f197.google.com [209.85.221.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 46rwf98619-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 20 May 2025 17:45:58 +0000 (GMT) Received: by mail-vk1-f197.google.com with SMTP id 71dfb90a1353d-5240cd60cdbso4906085e0c.0 for ; Tue, 20 May 2025 10:45:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747763156; x=1748367956; 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=H6UrbhzjRnU3uMFpyoo32DxRdNe3OSatEA2Do1k1S7w=; b=cFhE02H1vH0U9uy5HF04r3QzbDsYSYZTltS30phS5uTIHY9DvillFvKgW1AQDQJrXB jyB8P1Zio2G4315BnB0919PKPnwZFJxJkBOdvfmncwIOGxbmw1WJ0S3ABiP9BE0jLphf vK9Fnp0Ug4gcBzkS1IAFj0u05mQxxzMnETk32x40uy+9oOaVAJ4uWDihYmyCMkgUg6dE CHZ2A6tI/J+pUotJW84kPXnlGM4795D1bwSJ4LLytONBLd4DbwH+H3MR2MzIAy5jssuj 68PD+mRcodCe9lCD16hspS0q2N2PsUAbHX6O2ybTs3BXcPHjLOX2mS8Gg/rlYsp+TrCn 9RUQ== X-Gm-Message-State: AOJu0YyFTgu6I0HzKG6UN7W37lffUdPDpItYXIXVF9WaDWg0mQPlmRDP ZJKrGkXJQ7knArd+SLxRyApouNzaNi+7tcJxkUvRxc28FaTIYhR6P7Ogh7j7yMCaahpv1plO6P2 UNZXhmZe9FskY0w2vql2ldOTLpk1LWxgIFIH2yAMIJoXfKj4CGuIhx9r3XIxhLwf5xQ1mnkFEhv 0+yrLl9o1ZoQsMfPPTnA== X-Gm-Gg: ASbGnctM+mxX3f+OUTZ2SnD1fpUf4L+wwH/Wd51Ybo4pbIXQ7z18S/rmyr8r3lruHvF R+ji9rO7OX7LtQC2SzPhA42vsztsnb0OeUzkYtSJ3SplOW9DnqFjgyV/UHrNKLSZgVHvKLzSVj0 2emg1aE6aShKhBU8oXS5rlRJP7XKccVoS9khu9TgJ4WfUjr/AiGVsFCczigfe9PB2dcLm0LJr7y NgWJOe9oFn5zdDpj91BlK9AjYvEKTdG88YS7g31z1PisVKt5yU7SKJbc7nsdSlkZ6Vab4CwcYHi 0c6ztQQmansEYZ0BAC7vIwkWLwK4KKFsWZ2ChjYKBbYNR1t0KL2uWeInVZqesfd58ZTIEK3qSLU 0Ydig/5sTKz0mGWAjdBkbbUkN X-Received: by 2002:a05:620a:414c:b0:7ce:b7d2:84c4 with SMTP id af79cd13be357-7ceb7d28bd5mr1373955485a.7.1747763145307; Tue, 20 May 2025 10:45:45 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEd/WvYJKvwZzDL1/LDpmHlWiR13tJUU4NLsSec+lehp2QNIhIMG+da/sdgWm4vWvLD2GIsqA== X-Received: by 2002:a05:6214:224b:b0:6f8:e878:e082 with SMTP id 6a1803df08f44-6f8e878e10dmr32056046d6.17.1747763134273; Tue, 20 May 2025 10:45:34 -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-550e6f2fcb3sm2437225e87.86.2025.05.20.10.45.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 May 2025 10:45:33 -0700 (PDT) From: Dmitry Baryshkov To: openembedded-core@lists.openembedded.org Subject: [PATCH 3/5] mesa: don't add extra tags to the libopencl-mesa package Date: Tue, 20 May 2025 20:45:27 +0300 Message-Id: <20250520174529.1173460-3-dmitry.baryshkov@oss.qualcomm.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250520174529.1173460-1-dmitry.baryshkov@oss.qualcomm.com> References: <20250520174529.1173460-1-dmitry.baryshkov@oss.qualcomm.com> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: lhQYwt19IUTY0xQF43VkrrK1ohZi4N8W X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIwMDE0OCBTYWx0ZWRfX8j1dn9ag0JTh 8cJVK/Qkyq3kpt/1yNXiPyXgchFZQOgSfTLK6EJF+rYLyJ4j98ELJ9KbCt+uuRibtnijDHlIlmw rTuPlQwq/ibpPtszoLXufFdvsyGxWhCYH9Pi2Bb2xXob6kFxhaLlbFv3hOOw9+JZq+IPRqVQ2Gl Gs7Sz8UDVkCkMDH7tn7KXcjG0+berjF0smufXfwvLdT9hGiVa9nF2MUdsJyqnEOuImZKu8g1q1L hD/zB3Dm7UK1kHcOGpIT/ifSrxs2F28fB4RjJmN5m3lYPXZc3gV1PyKdWWWgOfvrqsF7CCgxN1b ipsGbyZvks4uPR39i07LpwLn6qummdBgcCwsnuLQUQUAyUF2o1aecpItxGZYWbphVS+cwNmRVKl dR5T2bjh7o/3/KKnYRGuYvbIB2Ky7r+sDZ1mNgAc/vL3s8OrS1neenoYs6cLGPSHcczQ8E3i X-Authority-Analysis: v=2.4 cv=GawXnRXL c=1 sm=1 tr=0 ts=682cbfd6 cx=c_pps a=JIY1xp/sjQ9K5JH4t62bdg==:117 a=xqWC_Br6kY4A:10 a=dt9VzEwgFbYA:10 a=EUspDBNiAAAA:8 a=jzjW0sQIQVclgA_JvjMA:9 a=tNoRWFLymzeba-QzToBc:22 X-Proofpoint-GUID: lhQYwt19IUTY0xQF43VkrrK1ohZi4N8W 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-20_08,2025-05-20_03,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 mlxlogscore=910 lowpriorityscore=0 impostorscore=0 priorityscore=1501 clxscore=1015 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 suspectscore=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-2505200148 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 ; Tue, 20 May 2025 17:46:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/216930 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 02e502e58737..fdebae7977e4 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -278,29 +278,32 @@ 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"), - ("gles", "libgles3",), - ("opencl", "libopencl",)): + ("gles", "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 Tue May 20 17:45: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: 63329 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 2ABF5C54756 for ; Tue, 20 May 2025 17:45:54 +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.27417.1747763148650921702 for ; Tue, 20 May 2025 10:45:48 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@qualcomm.com header.s=qcppdkim1 header.b=PdV/oBxm; 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 54KGiCmD019033 for ; Tue, 20 May 2025 17:45: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=3K551ReRrrx /QmCbjesgc/+wMVNNJFNCeTsI4gY15vc=; b=PdV/oBxmjloh0t18SxJBcZouEKQ AjoEC5//qGXeD12/Yis/8UBUOiokD4SffHcxnM9yoqoP8kAeZiF1GPAQlF2vE2tz +WQ0sMCfNph/o1c+8D85HQxBt2zf0QPNFchBIY5bgR+oEsJYRC0nN1CQD2DFSsjy 5CIJYqHR2/fWCn08PZZkP8tUWitoWgEdHAKZwb6oiwR4ZjEThpeobu5cmKJUpQXA u2plpuvJCRWKS7setRjAc0RXzbJi2/41Ae+49auUNN9Xw0dZ1By+Tr91LmUvqP8S U8fNtXj19rZkOWmXCZ9+9F4Wyq8lvjhUBZtMPkdzH+evBUsLz+/Td39gHjg== Received: from mail-pg1-f198.google.com (mail-pg1-f198.google.com [209.85.215.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 46rwh586e9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 20 May 2025 17:45:47 +0000 (GMT) Received: by mail-pg1-f198.google.com with SMTP id 41be03b00d2f7-6c8f99fef10so6191168a12.3 for ; Tue, 20 May 2025 10:45:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747763147; x=1748367947; 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=3K551ReRrrx/QmCbjesgc/+wMVNNJFNCeTsI4gY15vc=; b=ImYyk6813eMxE4wCSch4g6nRBIeEGgu1J5tO3tRrbfY3ezMI5kM+CkpXuJizzz3oZM boC43zrQ/ekV648Bz5/rG4A6C+ZPIPm/5Huf93V2l/jRHIqy0kBXnkinAy9zJSGMUZ5c q+cAC7dcUK/yIVyng8C8fdSIgPSVtHQLPe38/iG0INP1jxsg/jbAXtQ8P5pRjX17FeSS 9diSzEx0DlUvfi/BDRrKJmZvoFpszqcIEdyEOgmL/th8PeRYSaapulVCJxPjjm5ZzeSj NSKhNAGdJN3mX9nNy2WQ3w8dzJUXMfwJFKvtIfCBxiXYFNWcvrixPEIoYDCZzRM0QFMs 2M1Q== X-Gm-Message-State: AOJu0Yz3mL7o5wKuaxF9ww5tafYPjasFjUKXs9iCcVoW8t7q7kwRj+r9 jvNURdqoxSXovJZ2W5Ve7NTBFA60F4L7nLZiMgJPP/tUR87PWpIivEmHxqJrziIawIm5NAFY+3o piWoDs8909ntPmRfQhQQWDmOBN1jFtGTCdUrae6xYRv6ZLgBCYFrtnjT4kCXGQUzV7AHxbxC3s2 AliCvXmmR083ykbNbpDw== X-Gm-Gg: ASbGnctNj3ya2YutKA+oe4W9zMfGVqfQ9PxXvlxJChxer39awUUVTt5k+vfzgNZ2evB wXE/e36fomFh7sNQFO44/7IohRsFoBlEhE0rTL+p1Dgbq4gxAEP7q3LVQeztdwJ1OY8zssADdjd SR2/euXp6QuUy7O+JrXF/6qi9oJJB3uX5rUSdUUvWM50SgI+0V+kUTuc5Hz5U3JA4gmQolaAfOZ JXqJPjD5icEfOlopjBLop2LvuZkwjiDo+mZehAq13DC6sDyLFzNVAWjZkhCzp7cTw6JipZUnsEC TZBQxTgYefT74PRDGtTNXZZS6nanekvxeHY9kux2MMKKgkON0NKLKz2/I1LUkXdLh92jyDR5lpW U92opxmILqXUyfBYsA24RTlZ4 X-Received: by 2002:a05:6a20:728e:b0:1f5:7df9:f13c with SMTP id adf61e73a8af0-2170ce3aa79mr25270547637.41.1747763146861; Tue, 20 May 2025 10:45:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHjYWb2XPCO8awEmyxf14yOhu+DD7BM3Rk57TX6//UMVk0RhO39Zsx9jhOmC4VvwV23Kd7Vew== X-Received: by 2002:ad4:5ae3:0:b0:6f8:d76c:5885 with SMTP id 6a1803df08f44-6f8d76c5dadmr172095696d6.37.1747763135449; Tue, 20 May 2025 10:45: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-550e6f2fcb3sm2437225e87.86.2025.05.20.10.45.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 May 2025 10:45:34 -0700 (PDT) From: Dmitry Baryshkov To: openembedded-core@lists.openembedded.org Subject: [PATCH 4/5] mesa: don't set RCONFLICTS / PROVIDES if glvnd is enabled Date: Tue, 20 May 2025 20:45:28 +0300 Message-Id: <20250520174529.1173460-4-dmitry.baryshkov@oss.qualcomm.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250520174529.1173460-1-dmitry.baryshkov@oss.qualcomm.com> References: <20250520174529.1173460-1-dmitry.baryshkov@oss.qualcomm.com> MIME-Version: 1.0 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIwMDE0OCBTYWx0ZWRfX2yHj2iRrKmQh f7rXhTNNUaFJSGDz9apcCWVOesqcny1ctviTSin2i6iQygRiq1bg30KN6O4ldnVmde1jnj5I6G0 i0Ypuqepl94laOWQudMEgmuAi/8uFLvd/MyB/eD4o9rUlkes+/qwvvIxYNudeOpaqbzzvRzqwwx FENZBIC6tR3jrxhI82TL+D0iIt3qCl3DTNPX2XzcTxlYwBu+bDQTBZtBUYYN1xWH5i5voh/xfq+ 4ucgjU0uDbrH4kb+VY4v7aEmF6mi7nAad9npg65N0LaYNOAJ9drYcX+xOIVmXiWCgWf1SgaPWeH BCGv0BV5JsMRsM5roeWZ/pWtAyEhgZQ0Qgd45R+5MJDfz3tTT+iCzXcWd7BFp9a8TSufjYFoNMr IufEfsD/TQjOjBWhgEjRAefgJ2KgxbmuhZdwfaA/cLa6K1Gu7NWJAm/UTdRxNBkrdn6zf/rN X-Authority-Analysis: v=2.4 cv=XeWJzJ55 c=1 sm=1 tr=0 ts=682cbfcc cx=c_pps a=Qgeoaf8Lrialg5Z894R3/Q==:117 a=xqWC_Br6kY4A:10 a=dt9VzEwgFbYA:10 a=EUspDBNiAAAA:8 a=FoWhTOj7dWN7FlkGM-EA:9 a=x9snwWr2DeNwDh03kgHS:22 X-Proofpoint-GUID: FpW0l4BJ0MtG2YGONr7cUBad8uNZEye0 X-Proofpoint-ORIG-GUID: FpW0l4BJ0MtG2YGONr7cUBad8uNZEye0 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-20_08,2025-05-20_03,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-2505200148 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 ; Tue, 20 May 2025 17:45:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/216929 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 | 44 ++++++++++++++--------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index fdebae7977e4..53f77b98c898 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -289,28 +289,28 @@ 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"), - ("gles", "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"), + ("gles", "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 Tue May 20 17:45: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: 63327 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 2B21CC3ABDD for ; Tue, 20 May 2025 17:45:44 +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.27414.1747763139643504457 for ; Tue, 20 May 2025 10:45:39 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@qualcomm.com header.s=qcppdkim1 header.b=HwX1kIwI; 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 54KGe0W3000728 for ; Tue, 20 May 2025 17:45: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=/veDyPtBGR1 2hmWz6bhfehHfpVuyRP9U5v4cD2cbHjg=; b=HwX1kIwI3ll+RyNXlpul72tHkok hUdIcntOCM+D0eKhtb7SPTNTwCrEpiXVStdeVLeIHT6bBS4u/hnTDv1ob+1XYLFv 4gYO/T0szdwpQYuBuM9lIKpiVwdSduFpukbP33hyghnKOB4mLCims3bNgb9z2L81 sKt7R4upIolBG40BQni42+dmaoJYk4IyRp9vjDjnVVqRHQ3QHNKMZlhFE22OLJcD 9zxZEJZtmyhb67e++7eB0cnsQH1qk6GYN1Zwrtbf//ZafSbhFJ6gg5XgkZzMrZly ChqG+9XSgtS2oh+sDDAwgzMmOdgXYC/lYskCE9jbpvUxwHQdDKUA7RQcuVQ== Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 46rwf4r5wm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 20 May 2025 17:45:38 +0000 (GMT) Received: by mail-qv1-f69.google.com with SMTP id 6a1803df08f44-6f8ae3c3d80so98537176d6.2 for ; Tue, 20 May 2025 10:45:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747763137; x=1748367937; 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=/veDyPtBGR12hmWz6bhfehHfpVuyRP9U5v4cD2cbHjg=; b=oxgCdkMwax0iuNmWdYLUSBCzAxciSg5FByDMPTD3w6CCDrl5UMUmvvB4xB7f5JsGUU x+EqOCNyn9o3GJGFXQLqdPb93kcfXwFFZGKStq1x/J7CWzhaGz9BdWsKyXT+onwkhARB XzD2EmDoMd6gBre2sNnJmciJKs+qSMABO9z6gfP92+8h8/61hTg2RmN5RG8bvyRRjAFw QAbEGesjB8n201KQkIo7adF8uDTqxaPQqQ/n6HNKgLMxmxAt6PrTnU+lidj3YO9BH+ec g5/YPlS2YS/nupnzio52YTnTTt8PtEb2tqcyMu5b82FwDRNruTi9XObKcM/0C90Uu22O HhVg== X-Gm-Message-State: AOJu0Yxsi32dHRcXV/W7YlFUFlOJx3+TSghnFBXQ9rUOFwrE12RHxH4F 8SK4AyGvSgUqzcqt6mpZ5O8eh9SyOqJNcraqDJV/lIeObQxxcETp7zBrOF9L77KtQzcKD1DWlD6 jDvPVdJAIu6K40AnYRFAWhders+QmPvon7eaZC7lwccqm1yciIbo0eQuvPCzlZ+Lns+DK7ETMPR axCoXSl0HHAQ3ma035Xw== X-Gm-Gg: ASbGncttrsYo4GYqs/5R1rJUd3YobOR6Nn5C/jxeqeFMmjJIveVeT1EX31I9VGxarKv LAHTpTEKAfCNXqP/QMtD8tDkjSMiIhfN5rC98YEIfntSNJKABlQsUmXnKfdtXXQvmJ//CPBP41E k2UQM+fidUy3o147nT5220G6jkSIVtJOPqJ4CVLxxuGUwfv4O37l8L08mhCRSbnL27JfbdmAeNs J9O3ADiCQPq86ouefqrL55dYLYGAxii1Wra64q1Nz3pYIafzTO20G9IAN8Yz5IYYBAg2jxRlRI2 m+3UJ5ZtlAsV9Sf5Y8UUcAZ4eTqtsfu1xhNdKaj7gfV1+/NdpI7iZy1Hq4OzcpcWJLWQ9YBZq8A nfSN01etHAhYb60vI0tMTZZI+ X-Received: by 2002:ad4:576c:0:b0:6e6:61f1:458a with SMTP id 6a1803df08f44-6f8b07f6601mr247615336d6.14.1747763137314; Tue, 20 May 2025 10:45:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGCbOJb7E2Kdi6DU5228Nhs6Kwv0rE18GeaSvRhFxGCyBLnB9jYNrZ0jS1qLydAtJhuzKk2eQ== X-Received: by 2002:ad4:576c:0:b0:6e6:61f1:458a with SMTP id 6a1803df08f44-6f8b07f6601mr247614736d6.14.1747763136707; Tue, 20 May 2025 10:45:36 -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-550e6f2fcb3sm2437225e87.86.2025.05.20.10.45.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 May 2025 10:45:35 -0700 (PDT) From: Dmitry Baryshkov To: openembedded-core@lists.openembedded.org Subject: [PATCH 5/5] mesa: sort out PROVIDES for the glvnd case Date: Tue, 20 May 2025 20:45:29 +0300 Message-Id: <20250520174529.1173460-5-dmitry.baryshkov@oss.qualcomm.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250520174529.1173460-1-dmitry.baryshkov@oss.qualcomm.com> References: <20250520174529.1173460-1-dmitry.baryshkov@oss.qualcomm.com> MIME-Version: 1.0 X-Proofpoint-GUID: JRvE2Ynuu4FyyPy5gwH_Je-rEXTKF4AW X-Proofpoint-ORIG-GUID: JRvE2Ynuu4FyyPy5gwH_Je-rEXTKF4AW X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIwMDE0OCBTYWx0ZWRfX5x1SSSpLoC7N WmM6E6hoVsffl7nbQA4yVQnfkHP3WcH7AxfcDl9QKP2Gnfd+upaGveYl3Ak7PAfkEd4UQlYmbrh udLOY/niERvGWrSnvTZD8nMukpBZuVMkSH9NZaIEFg1wwByJs46YxPvUawUB5Aji2kHSCVNRbAi EFP6SZ1YEATup5nZ/93TGh+RilQx5KLWUUc068HVBKiJdGdhp7mtP4j0p9rC3qA08UIpQoB2jz7 ZrC80+f692DaxAcZz2UFDhiSH6Oe1yQPcs3UU8aYZbOIT5pIxg6EchlBtkqik8dlpYPhTNX23AO untVzWAJJIS6+9zxcm5/va97QYvBZ9Fm7h8Ls9sNxL/2vFnuKekDJwzocZzyE7DIcSKDiuCPyTK GKXVT2QCDQ6S35iOBdUd/I2SBqHothGjTfOasYqozzlrUQwJKHkk8ptKuA48LxOoSdPDNreJ X-Authority-Analysis: v=2.4 cv=R7UDGcRX c=1 sm=1 tr=0 ts=682cbfc2 cx=c_pps a=wEM5vcRIz55oU/E2lInRtA==:117 a=xqWC_Br6kY4A:10 a=dt9VzEwgFbYA:10 a=EUspDBNiAAAA:8 a=IT-0aZdPkTPXSIIZNVoA:9 a=OIgjcC2v60KrkQgK7BGD: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-20_08,2025-05-20_03,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-2505200148 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 ; Tue, 20 May 2025 17:45:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/216927 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 53f77b98c898..dca706efec68 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -39,11 +39,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 \ " @@ -289,7 +291,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"),