diff options
| author | Andoni Morales Alastruey <ylatuya@gmail.com> | 2020-11-25 16:52:44 +0000 |
|---|---|---|
| committer | Matthew Waters <matthew@centricular.com> | 2020-12-07 13:35:52 +1100 |
| commit | dd8b650d0f10c8ddc64181b635fd0742f4e4ab04 (patch) | |
| tree | d7b3bf49373254847a02ea38f67cc7a7124cb8b7 | |
| parent | 03e35126f133adc161a5ee79eb9bd71b4ab8b266 (diff) | |
macos: disable vulkan for ARM64
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/661>
| -rw-r--r-- | packages/gstreamer-1.0-system.package | 4 | ||||
| -rw-r--r-- | recipes/gst-plugins-bad-1.0.recipe | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/packages/gstreamer-1.0-system.package b/packages/gstreamer-1.0-system.package index 23b2ac83..ba28517d 100644 --- a/packages/gstreamer-1.0-system.package +++ b/packages/gstreamer-1.0-system.package @@ -19,7 +19,6 @@ class Package(custom.GStreamer, package.Package): 'gst-plugins-bad-1.0:plugins_sys_devel'] platform_files = { - Platform.DARWIN : ['moltenvk:libs'], Platform.IOS : ['moltenvk:libs'], } @@ -32,3 +31,6 @@ 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'] diff --git a/recipes/gst-plugins-bad-1.0.recipe b/recipes/gst-plugins-bad-1.0.recipe index d47e3eec..f9feaf12 100644 --- a/recipes/gst-plugins-bad-1.0.recipe +++ b/recipes/gst-plugins-bad-1.0.recipe @@ -492,7 +492,12 @@ class Recipe(custom.GStreamer): if self.config.target_platform in (Platform.DARWIN, Platform.IOS): self.meson_options['applemedia'] = 'enabled' - self.deps += ['moltenvk'] + # No Vulkan SDK for macOS ARM664 yet + if self.config.target_platform == Platform.DARWIN and \ + self.config.target_arch == Architecture.ARM64: + self.disable_plugin('vulkan', 'vulkan', library_name='vulkan') + else: + self.deps += ['moltenvk'] if self.config.target_platform in (Platform.ANDROID): self.deps += ['vulkan-android'] |