From 508a0c30def03cf8622159d43f3cc93e01669f96 Mon Sep 17 00:00:00 2001 From: Vittorio Palmisano Date: Mon, 4 Jul 2022 12:43:39 +0200 Subject: [PATCH 1/3] Fix libuv build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes a build error: ``` subprojects/libuv-v1.43.0/libuv.a.p/src_unix_stream.c.o.d -o subprojects/libuv-v1.43.0/libuv.a.p/src_unix_stream.c.o -c ../../../subprojects/libuv-v1.43.0/src/unix/stream.c ../../../subprojects/libuv-v1.43.0/src/unix/stream.c: In function ‘uv__write’: ../../../subprojects/libuv-v1.43.0/src/unix/stream.c:929:3: error: C++ style comments are not allowed in ISO C90 ``` --- worker/meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/worker/meson.build b/worker/meson.build index 3961e7e297..20b21af1f0 100644 --- a/worker/meson.build +++ b/worker/meson.build @@ -163,6 +163,7 @@ libuv_proj = subproject( 'warning_level=0', 'build_tests=false', 'build_benchmarks=false', + 'c_std=c99', ], ) libsrtp2_proj = subproject( From 6df8f78d92b92dbb579ea16cdb756f84f80171d2 Mon Sep 17 00:00:00 2001 From: Vittorio Palmisano Date: Mon, 4 Jul 2022 12:56:41 +0200 Subject: [PATCH 2/3] Revert change --- worker/meson.build | 1 - 1 file changed, 1 deletion(-) diff --git a/worker/meson.build b/worker/meson.build index 20b21af1f0..3961e7e297 100644 --- a/worker/meson.build +++ b/worker/meson.build @@ -163,7 +163,6 @@ libuv_proj = subproject( 'warning_level=0', 'build_tests=false', 'build_benchmarks=false', - 'c_std=c99', ], ) libsrtp2_proj = subproject( From be52d56e99c9e96d71bfa45f9a239af5d8b5781d Mon Sep 17 00:00:00 2001 From: Vittorio Palmisano Date: Mon, 4 Jul 2022 12:57:09 +0200 Subject: [PATCH 3/3] Upgrade libuv to 1.44.1 --- worker/subprojects/libuv.wrap | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/worker/subprojects/libuv.wrap b/worker/subprojects/libuv.wrap index 36571b6cd3..1027d239c0 100644 --- a/worker/subprojects/libuv.wrap +++ b/worker/subprojects/libuv.wrap @@ -1,12 +1,11 @@ [wrap-file] -directory = libuv-v1.43.0 -source_url = https://dist.libuv.org/dist/v1.43.0/libuv-v1.43.0.tar.gz -source_filename = libuv-v1.43.0.tar.gz -source_hash = 90d72bb7ae18de2519d0cac70eb89c319351146b90cd3f91303a492707e693a4 -patch_filename = libuv_1.43.0-1_patch.zip -patch_url = https://wrapdb.mesonbuild.com/v2/libuv_1.43.0-1/get_patch -patch_hash = 9bd241c95110c67f9486f1a77a988216bf5ec192dc3002651a6ccefb2e6aba5a +directory = libuv-v1.44.1 +source_url = https://dist.libuv.org/dist/v1.44.1/libuv-v1.44.1.tar.gz +source_filename = libuv-v1.44.1.tar.gz +source_hash = 9d37b63430fe3b92a9386b949bebd8f0b4784a39a16964c82c9566247a76f64a +patch_filename = libuv_1.44.1-1_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/libuv_1.44.1-1/get_patch +patch_hash = 8a105158cdabca2a54f1c7cc4c2f814c159271e10dc5e37ed1a08f13cfd67ff7 [provide] libuv = libuv_dep -