summaryrefslogtreecommitdiff
path: root/mail/thunderbird/files/patch-pipewire_init
diff options
context:
space:
mode:
authorChristoph Moench-Tegeder <cmt@FreeBSD.org>2023-09-26 21:14:51 +0200
committerChristoph Moench-Tegeder <cmt@FreeBSD.org>2023-09-26 21:14:51 +0200
commitafcc7e8a7365f9378d6ce30d41fdc41c818f8f17 (patch)
tree725562c940f0978fc54d32448a22981e245eb3dc /mail/thunderbird/files/patch-pipewire_init
parentnet-mgmt/librenms: Update to 23.9.1 (diff)
mail/thunderbird: update to 115.3.0 (ga)
Release Notes: https://www.thunderbird.net/en-US/thunderbird/115.3.0/releasenotes/
Diffstat (limited to 'mail/thunderbird/files/patch-pipewire_init')
-rw-r--r--mail/thunderbird/files/patch-pipewire_init67
1 files changed, 40 insertions, 27 deletions
diff --git a/mail/thunderbird/files/patch-pipewire_init b/mail/thunderbird/files/patch-pipewire_init
index 6673f942d028..04cd4c495cc3 100644
--- a/mail/thunderbird/files/patch-pipewire_init
+++ b/mail/thunderbird/files/patch-pipewire_init
@@ -1,35 +1,48 @@
-Chase ABI from multimedia/pipewire/files/patch-src_pipewire_pipewire_init
+ Chase ABI from multimedia/pipewire/files/patch-src_pipewire_pipewire_init
+
+ Ref: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/1819
-https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/1819
-
-diff --git third_party/libwebrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc third_party/libwebrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc
-index 2fd3b1a575..79a14d7d7e 100644
---- third_party/libwebrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc
-+++ third_party/libwebrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc
-@@ -279,7 +279,7 @@ void BaseCapturerPipeWire::InitPipeWire() {
- }
- #endif // defined(WEBRTC_DLOPEN_PIPEWIRE)
+diff --git third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc
+index 49b64845100b..283c387db770 100644
+--- third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc
++++ third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc
+@@ -402,7 +402,7 @@ bool SharedScreenCastStreamPrivate::StartScreenCastStream(
+
+ pw_stream_node_id_ = stream_node_id;
- pw_init(/*argc=*/nullptr, /*argc=*/nullptr);
+ pipewire_init(/*argc=*/nullptr, /*argc=*/nullptr);
pw_main_loop_ = pw_thread_loop_new("pipewire-main-loop", nullptr);
- pw_context_ = pw_context_new(pw_thread_loop_get_loop(pw_main_loop_), nullptr, 0);
-diff --git third_party/libwebrtc/modules/desktop_capture/linux/pipewire.sigs third_party/libwebrtc/modules/desktop_capture/linux/pipewire.sigs
-index 3e21e9dc07..f561dcf619 100644
---- third_party/libwebrtc/modules/desktop_capture/linux/pipewire.sigs
-+++ third_party/libwebrtc/modules/desktop_capture/linux/pipewire.sigs
-@@ -16,7 +16,7 @@ void pw_loop_destroy(pw_loop *loop);
- pw_loop * pw_loop_new(pw_properties *properties);
+
+diff --git third_party/libwebrtc/modules/desktop_capture/linux/wayland/test/test_screencast_stream_provider.cc third_party/libwebrtc/modules/desktop_capture/linux/wayland/test/test_screencast_stream_provider.cc
+index 3b829959aca8..9bdcdf1ffd51 100644
+--- third_party/libwebrtc/modules/desktop_capture/linux/wayland/test/test_screencast_stream_provider.cc
++++ third_party/libwebrtc/modules/desktop_capture/linux/wayland/test/test_screencast_stream_provider.cc
+@@ -36,7 +36,7 @@ TestScreenCastStreamProvider::TestScreenCastStreamProvider(Observer* observer,
+ return;
+ }
+
+- pw_init(/*argc=*/nullptr, /*argc=*/nullptr);
++ pipewire_init(/*argc=*/nullptr, /*argc=*/nullptr);
+
+ pw_main_loop_ = pw_thread_loop_new("pipewire-test-main-loop", nullptr);
+
+diff --git third_party/libwebrtc/modules/portal/pipewire.sigs third_party/libwebrtc/modules/portal/pipewire.sigs
+index 139a8c37a551..9fe131d8daa6 100644
+--- third_party/libwebrtc/modules/portal/pipewire.sigs
++++ third_party/libwebrtc/modules/portal/pipewire.sigs
+@@ -15,7 +15,7 @@ pw_loop * pw_loop_new(const spa_dict *props);
+
// pipewire.h
-void pw_init(int *argc, char **argv[]);
+void pipewire_init(int *argc, char **argv[]);
+ const char* pw_get_library_version();
// properties.h
- pw_properties * pw_properties_new_string(const char *args);
diff --git third_party/pipewire/libpipewire/mozpipewire.cpp third_party/pipewire/libpipewire/mozpipewire.cpp
-index 1ecfc3196a..6f44b35964 100644
+index fbeeb8e5a760..46f768790946 100644
--- third_party/pipewire/libpipewire/mozpipewire.cpp
+++ third_party/pipewire/libpipewire/mozpipewire.cpp
@@ -58,7 +58,7 @@ struct pw_context * (*pw_context_new_fn)(struct pw_loop *main_loop,
@@ -41,7 +54,7 @@ index 1ecfc3196a..6f44b35964 100644
static void (*pw_stream_add_listener_fn)(struct pw_stream *stream,
struct spa_hook *listener,
const struct pw_stream_events *events,
-@@ -96,7 +96,7 @@ bool IsPwLibraryLoaded() {
+@@ -101,7 +101,7 @@ bool IsPwLibraryLoaded() {
IS_FUNC_LOADED(pw_context_destroy_fn) &&
IS_FUNC_LOADED(pw_context_new_fn) &&
IS_FUNC_LOADED(pw_core_disconnect_fn) &&
@@ -49,8 +62,8 @@ index 1ecfc3196a..6f44b35964 100644
+ IS_FUNC_LOADED(pipewire_init_fn) &&
IS_FUNC_LOADED(pw_stream_add_listener_fn) &&
IS_FUNC_LOADED(pw_stream_connect_fn) &&
- IS_FUNC_LOADED(pw_stream_dequeue_buffer_fn) &&
-@@ -133,7 +133,7 @@ bool LoadPWLibrary() {
+ IS_FUNC_LOADED(pw_stream_disconnect_fn) &&
+@@ -142,7 +142,7 @@ bool LoadPWLibrary() {
GET_FUNC(pw_context_destroy, pwLib);
GET_FUNC(pw_context_new, pwLib);
GET_FUNC(pw_core_disconnect, pwLib);
@@ -58,8 +71,8 @@ index 1ecfc3196a..6f44b35964 100644
+ GET_FUNC(pipewire_init, pwLib);
GET_FUNC(pw_stream_add_listener, pwLib);
GET_FUNC(pw_stream_connect, pwLib);
- GET_FUNC(pw_stream_dequeue_buffer, pwLib);
-@@ -207,12 +207,12 @@ pw_core_disconnect(struct pw_core *core)
+ GET_FUNC(pw_stream_disconnect, pwLib);
+@@ -220,12 +220,12 @@ pw_core_disconnect(struct pw_core *core)
}
void
@@ -75,11 +88,11 @@ index 1ecfc3196a..6f44b35964 100644
void
diff --git third_party/pipewire/pipewire/pipewire.h third_party/pipewire/pipewire/pipewire.h
-index 69c523bd62..378502004c 100644
+index b932103f46e6..2c88e28421ec 100644
--- third_party/pipewire/pipewire/pipewire.h
+++ third_party/pipewire/pipewire/pipewire.h
-@@ -114,9 +114,9 @@ extern "C" {
- * \brief PipeWire initialization and infrastructure functions
+@@ -69,9 +69,9 @@ extern "C" {
+ * \{
*/
void
-pw_init(int *argc, char **argv[]);