Chase ABI from multimedia/pipewire/files/patch-src_pipewire_pipewire_init 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) - 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); // 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_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_stream_add_listener_fn)(struct pw_stream *stream, struct spa_hook *listener, const struct pw_stream_events *events, @@ -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) && - IS_FUNC_LOADED(pw_init_fn) && + 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() { GET_FUNC(pw_context_destroy, pwLib); GET_FUNC(pw_context_new, pwLib); GET_FUNC(pw_core_disconnect, pwLib); - GET_FUNC(pw_init, pwLib); + 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) } void -pw_init(int *argc, char **argv[]) +pipewire_init(int *argc, char **argv[]) { if (!LoadPWLibrary()) { return; } - return pw_init_fn(argc, argv); + return pipewire_init_fn(argc, argv); } void 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 */ void -pw_init(int *argc, char **argv[]); +pipewire_init(int *argc, char **argv[]); -void pw_deinit(void); +void pipewire_deinit(void); bool pw_debug_is_category_enabled(const char *name);