Update mesa and drop deps to llvm18

2026-06-17 15:34:18 +08:00 · 2025-12-07 22:04:35 +07:00 · 2025-12-07 22:04:35 +07:00 · 647666a5c6
commit 647666a5c6
parent 941784af9d
45 changed files with 16 additions and 68 deletions
--- a/recipes/demos/gears/recipe.toml
+++ b/recipes/demos/gears/recipe.toml
@ -1,7 +1,6 @@
 [build]
 dependencies=[
    "liborbital",
-    "llvm18",
    "mesa",
    "mesa-glu",
    "zlib",
--- a/recipes/demos/glutin/recipe.toml
+++ b/recipes/demos/glutin/recipe.toml
@ -6,7 +6,6 @@ upstream = "https://github.com/rust-windowing/glutin.git"
 [build]
 template = "custom"
 dependencies = [
-    "llvm18",
    "mesa",
    "zlib"
 ]
--- a/recipes/demos/osdemo/recipe.toml
+++ b/recipes/demos/osdemo/recipe.toml
@ -2,7 +2,6 @@
 template = "custom"
 dependencies = [
    "liborbital",
-    "llvm18",
    "mesa",
    "mesa-glu",
    "zlib"
--- a/recipes/emulators/flycast/recipe.toml
+++ b/recipes/emulators/flycast/recipe.toml
@ -7,7 +7,6 @@ dependencies = [
    "curl",
    "libiconv",
    "liborbital",
-    "llvm18",
    "mesa",
    "nghttp2",
    "openssl1",
--- a/recipes/emulators/mednafen/recipe.toml
+++ b/recipes/emulators/mednafen/recipe.toml
@ -11,7 +11,6 @@ dependencies = [
    #TODO: libflac
    "libiconv",
    "liborbital",
-    "llvm18",
    "mesa",
    "sdl2",
    "zlib",
--- a/recipes/emulators/mupen64plus/recipe.toml
+++ b/recipes/emulators/mupen64plus/recipe.toml
@ -8,7 +8,6 @@ dependencies = [
    "freetype2",
    "liborbital",
    "libpng",
-    "llvm18",
    "mesa",
    "mesa-glu",
    "sdl2",
--- a/recipes/emulators/retroarch/recipe.toml
+++ b/recipes/emulators/retroarch/recipe.toml
@ -6,7 +6,6 @@ template = "custom"
 dependencies = [
    "liborbital",
    "libretro-super",
-    "llvm18",
    "mesa",
    "openssl1",
    "sdl2",
--- a/recipes/games/classicube/recipe.toml
+++ b/recipes/games/classicube/recipe.toml
@ -5,7 +5,6 @@ git = "https://github.com/jackpot51/ClassiCube.git"
 template = "custom"
 dependencies = [
    "liborbital",
-    "llvm18",
    "mesa",
    "sdl2",
    "zlib",
--- a/recipes/games/freeciv/recipe.toml
+++ b/recipes/games/freeciv/recipe.toml
@ -11,7 +11,6 @@ dependencies = [
    "liborbital",
    "libjpeg",
    "libpng",
-    "llvm18",
    "openssl1",
    "mesa",
    "nghttp2",
--- a/recipes/games/hematite/recipe.toml
+++ b/recipes/games/hematite/recipe.toml
@ -6,7 +6,6 @@ upstream = "https://github.com/PistonDevelopers/hematite.git"
 [build]
 template = "custom"
 dependencies = [
-    "llvm18",
    "mesa",
    "zlib"
 ]
--- a/recipes/games/neverball/recipe.toml
+++ b/recipes/games/neverball/recipe.toml
@ -13,7 +13,6 @@ dependencies = [
    "liborbital",
    "libpng",
    "libvorbis",
-    "llvm18",
    "mesa",
    "sdl2",
    "sdl2-ttf",
--- a/recipes/games/openjk/recipe.toml
+++ b/recipes/games/openjk/recipe.toml
@ -8,7 +8,6 @@ dependencies = [
    "libjpeg",
    "liborbital",
    "libpng",
-    "llvm18",
    "mesa",
    "sdl2",
    "zlib",
--- a/recipes/games/opentyrian/recipe.toml
+++ b/recipes/games/opentyrian/recipe.toml
@ -14,7 +14,6 @@ patches = [ "redox.patch" ]
 [build]
 template = "custom"
 dependencies = [
-    "llvm18",
    "liborbital",
    "mesa",
    "sdl2",
--- a/recipes/games/quakespasm/recipe.toml
+++ b/recipes/games/quakespasm/recipe.toml
@ -10,7 +10,6 @@ rev = "cc32abe09ed417ce3be10af300d2dc2f686349ba"
 [build]
 template = "custom"
 dependencies = [
-  "llvm18",
  "libiconv",
  "libogg",
  "liborbital",
--- a/recipes/games/sm64ex/recipe.toml
+++ b/recipes/games/sm64ex/recipe.toml
@ -5,7 +5,6 @@ git = "https://github.com/jackpot51/sm64ex.git"
 template = "custom"
 dependencies = [
    "liborbital",
-    "llvm18",
    "mesa",
    "sdl2",
    "zlib",
--- a/recipes/games/spacecadetpinball/recipe.toml
+++ b/recipes/games/spacecadetpinball/recipe.toml
@ -9,7 +9,6 @@ dependencies = [
    "libogg",
    "liborbital",
    "libvorbis",
-    "llvm18",
    "mesa",
    "sdl2",
    "sdl2-mixer",
--- a/recipes/groups/dev-essential/recipe.toml
+++ b/recipes/groups/dev-essential/recipe.toml
@ -5,7 +5,7 @@ dependencies = [
    "cargo",
    "gcc13",
    "gcc13.cxx",
-    "llvm18",
+    "llvm21",
    "gnu-binutils",
    "gnu-make",
    "gnu-grep",
--- a/recipes/libs/ffmpeg6/recipe.toml
+++ b/recipes/libs/ffmpeg6/recipe.toml
@ -10,7 +10,6 @@ patches = [
 template = "custom"
 dependencies = [
    "liborbital",
-    "llvm18",
    "mesa",
    "sdl2",
    "zlib",
--- a/recipes/libs/mesa-glu/recipe.toml
+++ b/recipes/libs/mesa-glu/recipe.toml
@ -3,7 +3,7 @@ tar = "https://archive.mesa3d.org/glu/glu-9.0.3.tar.xz"
 blake3 = "beed1665ed983540e7502289ec50c7e66d840820af3e9ef21c9c4a7e9686ab9f"

 [build]
-dependencies = ["mesa", "zlib"]
+dependencies = ["mesa"]
 template = "custom"
 script = """
 DYNAMIC_INIT
--- a/recipes/libs/mesa/recipe.toml
+++ b/recipes/libs/mesa/recipe.toml
@ -9,9 +9,12 @@ dependencies = [
    "expat",
    "libdrm",
    "liborbital",
-    "llvm18",
+    "llvm21",
    "zlib",
 ]
+dev-dependencies = [
+    "llvm21.dev",
+]
 script = """
 DYNAMIC_INIT

--- a/recipes/libs/sdl2-gfx/recipe.toml
+++ b/recipes/libs/sdl2-gfx/recipe.toml
@ -10,7 +10,6 @@ dependencies = [
    "freetype2",
    "liborbital",
    "libpng",
-    "llvm18",
    "mesa",
    "sdl2",
    "zlib",
--- a/recipes/libs/sdl2-image/recipe.toml
+++ b/recipes/libs/sdl2-image/recipe.toml
@ -7,7 +7,6 @@ dependencies = [
    "libjpeg",
    "liborbital",
    "libpng",
-    "llvm18",
    "mesa",
    "sdl2",
    "zlib",
--- a/recipes/libs/sdl2-mixer/recipe.toml
+++ b/recipes/libs/sdl2-mixer/recipe.toml
@ -7,7 +7,6 @@ template = "custom"
 dependencies = [
  "sdl2",
  "liborbital",
-  "llvm18",
  "mesa",
  "zlib",
  "libogg",
--- a/recipes/libs/sdl2-ttf/recipe.toml
+++ b/recipes/libs/sdl2-ttf/recipe.toml
@ -13,7 +13,6 @@ dependencies = [
    "libdrm",
    "liborbital",
    "libpng",
-    "llvm18",
    "mesa",
    "sdl2",
    "zlib",
--- a/recipes/libs/sdl2/recipe.toml
+++ b/recipes/libs/sdl2/recipe.toml
@ -6,7 +6,6 @@ git = "https://gitlab.redox-os.org/redox-os/sdl2.git"
 template = "custom"
 dependencies = [
    "liborbital",
-    "llvm18",
    "mesa",
    "zlib",
 ]
--- a/recipes/tools/pathfinder/recipe.toml
+++ b/recipes/tools/pathfinder/recipe.toml
@ -6,7 +6,6 @@ upstream = "https://github.com/servo/pathfinder.git"
 [build]
 template = "custom"
 dependencies = [
-    "llvm18",
    "mesa",
    "zlib",
 ]
--- a/recipes/wip/emulators/game-console/ppsspp/recipe.toml
+++ b/recipes/wip/emulators/game-console/ppsspp/recipe.toml
@ -7,7 +7,6 @@ tar = "https://github.com/hrydgard/ppsspp/releases/download/v1.19.3/ppsspp-1.19.
 template = "custom"
 dependencies = [
    #"liborbital",
-    "llvm18",
    "mesa",
    "mesa-glu",
    "sdl2",
--- a/recipes/wip/emulators/windows/boxedwine/recipe.toml
+++ b/recipes/wip/emulators/windows/boxedwine/recipe.toml
@ -7,7 +7,6 @@ template = "custom"
 dependencies = [
    "curl",
    "liborbital",
-    "llvm18",
    "mesa",
    "mesa-glu",
    "nghttp2",
--- a/recipes/wip/games/other/love/recipe.toml
+++ b/recipes/wip/games/other/love/recipe.toml
@ -15,7 +15,6 @@ dependencies = [
    "libpng",
    "libtheora",
    "libvorbis",
-    "llvm18",
    "luajit",
    "openal",
    "mesa",
--- a/recipes/wip/games/other/shockolate/recipe.toml
+++ b/recipes/wip/games/other/shockolate/recipe.toml
@ -32,5 +32,4 @@ cp -rv "${COOKBOOK_SOURCE}/shaders" "${COOKBOOK_STAGE}/home/user/systemshock/sha
 """
 [package]
 dependencies = [
-    "llvm18",
 ]
--- a/recipes/wip/games/other/vvvvvv/recipe.toml
+++ b/recipes/wip/games/other/vvvvvv/recipe.toml
@ -15,7 +15,6 @@ dependencies = [
    "sdl2-mixer",
    "sdl2",
    "liborbital",
-    "llvm18",
    "mesa",
    "mesa-glu",
    "zlib",
--- a/recipes/wip/games/other/wesnoth/recipe.toml
+++ b/recipes/wip/games/other/wesnoth/recipe.toml
@ -24,7 +24,6 @@ dependencies = [
    "liborbital",
    "libpng",
    "libvorbis",
-    "llvm18",
    "mesa",
    "mesa-glu",
    "pcre",
--- a/recipes/wip/graphics/other/gaffer/recipe.toml
+++ b/recipes/wip/graphics/other/gaffer/recipe.toml
@ -13,7 +13,6 @@ dependencies = [
    "freetype2",
    "glew",
    "imath",
-    "llvm18",
    "lz4",
    "libffi",
    "libjpeg",
--- a/recipes/wip/libs/audio/openal/recipe.toml
+++ b/recipes/wip/libs/audio/openal/recipe.toml
@ -10,7 +10,6 @@ template = "custom"
 dependencies = [
    "liborbital",
    "libsndfile",
-    "llvm18",
    "mesa",
    "sdl2",
    "zlib",
--- a/recipes/wip/libs/mozjs/recipe.toml
+++ b/recipes/wip/libs/mozjs/recipe.toml
@ -29,7 +29,6 @@ dependencies = [
    "libpthread-stubs",
    "fontconfig",
    "expat",
-    "llvm18",
    "gcc13",
 ]

--- a/recipes/wip/libs/other/libepoxy/recipe.toml
+++ b/recipes/wip/libs/other/libepoxy/recipe.toml
@ -13,7 +13,6 @@ dependencies = [
    "libxext",
    "libxfixes",
    "libxxf86vm",
-    "llvm18",
    "mesa-x11",
    "x11proto",
    "zlib",
--- a/recipes/wip/players/tplay/recipe.toml
+++ b/recipes/wip/players/tplay/recipe.toml
@ -5,7 +5,6 @@ git = "https://github.com/maxcurzi/tplay"
 template = "cargo"
 dependencies = [
    "ffmpeg6",
-    "llvm18",
    "openssl1",
    "opencv4",
 ]
--- a/recipes/wip/vm/qemu/recipe.toml
+++ b/recipes/wip/vm/qemu/recipe.toml
@ -14,7 +14,6 @@ dependencies = [
    "liborbital",
    "libpng",
    "libstdcxx",
-    "llvm18",
    "mesa",
    "nghttp2",
    "openssl1",
--- a/recipes/wip/web/servo/recipe.toml
+++ b/recipes/wip/web/servo/recipe.toml
@ -37,6 +37,7 @@ export CLANGFLAGS="-I $PREFIX_INCLUDE/c++/13.2.0 -I $PREFIX_INCLUDE/c++/13.2.0/$

 #Mozjs specifics
 export CARGO_MAKEFLAGS="-j $COOKBOOK_MAKE_JOBS" CCACHE="sccache"
+unset CC_WRAPPER

 PACKAGE_PATH="ports/servoshell" cookbook_cargo

--- a/recipes/wip/x11/keybinder3/recipe.toml
+++ b/recipes/wip/x11/keybinder3/recipe.toml
@ -36,7 +36,6 @@ dependencies = [
    "libxrandr",
    "libxrender",
    "libxxf86vm",
-    "llvm18",
    "mesa-x11",
    "pango",
    "pcre",
--- a/recipes/wip/x11/lxde/libfm-gtk3/recipe.toml
+++ b/recipes/wip/x11/lxde/libfm-gtk3/recipe.toml
@ -39,7 +39,6 @@ dependencies = [
    "libxrandr",
    "libxrender",
    "libxxf86vm",
-    "llvm18",
    "mesa-x11",
    "pango",
    "pcre",
--- a/recipes/wip/x11/lxde/lxpanel/recipe.toml
+++ b/recipes/wip/x11/lxde/lxpanel/recipe.toml
@ -41,7 +41,6 @@ dependencies = [
    "libxrandr",
    "libxrender",
    "libxxf86vm",
-    "llvm18",
    "mesa-x11",
    "pango",
    "pcre",
--- a/recipes/wip/x11/mesa-demos-x11/recipe.toml
+++ b/recipes/wip/x11/mesa-demos-x11/recipe.toml
@ -5,23 +5,12 @@ patches = ["redox.patch"]

 [build]
 dependencies = [
-    "expat",
-    "libpthread-stubs",
-    "libstdcxx",
-    "libx11",
-    "libxau",
-    "libxcb",
-    "libxext",
-    "libxfixes",
-    "libxml2",
-    "libxxf86vm",
-    "llvm18",
-    "mesa-x11",
    "mesa-glu-x11",
-    "x11proto",
-    "xextproto",
-    "zlib",
 ]
+dev-dependencies = [
+    "libstdcxx",
+]
+
 template = "custom"
 script = """
 DYNAMIC_INIT
--- a/recipes/wip/x11/mesa-glu-x11/recipe.toml
+++ b/recipes/wip/x11/mesa-glu-x11/recipe.toml
@ -4,15 +4,7 @@ blake3 = "beed1665ed983540e7502289ec50c7e66d840820af3e9ef21c9c4a7e9686ab9f"

 [build]
 dependencies = [
-    "libpthread-stubs",
-    "libx11",
-    "libxau",
-    "libxcb",
-    "libxext",
-    "libxfixes",
-    "libxxf86vm",
    "mesa-x11",
-    "x11proto",
 ]
 template = "custom"
 script = """
--- a/recipes/wip/x11/mesa-x11/recipe.toml
+++ b/recipes/wip/x11/mesa-x11/recipe.toml
@ -6,19 +6,20 @@ template = "custom"
 dependencies = [
    "expat",
    "libdrm",
-    "libpthread-stubs",
    "libx11",
-    "libxau",
    "libxcb",
    "libxext",
    "libxfixes",
    "libxrandr",
    "libxshmfence",
    "libxxf86vm",
-    "llvm18",
-    "x11proto",
+    "llvm21",
    "zlib",
 ]
+dev-dependencies = [
+    "llvm21.dev"
+]
+
 script = """
 DYNAMIC_INIT
 cookbook_meson \