FreeBSD Bugzilla – Attachment 229547 Details for
Bug 259621
multimedia/pipewire: SIGSEGV due to ambiguous pw_init
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
patch-src_pipewire_pipewire_init (text/plain), 1.24 KB, created by
Gleb Popov
on 2021-11-17 10:20:55 UTC
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Gleb Popov
Created:
2021-11-17 10:20:55 UTC
Size:
1.24 KB
patch
obsolete
>--- src/pipewire/pipewire.c.orig 2021-11-11 12:21:29 UTC >+++ src/pipewire/pipewire.c >@@ -583,7 +583,7 @@ out: > * > */ > SPA_EXPORT >-void pw_init(int *argc, char **argv[]) >+void pipewire_init(int *argc, char **argv[]) > { > const char *str; > struct spa_dict_item items[6]; >@@ -672,8 +672,9 @@ done: > pthread_mutex_unlock(&init_lock); > } > >+ > SPA_EXPORT >-void pw_deinit(void) >+void pipewire_deinit(void) > { > struct support *support = &global_support; > struct registry *registry = &support->registry; >@@ -696,6 +697,21 @@ void pw_deinit(void) > pthread_mutex_unlock(&init_lock); > > } >+ >+#if !defined(__FreeBSD__) >+#undef pw_init >+SPA_EXPORT >+void pw_init(int *argc, char **argv[]) >+{ >+ pipewire_init(argc, argv); >+} >+#undef pw_deinit >+SPA_EXPORT >+void pw_deinit(void) >+{ >+ pipewire_deinit(); >+} >+#endif > > /** Check if a debug category is enabled > * >--- src/pipewire/pipewire.h.orig 2021-11-11 12:21:29 UTC >+++ src/pipewire/pipewire.h >@@ -69,9 +69,12 @@ extern "C" { > * \{ > */ > void >-pw_init(int *argc, char **argv[]); >+pipewire_init(int *argc, char **argv[]); >+void pipewire_deinit(void); > >-void pw_deinit(void); >+/* BSD has pw_init already */ >+#define pw_init pipewire_init >+#define pw_deinit pipewire_deinit > > bool > pw_debug_is_category_enabled(const char *name);
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 259621
: 229547