[PR PATCH] pipewire: update to 0.3.72

[PR PATCH] pipewire: update to 0.3.72

[cinerea0]

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

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


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

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

From a38c0cb3deede003afe991ed853ee6905bdb929b Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 26 Jun 2023 21:44:00 -0400
Subject: [PATCH] pipewire: update to 0.3.72

---
 .../patches/jack-fix-notify-skip.patch        | 50 -------------------
 srcpkgs/pipewire/template                     | 13 +++--
 2 files changed, 8 insertions(+), 55 deletions(-)
 delete mode 100644 srcpkgs/pipewire/patches/jack-fix-notify-skip.patch

diff --git a/srcpkgs/pipewire/patches/jack-fix-notify-skip.patch b/srcpkgs/pipewire/patches/jack-fix-notify-skip.patch
deleted file mode 100644
index fed37727a636..000000000000
--- a/srcpkgs/pipewire/patches/jack-fix-notify-skip.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-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 3e0cffb69a3c..0b545fab99bd 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,7 +1,7 @@
 # Template file for 'pipewire'
 pkgname=pipewire
-version=0.3.71
-revision=3
+version=0.3.72
+revision=1
 build_style=meson
 configure_args="
  --auto-features=enabled
@@ -16,6 +16,7 @@ configure_args="
  -Dbluez5-codec-lc3plus=disabled
  -Dsession-managers=[]
  -Drlimits-match=@_pipewire
+ -Dlibffado=$(vopt_if ffado enabled disabled)
 "
 hostmakedepends="doxygen graphviz pkg-config python3-docutils gettext glib-devel"
 makedepends="$(vopt_if sdl2 SDL2-devel) gst-plugins-base1-devel jack-devel
@@ -23,7 +24,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 opus-devel"
+ libmysofa-devel opus-devel $(vopt_if ffado libffado-devel)"
 depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision}
  libspa-audiomixer>=${version}_${revision} libspa-control>=${version}_${revision}
  libspa-v4l2>=${version}_${revision} pulseaudio-utils virtual?pipewire-session-manager"
@@ -34,11 +35,13 @@ 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"
-checksum=070dcf83c514903d603351921c7829014c8d9162c49ae5a043290c920f6a6363
+checksum=eb11d03e7c700e0d9204624fd3116f165f104c37eff30e93e7ac6df763e93829
 make_dirs="/var/lib/pipewire 0755 _pipewire _pipewire"
 system_accounts="_pipewire"
 
-build_options="sdl2"
+build_options="ffado sdl2"
+desc_option_ffado="Enable support for FireWire based audio devices"
+desc_option_sdl2="Enable support for SDL2"
 
 replaces="libpulseaudio-pipewire>=0"
 

Re: [PR REVIEW] pipewire: update to 0.3.72

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/44654#discussion_r1243322210

Comment:
this already exists in common/options.description

Re: [PR REVIEW] pipewire: update to 0.3.72

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/44654#discussion_r1243322432

Comment:
```suggestion
 $(vopt_bool ffado libffado)
```

Re: [PR REVIEW] pipewire: update to 0.3.72

[cinerea0]

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

New review comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/44654#discussion_r1243723113

Comment:
That option specifically looks for "enabled", "disabled", or "auto" (see error below), which I don't think any of the `vopt_` shortcuts provide.

`meson.build:1:0: ERROR: Value "false" (of type "string") for combo option "Enable code that depends on libffado" is not one of the choices. Possible choices are (as string): "enabled", "disabled", "auto".`

Re: [PR REVIEW] pipewire: update to 0.3.72

[cinerea0]

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

New review comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/44654#discussion_r1243723113

Comment:
That option specifically looks for "enabled", "disabled", or "auto" (see error below), which I don't think any of the `vopt_` shortcuts provide. There is `vopt_enable`, but I don't know if that's compatible with meson.

`meson.build:1:0: ERROR: Value "false" (of type "string") for combo option "Enable code that depends on libffado" is not one of the choices. Possible choices are (as string): "enabled", "disabled", "auto".`

Re: [PR PATCH] [Updated] pipewire: update to 0.3.72

[cinerea0]

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

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


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

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

From 4a7b6fde995a8b3a7f33470e4957f3088990b39a Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 27 Jun 2023 09:29:30 -0400
Subject: [PATCH] pipewire: update to 0.3.72

---
 .../patches/jack-fix-notify-skip.patch        | 50 -------------------
 srcpkgs/pipewire/template                     | 12 +++--
 2 files changed, 7 insertions(+), 55 deletions(-)
 delete mode 100644 srcpkgs/pipewire/patches/jack-fix-notify-skip.patch

