diff options
Diffstat (limited to 'www/firefox-esr/files/patch-pipewire_init')
-rw-r--r-- | www/firefox-esr/files/patch-pipewire_init | 41 |
1 files changed, 30 insertions, 11 deletions
diff --git a/www/firefox-esr/files/patch-pipewire_init b/www/firefox-esr/files/patch-pipewire_init index d7be2a6239f4..6673f942d028 100644 --- a/www/firefox-esr/files/patch-pipewire_init +++ b/www/firefox-esr/files/patch-pipewire_init @@ -2,20 +2,37 @@ Chase ABI from multimedia/pipewire/files/patch-src_pipewire_pipewire_init https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/1819 ---- third_party/libwebrtc/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc.orig 2021-11-17 19:32:27 UTC -+++ third_party/libwebrtc/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc -@@ -253,7 +253,7 @@ void BaseCapturerPipeWire::InitPortal() { - } +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) - void BaseCapturerPipeWire::InitPipeWire() { - 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); ---- third_party/pipewire/libpipewire/mozpipewire.cpp.orig 2021-11-17 19:33:46 UTC +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); + + // pipewire.h +-void pw_init(int *argc, char **argv[]); ++void pipewire_init(int *argc, char **argv[]); + + // 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 +--- 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_loo +@@ -58,7 +58,7 @@ struct pw_context * (*pw_context_new_fn)(struct pw_loop *main_loop, struct pw_properties *props, size_t user_data_size); static int (*pw_core_disconnect_fn)(struct pw_core *core); @@ -24,7 +41,7 @@ https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/1819 static void (*pw_stream_add_listener_fn)(struct pw_stream *stream, struct spa_hook *listener, const struct pw_stream_events *events, -@@ -93,7 +93,7 @@ bool IsPwLibraryLoaded() { +@@ -96,7 +96,7 @@ bool IsPwLibraryLoaded() { IS_FUNC_LOADED(pw_context_destroy_fn) && IS_FUNC_LOADED(pw_context_new_fn) && IS_FUNC_LOADED(pw_core_disconnect_fn) && @@ -33,7 +50,7 @@ https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/1819 IS_FUNC_LOADED(pw_stream_add_listener_fn) && IS_FUNC_LOADED(pw_stream_connect_fn) && IS_FUNC_LOADED(pw_stream_dequeue_buffer_fn) && -@@ -127,7 +127,7 @@ bool LoadPWLibrary() { +@@ -133,7 +133,7 @@ bool LoadPWLibrary() { GET_FUNC(pw_context_destroy, pwLib); GET_FUNC(pw_context_new, pwLib); GET_FUNC(pw_core_disconnect, pwLib); @@ -42,7 +59,7 @@ https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/1819 GET_FUNC(pw_stream_add_listener, pwLib); GET_FUNC(pw_stream_connect, pwLib); GET_FUNC(pw_stream_dequeue_buffer, pwLib); -@@ -198,12 +198,12 @@ pw_core_disconnect(struct pw_core *core) +@@ -207,12 +207,12 @@ pw_core_disconnect(struct pw_core *core) } void @@ -57,7 +74,9 @@ https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/1819 } void ---- third_party/pipewire/pipewire/pipewire.h.orig 2021-11-17 19:34:07 UTC +diff --git third_party/pipewire/pipewire/pipewire.h third_party/pipewire/pipewire/pipewire.h +index 69c523bd62..378502004c 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 |