From f67a170a882266d30e76977653272471498eab68 Mon Sep 17 00:00:00 2001 From: Robbert van der Helm Date: Sat, 28 Oct 2023 15:45:02 +0200 Subject: [PATCH] Update the CLAP dependency to version 1.1.9 --- CHANGELOG.md | 2 ++ README.md | 2 +- meson.build | 2 +- src/common/serialization/clap/README.md | 30 ++++++++++++----------- subprojects/clap.wrap | 4 +-- subprojects/packagefiles/clap/meson.build | 2 +- 6 files changed, 23 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a51f65b5..9bec2827 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,8 @@ Versioning](https://semver.org/spec/v2.0.0.html). - This release includes a workaround to make bitsery compile with GCC 13 due to changes in transitive header includes. +- The CLAP dependency has been updated to target version 1.1.9 (revision version + update). - The asio dependency has been updated to target version 1.28.2. - The bitsery dependency has been updated to version 5.2.3 (revision version bump). diff --git a/README.md b/README.md index eb748f1d..d6f9ba2b 100644 --- a/README.md +++ b/README.md @@ -841,7 +841,7 @@ The following dependencies are included in the repository as a Meson wrap: - Version 3.7.7 of the [VST3 SDK](https://github.com/robbert-vdh/vst3sdk) with some [patches](https://github.com/robbert-vdh/yabridge/blob/master/tools/patch-vst3-sdk.sh) to allow Winelib compilation -- Version 1.1.7 of the [CLAP headers](https://github.com/free-audio/clap). +- Version 1.1.9 of the [CLAP headers](https://github.com/free-audio/clap). The project can then be compiled with the command below. You can remove or change the unity size argument if building takes up too much RAM, or you can diff --git a/meson.build b/meson.build index e7a53341..19b091c6 100644 --- a/meson.build +++ b/meson.build @@ -286,7 +286,7 @@ wine_threads_dep = declare_dependency(link_args : '-lpthread') wine_uuid_dep = declare_dependency(link_args : '-luuid') if with_clap - clap_dep = dependency('clap', version : '==1.1.7') + clap_dep = dependency('clap', version : ['>=1.1.7', '<1.2']) endif # We need to build the VST3 SDK dependencies in tree because Meson won't let us diff --git a/src/common/serialization/clap/README.md b/src/common/serialization/clap/README.md index f7bc18ad..d692724f 100644 --- a/src/common/serialization/clap/README.md +++ b/src/common/serialization/clap/README.md @@ -35,17 +35,19 @@ Yabridge currently tracks CLAP 1.1.2. The implementation status for CLAP's core | `clap.timer-support` | :heavy_check_mark: No bridging involved | | `clap.voice-info` | :heavy_check_mark: | -| draft extension | status | -| -------------------------------- | -------------------------------------------------------- | -| `clap.ambisonic.draft/0` | :x: Will be supported once the extension gets stabilized | -| `clap.check_for_update.draft/0` | :x: Will be supported once the extension gets stabilized | -| `clap.cv.draft/0` | :x: Will be supported once the extension gets stabilized | -| `clap.file-reference.draft/0` | :x: Will be supported once the extension gets stabilized | -| `clap.midi-mappings.draft/0` | :x: Will be supported once the extension gets stabilized | -| `clap.preset-load.draft/0` | :x: Will be supported once the extension gets stabilized | -| `clap.quick-controls.draft/0` | :x: Will be supported once the extension gets stabilized | -| `clap.state-context.draft/1` | :x: Will be supported once the extension gets stabilized | -| `clap.surround.draft/1` | :x: Will be supported once the extension gets stabilized | -| `clap.track-info.draft/0` | :x: Will be supported once the extension gets stabilized | -| `clap.transport-control.draft/0` | :x: Will be supported once the extension gets stabilized | -| `clap.tuning.draft/2` | :x: Will be supported once the extension gets stabilized | +| draft extension | status | +| -------------------------------------- | -------------------------------------------------------- | +| `clap.ambisonic.draft*` | :x: Will be supported once the extension gets stabilized | +| `clap.configurable-audio-ports.draft*` | :x: Will be supported once the extension gets stabilized | +| `clap.extensible-audio-ports.draft*` | :x: Will be supported once the extension gets stabilized | +| `clap.check_for_update.draft*` | :x: Will be supported once the extension gets stabilized | +| `clap.cv.draft*` | :x: Will be supported once the extension gets stabilized | +| `clap.file-reference.draft*` | :x: Will be supported once the extension gets stabilized | +| `clap.midi-mappings.draft*` | :x: Will be supported once the extension gets stabilized | +| `clap.preset-load.draft*` | :x: Will be supported once the extension gets stabilized | +| `clap.quick-controls.draft*` | :x: Will be supported once the extension gets stabilized | +| `clap.state-context.draft*` | :x: Will be supported once the extension gets stabilized | +| `clap.surround.draft*` | :x: Will be supported once the extension gets stabilized | +| `clap.track-info.draft*` | :x: Will be supported once the extension gets stabilized | +| `clap.transport-control.draft*` | :x: Will be supported once the extension gets stabilized | +| `clap.tuning.draft*` | :x: Will be supported once the extension gets stabilized | diff --git a/subprojects/clap.wrap b/subprojects/clap.wrap index 647ad6ec..67803e97 100644 --- a/subprojects/clap.wrap +++ b/subprojects/clap.wrap @@ -1,7 +1,7 @@ [wrap-git] url = https://github.com/free-audio/clap.git -# This is tag 1.1.7 -revision = 065d685d4e9657f0344f350eef748be2b4d8e318 +# This is tag 1.1.9 +revision = 094bb76c85366a13cc6c49292226d8608d6ae50c depth = 1 patch_directory = clap diff --git a/subprojects/packagefiles/clap/meson.build b/subprojects/packagefiles/clap/meson.build index f0794563..03fde3d5 100644 --- a/subprojects/packagefiles/clap/meson.build +++ b/subprojects/packagefiles/clap/meson.build @@ -1,3 +1,3 @@ -project('clap', 'cpp', version : '1.1.7') +project('clap', 'cpp', version : '1.1.9') clap_dep = declare_dependency(include_directories : include_directories('include'))