From 5150332d20a50f6c9082ac6a9ae1873eb7ee5a9f Mon Sep 17 00:00:00 2001 From: Robbert van der Helm Date: Thu, 22 Dec 2022 14:59:49 +0100 Subject: [PATCH] Update CLAP dependency to version 1.1.4 Version 1.1.3 changed the cv-qualification of the features array. --- CHANGELOG.md | 6 ++++++ README.md | 2 +- meson.build | 3 ++- src/common/serialization/clap/plugin.cpp | 2 +- subprojects/clap.wrap | 4 ++-- subprojects/packagefiles/clap/meson.build | 2 +- 6 files changed, 13 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 103a5db3..13548ac2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [Unreleased] + +### Packaging notes + +- The CLAP dependency has been updated to version 1.1.4. + ## [5.0.2] - 2022-11-28 # Changed diff --git a/README.md b/README.md index 43ce10dd..c79eaa90 100644 --- a/README.md +++ b/README.md @@ -823,7 +823,7 @@ The following dependencies are included in the repository as a Meson wrap: - Version 3.7.5 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.1 of the [CLAP headers](https://github.com/free-audio/clap). +- Version 1.1.4 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 fc36295a..951a44a0 100644 --- a/meson.build +++ b/meson.build @@ -273,7 +273,8 @@ 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.2') + # 1.1.3 should be API compatible with 1.1.4 + clap_dep = dependency('clap', version : '>=1.1.3') endif # We need to build the VST3 SDK dependencies in tree because Meson won't let us diff --git a/src/common/serialization/clap/plugin.cpp b/src/common/serialization/clap/plugin.cpp index dc22e5a4..14316070 100644 --- a/src/common/serialization/clap/plugin.cpp +++ b/src/common/serialization/clap/plugin.cpp @@ -48,7 +48,7 @@ Descriptor::Descriptor(const clap_plugin_descriptor_t& original) description(original.description ? std::optional(original.description) : std::nullopt) { // The features array is stored as an envp-style null terminated array - const char** orig_features = original.features; + const char* const* orig_features = original.features; if (orig_features) { while (*orig_features) { features.push_back(*orig_features); diff --git a/subprojects/clap.wrap b/subprojects/clap.wrap index 331c0dfc..9fa53abd 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.2 -revision = 27b7af0bebf4816d6286fa969d746abad05e89f2 +# This is tag 1.1.4 +revision = 650ad6a6b0215b3f964c49a004667ad876689dfd depth = 1 patch_directory = clap diff --git a/subprojects/packagefiles/clap/meson.build b/subprojects/packagefiles/clap/meson.build index 62e4751d..6a1d45d4 100644 --- a/subprojects/packagefiles/clap/meson.build +++ b/subprojects/packagefiles/clap/meson.build @@ -1,3 +1,3 @@ -project('clap', 'cpp', version : '1.1.2') +project('clap', 'cpp', version : '1.1.4') clap_dep = declare_dependency(include_directories : include_directories('include'))