Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] pipewire: update to 0.3.70
@ 2023-04-22 17:35 cinerea0
  2023-04-22 17:49 ` cinerea0
                   ` (11 more replies)
  0 siblings, 12 replies; 13+ messages in thread
From: cinerea0 @ 2023-04-22 17:35 UTC (permalink / raw)
  To: ml

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

There is a new pull request by cinerea0 against master on the void-packages repository

https://github.com/cinerea0/void-packages pipewire
https://github.com/void-linux/void-packages/pull/43574

pipewire: update to 0.3.70
#### Testing the changes
- I tested the changes in this PR: **YES**


A patch file from https://github.com/void-linux/void-packages/pull/43574.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pipewire-43574.patch --]
[-- Type: text/x-diff, Size: 3739 bytes --]

From 9e38c0d9cb2083336fe609699c8fa0923db0ce03 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sat, 22 Apr 2023 13:33:13 -0400
Subject: [PATCH] pipewire: update to 0.3.70

---
 .../patches/autostart-media-session.patch        | 16 ++++++++++------
 srcpkgs/pipewire/template                        |  6 +++---
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/pipewire/patches/autostart-media-session.patch b/srcpkgs/pipewire/patches/autostart-media-session.patch
index c5753a3719c2..6418cada31cc 100644
--- a/srcpkgs/pipewire/patches/autostart-media-session.patch
+++ b/srcpkgs/pipewire/patches/autostart-media-session.patch
@@ -2,16 +2,20 @@ Upstream's config does not autostart pipewire-media-session anymore, which
 is an essential component. It's not easy to start it externally in a script
 since it needs the pipewire socket up, and Void doesn't have a mechanism to
 ensure it (systemd socket activation).
-diff --git a/src/daemon/pipewire.conf.in.orig b/src/daemon/pipewire.conf.in
-index 95632c2..ab0b097 100644
---- a/src/daemon/pipewire.conf.in.orig
+diff --git a/src/daemon/pipewire.conf.in b/src/daemon/pipewire.conf.in
+index 697bf094d3..d4db26897b 100644
+--- a/src/daemon/pipewire.conf.in
 +++ b/src/daemon/pipewire.conf.in
-@@ -236,7 +236,7 @@
+@@ -294,8 +294,10 @@ context.exec = [
      # but it is better to start it as a systemd service.
      # Run the session manager with -h for options.
      #
--    @sm_comment@{ path = "@session_manager_path@" args = "@session_manager_args@" }
-+    { path = "@session_manager_path@" args = "@session_manager_args@" }
+-    @sm_comment@{ path = "@session_manager_path@" args = "@session_manager_args@"
+-    @sm_comment@  condition = [ { exec.session-manager = null } { exec.session-manager = true } ] }
++    { path = "@session_manager_path@"
++      args = "@session_manager_args@"
++      @sm_comment@  condition = [ { exec.session-manager = null } { exec.session-manager = true } ]
++    }
      #
      # You can optionally start the pulseaudio-server here as well
      # but it is better to start it as a systemd service.
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index f2d161227deb..b17849a3e4dd 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,6 +1,6 @@
 # Template file for 'pipewire'
 pkgname=pipewire
-version=0.3.68
+version=0.3.70
 revision=1
 _pms_version=0.4.2
 build_wrksrc="${pkgname}-${version}"
@@ -26,7 +26,7 @@ makedepends="$(vopt_if sdl2 SDL2-devel) gst-plugins-base1-devel jack-devel
  libfreeaptx-devel libusb-devel fdk-aac-devel libsndfile-devel Vulkan-Headers
  vulkan-loader pulseaudio-devel avahi-libs-devel webrtc-audio-processing-devel
  readline-devel openssl-devel lilv-devel libcanberra-devel dbus-devel
- libmysofa-devel"
+ libmysofa-devel opus-devel"
 depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision}
  libspa-audiomixer>=${version}_${revision} libspa-control>=${version}_${revision}
  libspa-v4l2>=${version}_${revision} pulseaudio-utils"
