From cf181971ca00168e4c9f35ad61d2149b5dac81ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20P=C3=B6tzsch?= Date: Fri, 19 Dec 2025 10:08:03 +0100 Subject: [PATCH 1/4] libs::mesa3d: regroup dependencies Group the dev/tgt dependencies for the different options together. This makes it much easier to see what gets pulled in as dependency when a specific option is used. --- recipes/libs/mesa3d.yaml | 42 ++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/recipes/libs/mesa3d.yaml b/recipes/libs/mesa3d.yaml index 1abb693d..b4931b7b 100644 --- a/recipes/libs/mesa3d.yaml +++ b/recipes/libs/mesa3d.yaml @@ -66,6 +66,7 @@ multiPackage: - devel::llvm-libclc-tgt - libs::spirv-tools-tgt - libs::spirv-llvm-translator-tgt + buildTools: [llvm] buildSetup: | if [ -e cross_file.txt ] && ! grep -q llvm-config cross_file.txt ; then @@ -109,11 +110,23 @@ multiPackage: "": depends: + - libs::libunwind-dev + - libs::zlib-dev + - virtual::libs::libdrm-dev + - use: [] + depends: + - libs::libunwind-tgt + - libs::zlib-tgt + - virtual::libs::libdrm-tgt + - if: "$(eq,$MESA3D_PLATFORM,wayland)" depends: - graphics::wayland::wayland-protocols - graphics::wayland::wayland-dev + - use: [] + depends: + - graphics::wayland::wayland-tgt - if: "$(eq,$MESA3D_PLATFORM,x11)" depends: @@ -127,27 +140,7 @@ multiPackage: - libs::xorg::libXt-dev - libs::xorg::libXxf86vm-dev - virtual::core::udev-dev - - - if: "$(match,$MESA3D_GALLIUM_DRIVERS,iris)" - tools: - target-toolchain: host-compat-toolchain - depends: - - name: libs::mesa3d-clc - use: [tools] - - - libs::libunwind-dev - - libs::zlib-dev - - virtual::libs::libdrm-dev - - use: [] - depends: - - libs::libunwind-tgt - - libs::zlib-tgt - - virtual::libs::libdrm-tgt - - - if: "$(eq,$MESA3D_PLATFORM,wayland)" - name: graphics::wayland::wayland-tgt - - - if: "$(eq,$MESA3D_PLATFORM,x11)" + - use: [] depends: - libs::xcb::libxcb-tgt - libs::xorg::libX11-tgt @@ -160,6 +153,13 @@ multiPackage: - libs::xorg::libXxf86vm-tgt - virtual::core::udev-tgt + - if: "$(match,$MESA3D_GALLIUM_DRIVERS,iris)" + tools: + target-toolchain: host-compat-toolchain + depends: + - name: libs::mesa3d-clc + use: [tools] + buildTools: - if: "$(match,$MESA3D_GALLIUM_DRIVERS,iris)" name: mesa_clc From 241fb29b8a73a2158a8f0481422fa912dddab434 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20P=C3=B6tzsch?= Date: Fri, 19 Dec 2025 10:41:54 +0100 Subject: [PATCH 2/4] libs::mesa3d: add llvmpipe support Add support for compiling the llvmpipe sw renderer gallium driver. --- recipes/libs/mesa3d.yaml | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/recipes/libs/mesa3d.yaml b/recipes/libs/mesa3d.yaml index b4931b7b..2fc694e7 100644 --- a/recipes/libs/mesa3d.yaml +++ b/recipes/libs/mesa3d.yaml @@ -11,7 +11,7 @@ Config: type: str # crocus,etnaviv,freedreno,i915,iris,lima,nouveau,panfrost,r300,r600,radeonsi,svga,softpipe,llvmpipe,tegra,v3d,vc4,virgl # this is the maximum we support right now: - default: "crocus,lima,panfrost,svga,nouveau,tegra,v3d,vc4,virgl" + default: "crocus,lima,panfrost,svga,nouveau,llvmpipe,tegra,v3d,vc4,virgl" MESA3D_GLX: help: "Build support for GLX platform. Ignored if building for wayland. Default: auto." type: choice @@ -109,6 +109,9 @@ multiPackage: mesa_clc: "usr/bin" "": + environment: + LLVM_OCAML_BINDINGS: "0" + depends: - libs::libunwind-dev - libs::zlib-dev @@ -119,7 +122,6 @@ multiPackage: - libs::zlib-tgt - virtual::libs::libdrm-tgt - - if: "$(eq,$MESA3D_PLATFORM,wayland)" depends: - graphics::wayland::wayland-protocols @@ -153,6 +155,13 @@ multiPackage: - libs::xorg::libXxf86vm-tgt - virtual::core::udev-tgt + - if: "$(match,$MESA3D_GALLIUM_DRIVERS,llvmpipe)" + depends: + - devel::llvm-libs-dev + - use: [] + depends: + - devel::llvm-libs-tgt + - if: "$(match,$MESA3D_GALLIUM_DRIVERS,iris)" tools: target-toolchain: host-compat-toolchain @@ -160,6 +169,13 @@ multiPackage: - name: libs::mesa3d-clc use: [tools] + buildSetup: | + if [[ ${BOB_DEP_PATHS['devel::llvm-libs-dev']:+set} && -e cross_file.txt ]] && + ! grep -q llvm-config cross_file.txt ; then + sed -i \ + "/\[binaries\]/a llvm-config = '${BOB_DEP_PATHS['devel::llvm-libs-dev']}\/usr\/bin\/llvm-config'" \ + cross_file.txt + fi buildTools: - if: "$(match,$MESA3D_GALLIUM_DRIVERS,iris)" name: mesa_clc @@ -181,7 +197,7 @@ multiPackage: -Dgles2=enabled \ -Dglx-read-only-text=$([[ $MESA3D_GLX_READ_ONLY_TEXT -ne 0 ]] && echo true || echo false) \ -Dvalgrind=disabled \ - -Dllvm=disabled \ + -Dllvm=$([[ "$MESA3D_GALLIUM_DRIVERS" =~ "llvmpipe" ]] && echo 'enabled' || echo 'disabled') \ -Dintel-clc=system \ ${BOB_TOOL_PATHS[mesa_clc]+-Dmesa-clc=system} \ -Dosmesa=false From f14193b20837227471ffd3350aac8b619f713d70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20P=C3=B6tzsch?= Date: Fri, 19 Dec 2025 11:00:32 +0100 Subject: [PATCH 3/4] graphics::wayland::wayland-protocols: bump to v1.47 --- recipes/graphics/wayland/wayland-protocols.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/graphics/wayland/wayland-protocols.yaml b/recipes/graphics/wayland/wayland-protocols.yaml index ac24c52f..6b93c7b6 100644 --- a/recipes/graphics/wayland/wayland-protocols.yaml +++ b/recipes/graphics/wayland/wayland-protocols.yaml @@ -1,14 +1,14 @@ inherit: [meson, wayland-scanner] metaEnvironment: - PKG_VERSION: "1.38" + PKG_VERSION: "1.47" PKG_LICENSE: "MIT" checkoutSCM: scm: url url: "https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/\ ${PKG_VERSION}/downloads/wayland-protocols-${PKG_VERSION}.tar.xz" - digestSHA1: 3fbb7095a8a33e8465351c25ff1fc01bedeafacd + digestSHA1: cc3915eb646e607abc82242e84652e4a548832d0 stripComponents: 1 buildScript: | From 73f95816b2cb598a6c99a6473d6f6023e04b083c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20P=C3=B6tzsch?= Date: Fri, 19 Dec 2025 11:02:05 +0100 Subject: [PATCH 4/4] graphics::wayland::wayland: bump to v1.24.0 --- recipes/graphics/wayland/wayland.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/graphics/wayland/wayland.yaml b/recipes/graphics/wayland/wayland.yaml index 16cd8fde..23180331 100644 --- a/recipes/graphics/wayland/wayland.yaml +++ b/recipes/graphics/wayland/wayland.yaml @@ -1,7 +1,7 @@ inherit: [meson] metaEnvironment: - PKG_VERSION: "1.23.0" + PKG_VERSION: "1.24.0" PKG_LICENSE: "MIT" depends: @@ -18,7 +18,7 @@ depends: checkoutSCM: scm: url url: https://gitlab.freedesktop.org/wayland/wayland/-/archive/${PKG_VERSION}/wayland-${PKG_VERSION}.tar.bz2 - digestSHA1: 118c3a94f1f4a20e488a1451cdc1dd3f8ec8696e + digestSHA1: b2e4f077a60c07bfaa7b241bcdeecea6bfa85c78 stripComponents: 1 multiPackage: