summaryrefslogtreecommitdiff
path: root/x11-wm/niri/files/patch-pipewire_init
blob: b6140886146359cec53f60aa8e9e94694949ded1 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
Chase ABI from multimedia/pipewire/files/patch-src_pipewire_pipewire_init

https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/1819

error[E0425]: cannot find function `pw_init` in crate `pw_sys`
   --> cargo-crates/pipewire-0.4.1/src/lib.rs:156:49
    |
156 |     INITIALIZED.get_or_init(|| unsafe { pw_sys::pw_init(ptr::null_mut(), ptr::null_mut()) });
    |                                                 ^^^^^^^ not found in `pw_sys`

error[E0425]: cannot find function `pw_deinit` in crate `pw_sys`
   --> cargo-crates/pipewire-0.4.1/src/lib.rs:165:13
    |
165 |     pw_sys::pw_deinit()
    |             ^^^^^^^^^ not found in `pw_sys`

--- ../pipewire-rs-fd3d8f7861a29c2eeaa4c393402e013578bb36d9/pipewire/src/lib.rs.orig	2006-07-24 01:21:28 UTC
+++ ../pipewire-rs-fd3d8f7861a29c2eeaa4c393402e013578bb36d9/pipewire/src/lib.rs
@@ -152,7 +152,7 @@ pub fn init() {
 pub fn init() {
     use once_cell::sync::OnceCell;
     static INITIALIZED: OnceCell<()> = OnceCell::new();
-    INITIALIZED.get_or_init(|| unsafe { pw_sys::pw_init(ptr::null_mut(), ptr::null_mut()) });
+    INITIALIZED.get_or_init(|| unsafe { pw_sys::pipewire_init(ptr::null_mut(), ptr::null_mut()) });
 }
 
 /// Deinitialize PipeWire
@@ -161,7 +161,7 @@ pub unsafe fn deinit() {
 /// This must only be called once during the lifetime of the process, once no PipeWire threads
 /// are running anymore and all PipeWire resources are released.
 pub unsafe fn deinit() {
-    pw_sys::pw_deinit()
+    pw_sys::pipewire_deinit()
 }
 
 #[cfg(test)]
--- ../pipewire-rs-fd3d8f7861a29c2eeaa4c393402e013578bb36d9/pipewire-sys/build.rs.orig	2006-07-24 01:21:28 UTC
+++ ../pipewire-rs-fd3d8f7861a29c2eeaa4c393402e013578bb36d9/pipewire-sys/build.rs
@@ -19,6 +19,7 @@ fn main() {
         // included header files changed.
         .parse_callbacks(Box::new(bindgen::CargoCallbacks))
         .size_t_is_usize(true)
+        .allowlist_function("pipewire_.*")
         .allowlist_function("pw_.*")
         .allowlist_type("pw_.*")
         .allowlist_var("pw_.*")
--- ../pipewire-rs-fd3d8f7861a29c2eeaa4c393402e013578bb36d9/pipewire-sys/src/lib.rs.orig	2006-07-24 01:21:28 UTC
+++ ../pipewire-rs-fd3d8f7861a29c2eeaa4c393402e013578bb36d9/pipewire-sys/src/lib.rs
@@ -20,8 +20,8 @@ mod tests {
     #[test]
     fn init() {
         unsafe {
-            pw_init(std::ptr::null_mut(), std::ptr::null_mut());
-            pw_deinit();
+            pipewire_init(std::ptr::null_mut(), std::ptr::null_mut());
+            pipewire_deinit();
         }
     }
 }