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.

Sign up for GitHub

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

Jump to bottom

more macOS stuff #12705

Merged
merged 2 commits into from
Nov 9, 2023
Merged

more macOS stuff #12705

merged 2 commits into from
Nov 9, 2023

Conversation

Dudemanguy
Copy link
Member

First one is build changes. Second one is using clock_gettime in the semaphore wrapper. Someone please actually test them.

sfan5
sfan5 reviewed Oct 21, 2023
View reviewed changes
osdep/semaphore_osx.c Outdated Show resolved Hide resolved
@github-actions
Copy link

github-actions bot commented Oct 21, 2023 •
edited
Loading

Download the artifacts for this pull request:

Windows

orion1vi
orion1vi reviewed Oct 21, 2023
View reviewed changes
osdep/semaphore_osx.c Outdated Show resolved Hide resolved
kasper93
kasper93 reviewed Oct 22, 2023
View reviewed changes
osdep/semaphore_osx.c Outdated Show resolved Hide resolved
@Dudemanguy
Copy link
Member Author

Since #12709 rewrites it all anyway, I dropped the semaphore commit so this is just build changes. @Akemi: what do you think? I didn't remove anything like the macos-touchbar option. Just specifically the macos-10-11-features, macos-10-12-2-features and macos-10-14-features options. I suspect there's other legacy stuff within swift that can be dropped (stuff like if #available(macOS 10.11, *) looks suspicious), but I didn't touch it since I don't really know what it does.

@kasper93
Copy link
Contributor

Probably could be even more cleaned up as we support >= 10.15 now apparently.

@Dudemanguy
Copy link
Member Author

Dudemanguy commented Oct 24, 2023 •
edited
Loading

Yeah I can drop the 10.14 define too.

@Dudemanguy
meson: remove several macos-10-* build options
1020411 
These have been build options since the waf build, but that doesn't
really make sense. The build can detect whatever macOS sdk version is
available and then use that information to determine whether to enable
the features or not. Potentially disabling multiple sdk versions doesn't
really make any sense. Because f5ca11e
effectively made macOS 10.15 the minimum supported version, we can drop
all of these checks and bump the required sdk version to 10.15. The rest
of the build simplifies from there.
@Dudemanguy Dudemanguy force-pushed the macos-again branch 2 times, most recently from 9e6d025 to 1020411 Compare October 24, 2023 14:09
@Dudemanguy Dudemanguy requested a review from Akemi November 5, 2023 15:36
@Dudemanguy Dudemanguy added this to the Release checklist v0.37.0 milestone Nov 9, 2023
@Akemi
mac: remove runtime checks and compatibility for macOS older than 10.15
97b408a 
we stopped supporting macOS older than 10.15 and hence can remove all
the unnecessary runtime checks and compatibility layers.
@Akemi
Copy link
Member

Akemi commented Nov 9, 2023 •
edited
Loading

those if #available(macOS 10.11, *) checks are just the swift runtime checks, eg when the binary is build with a newer SDK but a lower target. features are available just not when run on older macOS versions.

i pushed some more cleanups, though it might not be everything. i am not sure if you want to keep those commits separate or squash them, since they are related but still a bit different.

[edit]
this overlaps a bit with #12861.

@Dudemanguy Dudemanguy merged commit 23de1de into mpv-player:master Nov 9, 2023
13 checks passed
@Dudemanguy Dudemanguy deleted the macos-again branch November 9, 2023 18:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@orion1vi orion1vi orion1vi left review comments

@kasper93 kasper93 kasper93 left review comments

@sfan5 sfan5 sfan5 left review comments

@Akemi Akemi Awaiting requested review from Akemi

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
Release checklist v0.37.0
Development

Successfully merging this pull request may close these issues.
5 participants
@Dudemanguy @kasper93 @Akemi @sfan5 @orion1vi