From 6565c63a73f4173f6dfb28a7c8109c53f326a8e2 Mon Sep 17 00:00:00 2001 From: Robbert van der Helm Date: Sat, 28 Oct 2023 15:24:58 +0200 Subject: [PATCH] Update Asio to 1.28.2 --- CHANGELOG.md | 1 + meson.build | 6 +++--- subprojects/asio.wrap | 4 ++-- subprojects/packagefiles/asio/meson.build | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f3d5e37c..2e3e4133 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ 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 asio dependency has been updated to target version 1.28.2. - The tomlplusplus dependency has been updated to target version 3.4.0. ## [5.0.5] - 2023-05-07 diff --git a/meson.build b/meson.build index b1932afc..e7a53341 100644 --- a/meson.build +++ b/meson.build @@ -243,14 +243,14 @@ if with_system_asio endif asio_version = meson.get_compiler('cpp', native : true).get_define('ASIO_VERSION', prefix : '#include ') - if asio_version.to_int() < 102000 - error('Expected version 1.22.0 of the asio library or higher, found @0@ (MMmmrr)'.format(asio_version)) + 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.22.0') + asio_dep = dependency('asio', version : '>=1.28.0') endif if meson.version().version_compare('>=0.60') diff --git a/subprojects/asio.wrap b/subprojects/asio.wrap index 6c24ea38..a6a3dd77 100644 --- a/subprojects/asio.wrap +++ b/subprojects/asio.wrap @@ -1,7 +1,7 @@ [wrap-git] url = https://github.com/chriskohlhoff/asio.git -# This is tag asio-1-22-1 -revision = bba12d10501418fd3789ce01c9f86a77d37df7ed +# This is tag asio-1-28-2 +revision = 7609450f71434bdc9fbd9491a9505b423c2a8496 depth = 1 patch_directory = asio diff --git a/subprojects/packagefiles/asio/meson.build b/subprojects/packagefiles/asio/meson.build index c99c65dd..e1f26cc1 100644 --- a/subprojects/packagefiles/asio/meson.build +++ b/subprojects/packagefiles/asio/meson.build @@ -1,3 +1,3 @@ -project('asio', 'cpp', version : '1.22.1') +project('asio', 'cpp', version : '1.28.2') asio_dep = declare_dependency(include_directories : include_directories('asio/include'))