Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] pipewire: apply qjackctl fix from master
@ 2021-02-08 15:26 st3r4g
  2021-02-08 15:34 ` [PR REVIEW] " ericonr
                   ` (10 more replies)
  0 siblings, 11 replies; 12+ messages in thread
From: st3r4g @ 2021-02-08 15:26 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1673 bytes --]

There is a new 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: 3795 bytes --]

From 8e7c45acc9302450e54052e5915788f911de68b9 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 | 73 +++++++++++++++++++
 ...167573d3d364e1a768605d11be241293.diff.args |  1 +
 srcpkgs/pipewire/template                     |  2 +-
 3 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/pipewire/patches/3450bea4167573d3d364e1a768605d11be241293.diff
 create mode 100644 srcpkgs/pipewire/patches/3450bea4167573d3d364e1a768605d11be241293.diff.args

diff --git a/srcpkgs/pipewire/patches/3450bea4167573d3d364e1a768605d11be241293.diff b/srcpkgs/pipewire/patches/3450bea4167573d3d364e1a768605d11be241293.diff
new file mode 100644
index 00000000000..d3c50a9ed64
--- /dev/null
+++ b/srcpkgs/pipewire/patches/3450bea4167573d3d364e1a768605d11be241293.diff
@@ -0,0 +1,73 @@
+diff --git a/pipewire-jack/src/pipewire-jack.c b/pipewire-jack/src/pipewire-jack.c
+index 5163d4a5e287d076160ee01bb8c1c1aac73ff35c..a7ead586db3d682b7ae0e6ba0069fec98458d69b 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)
+ {
diff --git a/srcpkgs/pipewire/patches/3450bea4167573d3d364e1a768605d11be241293.diff.args b/srcpkgs/pipewire/patches/3450bea4167573d3d364e1a768605d11be241293.diff.args
new file mode 100644
index 00000000000..2eba1cb3c5c
--- /dev/null
+++ b/srcpkgs/pipewire/patches/3450bea4167573d3d364e1a768605d11be241293.diff.args
@@ -0,0 +1 @@
+-Np1
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

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR REVIEW] pipewire: apply qjackctl fix from master
  2021-02-08 15:26 [PR PATCH] pipewire: apply qjackctl fix from master st3r4g
@ 2021-02-08 15:34 ` ericonr
  2021-02-08 15:40 ` st3r4g
                   ` (9 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: ericonr @ 2021-02-08 15:34 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 283 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28589#discussion_r572141472

Comment:
```suggestion
--- pipewire-jack/src/pipewire-jack.c
+++ pipewire-jack/src/pipewire-jack.c
```

Avoids the need for the series file.

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: pipewire: apply qjackctl fix from master
  2021-02-08 15:26 [PR PATCH] pipewire: apply qjackctl fix from master st3r4g
  2021-02-08 15:34 ` [PR REVIEW] " ericonr