diff --git a/srcpkgs/pipewire/patches/jack-fix-notify-skip.patch b/srcpkgs/pipewire/patches/jack-fix-notify-skip.patch
deleted file mode 100644
index fed37727a636..000000000000
--- a/srcpkgs/pipewire/patches/jack-fix-notify-skip.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-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 3e0cffb69a3c..312e34a6bb85 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,7 +1,7 @@
 # Template file for 'pipewire'
 pkgname=pipewire
-version=0.3.71
-revision=3
+version=0.3.72
+revision=1
 build_style=meson
 configure_args="
  --auto-features=enabled
@@ -16,6 +16,7 @@ configure_args="
  -Dbluez5-codec-lc3plus=disabled
  -Dsession-managers=[]
  -Drlimits-match=@_pipewire
+ -Dlibffado=$(vopt_if ffado enabled disabled)
 "
 hostmakedepends="doxygen graphviz pkg-config python3-docutils gettext glib-devel"
 makedepends="$(vopt_if sdl2 SDL2-devel) gst-plugins-base1-devel jack-devel
@@ -23,7 +24,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 opus-devel"
+ libmysofa-devel opus-devel $(vopt_if ffado libffado-devel)"
 depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision}
  libspa-audiomixer>=${version}_${revision} libspa-control>=${version}_${revision}
  libspa-v4l2>=${version}_${revision} pulseaudio-utils virtual?pipewire-session-manager"
@@ -34,11 +35,12 @@ 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"
-checksum=070dcf83c514903d603351921c7829014c8d9162c49ae5a043290c920f6a6363
+checksum=eb11d03e7c700e0d9204624fd3116f165f104c37eff30e93e7ac6df763e93829
 make_dirs="/var/lib/pipewire 0755 _pipewire _pipewire"
 system_accounts="_pipewire"
 
-build_options="sdl2"
+build_options="ffado sdl2"
+desc_option_ffado="Enable support for FireWire based audio devices"
 
 replaces="libpulseaudio-pipewire>=0"
 

Re: [PR REVIEW] pipewire: update to 0.3.72

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/44654#discussion_r1243998284

Comment:
hm strange, meson is usually good about that

Re: [PR PATCH] [Updated] pipewire: update to 0.3.72

[cinerea0]

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

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


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

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

From 7008e499a3d05ca8a9df2dcdc49b4f0de5045731 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 27 Jun 2023 15:43:58 -0400
Subject: [PATCH] pipewire: update to 0.3.72, adopt

---
 .../patches/jack-fix-notify-skip.patch        | 50 -------------------
 srcpkgs/pipewire/template                     | 14 +++---
 2 files changed, 8 insertions(+), 56 deletions(-)
 delete mode 100644 srcpkgs/pipewire/patches/jack-fix-notify-skip.patch

diff --git a/srcpkgs/pipewire/patches/jack-fix-notify-skip.patch b/srcpkgs/pipewire/patches/jack-fix-notify-skip.patch
deleted file mode 100644
index fed37727a636..000000000000
--- a/srcpkgs/pipewire/patches/jack-fix-notify-skip.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-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 3e0cffb69a3c..5320cb07f6a4 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,7 +1,7 @@
 # Template file for 'pipewire'
 pkgname=pipewire
-version=0.3.71
-revision=3
+version=0.3.72
+revision=1
 build_style=meson
 configure_args="
  --auto-features=enabled
@@ -16,6 +16,7 @@ configure_args="
  -Dbluez5-codec-lc3plus=disabled
  -Dsession-managers=[]
  -Drlimits-match=@_pipewire
+ -Dlibffado=$(vopt_if ffado enabled disabled)
 "
 hostmakedepends="doxygen graphviz pkg-config python3-docutils gettext glib-devel"
 makedepends="$(vopt_if sdl2 SDL2-devel) gst-plugins-base1-devel jack-devel
@@ -23,22 +24,23 @@ 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 opus-devel"
+ libmysofa-devel opus-devel $(vopt_if ffado libffado-devel)"
 depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision}
  libspa-audiomixer>=${version}_${revision} libspa-control>=${version}_${revision}
  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>"
+maintainer="cinerea0 <cinerea0@protonmail.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"
-checksum=070dcf83c514903d603351921c7829014c8d9162c49ae5a043290c920f6a6363
+checksum=eb11d03e7c700e0d9204624fd3116f165f104c37eff30e93e7ac6df763e93829
 make_dirs="/var/lib/pipewire 0755 _pipewire _pipewire"
 system_accounts="_pipewire"
 
-build_options="sdl2"
+build_options="ffado sdl2"
+desc_option_ffado="Enable support for FireWire based audio devices"
 
 replaces="libpulseaudio-pipewire>=0"
 

Re: [PR PATCH] [Merged]: pipewire: update to 0.3.72

[classabbyamp]

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

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

pipewire: update to 0.3.72
https://github.com/void-linux/void-packages/pull/44654

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