mirror of
https://github.com/robbert-vdh/yabridge.git
synced 2026-05-06 19:40:10 +02:00
Remove system-asio build option
Asio has been shipping with `pkg-config` support since version 1.23, so this is no longer needed.
This commit is contained in:
@@ -29,6 +29,11 @@ Versioning](https://semver.org/spec/v2.0.0.html).
|
|||||||
- Fixed a regression that caused `yabridgectl set --path-auto` to no longer
|
- Fixed a regression that caused `yabridgectl set --path-auto` to no longer
|
||||||
work.
|
work.
|
||||||
|
|
||||||
|
### Packaging notes
|
||||||
|
|
||||||
|
- The `system-asio` build option has been removed since `asio` added
|
||||||
|
`pkg-config` support three years ago in version 1.23.
|
||||||
|
|
||||||
## [5.1.1] - 2024-12-23
|
## [5.1.1] - 2024-12-23
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|||||||
+1
-21
@@ -22,7 +22,6 @@ project(
|
|||||||
is_64bit_system = build_machine.cpu_family() not in ['x86', 'arm']
|
is_64bit_system = build_machine.cpu_family() not in ['x86', 'arm']
|
||||||
with_bitbridge = get_option('bitbridge')
|
with_bitbridge = get_option('bitbridge')
|
||||||
with_clap = get_option('clap')
|
with_clap = get_option('clap')
|
||||||
with_system_asio = get_option('system-asio')
|
|
||||||
with_winedbg = get_option('winedbg')
|
with_winedbg = get_option('winedbg')
|
||||||
with_vst3 = get_option('vst3')
|
with_vst3 = get_option('vst3')
|
||||||
|
|
||||||
@@ -225,26 +224,7 @@ endif
|
|||||||
# These are all headers-only libraries, and thus won't require separate 32-bit
|
# These are all headers-only libraries, and thus won't require separate 32-bit
|
||||||
# and 64-bit versions
|
# and 64-bit versions
|
||||||
|
|
||||||
# NOTE: The standalone asio library does not come with a pkgconfig or CMake
|
asio_dep = dependency('asio', version : '>=1.28.0')
|
||||||
# build definition, and Meson thus also won't be able to detect it this
|
|
||||||
# way. As a workaround for distro packaging, configuring the project with
|
|
||||||
# `-Dsystem-asio=true` will use `<asio.h>` from the standard include
|
|
||||||
# directories instead.
|
|
||||||
if with_system_asio
|
|
||||||
if not meson.get_compiler('cpp', native : true).check_header('asio.hpp')
|
|
||||||
error('The \'system-asio\' build option was set, but <asio.hpp> was not found')
|
|
||||||
endif
|
|
||||||
|
|
||||||
asio_version = meson.get_compiler('cpp', native : true).get_define('ASIO_VERSION', prefix : '#include <asio.hpp>')
|
|
||||||
if asio_version.to_int() < 102800
|
|
||||||
error('Expected version 1.28.0 of the asio library or higher, found @0@ (MMmmrr)'.format(asio_version))
|
|
||||||
endif
|
|
||||||
|
|
||||||
# This is a dummy dependency, since the library is only accessible implicitly through the system include path
|
|
||||||
asio_dep = declare_dependency()
|
|
||||||
else
|
|
||||||
asio_dep = dependency('asio', version : '>=1.28.0')
|
|
||||||
endif
|
|
||||||
|
|
||||||
if meson.version().version_compare('>=0.60')
|
if meson.version().version_compare('>=0.60')
|
||||||
# Bitsery's CMake build definition is capitalized for some reason
|
# Bitsery's CMake build definition is capitalized for some reason
|
||||||
|
|||||||
@@ -12,18 +12,6 @@ option(
|
|||||||
description : 'Whether to build the CLAP version of yabridge.'
|
description : 'Whether to build the CLAP version of yabridge.'
|
||||||
)
|
)
|
||||||
|
|
||||||
option(
|
|
||||||
'system-asio',
|
|
||||||
type : 'boolean',
|
|
||||||
value : false,
|
|
||||||
description : '''If set to true, then <asio.hpp> from the standard include
|
|
||||||
directories will be used in place of a pkgconfig definition,
|
|
||||||
CMake dependency, or subproject wrap. The asio library does
|
|
||||||
not come with any build definitions Meson can use to detect
|
|
||||||
its installed version and location, so this behavior is
|
|
||||||
behind an option as it's only relevant for distro packaging.'''
|
|
||||||
)
|
|
||||||
|
|
||||||
option(
|
option(
|
||||||
'vst3',
|
'vst3',
|
||||||
type : 'boolean',
|
type : 'boolean',
|
||||||
|
|||||||
Reference in New Issue
Block a user