@ 2021-02-08 15:40 ` st3r4g
  2021-02-08 15:42 ` [PR PATCH] [Updated] " st3r4g
                   ` (8 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: st3r4g @ 2021-02-08 15:40 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 362 bytes --]

New comment by st3r4g on void-packages repository

https://github.com/void-linux/void-packages/pull/28589#issuecomment-775237211

Comment:
> Can you add a link to the commit to the top of the file. It's hard to tell what this does.

Well, the commit hash is already in the filename, I though it was descriptive enough. Also it will be removed on next release.

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] pipewire: apply qjackctl fix from master
  2021-02-08 15:26 [PR PATCH] pipewire: apply qjackctl fix from master st3r4g
  2021-02-08 15:34 ` [PR REVIEW] " ericonr
  2021-02-08 15:40 ` st3r4g
@ 2021-02-08 15:42 ` st3r4g
  2021-02-08 15:45 ` st3r4g
                   ` (7 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: st3r4g @ 2021-02-08 15:42 UTC (permalink / raw)
  To: ml

[-- 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: 3408 bytes --]

From 682d88c942caf6e94d1b005b5639668738713f61 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 | 75 +++++++++++++++++++
 srcpkgs/pipewire/template                     |  2 +-
 2 files changed, 76 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..897de9b75c5
--- /dev/null
+++ b/srcpkgs/pipewire/patches/3450bea4167573d3d364e1a768605d11be241293.diff
@@ -0,0 +1,75 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/3450bea4167573d3d364e1a768605d11be241293
+
+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

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: pipewire: apply qjackctl fix from master
  2021-02-08 15:26 [PR PATCH] pipewire: apply qjackctl fix from master st3r4g
                   ` (2 preceding siblings ...)
  2021-02-08 15:42 ` [PR PATCH] [Updated] " st3r4g
@ 2021-02-08 15:45 ` st3r4g
  2021-02-08 15:58 ` [PR PATCH] [Updated] " st3r4g
                   ` (6 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: st3r4g @ 2021-02-08 15:45 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 400 bytes --]

New comment by st3r4g on void-packages repository

https://github.com/void-linux/void-packages/pull/28589#issuecomment-775237211

Comment:
> Can you add a link to the commit to the top of the file. It's hard to tell what this does.

Well, the commit hash is already in the filename, I though it was descriptive enough. Also it will be removed on next release. Should we just wait for next release?

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] pipewire: apply qjackctl fix from master
  2021-02-08 15:26 [PR PATCH] pipewire: apply qjackctl fix from master st3r4g
                   ` (3 preceding siblings ...)
  2021-02-08 15:45 ` st3r4g
@ 2021-02-08 15:58 ` st3r4g
  2021-02-08 16:40 ` ericonr
                   ` (5 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: st3r4g @ 2021-02-08 15:58 UTC (permalink / raw)
  To: ml

[-- 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

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: pipewire: apply qjackctl fix from master
  2021-02-08 15:26 [PR PATCH] pipewire: apply qjackctl fix from master st3r4g
                   ` (4 preceding siblings ...)
  2021-02-08 15:58 ` [PR PATCH] [Updated] " st3r4g
@ 2021-02-08 16:40 ` ericonr
  2021-02-08 23:38 ` [PR PATCH] [Updated] " st3r4g
                   ` (4 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: ericonr @ 2021-02-08 16:40 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 496 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28589#issuecomment-775277350

Comment:
> Well, the commit hash is already in the filename, I though it was descriptive enough. 

I somehow missed that, but the link is also easier to click and go directly to the explanation.

Re. Waiting for release, your choice. Pipewire is small enough IMO that either is ok. Unless a release is coming in the next few days, then I guess waiting is best.

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] pipewire: apply qjackctl fix from master
  2021-02-08 15:26 [PR PATCH] pipewire: apply qjackctl fix from master st3r4g
                   ` (5 preceding siblings ...)
  2021-02-08 16:40 ` ericonr
@ 2021-02-08 23:38 ` st3r4g
  2021-02-08 23:41 ` st3r4g
                   ` (3 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: st3r4g @ 2021-02-08 23:38 UTC (permalink / raw)
  To: ml

[-- 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 32c8de50db70ceaa4b5292518f84b49a5cdb5bc9 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

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: pipewire: apply qjackctl fix from master
  2021-02-08 15:26 [PR PATCH] pipewire: apply qjackctl fix from master st3r4g
                   ` (6 preceding siblings ...)
  2021-02-08 23:38 ` [PR PATCH] [Updated] " st3r4g
@ 2021-02-08 23:41 ` st3r4g
  2021-02-08 23:42 ` st3r4g
                   ` (2 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: st3r4g @ 2021-02-08 23:41 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 313 bytes --]

New comment by st3r4g on void-packages repository

https://github.com/void-linux/void-packages/pull/28589#issuecomment-775538698

Comment:
Rerun CI because GitHub had problem earlier today.

> Unless a release is coming in the next few days, then I guess waiting is best.

Releases are usually every 2 weeks.

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: pipewire: apply qjackctl fix from master
  2021-02-08 15:26 [PR PATCH] pipewire: apply qjackctl fix from master st3r4g
                   ` (7 preceding siblings ...)
  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
  10 siblings, 0 replies; 12+ messages in thread
From: st3r4g @ 2021-02-08 23:42 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 388 bytes --]

New comment by st3r4g on void-packages repository

https://github.com/void-linux/void-packages/pull/28589#issuecomment-775538698

Comment:
Rerun CI because GitHub had problem earlier today.

> Unless a release is coming in the next few days, then I guess waiting is best.

Releases are usually every 2 weeks.
But until the other PR is merged qjackctl with pipewire is broken anyway.

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: pipewire: apply qjackctl fix from master
  2021-02-08 15:26 [PR PATCH] pipewire: apply qjackctl fix from master st3r4g
                   ` (8 preceding siblings ...)
  2021-02-08 23:42 ` st3r4g
@ 2021-02-08 23:42 ` st3r4g
  2021-02-09  1:28 ` [PR PATCH] [Merged]: " ericonr
  10 siblings, 0 replies; 12+ messages in thread
From: st3r4g @ 2021-02-08 23:42 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 404 bytes --]

New comment by st3r4g on void-packages repository

https://github.com/void-linux/void-packages/pull/28589#issuecomment-775538698

Comment:
Rerun CI because GitHub had problem earlier today.

> Unless a release is coming in the next few days, then I guess waiting is best.

Releases are usually every 2 weeks.
But until the other PR (rpath removal) is merged qjackctl with pipewire is broken anyway.

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Merged]: pipewire: apply qjackctl fix from master
  2021-02-08 15:26 [PR PATCH] pipewire: apply qjackctl fix from master st3r4g
                   ` (9 preceding siblings ...)
  2021-02-08 23:42 ` st3r4g
@ 2021-02-09  1:28 ` ericonr
  10 siblings, 0 replies; 12+ messages in thread
From: ericonr @ 2021-02-09  1:28 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1514 bytes --]

There's a merged pull request on the void-packages repository

pipewire: apply qjackctl fix from master
https://github.com/void-linux/void-packages/pull/28589

Description:
<!-- 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

^ permalink raw reply	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2021-02-09  1:28 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-08 15:26 [PR PATCH] pipewire: apply qjackctl fix from master 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 ` [PR PATCH] [Updated] " st3r4g
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

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).