diff options
| author | Matthew Waters <matthew@centricular.com> | 2021-07-15 17:33:44 +1000 |
|---|---|---|
| committer | GStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2021-07-15 10:45:35 +0000 |
| commit | c7138965a2501297576b3fe75c289ab9a691d924 (patch) | |
| tree | 351565970c5727310d4ccd37501d0ee9ce3fc521 | |
| parent | bd71f936b98fa0017cb8bcb64630566c9b2086d6 (diff) | |
moltenvk: update to 1.2.182.0
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/717>
| -rw-r--r-- | recipes/build-tools/moltenvk-tools.recipe | 15 | ||||
| -rw-r--r-- | recipes/moltenvk.recipe | 2 |
2 files changed, 13 insertions, 4 deletions
diff --git a/recipes/build-tools/moltenvk-tools.recipe b/recipes/build-tools/moltenvk-tools.recipe index 4df8063d..0acb1455 100644 --- a/recipes/build-tools/moltenvk-tools.recipe +++ b/recipes/build-tools/moltenvk-tools.recipe @@ -4,14 +4,14 @@ from cerbero.utils import shell class Recipe(recipe.Recipe): name = 'moltenvk-tools' - version = '1.2.162.1' + version = '1.2.182.0' licenses = [License.Apachev2] stype = SourceType.TARBALL tarball_dirname = "vulkansdk-macos-%(version)s" # Mirrored because lunarg.com has an extremely small download limit #url = 'https://sdk.lunarg.com/sdk/download/%(version)s/mac/' + tarball_dirname + '.dmg' url = 'https://gstreamer.freedesktop.org/data/src/mirror/' + tarball_dirname + '.dmg' - tarball_checksum = '2781c334997598c2828d8a3368aef7b7c94a25204c90d5503396e40c7a03fd5c' + tarball_checksum = '9e89291283e41d62673bf48007dac764e99a504d145ee4d70d2d32e328f7ee40' btype = BuildType.CUSTOM files_bins = [ @@ -43,7 +43,16 @@ class Recipe(recipe.Recipe): if os.path.exists(srcdir): shutil.rmtree(srcdir) - shell.copy_dir(self.build_dir, srcdir) + # https://vulkan.lunarg.com/doc/sdk/1.2.182.0/mac/getting_started.html + vulkan_installer = os.path.join(self.build_dir, 'InstallVulkan.app/Contents/MacOS/InstallVulkan') + await shell.async_call([vulkan_installer, + '--root', self.config.moltenvk_prefix, + '--accept-licenses', + '--default-answer', + '--confirm-command', + 'install', + 'copy_only=1'], + env=self.env, logfile=self.logfile) for bin in self.files_bins: shutil.copy(os.path.join(srcdir, 'macOS', 'bin', bin), os.path.join(prefix, 'bin', bin)) diff --git a/recipes/moltenvk.recipe b/recipes/moltenvk.recipe index fb96cfe0..d08e0ea2 100644 --- a/recipes/moltenvk.recipe +++ b/recipes/moltenvk.recipe @@ -6,7 +6,7 @@ from cerbero.tools.libtool import LibtoolLibrary class Recipe(recipe.Recipe): name = 'moltenvk' - version = '1.2.162.1' + version = '1.2.182.0' licenses = [License.Apachev2] stype = SourceType.CUSTOM btype = BuildType.CUSTOM |