diff mbox series

[v3,3/3] mesa, mesa-tools-native: Use mesa-libclc

Message ID 20260806051437.276400-3-zboszor@gmail.com
State Under Review
Headers show
Series [v3,1/3] mesa: Upgrade to 26.2.0 | expand

Commit Message

Zoltán Böszörményi Aug. 6, 2026, 5:14 a.m. UTC
According to the release notes at
https://lists.freedesktop.org/archives/mesa-dev/2026-August/226690.html

| One important note for packagers is that there is now a Mesa community
| maintained libclc fork that is verified to pass the OpenCL CTS with
| Mesa/Rusticl, and will fix bugs after an upstream libclc major release
| branch goes EoL. The Mesa build system will pick it up when available,
| and fall back to upstream libclc if not. This libclc fork is not
| verified for any other usages or users of libclc outside of Mesa.

Rusticl would complain if about not this libclc fork is used due to
OpenCL CTS compliance.

Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
---
 meta/recipes-graphics/mesa/mesa-tools-native.bb | 2 +-
 meta/recipes-graphics/mesa/mesa.inc             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

Comments

Jose Quaresma Aug. 6, 2026, 9:10 a.m. UTC | #1
On Thu, Aug 6, 2026 at 6:15 AM Zoltan Boszormenyi via lists.openembedded.org
<zboszor=gmail.com@lists.openembedded.org> wrote:

> According to the release notes at
> https://lists.freedesktop.org/archives/mesa-dev/2026-August/226690.html
>
> | One important note for packagers is that there is now a Mesa community
> | maintained libclc fork that is verified to pass the OpenCL CTS with
> | Mesa/Rusticl, and will fix bugs after an upstream libclc major release
> | branch goes EoL. The Mesa build system will pick it up when available,
> | and fall back to upstream libclc if not. This libclc fork is not
> | verified for any other usages or users of libclc outside of Mesa.
>
> Rusticl would complain if about not this libclc fork is used due to
> OpenCL CTS compliance.
>
> Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
> ---
>  meta/recipes-graphics/mesa/mesa-tools-native.bb | 2 +-
>  meta/recipes-graphics/mesa/mesa.inc             | 4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/meta/recipes-graphics/mesa/mesa-tools-native.bb
> b/meta/recipes-graphics/mesa/mesa-tools-native.bb
> index 20207450bf..c495d2e8a8 100644
> --- a/meta/recipes-graphics/mesa/mesa-tools-native.bb
> +++ b/meta/recipes-graphics/mesa/mesa-tools-native.bb
> @@ -11,7 +11,7 @@ PACKAGECONFIG += "gallium-llvm"
>  # to PACKAGECONFIG like in mesa.inc
>  PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'x11 wayland',
> d)}"
>
> -DEPENDS += "libclc-native spirv-tools-native spirv-llvm-translator-native"
> +DEPENDS += "mesa-libclc-native spirv-tools-native
> spirv-llvm-translator-native"
>
>  EXTRA_OEMESON += " \
>      -Dmesa-clc=enabled -Dinstall-mesa-clc=true
> -Dmesa-clc-bundle-headers=enabled \
> diff --git a/meta/recipes-graphics/mesa/mesa.inc
> b/meta/recipes-graphics/mesa/mesa.inc
> index a50b900cf2..fa51d62bfc 100644
> --- a/meta/recipes-graphics/mesa/mesa.inc
> +++ b/meta/recipes-graphics/mesa/mesa.inc
> @@ -109,7 +109,7 @@ PACKAGECONFIG[opengl] = "-Dopengl=true, -Dopengl=false"
>
>  # "opencl" also requires libclc and gallium-llvm to be present in
> PACKAGECONFIG!
>  # Be sure to enable them both for the target and for the native build.
> -PACKAGECONFIG[opencl] = "-Dgallium-rusticl=true
> -Dmesa-clc-bundle-headers=enabled, -Dgallium-rusticl=false,
> bindgen-cli-native clang libclc spirv-tools spirv-llvm-translator"
> +PACKAGECONFIG[opencl] = "-Dgallium-rusticl=true
> -Dmesa-clc-bundle-headers=enabled, -Dgallium-rusticl=false,
> bindgen-cli-native clang mesa-libclc spirv-tools spirv-llvm-translator"
>
>  X11_DEPS = "xorgproto virtual/libx11 libxext libxxf86vm libxdamage
> libxfixes xrandr xorgproto libxshmfence"
>  # "x11" requires "opengl"
> @@ -253,7 +253,7 @@ RPROVIDES:libopencl-mesa += "virtual-opencl-icd"
>  RPROVIDES:libgles2-mesa += "libgles3-mesa"
>  RPROVIDES:libgles2-mesa-dev += "libgles3-mesa-dev"
>
> -RDEPENDS:libopencl-mesa += "${@bb.utils.contains('PACKAGECONFIG',
> 'opencl', 'libclc', '', d)}"
> +RDEPENDS:libopencl-mesa += "${@bb.utils.contains('PACKAGECONFIG',
> 'opencl', 'mesa-libclc', '', d)}"
>

