diff options
Diffstat (limited to 'www/firefox-esr/files/patch-pipewire_init')
| -rw-r--r-- | www/firefox-esr/files/patch-pipewire_init | 85 |
1 files changed, 65 insertions, 20 deletions
diff --git a/www/firefox-esr/files/patch-pipewire_init b/www/firefox-esr/files/patch-pipewire_init index d7be2a6239f4..0af5db362656 100644 --- a/www/firefox-esr/files/patch-pipewire_init +++ b/www/firefox-esr/files/patch-pipewire_init @@ -1,39 +1,82 @@ -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 - ---- 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/wayland/shared_screencast_stream.cc third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc +index 1872a8684132..7e519f9e9cbb 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 +@@ -417,7 +417,7 @@ bool SharedScreenCastStreamPrivate::StartScreenCastStream( + + pw_stream_node_id_ = stream_node_id; - 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/wayland/test/test_screencast_stream_provider.cc third_party/libwebrtc/modules/desktop_capture/linux/wayland/test/test_screencast_stream_provider.cc +index ffba13775363..da6a828a21ee 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 c3abf05b386f..a994c218f5a5 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 +diff --git third_party/libwebrtc/modules/video_capture/linux/pipewire_session.cc third_party/libwebrtc/modules/video_capture/linux/pipewire_session.cc +index f2680b28162c..03476a5fffd0 100644 +--- third_party/libwebrtc/modules/video_capture/linux/pipewire_session.cc ++++ third_party/libwebrtc/modules/video_capture/linux/pipewire_session.cc +@@ -252,7 +252,7 @@ void PipeWireSession::InitPipeWire(int fd) { + } + + bool PipeWireSession::StartPipeWire(int fd) { +- pw_init(/*argc=*/nullptr, /*argv=*/nullptr); ++ pipewire_init(/*argc=*/nullptr, /*argv=*/nullptr); + + pw_main_loop_ = pw_thread_loop_new("pipewire-main-loop", nullptr); + +diff --git third_party/pipewire/libpipewire/mozpipewire.cpp third_party/pipewire/libpipewire/mozpipewire.cpp +index b8068296745e..7e8be3dc764f 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); -static void (*pw_init_fn)(int *argc, char **argv[]); +static void (*pipewire_init_fn)(int *argc, char **argv[]); + static void (*pw_proxy_destroy_fn)(struct pw_proxy *proxy); 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() { +@@ -103,7 +103,7 @@ bool IsPwLibraryLoaded() { IS_FUNC_LOADED(pw_context_destroy_fn) && IS_FUNC_LOADED(pw_context_new_fn) && IS_FUNC_LOADED(pw_core_disconnect_fn) && - IS_FUNC_LOADED(pw_init_fn) && + IS_FUNC_LOADED(pipewire_init_fn) && + IS_FUNC_LOADED(pw_proxy_destroy_fn) && 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() { +@@ -146,7 +146,7 @@ bool LoadPWLibrary() { GET_FUNC(pw_context_destroy, pwLib); GET_FUNC(pw_context_new, pwLib); GET_FUNC(pw_core_disconnect, pwLib); @@ -41,8 +84,8 @@ https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/1819 + 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); -@@ -198,12 +198,12 @@ pw_core_disconnect(struct pw_core *core) + GET_FUNC(pw_stream_disconnect, pwLib); +@@ -226,12 +226,12 @@ pw_core_disconnect(struct pw_core *core) } void @@ -57,10 +100,12 @@ 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 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[]); |