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

ci/win32: make win32 build more complete #14073

Merged
merged 8 commits into from
May 18, 2024
Merged

Conversation

kasper93
Copy link
Contributor

@kasper93 kasper93 commented May 5, 2024

No description provided.

@kasper93 kasper93 force-pushed the win32_p2 branch 3 times, most recently from fb07c43 to 31bd471 Compare May 6, 2024 01:47
Copy link

github-actions bot commented May 6, 2024

Download the artifacts for this pull request:

Windows
macOS

@kasper93 kasper93 force-pushed the win32_p2 branch 10 times, most recently from 200d27e to 4278e9c Compare May 11, 2024 19:11
@kasper93
Copy link
Contributor Author

kasper93 commented May 11, 2024

@kasper93 kasper93 marked this pull request as ready for review May 11, 2024 19:15
@kasper93 kasper93 changed the title ci/win32: add shaderc, spirv-cross and luajit ci/win32: make win32 build more complete May 11, 2024
@kasper93 kasper93 requested review from sfan5 and Dudemanguy May 12, 2024 15:54
ci/build-win32.ps1 Outdated Show resolved Hide resolved
ci/build-win32.ps1 Outdated Show resolved Hide resolved
It provides broken tools like diff, patch.

Also fix PATH in test stage
Use pre-built binaries to reduce CI build time.
Rubber Band is disabled because it pulls more dependencies and it is not
worth build. Might be reconsidered later.
Instead of linking binary blobs, build everything ourselves.
When Vulkan loader is build internally, let's assume it is available.
vulkan-1.dll is packaged, but is not neccessary in most cases where
Vulkan Loader is already instaled by GPU driver.
@kasper93
Copy link
Contributor Author

kasper93 commented May 18, 2024

Added Vulkan-Loader, switched luajit to upstream wrap as it is merged now. Also using upstream ffmpeg as fixes were merged there also. I will probably merge this later, I don't expect this to get any better. Remaining custom wraps are either to specify some cmake command, but in most cases also to workaround meson bugs with cmake support, which works fine, but not always everything is correct and needs adjustments.

@kasper93 kasper93 merged commit 0125d35 into mpv-player:master May 18, 2024
18 checks passed
@kasper93 kasper93 deleted the win32_p2 branch May 18, 2024 21:57
@kasper93 kasper93 restored the win32_p2 branch May 18, 2024 22:02
@kasper93 kasper93 deleted the win32_p2 branch May 18, 2024 22:03
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