Skip to content
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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Mesa v25.0.1 #679

wants to merge 3 commits into from

Conversation

philmmanjaro
Copy link
Contributor

  • adds mesa-clc
  • updates mesa to 25.0.1

Note: if intel-clc was only used for compiling intel drivers in Mesa, that can be dropped.

@philmmanjaro philmmanjaro requested a review from a team as a code owner March 6, 2025 15:40
@ReillyBrogan ReillyBrogan self-assigned this Mar 6, 2025
@ReillyBrogan
Copy link
Member

I have some comments about this but I'm on mobile for a bit. I'll come back with proper feedback soon

- optimize: speed
builddeps :
- cmake(Clang)
- binary(llvm-config32)
Copy link
Member

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

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, done

license :
- BSD-2-Clause
- MIT
#toolchain : gnu
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like a leftover.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed.

Comment on lines 19 to 22
tuning :
- lto: false
- symbolic: false
- optimize: speed
Copy link
Member

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?

Copy link
Contributor Author

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.

- pkgconfig(SPIRV-Tools)
- pkgconfig(libclc)
- pkgconfig(libdrm)
- pkgconfig32(expat)
Copy link
Member

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)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed as requested.

Comment on lines 34 to 35
# Patch to acctually find LLVM
# %%patch %(pkgdir)/llvm.patch
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove these lines.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They are gone now.

-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 \
Copy link
Member

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.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, adjusted.

-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
Copy link
Member

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.

Copy link
Contributor Author

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
Copy link
Member

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?

Copy link
Contributor Author

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
Copy link
Member

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?

Copy link
Contributor Author

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?

Copy link
Member

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants