community/pipewire: re-add revert of 28c2e8ca

Sound over network is _still_ completely silent without reverting this

community/pipewire/0002-Revert-pulse-tunnel-use-format-channels-and-rate-pro.patch

+diff --git a/src/modules/module-protocol-pulse/modules/module-tunnel-sink.c b/src/modules/module-protocol-pulse/modules/module-tunnel-sink.c
+index 064c09812..134dfc601 100644
+--- a/src/modules/module-protocol-pulse/modules/module-tunnel-sink.c
++++ b/src/modules/module-protocol-pulse/modules/module-tunnel-sink.c
+@@ -202,15 +202,6 @@ struct module *create_module_tunnel_sink(struct impl *impl, const char *argument
+ 	}
+ 
+ 	audio_info_to_props(&info, stream_props);
+-	if ((str = pw_properties_get(props, "format")) != NULL) {
+-		uint32_t id = format_paname2id(str, strlen(str));
+-		if (id == SPA_AUDIO_FORMAT_UNKNOWN) {
+-			res = -EINVAL;
+-			goto out;
+-		}
+-
+-		pw_properties_set(stream_props, PW_KEY_AUDIO_FORMAT, format_id2name(id));
+-	}
+ 
+ 	module = module_new(impl, sizeof(*d));
+ 	if (module == NULL) {
+diff --git a/src/modules/module-pulse-tunnel.c b/src/modules/module-pulse-tunnel.c
+index 84e969a04..203de371e 100644
+--- a/src/modules/module-pulse-tunnel.c
++++ b/src/modules/module-pulse-tunnel.c
+@@ -52,7 +52,6 @@
+ #include <pipewire/private.h>
+ 
+ #include <pulse/pulseaudio.h>
+-#include "module-protocol-pulse/format.h"
+ 
+ /** \page page_module_pulse_tunnel PipeWire Module: Pulse Tunnel
+  */
+@@ -325,6 +324,13 @@ static int create_stream(struct impl *impl)
+ 				&playback_stream_events, impl);
+ 	}
+ 
++	impl->info = SPA_AUDIO_INFO_RAW_INIT(
++			.format = SPA_AUDIO_FORMAT_S16,
++			.rate = 48000,
++			.channels = 2,
++			.position = { SPA_AUDIO_CHANNEL_FL, SPA_AUDIO_CHANNEL_FR });
++	impl->frame_size = 2 * 2;
++
+ 	n_params = 0;
+ 	spa_pod_builder_init(&b, buffer, sizeof(buffer));
+ 	params[n_params++] = spa_format_audio_raw_build(&b,
+@@ -538,9 +544,9 @@ static int create_pulse_stream(struct impl *impl)
+ 		pa_threaded_mainloop_wait(impl->pa_mainloop);
+ 	}
+ 
+-	ss.format = (pa_sample_format_t) format_id2pa(impl->info.format);
+-	ss.channels = impl->info.channels;
+-	ss.rate = impl->info.rate;
++	ss.format = PA_SAMPLE_S16NE;
++	ss.channels = 2;
++	ss.rate = 48000;
+ 
+ 	snprintf(stream_name, sizeof(stream_name), _("Tunnel for %s@%s"),
+ 			pw_get_user_name(), pw_get_host_name());
+@@ -862,7 +858,6 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
+ 	if ((str = pw_properties_get(props, "stream.props")) != NULL)
+ 		pw_properties_update_string(impl->stream_props, str, strlen(str));
+ 
+-	copy_props(impl, props, PW_KEY_AUDIO_FORMAT);
+ 	copy_props(impl, props, PW_KEY_AUDIO_RATE);
+ 	copy_props(impl, props, PW_KEY_AUDIO_CHANNELS);
+ 	copy_props(impl, props, SPA_KEY_AUDIO_POSITION);

community/pipewire/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=pipewire
 pkgver=0.3.50
-pkgrel=1
+pkgrel=2
 pkgdesc="Multimedia processing graphs"
 url="https://pipewire.org/"
 arch="all"
@@ -53,6 +53,7 @@ source="https://gitlab.freedesktop.org/PipeWire/pipewire/-/archive/$pkgver/pipew
 	pipewire.desktop
 	pipewire-launcher.sh
 	0001-spa-fix-c90-header-include.patch
+	0002-Revert-pulse-tunnel-use-format-channels-and-rate-pro.patch
 	"
 
 case "$CARCH" in
@@ -200,4 +201,5 @@ e29a626258ab28d74e35e310037fac374fe009fb56e0fa41cef7abb1ec6abb26f828cff1b17500f9
 d5d8bc64e42715aa94296e3e26e740142bff7f638c7eb4fecc0301e46d55636d889bdc0c0399c1eb523271b20f7c48cc03f6ce3c072e0e8576c821ed1ea0e3dd  pipewire.desktop
 be2bd1520fae27ccca6af4c98e8ebe63541260af55eb085839235a8441a7bce434ba8bf23a5d1ca8b5f361229f5482d5b63504b9a5cbbe9d39bc051207cd7dac  pipewire-launcher.sh
 49e24a20284202aba25c007b07345f6d8fce92491208064caada2355abfd09a1a6992eb1ea13a29ba69ab6ac9b9820bd887d035e5d5909350eeeb1323bff7941  0001-spa-fix-c90-header-include.patch
+5a84a255794cd260476f93b154a32a84efc925c1f6ecc64efe659d89eb81bb3090438e2b3c4000a8ab68d8c72bca453e13297719a95f1e4457f43e43acec8bfa  0002-Revert-pulse-tunnel-use-format-channels-and-rate-pro.patch
 "