Build fixes

cyanreg · May 20, 2024 · 01826c7 · 01826c7
1 parent a09b686
commit 01826c7
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 13 deletions.
diff --git a/libavtransport/protocol_quic.c b/libavtransport/protocol_quic.c
@@ -31,6 +31,7 @@
 #include <openssl/ssl.h>
 #include <openssl/err.h>
 
+#include <avtransport/avtransport.h>
 #include "protocol_common.h"
 #include "io_common.h"
 

diff --git 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
@@ -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
@@ -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())