Date: Tue, 25 Oct 2022 17:32:50 GMT From: Gleb Popov <arrowd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: b116213f2401 - main - multimedia/pipewire: Add a patch for upstream fixing a crash. Message-ID: <202210251732.29PHWor6021115@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=b116213f2401ce2578d398c5e38ae0bdfcfcd209 commit b116213f2401ce2578d398c5e38ae0bdfcfcd209 Author: Gleb Popov <arrowd@FreeBSD.org> AuthorDate: 2022-10-25 17:31:00 +0000 Commit: Gleb Popov <arrowd@FreeBSD.org> CommitDate: 2022-10-25 17:32:34 +0000 multimedia/pipewire: Add a patch for upstream fixing a crash. PR: 267264 Reported by: diizzy --- multimedia/pipewire/Makefile | 1 + multimedia/pipewire/files/patch-filter-chain | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/multimedia/pipewire/Makefile b/multimedia/pipewire/Makefile index 1e79cb1a5ec0..2f62688dea1c 100644 --- a/multimedia/pipewire/Makefile +++ b/multimedia/pipewire/Makefile @@ -1,5 +1,6 @@ PORTNAME= pipewire DISTVERSION= 0.3.59 +PORTREVISION= 1 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/files/patch-filter-chain b/multimedia/pipewire/files/patch-filter-chain new file mode 100644 index 000000000000..8d2d41af0349 --- /dev/null +++ b/multimedia/pipewire/files/patch-filter-chain @@ -0,0 +1,26 @@ +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--; + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202210251732.29PHWor6021115>