@@ -38,7 +38,7 @@ homepage="https://pipewire.org/"
 changelog="https://gitlab.freedesktop.org/pipewire/pipewire/-/raw/master/NEWS"
 distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz
  https://gitlab.freedesktop.org/pipewire/media-session/-/archive/${_pms_version}/media-session-${_pms_version}.tar.gz"
-checksum="fdcf7f2ee881cdc91ef54b3a558e431bdb3395f7a1e9044753c7a89346fafd91
+checksum="e9a86d592dea6ee28c67b82c17bd6ba10afd1c880decfcf4b3e7c5421f146d38
  4cf8577d4431e08b0e6f29c1ad6bf8662765ab66986ea6f0151883101811c119"
 make_dirs="/var/lib/pipewire 0755 _pipewire _pipewire"
 system_accounts="_pipewire"

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

* Re: pipewire: update to 0.3.70
  2023-04-22 17:35 [PR PATCH] pipewire: update to 0.3.70 cinerea0
@ 2023-04-22 17:49 ` cinerea0
  2023-05-06  1:53 ` ahesford
                   ` (10 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: cinerea0 @ 2023-04-22 17:49 UTC (permalink / raw)
  To: ml

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

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/43574#issuecomment-1518716034

Comment:
This release of pipewire added functionality to conditionally start a session manager. I want to draw attention to [this comment](https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/3160#note_1870332) by a pipewire dev on the issue that led to this feature being implemented, which references problems resulting from autostarting `pipewire-media-session`:

> Yes, the way you did will end up running both. You will need to fully override the main pipewire.conf file instead. Alternatively either convince your distro to:  
> * stop using dead software
> * adopt a launcher script or daemon like they should have long ago
> * just switch to a better distro (and, if no, you can keep your reasoning to yourself, I can already imagine them without you typing them out but it still needed to be said).

Given that pipewire contributors are now regularly referring to p-m-s as "dead software", I think we have three options:

1. Continue to leave things as they are.
2. Change the patch to only start p-m-s conditionally and update the documentation to reference the solution in the linked issue.
3. Drop p-m-s as in #41868, even though it still builds fine.

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

* Re: pipewire: update to 0.3.70
  2023-04-22 17:35 [PR PATCH] pipewire: update to 0.3.70 cinerea0
  2023-04-22 17:49 ` cinerea0
