[v2,2/3] mesa: Rename PACKAGECONFIG "opencl" to "clover"

Message ID	20230226050814.929055-3-zboszor@gmail.com
State	New
Headers	show Return-Path: <zboszor@gmail.com> ip: 209.85.208.46, mailfrom: zboszor@gmail.com) From: =?utf-8?b?Wm9sdMOhbiBCw7ZzesO2cm3DqW55aQ==?= <zboszor@gmail.com> To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin <alex.kanavin@gmail.com>, Ross Burton <Ross.Burton@arm.com>, Alexandre Belloni <alexandre.belloni@bootlin.com>, Alex Kiernan <alex.kiernan@gmail.com>, =?utf-8?b?Wm9sdMOhbiBCw7ZzesO2cm0=?= =?utf-8?b?w6lueWk=?= <zboszor@gmail.com> Subject: [PATCH v2 2/3] mesa: Rename PACKAGECONFIG "opencl" to "clover" Date: Sun, 26 Feb 2023 06:08:13 +0100 Message-Id: <20230226050814.929055-3-zboszor@gmail.com> In-Reply-To: <20230226050814.929055-1-zboszor@gmail.com> References: <20230224093850.3393567-1-zboszor@gmail.com> <20230226050814.929055-1-zboszor@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit
Series	Mesa 23.0.0 \| expand [v2,0/3] Mesa 23.0.0 [v2,1/3] mesa, mesa-gl: 23.0.0 [v2,2/3] mesa: Rename PACKAGECONFIG "opencl" to "clover" [v2,3/3] mesa: Add PACKAGECONFIG "rusticl"

Message ID

20230226050814.929055-3-zboszor@gmail.com

State

New

Headers

From: =?utf-8?b?Wm9sdMOhbiBCw7ZzesO2cm3DqW55aQ==?= <zboszor@gmail.com>
To: openembedded-core@lists.openembedded.org
Cc: Alexander Kanavin <alex.kanavin@gmail.com>,
 Ross Burton <Ross.Burton@arm.com>,
 Alexandre Belloni <alexandre.belloni@bootlin.com>,
 Alex Kiernan <alex.kiernan@gmail.com>, =?utf-8?b?Wm9sdMOhbiBCw7ZzesO2cm0=?=
	=?utf-8?b?w6lueWk=?= <zboszor@gmail.com>
Subject: [PATCH v2 2/3] mesa: Rename PACKAGECONFIG "opencl" to "clover"
Date: Sun, 26 Feb 2023 06:08:13 +0100
Message-Id: <20230226050814.929055-3-zboszor@gmail.com>
In-Reply-To: <20230226050814.929055-1-zboszor@gmail.com>
References: <20230224093850.3393567-1-zboszor@gmail.com>
 <20230226050814.929055-1-zboszor@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Series

Mesa 23.0.0 | expand

There is another OpenCL frontend called "rusticl" now. Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com> --- meta/recipes-graphics/mesa/mesa.inc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)

Comments

Alexander Kanavin Feb. 27, 2023, 9:18 a.m. UTC | #1

On Sun, 26 Feb 2023 at 06:08, Zoltán Böszörményi <zboszor@gmail.com> wrote:

> @@ -233,6 +233,8 @@ do_install:append () {
>  # RPROVIDEs/RCONFLICTs on the generic libgl name.
>  python __anonymous() {
>      pkgconfig = (d.getVar('PACKAGECONFIG') or "").split()
> +    if "clover" in pkgconfig:
> +        pkgconfig.append("opencl")
>      suffix = ""
>      if "-native" in d.getVar("PN"):
>          suffix = "-native"

Why? This change needs to be explained in the commit message.

Alex

diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 70f9b6fc17..89e2dc6e90 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -115,9 +115,9 @@  PACKAGECONFIG[gles] = "-Dgles1=enabled -Dgles2=enabled, -Dgles1=disabled -Dgles2
 # "egl" requires "opengl"
 PACKAGECONFIG[egl] = "-Degl=enabled, -Degl=disabled"
 
-# "opencl" requires libclc from meta-clang and spirv-tools from OE-Core
+# "clover" requires libclc from meta-clang and spirv-tools from OE-Core
 OPENCL_NATIVE = "${@bb.utils.contains('PACKAGECONFIG', 'freedreno', '-Dopencl-native=true', '', d)}"
-PACKAGECONFIG[opencl] = "-Dgallium-opencl=icd -Dopencl-spirv=true ${OPENCL_NATIVE},-Dgallium-opencl=disabled -Dopencl-spirv=false,libclc spirv-tools"
+PACKAGECONFIG[clover] = "-Dgallium-opencl=icd -Dopencl-spirv=true ${OPENCL_NATIVE},-Dgallium-opencl=disabled -Dopencl-spirv=false,libclc spirv-tools"
 
 PACKAGECONFIG[broadcom] = ""
 PACKAGECONFIG[etnaviv] = ""
@@ -196,7 +196,7 @@  DEV_PKG_DEPENDENCY = ""
 # development package of libgles3.
 RDEPENDS:libgles3-mesa-dev += "libgles2-mesa-dev"
 
-RDEPENDS:libopencl-mesa += "${@bb.utils.contains('PACKAGECONFIG', 'opencl', 'libclc spirv-tools', '', d)}"
+RDEPENDS:libopencl-mesa += "${@bb.utils.contains('PACKAGECONFIG', 'clover', 'libclc spirv-tools', '', d)}"
 
 PACKAGES =+ "libegl-mesa libegl-mesa-dev \
              libosmesa libosmesa-dev \
@@ -233,6 +233,8 @@  do_install:append () {
 # RPROVIDEs/RCONFLICTs on the generic libgl name.
 python __anonymous() {
     pkgconfig = (d.getVar('PACKAGECONFIG') or "").split()
+    if "clover" in pkgconfig:
+        pkgconfig.append("opencl")
     suffix = ""
     if "-native" in d.getVar("PN"):
         suffix = "-native"

[v2,2/3] mesa: Rename PACKAGECONFIG "opencl" to "clover"

Commit Message

Comments

Patch