diff --git a/recipes/libs/mesa/recipe.toml b/local/recipes/libs/mesa/recipe.toml similarity index 82% rename from recipes/libs/mesa/recipe.toml rename to local/recipes/libs/mesa/recipe.toml index ba2d90ea5a..d1cb824387 100644 --- a/recipes/libs/mesa/recipe.toml +++ b/local/recipes/libs/mesa/recipe.toml @@ -1,16 +1,16 @@ [source] -git = "https://gitlab.redox-os.org/redox-os/mesa.git" +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" -branch = "redox-24.0" -shallow_clone = true +# Patches 01,03,06,07 need manual rebase for 26.1.4 (dry-run: hunk failures). patches = [ - "../../../local/patches/mesa/01-virgl-redox-disk-cache.patch", - "../../../local/patches/mesa/02-gbm-dumb-prime-export.patch", - "../../../local/patches/mesa/03-platform-redox-gpu-probe.patch", - "../../../local/patches/mesa/04-sys-ioccom-stub-header.patch", - "../../../local/patches/mesa/05-vk-sync-wchar-include.patch", - "../../../local/patches/mesa/06-redox-surface-image-fields.patch", - "../../../local/patches/mesa/07-wayland-scanner-env-override.patch", + "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" diff --git a/local/scripts/apply-patches.sh b/local/scripts/apply-patches.sh index a7a4994321..f7a0cb2944 100755 --- a/local/scripts/apply-patches.sh +++ b/local/scripts/apply-patches.sh @@ -183,6 +183,7 @@ symlink "../../local/recipes/libs/zbus" "recipes/libs/zbus" symlink "../../local/recipes/libs/freetype2" "recipes/libs/freetype2" symlink "../../local/recipes/libs/glib" "recipes/libs/glib" symlink "../../local/recipes/libs/libxkbcommon" "recipes/libs/libxkbcommon" +symlink "../../local/recipes/libs/mesa" "recipes/libs/mesa" symlink "../../local/recipes/libs/harfbuzz" "recipes/libs/harfbuzz" symlink "../../local/recipes/libs/pango" "recipes/libs/pango" symlink "../../local/recipes/libs/cairo" "recipes/libs/cairo" diff --git a/recipes/libs/mesa b/recipes/libs/mesa new file mode 120000 index 0000000000..9ab05c6587 --- /dev/null +++ b/recipes/libs/mesa @@ -0,0 +1 @@ +../../local/recipes/libs/mesa \ No newline at end of file