[PR PATCH] Backport pipewire segfault fix for Mumble 1.4.x

[PR PATCH] Backport pipewire segfault fix for Mumble 1.4.x

[z411]

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

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

https://github.com/z411/void-packages mumble-fix
https://github.com/void-linux/void-packages/pull/43756

Backport pipewire segfault fix for Mumble 1.4.x
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Description
Currently due to a libpipewire change the Mumble client segfaults when trying to change any setting. This backported patch fixes the issue (small change).

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

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_68-glibc


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

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

From 33d493f785b82e73f92754e3970bc8fd728de6ce Mon Sep 17 00:00:00 2001
From: z411 <z411@omaera.org>
Date: Fri, 5 May 2023 03:13:27 -0400
Subject: [PATCH] Backport pipewire segfault fix for Mumble 1.4.x

---
 srcpkgs/mumble/patches/pipewire-fix.patch | 22 ++++++++++++++++++++++
 srcpkgs/mumble/template                   |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/mumble/patches/pipewire-fix.patch

diff --git a/srcpkgs/mumble/patches/pipewire-fix.patch b/srcpkgs/mumble/patches/pipewire-fix.patch
new file mode 100644
index 000000000000..bcc2f11fe8e3
--- /dev/null
+++ b/srcpkgs/mumble/patches/pipewire-fix.patch
@@ -0,0 +1,22 @@
+diff --git a/src/mumble/PipeWire.cpp b/src/mumble/PipeWire.cpp
+index 91924e4fb..c206ab5bb 100644
+--- a/src/mumble/PipeWire.cpp
++++ b/src/mumble/PipeWire.cpp
+@@ -213,13 +213,14 @@ PipeWireEngine::~PipeWireEngine() {
+ 		return;
+ 	}
+ 
++	if (m_stream) {
++		pws->pw_stream_destroy(m_stream);
++	}
++
+ 	if (m_thread) {
+ 		pws->pw_thread_loop_destroy(m_thread);
+ 	}
+ 
+-	if (m_stream) {
+-		pws->pw_stream_destroy(m_stream);
+-	}
+ 
+ 	if (m_loop) {
+ 		pws->pw_loop_destroy(m_loop);
diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index acb6af454e0f..35c2728c74ce 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -1,7 +1,7 @@
 # Template file for 'mumble'
 pkgname=mumble
 version=1.4.287
-revision=2
+revision=3
 build_style=cmake
 make_cmd=make
 configure_args="-Doverlay-xcompile=OFF -Dbundled-opus=OFF

Re: [PR REVIEW] Backport pipewire segfault fix for Mumble 1.4.x

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/43756#discussion_r1185774114

Comment:
where does this fix come from? can you add a reference to an upstream git commit or PR link or something along those lines?

Re: [PR REVIEW] Backport pipewire segfault fix for Mumble 1.4.x

[z411]

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

New review comment by z411 on void-packages repository

https://github.com/void-linux/void-packages/pull/43756#discussion_r1185774707

Comment:
Fix comes fom upstream. Sure I'll add a description.

Re: [PR PATCH] [Updated] mumble: backport fix for segfault with pipewire

[z411]

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

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

https://github.com/z411/void-packages mumble-fix
https://github.com/void-linux/void-packages/pull/43756

mumble: backport fix for segfault with pipewire
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Description
Currently due to a libpipewire change the Mumble client segfaults when trying to change any setting. This backported patch fixes the issue (small change).

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

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_68-glibc


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

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

From 929533c948c63781a77050eb0e8ef5b56195f960 Mon Sep 17 00:00:00 2001
From: z411 <z411@omaera.org>
Date: Fri, 5 May 2023 03:13:27 -0400
Subject: [PATCH] mumble: backport fix for segfault with pipewire

---
 srcpkgs/mumble/patches/pipewire-fix.patch | 38 +++++++++++++++++++++++
 srcpkgs/mumble/template                   |  2 +-
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/mumble/patches/pipewire-fix.patch

diff --git a/srcpkgs/mumble/patches/pipewire-fix.patch b/srcpkgs/mumble/patches/pipewire-fix.patch
new file mode 100644
index 000000000000..460f00eb195c
--- /dev/null
+++ b/srcpkgs/mumble/patches/pipewire-fix.patch
@@ -0,0 +1,38 @@
+From 24b9276d97cac459284143b936e46b626d7396f0 Mon Sep 17 00:00:00 2001
+From: Robert Adam <dev@robert-adam.de>
+Date: Tue, 11 Apr 2023 13:50:47 +0200
+Subject: [PATCH] FIX(client): PipeWire crash
+
+When destroying the PipeWire object we first destroyed the thread loop
+and then the stream, but this has to be done in reverse order in order
+to avoid crashes.
+
+Fixes #6101
+
+Source: https://github.com/mumble-voip/mumble/pull/6103
+---
+ src/mumble/PipeWire.cpp | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/mumble/PipeWire.cpp b/src/mumble/PipeWire.cpp
+index 91924e4fb1..c206ab5bbb 100644
+--- a/src/mumble/PipeWire.cpp
++++ b/src/mumble/PipeWire.cpp
+@@ -213,13 +213,14 @@ PipeWireEngine::~PipeWireEngine() {
+ 		return;
+ 	}
+ 
++	if (m_stream) {
++		pws->pw_stream_destroy(m_stream);
++	}
++
+ 	if (m_thread) {
+ 		pws->pw_thread_loop_destroy(m_thread);
+ 	}
+ 
+-	if (m_stream) {
+-		pws->pw_stream_destroy(m_stream);
+-	}
+ 
+ 	if (m_loop) {
+ 		pws->pw_loop_destroy(m_loop);
diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index acb6af454e0f..35c2728c74ce 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -1,7 +1,7 @@
 # Template file for 'mumble'
 pkgname=mumble
 version=1.4.287
-revision=2
+revision=3
 build_style=cmake
 make_cmd=make
 configure_args="-Doverlay-xcompile=OFF -Dbundled-opus=OFF

Re: [PR REVIEW] mumble: backport fix for segfault with pipewire

[z411]

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

New review comment by z411 on void-packages repository

https://github.com/void-linux/void-packages/pull/43756#discussion_r1185785683

Comment:
I added the original description of the upstream PR and a link to it.

Re: mumble: backport fix for segfault with pipewire

[z411]

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

New comment by z411 on void-packages repository

https://github.com/void-linux/void-packages/pull/43756#issuecomment-1535849196

Comment:
Fixed commit message and added patch description and link to upstream PR..

Re: mumble: backport fix for segfault with pipewire

[z411]

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

New comment by z411 on void-packages repository

https://github.com/void-linux/void-packages/pull/43756#issuecomment-1535849196

Comment:
Fixed commit message and added patch description and link to upstream PR.

Re: [PR PATCH] [Merged]: mumble: backport fix for segfault with pipewire

[classabbyamp]

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

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

mumble: backport fix for segfault with pipewire
https://github.com/void-linux/void-packages/pull/43756

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Description
Currently due to a libpipewire change (most likely >= 0.3.68) the Mumble client segfaults when trying to change any setting. This backported patch fixes the issue (small change).

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

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_68-glibc