RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

osxbundle: remove mpv-bundle symlink to allow code signing 

Apps on Apple silicon have to be codesigned to run, but you can't
codesign bundles that have a symlink for the main executable.

The "mpv-bundle" symlink was used as the bundle's main executable
because it makes the execution name of the binary different.
Launch Services runs the CFBundleExecutable key from Info.plist when
launching a bundle, so by comparing the execution name to the name of
the symlink, you can check if that's how the binary was launched.

This replaces that detection method by moving the MPVBUNDLE
environmental variable into Info.plist. Launch Services will set
anything in LSEnvironment as environmental variables before launching
the bundle, so we're able to check for it instead of needing to
differentiate the execution name of the binary.

Fixes #12116
This commit is contained in:
Daniel Brookman 2023-08-10 16:09:37 -04:00 committed by der richter
parent dcb3213aa7
commit aa8af2e66b
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
TOOLS/osxbundle.py
View File

@ -38,10 +38,6 @@ def apply_plist_template(plist_file, version):
for line in fileinput.input(plist_file, inplace=1):
print(line.rstrip().replace('${VERSION}', version))
def create_bundle_symlink(binary_name, symlink_name):
os.symlink(os.path.basename(binary_name),
os.path.join(target_directory(binary_name), symlink_name))
def bundle_version():
if os.path.exists('VERSION'):
x = open('VERSION')
@ -72,8 +68,6 @@ def main():
copy_bundle(binary_name)
print("> copying binary")
copy_binary(binary_name)
print("> create bundle symlink")
create_bundle_symlink(binary_name, "mpv-bundle")
print("> generating Info.plist")
apply_plist_template(target_plist(binary_name), version)

4
TOOLS/osxbundle/mpv.app/Contents/Info.plist
View File

@ -173,7 +173,7 @@
</dict>
</array>
<key>CFBundleExecutable</key>
<string>mpv-bundle</string>
<string>mpv</string>
<key>CFBundleIconFile</key>
<string>icon</string>
<key>CFBundleIdentifier</key>
@ -192,6 +192,8 @@
<dict>
<key>MallocNanoZone</key>
<string>0</string>
<key>MPVBUNDLE</key>
<string>true</string>
</dict>
<key>CFBundleURLTypes</key>
<array>

9
osdep/macosx_application.m
View File

@ -310,10 +310,10 @@ static void init_cocoa_application(bool regular)
});
}
static bool bundle_started_from_finder(char **argv)
static bool bundle_started_from_finder()
{
NSString *binary_path = [NSString stringWithUTF8String:argv[0]];
return [binary_path hasSuffix:@"mpv-bundle"];
NSString* bundle = [[[NSProcessInfo processInfo] environment] objectForKey:@"MPVBUNDLE"];
return [bundle isEqual:@"true"];
}
static bool is_psn_argument(char *arg_to_check)
@ -338,7 +338,6 @@ static void setup_bundle(int *argc, char *argv[])
@"/opt/local/bin",
@"/opt/local/sbin"];
setenv("PATH", [path_new UTF8String], 1);
setenv("MPVBUNDLE", "true", 1);
}
int cocoa_main(int argc, char *argv[])
@ -351,7 +350,7 @@ int cocoa_main(int argc, char *argv[])
ctx.argc = &argc;
ctx.argv = &argv;
if (bundle_started_from_finder(argv)) {
if (bundle_started_from_finder()) {
setup_bundle(&argc, argv);
init_cocoa_application(true);
} else {