git: bbdc4e71a8bf - main - multimedia/pipewire: Update to 0.3.61

From: Gleb Popov <arrowd_at_FreeBSD.org>
Date: Thu, 24 Nov 2022 13:22:52 UTC 
The branch main has been updated by arrowd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=bbdc4e71a8bf27e920b8dedb36846682ae3f397c

commit bbdc4e71a8bf27e920b8dedb36846682ae3f397c
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2022-11-24 13:22:14 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2022-11-24 13:22:34 +0000

    multimedia/pipewire: Update to 0.3.61
---
 multimedia/pipewire/Makefile                       |  3 +--
 multimedia/pipewire/distinfo                       |  6 ++---
 multimedia/pipewire/files/patch-filter-chain       | 26 ----------------------
 ...rotocol-pulse_modules_module-zeroconf-publish.c | 10 +++++++++
 .../patch-src_modules_module-protocol-simple.c     | 11 +++++++++
 multimedia/pipewire/pkg-plist                      | 10 +++++----
 6 files changed, 31 insertions(+), 35 deletions(-)

diff --git a/multimedia/pipewire/Makefile b/multimedia/pipewire/Makefile
index 2f62688dea1c..c27d062376fb 100644
--- a/multimedia/pipewire/Makefile
+++ b/multimedia/pipewire/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	pipewire
-DISTVERSION=	0.3.59
-PORTREVISION=	1
+DISTVERSION=	0.3.61
 CATEGORIES=	multimedia
 MASTER_SITES=	https://gitlab.freedesktop.org/pipewire/media-session/-/archive/${MEDIA_SESSION_VERSION}/:media_session
 DISTFILES=	media-session-${MEDIA_SESSION_VERSION}${EXTRACT_SUFX}:media_session
diff --git a/multimedia/pipewire/distinfo b/multimedia/pipewire/distinfo
index 0b91cb1deb0b..8ad9a512b3c5 100644
--- a/multimedia/pipewire/distinfo
+++ b/multimedia/pipewire/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1666402657
+TIMESTAMP = 1669294611
 SHA256 (media-session-0.4.1.tar.gz) = 119c9216070b54018217552c7924f9888da270c3c4647c5e2b85ffa6b1574975
 SIZE (media-session-0.4.1.tar.gz) = 123224