@ 2023-05-06  1:53 ` ahesford
  2023-05-06  1:54 ` ahesford
                   ` (9 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: ahesford @ 2023-05-06  1:53 UTC (permalink / raw)
  To: ml

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/43574#issuecomment-1536976958

Comment:
I think it's time to drop pipewire-media-session.

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

* Re: pipewire: update to 0.3.70
  2023-04-22 17:35 [PR PATCH] pipewire: update to 0.3.70 cinerea0
  2023-04-22 17:49 ` cinerea0
  2023-05-06  1:53 ` ahesford
@ 2023-05-06  1:54 ` ahesford
  2023-05-06  3:04 ` oreo639
                   ` (8 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: ahesford @ 2023-05-06  1:54 UTC (permalink / raw)
  To: ml

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/43574#issuecomment-1536976958

Comment:
I think it's time to drop pipewire-media-session.

Edit: we sure as hell shouldn't start patching it, so the choice is between leaving it alone or dropping it altogether.

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

* Re: pipewire: update to 0.3.70
  2023-04-22 17:35 [PR PATCH] pipewire: update to 0.3.70 cinerea0
                   ` (2 preceding siblings ...)
  2023-05-06  1:54 ` ahesford
@ 2023-05-06  3:04 ` oreo639
  2023-05-06  3:05 ` oreo639
                   ` (7 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: oreo639 @ 2023-05-06  3:04 UTC (permalink / raw)
  To: ml

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/43574#issuecomment-1537025378

Comment:
> we sure as hell shouldn't start patching it, so the choice is between leaving it alone or dropping it altogether.

It isn't about adding a new patch, it is about updating the existing path for this:
https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/27bc60aeab83a91d4eae3be14f6eff4f67552d02

See here in the diff (i.e. should the `@sm_comment@` be there or not):
`@sm_comment@  condition = [ { exec.session-manager = null } { exec.session-manager = true } ]`

Unless I am misunderstanding you?

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

* Re: pipewire: update to 0.3.70
  2023-04-22 17:35 [PR PATCH] pipewire: update to 0.3.70 cinerea0
                   ` (3 preceding siblings ...)
  2023-05-06  3:04 ` oreo639
@ 2023-05-06  3:05 ` oreo639
  2023-05-06  3:07 ` oreo639
                   ` (6 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: oreo639 @ 2023-05-06  3:05 UTC (permalink / raw)
  To: ml

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/43574#issuecomment-1537025378

Comment:
> we sure as hell shouldn't start patching it, so the choice is between leaving it alone or dropping it altogether.

It isn't about adding a new patch, it is about updating the existing path for this:
https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/27bc60aeab83a91d4eae3be14f6eff4f67552d02

See here in the diff:
`@sm_comment@  condition = [ { exec.session-manager = null } { exec.session-manager = true } ]`
(i.e. should the `@sm_comment@` be there or not)

Unless I am misunderstanding you?

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

* Re: pipewire: update to 0.3.70
  2023-04-22 17:35 [PR PATCH] pipewire: update to 0.3.70 cinerea0
                   ` (4 preceding siblings ...)
  2023-05-06  3:05 ` oreo639
@ 2023-05-06  3:07 ` oreo639
  2023-05-06  3:47 ` ahesford
                   ` (5 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: oreo639 @ 2023-05-06  3:07 UTC (permalink / raw)
  To: ml

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/43574#issuecomment-1537025378

Comment:
> we sure as hell shouldn't start patching it, so the choice is between leaving it alone or dropping it altogether.

It isn't about adding a new patch, it is about updating the existing path for this:
https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/27bc60aeab83a91d4eae3be14f6eff4f67552d02

See here in the diff:
`@sm_comment@  condition = [ { exec.session-manager = null } { exec.session-manager = true } ]`
(i.e. should the `@sm_comment@` be there or not)

Unless I am misunderstanding you?

(imo, it should be fine to have the condition and that would avoid having to replace the `pipewire.conf`)

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

* Re: pipewire: update to 0.3.70
  2023-04-22 17:35 [PR PATCH] pipewire: update to 0.3.70 cinerea0
                   ` (5 preceding siblings ...)
  2023-05-06  3:07 ` oreo639
@ 2023-05-06  3:47 ` ahesford
  2023-05-15 21:49 ` marmeladema
                   ` (4 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: ahesford @ 2023-05-06  3:47 UTC (permalink / raw)
  To: ml

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/43574#issuecomment-1537035971

Comment:
Upstream has been telling us unequivocally for a long time to stop using this program. We need to rip off this Band-Aid and stop patching our configs to do things we shouldn't have been doing in the first place. We are now at the point where we are causing problems for upstream because our users are complaining to them when our problematic configuration changes break. This is inconsiderate and should not be allowed to continue.

The marginal benefit of keeping p-m-s going and adopting the conditional change is that some users *who have not already switched to wireplumber* in the months we've been warning them to do so, but will *suddenly decide to do so before we drop p-m-s*, can do so with a drop-in configuration snippet that will become a no-op after we actually drop the session manager.
1. Those that have already switched to WirePlumber will have already shadowed the system configuration. This isn't a major issue, but can be a minor inconvenience because they may not notice other configuration changes that would have to be reconciled with their overrides.
2. All remaining users will still have their pipewire configuration break at some point in the future when p-m-s stops working properly.


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

* Re: pipewire: update to 0.3.70
  2023-04-22 17:35 [PR PATCH] pipewire: update to 0.3.70 cinerea0
                   ` (6 preceding siblings ...)
  2023-05-06  3:47 ` ahesford
@ 2023-05-15 21:49 ` marmeladema
  2023-05-17 18:17 ` cinerea0
                   ` (3 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: marmeladema @ 2023-05-15 21:49 UTC (permalink / raw)
  To: ml

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

New comment by marmeladema on void-packages repository

https://github.com/void-linux/void-packages/pull/43574#issuecomment-1548641275

Comment:
I concur, it would be really great to drop pms. This has been deprecated for ages and yet, in every Void Linux installation, we have to disable it manually to run wireplumber instead.
Half of the time, I do it wrong and end up with a configuration that starts both :(
Keeping pms doesn't really help anyone at this point and just puts burden on upstream for no good reasons.

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

* Re: pipewire: update to 0.3.70
  2023-04-22 17:35 [PR PATCH] pipewire: update to 0.3.70 cinerea0
                   ` (7 preceding siblings ...)
  2023-05-15 21:49 ` marmeladema
@ 2023-05-17 18:17 ` cinerea0
  2023-05-18 13:28 ` ahesford
                   ` (2 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: cinerea0 @ 2023-05-17 18:17 UTC (permalink / raw)
  To: ml

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

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/43574#issuecomment-1551856117

Comment:
I agree that the best choice at this point is to drop p-m-s. The install message has been around for 4 package updates and almost 5 months, so it's not like people haven't been given warning. *There absolutely will be people whose setups break with this*, but I don't think anything besides a breakage would get them to change at this point.

I'm temporarily marking this as a draft while I test the new 0.3.71 release. I'd be happy to include the changes from the above-linked PR in this one if that would be the best way forward.

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

* Re: pipewire: update to 0.3.70
  2023-04-22 17:35 [PR PATCH] pipewire: update to 0.3.70 cinerea0
                   ` (8 preceding siblings ...)
  2023-05-17 18:17 ` cinerea0
@ 2023-05-18 13:28 ` ahesford
  2023-05-20  2:38 ` [PR PATCH] [Updated] " cinerea0
  2023-05-24 17:10 ` [PR PATCH] [Closed]: pipewire: update to 0.3.71, drop pipewire-media-session ahesford
  11 siblings, 0 replies; 13+ messages in thread
From: ahesford @ 2023-05-18 13:28 UTC (permalink / raw)
  To: ml

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/43574#issuecomment-1553056247

Comment:
I think my approach is the easiest way to avoid a build cycle, so go ahead and pull that into this PR if you'd like.

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

* Re: [PR PATCH] [Updated] pipewire: update to 0.3.70
  2023-04-22 17:35 [PR PATCH] pipewire: update to 0.3.70 cinerea0
                   ` (9 preceding siblings ...)
  2023-05-18 13:28 ` ahesford
@ 2023-05-20  2:38 ` cinerea0
  2023-05-24 17:10 ` [PR PATCH] [Closed]: pipewire: update to 0.3.71, drop pipewire-media-session ahesford
  11 siblings, 0 replies; 13+ messages in thread
From: cinerea0 @ 2023-05-20  2:38 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by cinerea0 against master on the void-packages repository

https://github.com/cinerea0/void-packages pipewire
https://github.com/void-linux/void-packages/pull/43574

pipewire: update to 0.3.70
#### Testing the changes
- I tested the changes in this PR: **YES**


A patch file from https://github.com/void-linux/void-packages/pull/43574.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pipewire-43574.patch --]
[-- Type: text/x-diff, Size: 10426 bytes --]

From 693e816360d5cb85a11d4eb84dae049e4aa52f0e Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 19 May 2023 22:33:54 -0400
Subject: [PATCH 1/3] New package:
 pipewire-session-manager-bootstrap-2023.05.19

This dummy package will be the default provider for the the session
manager pulled in by pipewire, breaking a build cycle.
---
 etc/defaults.virtual                                |  1 +
 srcpkgs/pipewire-session-manager-bootstrap/template | 11 +++++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 srcpkgs/pipewire-session-manager-bootstrap/template

diff --git a/etc/defaults.virtual b/etc/defaults.virtual
index 083ab6349eac..f399b1299840 100644
--- a/etc/defaults.virtual
+++ b/etc/defaults.virtual
@@ -28,6 +28,7 @@ nodejs-runtime nodejs
 ntp-daemon chrony
 phonon-backend phonon-backend-gstreamer
 phonon-qt5-backend phonon-qt5-backend-gstreamer
+pipewire-session-manager pipewire-session-manager-bootstrap
 rkt-stage1 rkt-stage1-coreos
 smtp-server opensmtpd
 tex texlive
diff --git a/srcpkgs/pipewire-session-manager-bootstrap/template b/srcpkgs/pipewire-session-manager-bootstrap/template
new file mode 100644
index 000000000000..32dfa636b07c
--- /dev/null
+++ b/srcpkgs/pipewire-session-manager-bootstrap/template
@@ -0,0 +1,11 @@
+# Template file for 'pipewire-session-manager-bootstrap'
+pkgname=pipewire-session-manager-bootstrap
+version=2023.05.19
+revision=1
+build_style=meta
+short_desc="Dummy pipewire-session-manager provider"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="Public Domain"
+homepage="https://voidlinux.org"
+provides="pipewire-session-manager-${version}_${revision}"
+repository=bootstrap

From f593b5803700525928a7193472b7113ae4ae6251 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 19 May 2023 22:35:25 -0400
Subject: [PATCH 2/3] wireplumber: provide virtual pipewire-session-manager

---
 srcpkgs/wireplumber/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/wireplumber/template b/srcpkgs/wireplumber/template
index 23b011e8d203..736e81629137 100644
--- a/srcpkgs/wireplumber/template
+++ b/srcpkgs/wireplumber/template
@@ -1,7 +1,7 @@
 # Template file for 'wireplumber'
 pkgname=wireplumber
 version=0.4.14
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 configure_args="-Dintrospection=enabled -Dsystem-lua=true"
@@ -15,6 +15,7 @@ homepage="https://pipewire.pages.freedesktop.org/wireplumber"
 changelog="https://gitlab.freedesktop.org/pipewire/wireplumber/-/raw/master/NEWS.rst"
 distfiles="https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/$version/wireplumber-$version.tar.gz"
 checksum=b160424ce7c3eeeccba388726f6a448f53501d25085e5fa1bf6c690c1bcd85ea
+provides="pipewire-session-manager-2023.05.19_1"
 
 post_install() {
 	vlicense LICENSE

From 88f7458b8ff7562ae5d1ca78817739120bdab4fc Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 19 May 2023 22:38:03 -0400
Subject: [PATCH 3/3] pipewire: update to 0.3.71, drop pipewire-media-session

Now depends on virtual session manager
---
 srcpkgs/pipewire/INSTALL.msg                  |  6 +--
 .../patches/autostart-media-session.patch     | 17 -------
 .../patches/jack-fix-notify-skip.patch        | 50 +++++++++++++++++++
 srcpkgs/pipewire/template                     | 27 +++-------
 4 files changed, 60 insertions(+), 40 deletions(-)
 delete mode 100644 srcpkgs/pipewire/patches/autostart-media-session.patch
 create mode 100644 srcpkgs/pipewire/patches/jack-fix-notify-skip.patch

diff --git a/srcpkgs/pipewire/INSTALL.msg b/srcpkgs/pipewire/INSTALL.msg
index 9a3d2db6e1f1..3c3a9b13ef4f 100644
--- a/srcpkgs/pipewire/INSTALL.msg
+++ b/srcpkgs/pipewire/INSTALL.msg
@@ -1,4 +1,2 @@
-The pipewire-media-session session manager has been abandoned upstream and will
-be removed from Void in a subsequent pipewire update. All users are encouraged
-to transition to wireplumber as soon as possible to avoid unexpected loss of
-functionality in the future.
+The pipewire-media-session session manager has been removed from Void.
+All users must transition to wireplumber to avoid loss of functionality.
diff --git a/srcpkgs/pipewire/patches/autostart-media-session.patch b/srcpkgs/pipewire/patches/autostart-media-session.patch
deleted file mode 100644
index c5753a3719c2..000000000000
--- a/srcpkgs/pipewire/patches/autostart-media-session.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Upstream's config does not autostart pipewire-media-session anymore, which
-is an essential component. It's not easy to start it externally in a script
-since it needs the pipewire socket up, and Void doesn't have a mechanism to
-ensure it (systemd socket activation).
-diff --git a/src/daemon/pipewire.conf.in.orig b/src/daemon/pipewire.conf.in
-index 95632c2..ab0b097 100644
---- a/src/daemon/pipewire.conf.in.orig
-+++ b/src/daemon/pipewire.conf.in
-@@ -236,7 +236,7 @@
-     # but it is better to start it as a systemd service.
-     # Run the session manager with -h for options.
-     #
--    @sm_comment@{ path = "@session_manager_path@" args = "@session_manager_args@" }
-+    { path = "@session_manager_path@" args = "@session_manager_args@" }
-     #
-     # You can optionally start the pulseaudio-server here as well
-     # but it is better to start it as a systemd service.
diff --git a/srcpkgs/pipewire/patches/jack-fix-notify-skip.patch b/srcpkgs/pipewire/patches/jack-fix-notify-skip.patch
new file mode 100644
index 000000000000..fed37727a636
--- /dev/null
+++ b/srcpkgs/pipewire/patches/jack-fix-notify-skip.patch
@@ -0,0 +1,50 @@
+From ce71b37b58d5e251ae7acda0799f696688df11c2 Mon Sep 17 00:00:00 2001
+From: Wim Taymans <wtaymans@redhat.com>
+Date: Thu, 18 May 2023 09:59:26 +0200
+Subject: [PATCH] jack: update bufsize and samplerate when skipping notify
+
+When we skip the notify because we are not active or we don't have a
+callback, still update the buffer_size and sample_rate fields or else
+we will keep on trying forever.
+
+Fixes #3226
+---
+ pipewire-jack/src/pipewire-jack.c | 14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/pipewire-jack/src/pipewire-jack.c b/pipewire-jack/src/pipewire-jack.c
+index 0c8363ea3..20feb2462 100644
+--- a/pipewire-jack/src/pipewire-jack.c
++++ b/pipewire-jack/src/pipewire-jack.c
+@@ -1027,8 +1027,6 @@ static int queue_notify(struct client *c, int type, struct object *o, int arg1,
+ 	struct notify *notify;
+ 	bool emit = false;;
+ 
+-	if ((type & NOTIFY_ACTIVE_FLAG) && !c->active)
+-		return 0;
+ 	switch (type) {
+ 	case NOTIFY_TYPE_REGISTRATION:
+ 		emit = c->registration_callback != NULL && o != NULL;
+@@ -1060,8 +1058,18 @@ static int queue_notify(struct client *c, int type, struct object *o, int arg1,
+ 	default:
+ 		break;
+ 	}
++	if ((type & NOTIFY_ACTIVE_FLAG) && !c->active)
++		emit = false;
+ 	if (!emit) {
+-		pw_log_debug("%p: skip notify %d", c, type);
++		switch (type) {
++		case NOTIFY_TYPE_BUFFER_FRAMES:
++			c->buffer_frames = arg1;
++			break;
++		case NOTIFY_TYPE_SAMPLE_RATE:
++			c->sample_rate = arg1;
++			break;
++		}
++		pw_log_debug("%p: skip notify %08x active:%d", c, type, c->active);
+ 		if (o != NULL && arg1 == 0 && o->removing) {
+ 			o->removing = false;
+ 			free_object(c, o);
+-- 
+GitLab
+
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index f2d161227deb..92feaab2a6d7 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,9 +1,7 @@
 # Template file for 'pipewire'
 pkgname=pipewire
-version=0.3.68
+version=0.3.71
 revision=1
-_pms_version=0.4.2
-build_wrksrc="${pkgname}-${version}"
 build_style=meson
 configure_args="
  --auto-features=enabled
@@ -15,9 +13,8 @@ configure_args="
  -Dsystemd=disabled
  -Dudevrulesdir=/usr/lib/udev/rules.d
  -Dvulkan=enabled
- -Dmedia-session:systemd=disabled
  -Dbluez5-codec-lc3plus=disabled
- -Dsession-managers=media-session
+ -Dsession-managers=[]
  -Drlimits-match=@_pipewire
 "
 hostmakedepends="doxygen graphviz pkg-config python3-docutils gettext glib-devel"
@@ -26,23 +23,20 @@ makedepends="$(vopt_if sdl2 SDL2-devel) gst-plugins-base1-devel jack-devel
  libfreeaptx-devel libusb-devel fdk-aac-devel libsndfile-devel Vulkan-Headers
  vulkan-loader pulseaudio-devel avahi-libs-devel webrtc-audio-processing-devel
  readline-devel openssl-devel lilv-devel libcanberra-devel dbus-devel
- libmysofa-devel"
+ libmysofa-devel opus-devel"
 depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision}
  libspa-audiomixer>=${version}_${revision} libspa-control>=${version}_${revision}
- libspa-v4l2>=${version}_${revision} pulseaudio-utils"
+ libspa-v4l2>=${version}_${revision} pulseaudio-utils virtual?pipewire-session-manager"
 checkdepends="pulseaudio-utils"
 short_desc="Server and user space API to deal with multimedia pipelines"
 maintainer="Stefano Ragni <stefano.ragni@outlook.com>"
 license="MIT"
 homepage="https://pipewire.org/"
 changelog="https://gitlab.freedesktop.org/pipewire/pipewire/-/raw/master/NEWS"
-distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz
- https://gitlab.freedesktop.org/pipewire/media-session/-/archive/${_pms_version}/media-session-${_pms_version}.tar.gz"
-checksum="fdcf7f2ee881cdc91ef54b3a558e431bdb3395f7a1e9044753c7a89346fafd91
- 4cf8577d4431e08b0e6f29c1ad6bf8662765ab66986ea6f0151883101811c119"
+distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz"
+checksum=070dcf83c514903d603351921c7829014c8d9162c49ae5a043290c920f6a6363
 make_dirs="/var/lib/pipewire 0755 _pipewire _pipewire"
 system_accounts="_pipewire"
-patch_args="-Np1 --directory=${build_wrksrc}"
 
 build_options="sdl2"
 
@@ -59,18 +53,13 @@ else
 	configure_args+=" -Dbluez5-codec-ldac=disabled"
 fi
 
-post_extract() {
-	mv media-session-${_pms_version} ${build_wrksrc}/subprojects/media-session
-}
-
 post_install() {
 	vlicense LICENSE
 	vdoc "${FILESDIR}/README.voidlinux"
 	vsv pipewire
 	vsv pipewire-pulse
-	vmkdir usr/share/applications
-	cp "${FILESDIR}/pipewire.desktop" ${DESTDIR}/usr/share/applications/pipewire.desktop
-	cp "${FILESDIR}/pipewire-pulse.desktop" ${DESTDIR}/usr/share/applications/pipewire-pulse.desktop
+	vinstall "${FILESDIR}/pipewire.desktop" 644 usr/share/applications
+	vinstall "${FILESDIR}/pipewire-pulse.desktop" 644 usr/share/applications
 }
 
 libpipewire_package() {

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

* Re: [PR PATCH] [Closed]: pipewire: update to 0.3.71, drop pipewire-media-session
  2023-04-22 17:35 [PR PATCH] pipewire: update to 0.3.70 cinerea0
                   ` (10 preceding siblings ...)
  2023-05-20  2:38 ` [PR PATCH] [Updated] " cinerea0
@ 2023-05-24 17:10 ` ahesford
  11 siblings, 0 replies; 13+ messages in thread
From: ahesford @ 2023-05-24 17:10 UTC (permalink / raw)
  To: ml

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

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

pipewire: update to 0.3.71, drop pipewire-media-session
https://github.com/void-linux/void-packages/pull/43574

Description:
#### Testing the changes
- I tested the changes in this PR: **YES**


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

end of thread, other threads:[~2023-05-24 17:10 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-22 17:35 [PR PATCH] pipewire: update to 0.3.70 cinerea0
2023-04-22 17:49 ` cinerea0
2023-05-06  1:53 ` ahesford
2023-05-06  1:54 ` ahesford
2023-05-06  3:04 ` oreo639
2023-05-06  3:05 ` oreo639
2023-05-06  3:07 ` oreo639
2023-05-06  3:47 ` ahesford
2023-05-15 21:49 ` marmeladema
2023-05-17 18:17 ` cinerea0
2023-05-18 13:28 ` ahesford
2023-05-20  2:38 ` [PR PATCH] [Updated] " cinerea0
2023-05-24 17:10 ` [PR PATCH] [Closed]: pipewire: update to 0.3.71, drop pipewire-media-session ahesford

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