diff --git a/.gitignore b/.gitignore index 5da911e..d24226f 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ /pipewire-0.3.19.tar.gz /pipewire-0.3.20.tar.gz /pipewire-0.3.21.tar.gz +/pipewire-0.3.22.tar.gz diff --git a/0001-pulse-server-actually-fill-in-the-maxlenght-and-frag.patch b/0001-pulse-server-actually-fill-in-the-maxlenght-and-frag.patch deleted file mode 100644 index 8f9823c..0000000 --- a/0001-pulse-server-actually-fill-in-the-maxlenght-and-frag.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 20008b4846f4c86e6d6641c95045cd8360eebcfc Mon Sep 17 00:00:00 2001 -From: Wim Taymans -Date: Thu, 4 Feb 2021 14:53:28 +0100 -Subject: [PATCH 1/2] pulse-server: actually fill in the maxlenght and - fragsize.. - ---- - src/modules/module-protocol-pulse/pulse-server.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/modules/module-protocol-pulse/pulse-server.c b/src/modules/module-protocol-pulse/pulse-server.c -index 40ec4f830..55fa88d3c 100644 ---- a/src/modules/module-protocol-pulse/pulse-server.c -+++ b/src/modules/module-protocol-pulse/pulse-server.c -@@ -1243,6 +1243,9 @@ static int reply_create_record_stream(struct stream *stream) - - snprintf(latency, sizeof(latency), "%u/%u", lat.num, lat.denom); - -+ snprintf(attr_maxlength, sizeof(attr_maxlength), "%u", stream->attr.maxlength); -+ snprintf(attr_fragsize, sizeof(attr_fragsize), "%u", stream->attr.fragsize); -+ - items[0] = SPA_DICT_ITEM_INIT(PW_KEY_NODE_LATENCY, latency); - items[1] = SPA_DICT_ITEM_INIT("pulse.attr.maxlength", attr_maxlength); - items[2] = SPA_DICT_ITEM_INIT("pulse.attr.fragsize", attr_fragsize); --- -2.26.2 - diff --git a/0002-jack-implement-some-missing-methods.patch b/0002-jack-implement-some-missing-methods.patch deleted file mode 100644 index 16046ce..0000000 --- a/0002-jack-implement-some-missing-methods.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 3450bea4167573d3d364e1a768605d11be241293 Mon Sep 17 00:00:00 2001 -From: Wim Taymans -Date: Thu, 4 Feb 2021 15:48:36 +0100 -Subject: [PATCH 2/2] jack: implement some missing methods - -to make qjackctl 0.9.0 work ---- - pipewire-jack/src/pipewire-jack.c | 55 ++++++++++++++++++++++++++++++- - 1 file changed, 54 insertions(+), 1 deletion(-) - -diff --git a/pipewire-jack/src/pipewire-jack.c b/pipewire-jack/src/pipewire-jack.c -index 5163d4a5e..a7ead586d 100644 ---- a/pipewire-jack/src/pipewire-jack.c -+++ b/pipewire-jack/src/pipewire-jack.c -@@ -4719,7 +4719,12 @@ int jack_session_reply (jack_client_t *client, - SPA_EXPORT - void jack_session_event_free (jack_session_event_t *event) - { -- pw_log_warn("not implemented"); -+ if (event) { -+ free((void *)event->session_dir); -+ free((void *)event->client_uuid); -+ free(event->command_line); -+ free(event); -+ } - } - - SPA_EXPORT -@@ -4732,6 +4737,54 @@ char *jack_client_get_uuid (jack_client_t *client) - return spa_aprintf("%"PRIu64, client_make_uuid(c->node_id)); - } - -+SPA_EXPORT -+jack_session_command_t *jack_session_notify ( -+ jack_client_t* client, -+ const char *target, -+ jack_session_event_type_t type, -+ const char *path) -+{ -+ struct client *c = (struct client *) client; -+ spa_return_val_if_fail(c != NULL, NULL); -+ pw_log_warn("not implemented"); -+ return NULL; -+} -+ -+SPA_EXPORT -+void jack_session_commands_free (jack_session_command_t *cmds) -+{ -+ int i; -+ if (cmds == NULL) -+ return; -+ -+ for (i = 0; cmds[i].uuid != NULL; i++) { -+ free((char*)cmds[i].client_name); -+ free((char*)cmds[i].command); -+ free((char*)cmds[i].uuid); -+ } -+ free(cmds); -+} -+ -+SPA_EXPORT -+int jack_reserve_client_name (jack_client_t *client, -+ const char *name, -+ const char *uuid) -+{ -+ struct client *c = (struct client *) client; -+ spa_return_val_if_fail(c != NULL, -1); -+ pw_log_warn("not implemented"); -+ return 0; -+} -+ -+SPA_EXPORT -+int jack_client_has_session_callback (jack_client_t *client, const char *client_name) -+{ -+ struct client *c = (struct client *) client; -+ spa_return_val_if_fail(c != NULL, -1); -+ return 0; -+} -+ -+ - SPA_EXPORT - int jack_client_real_time_priority (jack_client_t * client) - { --- -2.26.2 - diff --git a/pipewire.spec b/pipewire.spec index edecf0a..28f82e0 100644 --- a/pipewire.spec +++ b/pipewire.spec @@ -1,6 +1,6 @@ %global majorversion 0 %global minorversion 3 -%global microversion 21 +%global microversion 22 %global apiversion 0.3 %global spaversion 0.2 @@ -8,7 +8,7 @@ %global libversion %{soversion}.%(bash -c '((intversion = (%{minorversion} * 100) + %{microversion})); echo ${intversion}').0 # For rpmdev-bumpspec and releng automation -%global baserelease 2 +%global baserelease 1 #global snapdate 20210107 #global gitcommit b17db2cebc1a5ab2c01851d29c05f79cd2f262bb @@ -52,8 +52,6 @@ Source0: https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/%{version}/p %endif ## upstream patches -Patch0: 0001-pulse-server-actually-fill-in-the-maxlenght-and-frag.patch -Patch1: 0002-jack-implement-some-missing-methods.patch ## upstreamable patches @@ -216,10 +214,10 @@ This package provides a PulseAudio implementation based on PipeWire %build %meson \ -D docs=true -D man=true -D gstreamer=true -D systemd=true \ - -D gstreamer-device-provider=false \ + -D gstreamer-device-provider=false -D sdl2=disabled \ %{!?with_jack:-D jack=false -D pipewire-jack=false} \ %{!?with_alsa:-D pipewire-alsa=false} \ - %{!?with_vulkan:-D vulkan=false} + %{?with_vulkan:-D vulkan=true} %meson_build %install @@ -297,7 +295,11 @@ systemctl --no-reload preset --global pipewire.socket >/dev/null 2>&1 || : %{_mandir}/man1/pipewire.1* %dir %{_sysconfdir}/pipewire/ %dir %{_sysconfdir}/pipewire/media-session.d/ +%config(noreplace) %{_sysconfdir}/pipewire/client.conf +%config(noreplace) %{_sysconfdir}/pipewire/client-rt.conf +%config(noreplace) %{_sysconfdir}/pipewire/jack.conf %config(noreplace) %{_sysconfdir}/pipewire/pipewire.conf +%config(noreplace) %{_sysconfdir}/pipewire/pipewire-pulse.conf %config(noreplace) %{_sysconfdir}/pipewire/media-session.d/alsa-monitor.conf %config(noreplace) %{_sysconfdir}/pipewire/media-session.d/bluez-monitor.conf %config(noreplace) %{_sysconfdir}/pipewire/media-session.d/media-session.conf @@ -365,6 +367,7 @@ systemctl --no-reload preset --global pipewire.socket >/dev/null 2>&1 || : %{_bindir}/spa-acp-tool %{_bindir}/spa-inspect +%{_bindir}/spa-json-dump %{_bindir}/spa-monitor %{_bindir}/spa-resample @@ -401,6 +404,10 @@ systemctl --no-reload preset --global pipewire.socket >/dev/null 2>&1 || : %endif %changelog +* Thu Feb 18 2021 Wim Taymans - 0.3.22-1 +- Update to 0.3.22 +- disable sdl2 examples + * Thu Feb 04 2021 Wim Taymans - 0.3.21-2 - Add some upstream patches - Fixes rhbz#1925138 diff --git a/sources b/sources index d83b3fd..6347674 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pipewire-0.3.21.tar.gz) = cd1e7696c5712dfbd0f5ebffbb74f23ce5f6752744b062741546d55d524a4dca43776e1862fdc55faf5220c23f7ef9e0c5f9c3b1892a6b43ad50dfb99b9a66cc +SHA512 (pipewire-0.3.22.tar.gz) = a6587e0afd5c90be1733ecf62c6fc68e735ab3b84f2cbbf844bbe1be93e7a23dee07b041ed6b273cab6ab207d2388ae6f2027d0380928555a0155a7cc9ca4a7e