From b18fbfcf6b3afe9d6575a4533af366a1d0b8bc3c Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Thu, 27 Apr 2023 23:59:59 +0200 Subject: [PATCH] Upgrade to 3.1.0 (#2190310) --- baresip-3.0.0-pipewire.patch | 68 ++++++++++++++++++++++++------------ baresip.spec | 9 +++-- sources | 2 +- 3 files changed, 52 insertions(+), 27 deletions(-) diff --git a/baresip-3.0.0-pipewire.patch b/baresip-3.0.0-pipewire.patch index 8567b06..faee8b0 100644 --- a/baresip-3.0.0-pipewire.patch +++ b/baresip-3.0.0-pipewire.patch @@ -1,7 +1,7 @@ -From 5c473db1b9606134b400c0b1622df8740b16a0fc Mon Sep 17 00:00:00 2001 +From 8f9d27a2c48b8e913669344d2af59947357ba830 Mon Sep 17 00:00:00 2001 From: Christian Spielberger Date: Thu, 2 Feb 2023 08:52:54 +0100 -Subject: [PATCH 01/10] pipewire: add pipewire module +Subject: [PATCH 01/11] pipewire: add pipewire module --- cmake/FindPIPEWIRE.cmake | 10 ++ @@ -609,10 +609,10 @@ index 000000000..94fceb1b0 + pw_stream_queue_buffer(st->stream, b); +} -From 2c17a323ec53a9512ea2374e86b73057cecff9c5 Mon Sep 17 00:00:00 2001 +From a1a3e596da6f4fc0e11a4de77f9bf468a7ccb351 Mon Sep 17 00:00:00 2001 From: Christian Spielberger Date: Thu, 2 Feb 2023 10:57:15 +0100 -Subject: [PATCH 02/10] cmake: repair FindPIPEWIRE.cmake +Subject: [PATCH 02/11] cmake: repair FindPIPEWIRE.cmake --- cmake/FindPIPEWIRE.cmake | 4 ++++ @@ -631,10 +631,10 @@ index bd9b90181..20fa46a6f 100644 +find_package_handle_standard_args(PIPEWIRE DEFAULT_MSG PIPEWIRE_INCLUDE_DIRS + PIPEWIRE_LIBRARIES) -From fc4496f2b527a9216b59a2c2a1d2938b3eedef9f Mon Sep 17 00:00:00 2001 +From fe94c10108cb2beb9dbf72374ffbf9f7b6651907 Mon Sep 17 00:00:00 2001 From: Christian Spielberger Date: Thu, 2 Feb 2023 14:19:41 +0100 -Subject: [PATCH 03/10] pipewire: set node latency and use chunk offset +Subject: [PATCH 03/11] pipewire: set node latency and use chunk offset --- modules/pipewire/capture.c | 16 +++++++++++++--- @@ -699,10 +699,10 @@ index 3e92d131c..697845e7d 100644 auframe_init(&af, st->prm.fmt, sampv, sampc, st->prm.srate, st->prm.ch); -From 6dd765174f55bb05ad9e4a339ab8f9b5d9ad4806 Mon Sep 17 00:00:00 2001 +From c3ae03b803a742d2816ab19825af578d2da7c290 Mon Sep 17 00:00:00 2001 From: Christian Spielberger Date: Thu, 2 Feb 2023 14:20:30 +0100 -Subject: [PATCH 04/10] pipewire: playback cleanup +Subject: [PATCH 04/11] pipewire: playback cleanup --- modules/pipewire/playback.c | 15 +++++++++------ @@ -751,10 +751,10 @@ index 94fceb1b0..012731570 100644 pw_stream_queue_buffer(st->stream, b); } -From d08fcfe3cf2eb5cbc2f29958f9d1aff3ce1ecb66 Mon Sep 17 00:00:00 2001 +From 074b37357fbe98314094d2a37f226baa81e7d0b2 Mon Sep 17 00:00:00 2001 From: Christian Spielberger Date: Fri, 3 Feb 2023 08:19:30 +0100 -Subject: [PATCH 05/10] pipewire: device selection +Subject: [PATCH 05/11] pipewire: device selection --- modules/pipewire/capture.c | 3 +- @@ -1031,10 +1031,10 @@ index 012731570..24b4f2c3a 100644 PW_STREAM_FLAG_MAP_BUFFERS | PW_STREAM_FLAG_RT_PROCESS, -From 86e4a4fd4e0ec7723b7e3129e868f5dd599c5e2f Mon Sep 17 00:00:00 2001 +From 018d8113bcc3029a7e0ec71a5c722c6d2e3b3615 Mon Sep 17 00:00:00 2001 From: Christian Spielberger Date: Wed, 1 Mar 2023 09:30:21 +0100 -Subject: [PATCH 06/10] pipewire: set _XOPEN_SOURCE=700 +Subject: [PATCH 06/11] pipewire: set _XOPEN_SOURCE=700 --- modules/pipewire/CMakeLists.txt | 1 + @@ -1051,10 +1051,10 @@ index 8673873af..bb2ad8f2a 100644 + -D_XOPEN_SOURCE=700 ) -From 63f9a8a2afad5eff06f6fc55b87276a881f25c08 Mon Sep 17 00:00:00 2001 +From 978787dee5b3fd8dc50100224ff0ef34a4ef7ce6 Mon Sep 17 00:00:00 2001 From: Christian Spielberger Date: Wed, 1 Mar 2023 09:34:19 +0100 -Subject: [PATCH 07/10] pipewire: replace _XOPEN_SOURCE by _GNU_SOURCE +Subject: [PATCH 07/11] pipewire: replace _XOPEN_SOURCE by _GNU_SOURCE --- modules/pipewire/CMakeLists.txt | 2 +- @@ -1072,10 +1072,10 @@ index bb2ad8f2a..50a4befef 100644 + -D_GNU_SOURCE ) -From 572d69b24917e66a76015b8605eb58b8e5377969 Mon Sep 17 00:00:00 2001 +From 87b11d9ba47832865d2fb906f50467d6c7ce75f4 Mon Sep 17 00:00:00 2001 From: Christian Spielberger Date: Wed, 1 Mar 2023 10:28:30 +0100 -Subject: [PATCH 08/10] pipewire: thread safe stream termination +Subject: [PATCH 08/11] pipewire: thread safe stream termination --- modules/pipewire/capture.c | 5 ++++- @@ -1134,10 +1134,10 @@ index 24b4f2c3a..55aff42c6 100644 d->chunk->offset = 0; d->chunk->stride = st->stride; -From dd142036ac430c8905ef90b1f73da7fe742b7a41 Mon Sep 17 00:00:00 2001 +From eab7291993107826adb4756b08009e0188a1d89a Mon Sep 17 00:00:00 2001 From: Christian Spielberger Date: Wed, 1 Mar 2023 10:29:15 +0100 -Subject: [PATCH 09/10] pipewire: remove unused errh +Subject: [PATCH 09/11] pipewire: remove unused errh --- modules/pipewire/capture.c | 4 +--- @@ -1180,10 +1180,10 @@ index 8d20eec52..00f6f5e99 100644 re_snprintf(nlat, sizeof(nlat), "%u/1000", prm->ptime); -From b3a65e2ddb353aeb28f45daad5e7bb575bb17ee0 Mon Sep 17 00:00:00 2001 +From 62f397052a2da2c967cd9100e6df66bb34a68c25 Mon Sep 17 00:00:00 2001 From: Christian Spielberger Date: Thu, 2 Mar 2023 07:18:30 +0100 -Subject: [PATCH 10/10] config: add pipewire as option for DEFAULT_AUDIO_DEVICE +Subject: [PATCH 10/11] config: add pipewire as option for DEFAULT_AUDIO_DEVICE --- docs/examples/config | 1 + @@ -1191,7 +1191,7 @@ Subject: [PATCH 10/10] config: add pipewire as option for DEFAULT_AUDIO_DEVICE 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/docs/examples/config b/docs/examples/config -index 07a8c8920..ff5fbbe33 100644 +index 153dc81ec..19ab2174b 100644 --- a/docs/examples/config +++ b/docs/examples/config @@ -118,6 +118,7 @@ module auresamp.so @@ -1203,10 +1203,10 @@ index 07a8c8920..ff5fbbe33 100644 #module portaudio.so #module aubridge.so diff --git a/src/config.c b/src/config.c -index 7948215b3..37284966d 100644 +index a9e332b9e..ca66fd880 100644 --- a/src/config.c +++ b/src/config.c -@@ -975,13 +975,20 @@ int config_write_template(const char *file, const struct config *cfg) +@@ -1001,13 +1001,20 @@ int config_write_template(const char *file, const struct config *cfg) #elif defined (WIN32) (void)re_fprintf(f, "module\t\t\t" "winwave" MOD_EXT "\n"); #else @@ -1228,3 +1228,25 @@ index 7948215b3..37284966d 100644 } #endif (void)re_fprintf(f, "#module\t\t\t" "jack" MOD_EXT "\n"); + +From 7a72698b35b97ddd78ed2370920b818fdddd2120 Mon Sep 17 00:00:00 2001 +From: Christian Spielberger +Date: Mon, 17 Apr 2023 16:09:15 +0200 +Subject: [PATCH 11/11] pipewire: disable stderr buffering after pw_init() + +--- + modules/pipewire/pipewire.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/modules/pipewire/pipewire.c b/modules/pipewire/pipewire.c +index 182420f8e..eb80ad16b 100644 +--- a/modules/pipewire/pipewire.c ++++ b/modules/pipewire/pipewire.c +@@ -265,6 +265,7 @@ static int module_init(void) + int err = 0; + + pw_init(NULL, NULL); ++ setvbuf(stderr, NULL, _IONBF, 0); + info("pipewire: headers %s library %s \n", + pw_get_headers_version(), pw_get_library_version()); + diff --git a/baresip.spec b/baresip.spec index d4d5253..7617468 100644 --- a/baresip.spec +++ b/baresip.spec @@ -1,6 +1,6 @@ Summary: Modular SIP user-agent with audio and video support Name: baresip -Version: 3.0.0 +Version: 3.1.0 Release: 1%{?dist} License: BSD-3-Clause URL: https://github.com/baresip/baresip @@ -18,7 +18,7 @@ BuildRequires: cmake3 %endif BuildRequires: gcc BuildRequires: gcc-c++ -BuildRequires: libre-devel >= 3.0.0 +BuildRequires: libre-devel >= 3.1.0 %if 0%{?fedora} || 0%{?rhel} >= 8 BuildRequires: openssl-devel >= 1.1.0 %else @@ -446,7 +446,7 @@ gtk-update-icon-cache --force %{_datadir}/icons/Adwaita &>/dev/null || : %license LICENSE %doc CHANGELOG.md docs/THANKS docs/examples %{_bindir}/%{name} -%{_libdir}/lib%{name}.so.5* +%{_libdir}/lib%{name}.so.6* %dir %{_libdir}/%{name}/ %dir %{_libdir}/%{name}/modules/ %{_libdir}/%{name}/modules/account.so @@ -586,6 +586,9 @@ gtk-update-icon-cache --force %{_datadir}/icons/Adwaita &>/dev/null || : %{_libdir}/%{name}/modules/x11.so %changelog +* Thu Apr 27 2023 Robert Scheck 3.1.0-1 +- Upgrade to 3.1.0 (#2190310) + * Mon Mar 20 2023 Robert Scheck 3.0.0-1 - Upgrade to 3.0.0 (#2180064) - Added (hopefully future upstream) patch for PipeWire support diff --git a/sources b/sources index 73863ba..8ab0673 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (baresip-3.0.0.tar.gz) = 7eaba0d36d14f6f4bb5077a816f3650192aa7d9ac372265a667bced24b10d13f4669eb426fb1121c3d3366ad01e3134ab25e494cfa987fcb7bb386679b265819 +SHA512 (baresip-3.1.0.tar.gz) = 5a56b9cebd66d57ae75c7175402e8516652ac165f97531698240f17b049ccd8b0974f6bdea4a37a18a2d563997abfb3ec03a05c8e45038d48b2edca0f40c6de0 SHA512 (call-incoming-symbolic.svg) = 49b6422efff9986dd4a18b34df4ab185b01b46c44ab5b8c1d45ab1ca25694cb42e73428b0a69e5fe2eb61c4e7a7aba9c0df82b5e0290f45950f3942be63bf987 SHA512 (call-outgoing-symbolic.svg) = 142cf668d977e3a709d3c13e01d86fdd09e501affd1756df3000de84581c55b3b5082758b32a73ae0e47f45233cc7e55609f3e54effbba01666ca97d5a55fdaa SHA512 (COPYING.adwaita-icon-theme) = e8963bab4d94d9fbcfc930b95164afff9502e4e53209104f4836fcd6dab2c2e9f105c9f9a17b43bc9502903c9c7b2e0880dacf2339cbe110a19654f13742e20a