-
-
Notifications
You must be signed in to change notification settings - Fork 27
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Mesa v25.0.1 #679
base: main
Are you sure you want to change the base?
Mesa v25.0.1 #679
Conversation
I have some comments about this but I'm on mobile for a bit. I'll come back with proper feedback soon |
m/mesa-clc/stone.yaml
Outdated
- optimize: speed | ||
builddeps : | ||
- cmake(Clang) | ||
- binary(llvm-config32) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
llvm-config32
is for the 32bit llvm package. You probably just want llvm-config
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK, done
m/mesa-clc/stone.yaml
Outdated
license : | ||
- BSD-2-Clause | ||
- MIT | ||
#toolchain : gnu |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like a leftover.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removed.
m/mesa-clc/stone.yaml
Outdated
tuning : | ||
- lto: false | ||
- symbolic: false | ||
- optimize: speed |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Probably not useful, I assume you just copied these from mesa?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removed, worked also without it.
m/mesa-clc/stone.yaml
Outdated
- pkgconfig(SPIRV-Tools) | ||
- pkgconfig(libclc) | ||
- pkgconfig(libdrm) | ||
- pkgconfig32(expat) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
pkgconfig32 is only for when you want to pull in the 32bit version of a library (which pulls in the 64bit one transitively). Since this is not a 32bit build you should just use pkgconfig(expat)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Changed as requested.
m/mesa-clc/stone.yaml
Outdated
# Patch to acctually find LLVM | ||
# %%patch %(pkgdir)/llvm.patch |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remove these lines.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
They are gone now.
m/mesa/stone.yaml
Outdated
-Dintel-clc=system \ | ||
-Dvulkan-drivers=amd,intel,intel_hasvk,swrast,virtio$EXTRA_VK_DRIVERS \ | ||
-Dvulkan-layers=device-select,overlay,screenshot | ||
-Dvulkan-drivers=amd,gfxstream,intel,intel_hasvk,swrast,virtio$EXTRA_VK_DRIVERS \ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As discussed on Matrix remove gfxstream from here and move it to the EXTRA_VK_DRIVERS
section on line 87.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok, adjusted.
m/mesa/stone.yaml
Outdated
-Dvulkan-drivers=amd,intel,intel_hasvk,swrast,virtio$EXTRA_VK_DRIVERS \ | ||
-Dvulkan-layers=device-select,overlay,screenshot | ||
-Dvulkan-drivers=amd,gfxstream,intel,intel_hasvk,swrast,virtio$EXTRA_VK_DRIVERS \ | ||
-Dvulkan-layers=device-select,intel-nullhw,overlay,screenshot,vram-report-limit |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
intel-nullhw
is really only for driver devs and is unnecessary for us.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removed.
# | ||
# SPDX-License-Identifier: MPL-2.0 | ||
# | ||
name : intel-clc |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There's a removals.md
in the project root, can you add intel-clc
and intel-clc-dbginfo
to it with a description of why they're being deprecated?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added to the removals.md
@@ -4,11 +4,11 @@ | |||
# SPDX-License-Identifier: MPL-2.0 | |||
# | |||
name : mesa | |||
version : 24.3.4 | |||
release : 30 | |||
version : 25.0.1 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you add a note here that mesa-clc
should be kept in sync with mesa version-wise?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why not find a way in tooling to allow 64bit split packages for 32bit base packages so all is in one spec?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So you want to make it so that we build mesa in one recipe and cross-compile within the same recipe? It's certainly possible but I suspect that it'll be more annoying to setup than just having a split out mesa-clc package.
- replaced by mesa-clc
Note: if intel-clc was only used for compiling intel drivers in Mesa, that can be dropped.