From: st3r4g <st3r4g@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] pipewire: apply qjackctl fix from master
Date: Mon, 08 Feb 2021 16:58:41 +0100 [thread overview]
Message-ID: <20210208155841.4c8hrzTuSZRqd1iH0SJj0IyTTCWgC2N8kKfn-IxAqV0@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-28589@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1678 bytes --]
There is an updated pull request by st3r4g against master on the void-packages repository
https://github.com/st3r4g/void-packages pipewire-0.3.21_2
https://github.com/void-linux/void-packages/pull/28589
pipewire: apply qjackctl fix from master
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/696
A patch file from https://github.com/void-linux/void-packages/pull/28589.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pipewire-0.3.21_2-28589.patch --]
[-- Type: text/x-diff, Size: 3373 bytes --]
From 534a7d7a47c95cacfedcd9590ece143b2253cf2f Mon Sep 17 00:00:00 2001
From: Stefano Ragni <st3r4g@protonmail.com>
Date: Mon, 8 Feb 2021 11:50:11 +0100
Subject: [PATCH] pipewire: apply qjackctl fix from master
---
...0bea4167573d3d364e1a768605d11be241293.diff | 74 +++++++++++++++++++
srcpkgs/pipewire/template | 2 +-
2 files changed, 75 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/pipewire/patches/3450bea4167573d3d364e1a768605d11be241293.diff
diff --git a/srcpkgs/pipewire/patches/3450bea4167573d3d364e1a768605d11be241293.diff b/srcpkgs/pipewire/patches/3450bea4167573d3d364e1a768605d11be241293.diff
new file mode 100644
index 00000000000..10cd090cce7
--- /dev/null
+++ b/srcpkgs/pipewire/patches/3450bea4167573d3d364e1a768605d11be241293.diff
@@ -0,0 +1,74 @@
+Fix https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/696
+diff --git a/pipewire-jack/src/pipewire-jack.c b/pipewire-jack/src/pipewire-jack.c
+index 5163d4a5e287d076160ee01bb8c1c1aac73ff35c..a7ead586db3d682b7ae0e6ba0069fec98458d69b 100644
+--- pipewire-jack/src/pipewire-jack.c
++++ 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)
+ {
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 50d32828a47..f327ea67fb2 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,7 +1,7 @@
# Template file for 'pipewire'
pkgname=pipewire
version=0.3.21
-revision=1
+revision=2
build_style=meson
configure_args="-Dman=true -Dgstreamer=true -Ddocs=true -Dsystemd=false
-Dbluez5=true -Dffmpeg=true -Dpipewire-alsa=true -Dpipewire-jack=true
next prev parent reply other threads:[~2021-02-08 15:58 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-08 15:26 [PR PATCH] " st3r4g
2021-02-08 15:34 ` [PR REVIEW] " ericonr
2021-02-08 15:40 ` st3r4g
2021-02-08 15:42 ` [PR PATCH] [Updated] " st3r4g
2021-02-08 15:45 ` st3r4g
2021-02-08 15:58 ` st3r4g [this message]
2021-02-08 16:40 ` ericonr
2021-02-08 23:38 ` [PR PATCH] [Updated] " st3r4g
2021-02-08 23:41 ` st3r4g
2021-02-08 23:42 ` st3r4g
2021-02-08 23:42 ` st3r4g
2021-02-09 1:28 ` [PR PATCH] [Merged]: " ericonr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210208155841.4c8hrzTuSZRqd1iH0SJj0IyTTCWgC2N8kKfn-IxAqV0@z \
--to=st3r4g@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).