diff --git a/releases.json b/releases.json index e97cc4b26..b07000c36 100644 --- a/releases.json +++ b/releases.json @@ -675,6 +675,7 @@ "cpr" ], "versions": [ + "1.14.1-1", "1.12.0-1", "1.11.2-1", "1.11.1-1", diff --git a/subprojects/cpr.wrap b/subprojects/cpr.wrap index 0beda6f33..8a4431016 100644 --- a/subprojects/cpr.wrap +++ b/subprojects/cpr.wrap @@ -1,9 +1,9 @@ [wrap-file] -directory = cpr-1.12.0 -source_url = https://github.com/libcpr/cpr/archive/1.12.0.tar.gz -source_filename = cpr-1.12.0.tar.gz -source_hash = f64b501de66e163d6a278fbb6a95f395ee873b7a66c905dd785eae107266a709 +directory = cpr-1.14.1 +source_url = https://github.com/libcpr/cpr/archive/1.14.1.tar.gz +source_filename = cpr-1.14.1.tar.gz +source_hash = 213ccc7c98683d2ca6304d9760005effa12ec51d664bababf114566cb2b1e23c patch_directory = cpr [provide] -cpr = cpr_dep +dependency_names = cpr diff --git a/subprojects/packagefiles/cpr/cpr/meson.build b/subprojects/packagefiles/cpr/cpr/meson.build index 2c6b9db4f..d6dbe8658 100644 --- a/subprojects/packagefiles/cpr/cpr/meson.build +++ b/subprojects/packagefiles/cpr/cpr/meson.build @@ -4,6 +4,7 @@ cpr_src = files( 'auth.cpp', 'callback.cpp', 'cert_info.cpp', + 'connection_pool.cpp', 'cookies.cpp', 'cprtypes.cpp', 'curl_container.cpp', @@ -21,25 +22,10 @@ cpr_src = files( 'redirect.cpp', 'response.cpp', 'session.cpp', + 'sse.cpp', 'ssl_ctx.cpp', 'threadpool.cpp', 'timeout.cpp', 'unix_socket.cpp', 'util.cpp', ) - -var = meson.project_version().split('.') - -cdata = configuration_data() -cdata.set('cpr_VERSION', meson.project_version()) -cdata.set('cpr_VERSION_MAJOR', var[0]) -cdata.set('cpr_VERSION_MINOR', var[1]) -cdata.set('cpr_VERSION_PATCH', var[2]) -cdata.set('cpr_VERSION_NUM', '0x10906') - -configure_file( - input: '../cmake/cprver.h.in', - output: 'cprver.h', - format: 'cmake', - configuration: cdata, -) diff --git a/subprojects/packagefiles/cpr/include/cpr/meson.build b/subprojects/packagefiles/cpr/include/cpr/meson.build new file mode 100644 index 000000000..573b67da7 --- /dev/null +++ b/subprojects/packagefiles/cpr/include/cpr/meson.build @@ -0,0 +1,22 @@ +version_splits = meson.project_version().split('.') + +cdata = configuration_data() +cdata.set('cpr_VERSION', meson.project_version()) +cdata.set('cpr_VERSION_MAJOR', version_splits[0]) +cdata.set('cpr_VERSION_MINOR', version_splits[1]) +cdata.set('cpr_VERSION_PATCH', version_splits[2]) +# Should be in hex (two digits each), but since Meson cannot output to hex do math manually +cdata.set( + 'cpr_VERSION_NUM', + version_splits[0].to_int() * 65536 + version_splits[1].to_int() * 256 + version_splits[2].to_int(), +) + +configure_file( + input: meson.project_source_root() / 'cmake' / 'cprver.h.in', + output: 'cprver.h', + format: 'cmake', + configuration: cdata, + install: true, + install_dir: get_option('includedir') / 'cpr', + install_tag: 'devel', +) diff --git a/subprojects/packagefiles/cpr/meson.build b/subprojects/packagefiles/cpr/meson.build index 1b7045147..c7c5cadd1 100644 --- a/subprojects/packagefiles/cpr/meson.build +++ b/subprojects/packagefiles/cpr/meson.build @@ -1,25 +1,38 @@ project( 'cpr', 'cpp', - version: '1.12.0', + version: '1.14.1', license: 'MIT', - default_options: 'cpp_std=c++17', + meson_version: '>=0.60.0', ) +override_cpp = 'cpp_std=c++17' + curl_dep = dependency( 'libcurl', - version: '>=7.64.0', + version: '>=7.71.0', ) thread_dep = dependency('threads') -includes = include_directories('.', 'include') +includes = include_directories('include') +subdir('include/cpr') subdir('cpr') +includes = include_directories('include') +install_subdir( + 'include/cpr', + install_dir: get_option('includedir'), + exclude_files: 'meson.build', +) + cpr_lib = library( 'cpr', include_directories: includes, sources: cpr_src, dependencies: [curl_dep, thread_dep], + override_options: override_cpp, + version: meson.project_version(), + install: true, ) cpr_dep = declare_dependency( @@ -27,5 +40,6 @@ cpr_dep = declare_dependency( link_with: cpr_lib, dependencies: [curl_dep, thread_dep], ) +meson.override_dependency('cpr', cpr_dep) subdir('test') diff --git a/subprojects/packagefiles/cpr/test/meson.build b/subprojects/packagefiles/cpr/test/meson.build index 8f259f9c9..93de6f10f 100644 --- a/subprojects/packagefiles/cpr/test/meson.build +++ b/subprojects/packagefiles/cpr/test/meson.build @@ -11,6 +11,7 @@ tests = [ # 'alternating', # 'async', # 'callback', + # 'connection_pool', # 'delete', # 'download', 'encoded_auth', @@ -48,6 +49,7 @@ foreach t : tests t, '@0@_tests.cpp'.format(t), dependencies: [cpr_dep, gtest_dep], + override_options: override_cpp, ), ) endforeach