-
Notifications
You must be signed in to change notification settings - Fork 3.2k
meson: support both pkg-config files installed by SPIRV-Cross #16778
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
Open
jeeb
wants to merge
1
commit into
mpv-player:master
Choose a base branch
from
jeeb:handle_both_spirv_cross_pc_files
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This is dumb, yes. One does not handle shared vs static like this, but alas upstream has been doing this since 2023¹. Until now I've been doing symlinks to work around this, but I keep forgetting it. [1]: KhronosGroup/SPIRV-Cross@bb0c17f
0350198 to
8b238a1
Compare
|
Download the artifacts for this pull request: Windows |
kasper93
reviewed
Sep 13, 2025
Comment on lines
+998
to
+1017
| spirv_cross_preferred_check_failed = false | ||
|
|
||
| if prefer_static | ||
| spirv_cross_deps = ['spirv-cross-c'] + spirv_cross_deps | ||
| else | ||
| spirv_cross_deps += ['spirv-cross-c'] | ||
| endif | ||
|
|
||
| foreach spirv_dep : spirv_cross_deps | ||
| spirv_cross = dependency( | ||
| spirv_dep, | ||
| required: spirv_cross_required and spirv_cross_preferred_check_failed | ||
| ) | ||
| if not spirv_cross.found() | ||
| spirv_cross_preferred_check_failed = true | ||
| continue | ||
| endif | ||
|
|
||
| break | ||
| endforeach |
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.
Would this work for you?
Suggested change
| spirv_cross_preferred_check_failed = false | |
| if prefer_static | |
| spirv_cross_deps = ['spirv-cross-c'] + spirv_cross_deps | |
| else | |
| spirv_cross_deps += ['spirv-cross-c'] | |
| endif | |
| foreach spirv_dep : spirv_cross_deps | |
| spirv_cross = dependency( | |
| spirv_dep, | |
| required: spirv_cross_required and spirv_cross_preferred_check_failed | |
| ) | |
| if not spirv_cross.found() | |
| spirv_cross_preferred_check_failed = true | |
| continue | |
| endif | |
| break | |
| endforeach | |
| foreach arg : [[prefer_static, false], [not prefer_static, spirv_cross_required]] | |
| spirv_cross = dependency(arg[0] ? 'spirv-cross-c' : 'spirv-cross-c-shared', required: arg[1]) | |
| if spirv_cross.found() | |
| break | |
| endif | |
| endforeach |
|
Is this working? sorry because I can't get it working. I try with spirv-cross static build, libplacebo check spirv-cross-c, and this pr. I use build scripts based on shinchiro and zhongfly |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is dumb, yes. One does not handle shared vs static like this, but alas upstream has been doing this since 2023¹.
Until now I've been doing symlinks to work around this, but I keep forgetting it.
¹: KhronosGroup/SPIRV-Cross@bb0c17f