From 01826c7a75c2140b33cf087cf5c9c7b6f947ad59 Mon Sep 17 00:00:00 2001 From: Lynne Date: Mon, 20 May 2024 04:19:09 +0200 Subject: [PATCH] Build fixes --- libavtransport/protocol_quic.c | 1 + libavtransport/tests/proto_quic.c | 4 ++-- libavtransport/x86/meson.build | 14 ++++++-------- meson.build | 4 +--- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/libavtransport/protocol_quic.c b/libavtransport/protocol_quic.c index fd9e466..b9243f2 100644 --- a/libavtransport/protocol_quic.c +++ b/libavtransport/protocol_quic.c @@ -31,6 +31,7 @@ #include #include +#include #include "protocol_common.h" #include "io_common.h" diff --git a/libavtransport/tests/proto_quic.c b/libavtransport/tests/proto_quic.c index 2396ce3..d094f59 100644 --- a/libavtransport/tests/proto_quic.c +++ b/libavtransport/tests/proto_quic.c @@ -137,7 +137,7 @@ int main(void) ret = io->init(avt, &io_server_ctx, &addr_server); if (ret < 0) goto end; - ret = p->init(avt, &p_server_ctx, &addr_server, io, io_server_ctx); + ret = p->init(avt, &p_server_ctx, &addr_server, io, io_server_ctx, NULL); if (ret < 0) goto end; } @@ -149,7 +149,7 @@ int main(void) ret = io->init(avt, &io_client_ctx, &addr_client); if (ret < 0) goto end; - ret = p->init(avt, &p_client_ctx, &addr_client, io, io_client_ctx); + ret = p->init(avt, &p_client_ctx, &addr_client, io, io_client_ctx, NULL); if (ret < 0) goto end; } diff --git a/libavtransport/x86/meson.build b/libavtransport/x86/meson.build index a0edf28..aa3c752 100644 --- a/libavtransport/x86/meson.build +++ b/libavtransport/x86/meson.build @@ -12,11 +12,9 @@ nasm_config = configure_file( output_format: 'nasm', ) -if get_option('output').auto() -# sources = sources.without([ -# 'ldpc_encode.c' -# ]) - sources += [ - 'x86/ldpc_encode.asm', - ] -endif +#sources = sources.without([ +# 'ldpc_encode.c' +#]) +sources += [ + 'x86/ldpc_encode.asm', +] diff --git a/meson.build b/meson.build index e8c05e5..b99d1f8 100644 --- a/meson.build +++ b/meson.build @@ -120,7 +120,7 @@ xxh_dep = dependency('libxxhash', required: false) cbor_dep = dependency('libcbor', required: false) uring_dep = dependency('liburing', required: false) zstd_dep = dependency('libzstd', required: false) -openssl_dep = dependency('openssl', required: false, version : '3.3.0') +openssl_dep = dependency('openssl', required: false, version : '>3.3.0') brotlienc_dep = dependency('libbrotlienc', required: false) brotlidec_dep = dependency('libbrotlienc', required: false) @@ -165,8 +165,6 @@ conf.set('CONFIG_DEFAULT_TYPE', 'AVT_PROTOCOL_UDP') # Configuration settings #============================================================================ conf.set('CONFIG_BIG_ENDIAN', host_machine.endian() == 'big') -conf.set('CONFIG_INPUT', get_option('input').auto()) -conf.set('CONFIG_OUTPUT', get_option('output').auto()) conf.set('CONFIG_HAVE_LIBBROTLIENC', brotlienc_dep.found()) conf.set('CONFIG_HAVE_LIBBROTLIDEC', brotlidec_dep.found()) conf.set('CONFIG_HAVE_LIBURING', uring_dep.found())