Skip to content

Commit 87cac74

Browse files
authored
Merge pull request #230365 from yurikoles/mesa-25.2
mesa 25.2
2 parents eac4f30 + 5ffed01 commit 87cac74

File tree

1 file changed

+37
-29
lines changed

1 file changed

+37
-29
lines changed

Formula/m/mesa.rb

Lines changed: 37 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ class Mesa < Formula
33

44
desc "Graphics Library"
55
homepage "https://www.mesa3d.org/"
6-
url "https://archive.mesa3d.org/mesa-25.1.7.tar.xz"
7-
sha256 "4afd26a3cc93c3dd27183d4c4845f1ca7d683f6343900b54995809b3271ebed6"
6+
url "https://archive.mesa3d.org/mesa-25.2.0.tar.xz"
7+
sha256 "7c726b21c074d14d31d253d638b741422f3c0a497ce7f1b4aaaa917d10bd8d4f"
88
license all_of: [
99
"MIT",
1010
"Apache-2.0", # include/{EGL,GLES*,vk_video,vulkan}, src/egl/generate/egl.xml, src/mapi/glapi/registry/gl.xml
@@ -23,13 +23,13 @@ class Mesa < Formula
2323
head "https://gitlab.freedesktop.org/mesa/mesa.git", branch: "main"
2424

2525
bottle do
26-
sha256 arm64_sequoia: "d54a994d617db4ddb0bf9765bb54c96d60bb01d5266f6a87f8e9f6ab6f80c249"
27-
sha256 arm64_sonoma: "ba6a2fc75b0fec41a597d4128ac9801ad6deae592f19a482f72b480d8b2f8226"
28-
sha256 arm64_ventura: "98deeccc481530b50a9883b6c5570acff5706189859d3944b54b56956077f8c3"
29-
sha256 sonoma: "688217590eba0699bbca2235c70938b2ff2b234b8810ec7403077eba8532c94c"
30-
sha256 ventura: "4624069368b1fd9ce6bf6b66fcba8f526da046a97ff0deaf70fe48c4403eaf32"
31-
sha256 arm64_linux: "53dcf6d62ab24c4d0c51f7d8647746e58e18a5c27f585623502cfe92d29a71aa"
32-
sha256 x86_64_linux: "e9b12a17d91dcd636c67823f6a503063ff5a7f366a341b80e20aefcbe1cd1498"
26+
sha256 arm64_sequoia: "bffd8abfa86f09df8df4399880aca7f58a2ed473dbf7aa1f582f960c9e78fd70"
27+
sha256 arm64_sonoma: "13bfee4104a8a08cc13adff5550553dc5d296f31f2afa4cddcc11eba7d8e934f"
28+
sha256 arm64_ventura: "d9419cc87981efa6b83d57b75ef6bab8b3ef6b445716645c9f3f2e05f95235bd"
29+
sha256 sonoma: "bf3f0585f07c345f32ac6cd540688240432a6557a25033908130425b1a3d8528"
30+
sha256 ventura: "9486bf2a88793e79d4cbcb7b458da6032bd210ddec452584c73d254b96894715"
31+
sha256 arm64_linux: "627564ca1ea98eb47540eb43038548aa2b344e5c29e14a4e8e85d84d7a430792"
32+
sha256 x86_64_linux: "98abe760e83460e40337490ef88e03744c291c036602f415bbb08ae8a53677fb"
3333
end
3434

3535
depends_on "bindgen" => :build
@@ -70,6 +70,7 @@ class Mesa < Formula
7070
depends_on "gzip" => :build
7171
depends_on "libva" => :build
7272
depends_on "libvdpau" => :build
73+
depends_on "pycparser" => :build
7374
depends_on "valgrind" => :build
7475
depends_on "wayland-protocols" => :build
7576

@@ -81,10 +82,6 @@ class Mesa < Formula
8182
depends_on "lm-sensors"
8283
depends_on "wayland"
8384

84-
on_arm do
85-
depends_on "pycparser" => :build
86-
end
87-
8885
on_intel do
8986
depends_on "cbindgen" => :build
9087
end
@@ -137,47 +134,58 @@ def install
137134

138135
args = %w[
139136
-Db_ndebug=true
137+
-Dgallium-rusticl=true
138+
-Dllvm=enabled
140139
-Dopengl=true
141140
-Dstrip=true
142-
-Dllvm=enabled
143-
144141
-Dvideo-codecs=all
145-
-Dgallium-rusticl=true
146142
]
147143
args += if OS.mac?
148144
%W[
149145
-Dgallium-drivers=llvmpipe,zink
150-
-Dvulkan-drivers=swrast
151-
-Dvulkan-layers=intel-nullhw,overlay,screenshot
152-
-Dtools=etnaviv,glsl,nir,nouveau,imagination,dlclose-skip
153146
-Dmoltenvk-dir=#{Formula["molten-vk"].prefix}
147+
-Dtools=etnaviv,glsl,nir,nouveau,imagination,dlclose-skip
148+
-Dvulkan-drivers=swrast
149+
-Dvulkan-layers=intel-nullhw,overlay,screenshot,vram-report-limit
154150
]
155151
else
156152
%w[
157153
-Degl=enabled
158-
-Dgallium-drivers=auto
159154
-Dgallium-extra-hud=true
160-
-Dgallium-nine=true
161155
-Dgallium-va=enabled
162156
-Dgallium-vdpau=enabled
163-
-Dgallium-xa=enabled
164157
-Dgbm=enabled
165158
-Dgles1=enabled
166159
-Dgles2=enabled
167160
-Dglx=dri
168161
-Dintel-clc=enabled
162+
-Dintel-rt=enabled
169163
-Dlmsensors=enabled
170164
-Dmicrosoft-clc=disabled
171165
-Dplatforms=x11,wayland
172-
-Dshared-glapi=enabled
173-
-Dtools=drm-shim,dlclose-skip,etnaviv,freedreno,glsl,intel,lima,nir,nouveau,asahi,imagination
166+
-Dtools=drm-shim,etnaviv,freedreno,glsl,intel,nir,nouveau,lima,panfrost,asahi,imagination,dlclose-skip
174167
-Dvalgrind=enabled
175-
-Dvulkan-drivers=auto
176-
-Dvulkan-layers=device-select,intel-nullhw,overlay,screenshot
177-
--force-fallback-for=indexmap,paste,pest_generator,roxmltree,syn
168+
-Dvulkan-layers=device-select,intel-nullhw,overlay,screenshot,vram-report-limit
169+
--force-fallback-for=indexmap,paste,pest_generator,roxmltree,rustc-hash,syn
178170
]
179171
end
180172

173+
# Not all supported drivers are being auto-enabled on x86 Linux.
174+
# TODO: Determine the explicit drivers list for ARM Linux.
175+
if OS.linux?
176+
args += if Hardware::CPU.intel?
177+
%w[
178+
-Dgallium-drivers=all
179+
-Dvulkan-drivers=all
180+
]
181+
else
182+
%w[
183+
-Dgallium-drivers=auto
184+
-Dvulkan-drivers=auto
185+
]
186+
end
187+
end
188+
181189
system "meson", "setup", "build", *args, *std_meson_args
182190
system "meson", "compile", "-C", "build", "--verbose"
183191
system "meson", "install", "-C", "build"
@@ -201,8 +209,8 @@ def install
201209

202210
test do
203211
resource "glxgears.c" do
204-
url "https://gitlab.freedesktop.org/mesa/demos/-/raw/8ecad14b04ccb3d4f7084122ff278b5032afd59a/src/xdemos/glxgears.c"
205-
sha256 "cbb5a797cf3d2d8b3fce01cfaf01643d6162ca2b0e97d760cc2e5aec8d707601"
212+
url "https://gitlab.freedesktop.org/mesa/demos/-/raw/a533acd00ed0b6d1beda7df0c68a59a873dba2b3/src/xdemos/glxgears.c"
213+
sha256 "36376674e73fb0657fd56a3738c330b828da6731c934e2b29d75253dc02ad03b"
206214
end
207215

208216
resource "gl_wrap.h" do

0 commit comments

Comments
 (0)