From ea03914e7e0147489a19140485e66adc7c0d69ee Mon Sep 17 00:00:00 2001 From: Robbert van der Helm Date: Fri, 21 Oct 2022 12:39:55 +0200 Subject: [PATCH] Update to upstream CLAP 1.1.2 This adds explicit calling conventions. --- CHANGELOG.md | 8 ++++---- meson.build | 2 +- subprojects/clap.wrap | 10 +++------- subprojects/packagefiles/clap/meson.build | 2 +- 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index db35f0f6..1b05c9db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -45,11 +45,11 @@ Versioning](https://semver.org/spec/v2.0.0.html). - The VST3 dependency is now at tag `v3.7.5_build_44-patched-2`. The only difference is that the version in the `meson.build` file was bumped from 3.7.3 to 3.7.5. -- As of right now (2022-08-31), the new CLAP wrap dependency uses a fork of CLAP - because upstream does not contain calling conventions. +- The new CLAP support requires version 1.1.2 of the CLAP headers because + earlier versions did not yet contain calling conventions. (, - ). Yabridge will build with - upstream CLAP, but using it will result in memory errors. + ). Building against older + versions will result in memory errors. ## [4.0.2] - 2022-06-27 diff --git a/meson.build b/meson.build index 61ed0034..b7ae8d1c 100644 --- a/meson.build +++ b/meson.build @@ -256,7 +256,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.1') + clap_dep = dependency('clap', version : '>=1.1.2') endif # We need to build the VST3 SDK dependencies in tree because Meson won't let us diff --git a/subprojects/clap.wrap b/subprojects/clap.wrap index 3a291598..331c0dfc 100644 --- a/subprojects/clap.wrap +++ b/subprojects/clap.wrap @@ -1,11 +1,7 @@ [wrap-git] -# url = https://github.com/free-audio/clap.git -# # This is tag 1.1.1 -# revision = af1e05ce6487151c6b36003fdb47566dbb50194e -# FIXME: This is a fork that adds calling convention, as it's not possible to -# use CLAP with Winelib bridging otherwise -url = https://github.com/robbert-vdh/clap.git -revision = feature/calling-conventions +url = https://github.com/free-audio/clap.git +# This is tag 1.1.2 +revision = 27b7af0bebf4816d6286fa969d746abad05e89f2 depth = 1 patch_directory = clap diff --git a/subprojects/packagefiles/clap/meson.build b/subprojects/packagefiles/clap/meson.build index a97962af..62e4751d 100644 --- a/subprojects/packagefiles/clap/meson.build +++ b/subprojects/packagefiles/clap/meson.build @@ -1,3 +1,3 @@ -project('clap', 'cpp', version : '1.1.1') +project('clap', 'cpp', version : '1.1.2') clap_dep = declare_dependency(include_directories : include_directories('include'))