Is it possible to have both versions installed side-by-side on the target?
I'm asking this because there might be a collision between the fork and the
original.

Jose


>
>  PACKAGES =+ "libegl-mesa libegl-mesa-dev \
>               libgallium \
> --
> 2.55.0
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#242898):
> https://lists.openembedded.org/g/openembedded-core/message/242898
> Mute This Topic: https://lists.openembedded.org/mt/120622539/10043485
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
> jose.quaresma@oss.qualcomm.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
diff mbox series

Patch

diff --git a/meta/recipes-graphics/mesa/mesa-tools-native.bb b/meta/recipes-graphics/mesa/mesa-tools-native.bb
index 20207450bf..c495d2e8a8 100644
--- a/meta/recipes-graphics/mesa/mesa-tools-native.bb
+++ b/meta/recipes-graphics/mesa/mesa-tools-native.bb
@@ -11,7 +11,7 @@  PACKAGECONFIG += "gallium-llvm"
 # to PACKAGECONFIG like in mesa.inc
 PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'x11 wayland', d)}"
 
-DEPENDS += "libclc-native spirv-tools-native spirv-llvm-translator-native"
+DEPENDS += "mesa-libclc-native spirv-tools-native spirv-llvm-translator-native"
 
 EXTRA_OEMESON += " \
     -Dmesa-clc=enabled -Dinstall-mesa-clc=true -Dmesa-clc-bundle-headers=enabled \
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index a50b900cf2..fa51d62bfc 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -109,7 +109,7 @@  PACKAGECONFIG[opengl] = "-Dopengl=true, -Dopengl=false"
 
 # "opencl" also requires libclc and gallium-llvm to be present in PACKAGECONFIG!
 # Be sure to enable them both for the target and for the native build.
-PACKAGECONFIG[opencl] = "-Dgallium-rusticl=true -Dmesa-clc-bundle-headers=enabled, -Dgallium-rusticl=false, bindgen-cli-native clang libclc spirv-tools spirv-llvm-translator"
+PACKAGECONFIG[opencl] = "-Dgallium-rusticl=true -Dmesa-clc-bundle-headers=enabled, -Dgallium-rusticl=false, bindgen-cli-native clang mesa-libclc spirv-tools spirv-llvm-translator"
 
 X11_DEPS = "xorgproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes xrandr xorgproto libxshmfence"
 # "x11" requires "opengl"
@@ -253,7 +253,7 @@  RPROVIDES:libopencl-mesa += "virtual-opencl-icd"
 RPROVIDES:libgles2-mesa += "libgles3-mesa"
 RPROVIDES:libgles2-mesa-dev += "libgles3-mesa-dev"
 
-RDEPENDS:libopencl-mesa += "${@bb.utils.contains('PACKAGECONFIG', 'opencl', 'libclc', '', d)}"
+RDEPENDS:libopencl-mesa += "${@bb.utils.contains('PACKAGECONFIG', 'opencl', 'mesa-libclc', '', d)}"
 
 PACKAGES =+ "libegl-mesa libegl-mesa-dev \
              libgallium \