diff options
| author | Matthew Waters <matthew@centricular.com> | 2022-02-03 21:07:57 +1100 |
|---|---|---|
| committer | Matthew Waters <matthew@centricular.com> | 2022-02-04 15:17:01 +1100 |
| commit | bc1f72b6b844d1e6da66b94743c2db222ff24224 (patch) | |
| tree | 184c105dca6edf5199db4ec501488c79d5cddfc5 /packages | |
| parent | e105cd97e1f0899aa9a5907bbece6bab9a25ed6a (diff) | |
moltenvk: ship correctly for macos universal1.20.0
libvulkan.dylib and libvulkan.1.dylib don't seem to respond well to
XCode 12.0 build tools modifying the binary as our current build set up
requires. Luckily we don't actually need them so disable that for
now.
We also need to remove the @rpath entry in libMoltenVK.dylib's id to avoid
dependant libraries from using that name as their link name and then
causing our relocation/merge to create a libgstvulkan/applemedia that links
against a non-existent @rpath/libMoltenVK.dylib.
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/796>
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/gstreamer-1.0-system.package | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/packages/gstreamer-1.0-system.package b/packages/gstreamer-1.0-system.package index ba28517d..912207fe 100644 --- a/packages/gstreamer-1.0-system.package +++ b/packages/gstreamer-1.0-system.package @@ -20,6 +20,7 @@ class Package(custom.GStreamer, package.Package): platform_files = { Platform.IOS : ['moltenvk:libs'], + Platform.DARWIN : ['moltenvk:libs'], } def prepare(self): @@ -31,6 +32,3 @@ class Package(custom.GStreamer, package.Package): if self.config.target_arch in (Architecture.X86, Architecture.X86_64, Architecture.ARM64, Architecture.UNIVERSAL): self.files.append('angle-uwp:libs') self.files_devel.append('angle-uwp:headers') - if self.config.target_platform == Platform.DARWIN and \ - self.config.target_arch == Architecture.X86_64: - self.platform_files[Platform.DARWIN] = ['moltenvk:libs'] |