-SHA256 (PipeWire-pipewire-0.3.59_GH0.tar.gz) = fd07b7cb8f509da3b5d2730be6748509454b3ec0b17282b9bc594e571b144920
-SIZE (PipeWire-pipewire-0.3.59_GH0.tar.gz) = 1909977
+SHA256 (PipeWire-pipewire-0.3.61_GH0.tar.gz) = 9cbc7048808c693cb7952c4b446e9ffbb91d1b34f057c340d83ae4e6d2d08f1d
+SIZE (PipeWire-pipewire-0.3.61_GH0.tar.gz) = 1956592
diff --git a/multimedia/pipewire/files/patch-filter-chain b/multimedia/pipewire/files/patch-filter-chain
deleted file mode 100644
index 8d2d41af0349..000000000000
--- a/multimedia/pipewire/files/patch-filter-chain
+++ /dev/null
@@ -1,26 +0,0 @@
-Pulled from upstream issue https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/2737
-
-diff --git a/src/modules/module-filter-chain.c b/src/modules/module-filter-chain.c
-index 6a899ef5fd776d7e1001ab7ae316ff4bf31a4754..9d65aa938ff441271d6202fc5b8eb8bc57094e17 100644
---- src/modules/module-filter-chain.c
-+++ src/modules/module-filter-chain.c
-@@ -1561,6 +1561,10 @@ static int load_node(struct graph *graph, struct spa_json *json)
- 	node->control_port = calloc(desc->n_control, sizeof(struct port));
- 	node->notify_port = calloc(desc->n_notify, sizeof(struct port));
- 
-+	pw_log_info("loaded n_input:%d n_output:%d n_control:%d n_notify:%d",
-+			desc->n_input, desc->n_output,
-+			desc->n_control, desc->n_notify);
-+
- 	for (i = 0; i < desc->n_input; i++) {
- 		struct port *port = &node->input_port[i];
- 		port->node = node;
-@@ -1953,6 +1957,8 @@ static int setup_graph(struct graph *graph, struct spa_json *inputs, struct spa_
- 			gh->hndl = &node->hndl[i];
- 			gh->desc = d;
- 
-+		}
-+		for (i = 0; i < desc->n_output; i++) {
- 			spa_list_for_each(link, &node->output_port[i].link_list, output_link)
- 				link->input->node->n_deps--;
- 		}
diff --git a/multimedia/pipewire/files/patch-src_modules_module-protocol-pulse_modules_module-zeroconf-publish.c b/multimedia/pipewire/files/patch-src_modules_module-protocol-pulse_modules_module-zeroconf-publish.c
new file mode 100644
index 000000000000..d66a0e3a082e
--- /dev/null
+++ b/multimedia/pipewire/files/patch-src_modules_module-protocol-pulse_modules_module-zeroconf-publish.c
@@ -0,0 +1,10 @@
+--- src/modules/module-protocol-pulse/modules/module-zeroconf-publish.c.orig	2022-11-24 08:57:59 UTC
++++ src/modules/module-protocol-pulse/modules/module-zeroconf-publish.c
+@@ -25,6 +25,7 @@
+ 
+ #include <sys/utsname.h>
+ #include <arpa/inet.h>
++#include <netinet/in.h>
+ 
+ #include <pipewire/pipewire.h>
+ 
diff --git a/multimedia/pipewire/files/patch-src_modules_module-protocol-simple.c b/multimedia/pipewire/files/patch-src_modules_module-protocol-simple.c
new file mode 100644
index 000000000000..7dca6e5977d9
--- /dev/null
+++ b/multimedia/pipewire/files/patch-src_modules_module-protocol-simple.c
@@ -0,0 +1,11 @@
+--- src/modules/module-protocol-simple.c.orig	2022-11-24 13:00:46 UTC
++++ src/modules/module-protocol-simple.c
+@@ -543,7 +543,7 @@ on_connect(void *data, int fd, uint32_t mask)
+ 	struct pw_properties *props = NULL;
+ 
+ 	addrlen = sizeof(addr);
+-	client_fd = accept4(fd, &addr, &addrlen, SOCK_NONBLOCK | SOCK_CLOEXEC);
++	client_fd = accept4(fd, (struct sockaddr*)&addr, &addrlen, SOCK_NONBLOCK | SOCK_CLOEXEC);
+ 	if (client_fd < 0)
+ 		goto error;
+ 
diff --git a/multimedia/pipewire/pkg-plist b/multimedia/pipewire/pkg-plist
index 5bdc89db43a4..c77e97d578f3 100644
--- a/multimedia/pipewire/pkg-plist
+++ b/multimedia/pipewire/pkg-plist
@@ -172,16 +172,16 @@ include/spa-0.2/spa/utils/type.h
 %%GSTREAMER%%lib/gstreamer-1.0/libgstpipewire.so
 lib/libpipewire-0.3.so
 lib/libpipewire-0.3.so.0
-lib/libpipewire-0.3.so.0.359.0
+lib/libpipewire-0.3.so.0.361.0
 %%PIPEWIRE_JACK%%lib/pipewire-0.3/jack/libjack.so
 %%PIPEWIRE_JACK%%lib/pipewire-0.3/jack/libjack.so.0
-%%PIPEWIRE_JACK%%lib/pipewire-0.3/jack/libjack.so.0.359.0
+%%PIPEWIRE_JACK%%lib/pipewire-0.3/jack/libjack.so.0.361.0
 %%PIPEWIRE_JACK%%lib/pipewire-0.3/jack/libjacknet.so
 %%PIPEWIRE_JACK%%lib/pipewire-0.3/jack/libjacknet.so.0
-%%PIPEWIRE_JACK%%lib/pipewire-0.3/jack/libjacknet.so.0.359.0
+%%PIPEWIRE_JACK%%lib/pipewire-0.3/jack/libjacknet.so.0.361.0
 %%PIPEWIRE_JACK%%lib/pipewire-0.3/jack/libjackserver.so
 %%PIPEWIRE_JACK%%lib/pipewire-0.3/jack/libjackserver.so.0
-%%PIPEWIRE_JACK%%lib/pipewire-0.3/jack/libjackserver.so.0.359.0
+%%PIPEWIRE_JACK%%lib/pipewire-0.3/jack/libjackserver.so.0.361.0
 lib/pipewire-0.3/libpipewire-module-access.so
 lib/pipewire-0.3/libpipewire-module-adapter.so
 lib/pipewire-0.3/libpipewire-module-client-device.so
@@ -203,6 +203,8 @@ lib/pipewire-0.3/libpipewire-module-protocol-simple.so
 lib/pipewire-0.3/libpipewire-module-raop-sink.so
 lib/pipewire-0.3/libpipewire-module-rt.so
 lib/pipewire-0.3/libpipewire-module-rtkit.so
+lib/pipewire-0.3/libpipewire-module-rtp-sink.so
+lib/pipewire-0.3/libpipewire-module-rtp-source.so
 lib/pipewire-0.3/libpipewire-module-session-manager.so
 lib/pipewire-0.3/libpipewire-module-spa-device-factory.so
 lib/pipewire-0.3/libpipewire-module-spa-device.so