diff --git a/local/recipes/libs/mesa/recipe.toml b/local/recipes/libs/mesa/recipe.toml index d1cb824387..c9912844d6 100644 --- a/local/recipes/libs/mesa/recipe.toml +++ b/local/recipes/libs/mesa/recipe.toml @@ -2,15 +2,15 @@ tar = "https://gitlab.freedesktop.org/mesa/mesa/-/archive/mesa-26.1.4/mesa-mesa-26.1.4.tar.gz" blake3 = "2299cd27430592c9a4a21c6345e74d5df278f4cd5839875ffd75abc3c1e988f9" upstream = "https://gitlab.freedesktop.org/mesa/mesa" -# Patches 01,03,06,07 need manual rebase for 26.1.4 (dry-run: hunk failures). +# Mesa 26.1.4 no longer has a Redox EGL platform file upstream. +# Keep only the patches that still apply cleanly; the Redox platform-specific +# patches must be rebased separately once the modern surfaceless path is +# validated. patches = [ "mesa/01-virgl-redox-disk-cache.patch", "mesa/02-gbm-dumb-prime-export.patch", - "mesa/03-platform-redox-gpu-probe.patch", "mesa/04-sys-ioccom-stub-header.patch", "mesa/05-vk-sync-wchar-include.patch", - "mesa/06-redox-surface-image-fields.patch", - "mesa/07-wayland-scanner-env-override.patch", ] [build] template = "custom" @@ -73,10 +73,11 @@ cookbook_meson \ -Degl=enabled \ -Dgbm=enabled \ -Dglx=disabled \ - -Dgallium-drivers=swrast,virgl,crocus,iris \ + -Dgallium-drivers=softpipe,llvmpipe,virgl,crocus,iris \ -Dllvm=enabled \ -Dosmesa=true \ - -Dplatforms=redox,wayland \ + -Dplatforms=wayland \ + -Degl-native-platform=surfaceless \ -Dshader-cache=disabled \ -Dc_args="['-Wno-error=implicit-function-declaration','-Wno-error','-std=gnu11','-Dstatic_assert=_Static_assert']" \ -Dcpp_args="['-Wno-error=implicit-function-declaration','-Wno-error']" \