diff options
| author | Mikael Urankar <mikael@FreeBSD.org> | 2025-01-20 15:11:40 +0100 |
|---|---|---|
| committer | Mikael Urankar <mikael@FreeBSD.org> | 2025-01-20 15:16:36 +0100 |
| commit | 30bc850f54f95e1d543b7a45aa8328487ba52b35 (patch) | |
| tree | b835e4d86acdc080bef0476962be716480533788 /multimedia/ringrtc/files/patch-cargo-crates_cubeb-sys_build.rs | |
| parent | security/vuxml: document electron31 multiple vulnerabilities (diff) | |
multimedia/ringrtc: Update to 2.49.2
Diffstat (limited to 'multimedia/ringrtc/files/patch-cargo-crates_cubeb-sys_build.rs')
| -rw-r--r-- | multimedia/ringrtc/files/patch-cargo-crates_cubeb-sys_build.rs | 69 |
1 files changed, 62 insertions, 7 deletions
diff --git a/multimedia/ringrtc/files/patch-cargo-crates_cubeb-sys_build.rs b/multimedia/ringrtc/files/patch-cargo-crates_cubeb-sys_build.rs index 09e3cf833a8c..37a3d10eb013 100644 --- a/multimedia/ringrtc/files/patch-cargo-crates_cubeb-sys_build.rs +++ b/multimedia/ringrtc/files/patch-cargo-crates_cubeb-sys_build.rs @@ -1,5 +1,5 @@ ---- cargo-crates/cubeb-sys-0.17.0/build.rs.orig 2024-11-18 16:08:09.330015000 +0100 -+++ cargo-crates/cubeb-sys-0.17.0/build.rs 2024-11-18 16:01:50.423150000 +0100 +--- cargo-crates/cubeb-sys-0.18.0/build.rs.orig 2024-11-18 16:08:09.330015000 +0100 ++++ cargo-crates/cubeb-sys-0.18.0/build.rs 2024-11-18 16:01:50.423150000 +0100 @@ -33,7 +33,6 @@ fn main() { return; } @@ -8,12 +8,67 @@ t!(fs::create_dir_all(env::var("OUT_DIR").unwrap())); env::remove_var("DESTDIR"); -@@ -46,7 +45,7 @@ fn main() { - let libcubeb_path = if Path::new("libcubeb").exists() { - "libcubeb".to_owned() - } else { +@@ -51,14 +50,14 @@ fn main() { + // so we expected a vendored copy of the source to be available. + // Vendored copy generated with: + // "tar -c -f libcubeb_vendored.tar --exclude libcubeb/googletest libcubeb" +- t!(Command::new("tar") +- .args([ +- "xvfC", +- "libcubeb_vendored.tar", +- &env::var("OUT_DIR").unwrap(), +- ]) +- .status()); - env::var("OUT_DIR").unwrap() + "/libcubeb" ++// t!(Command::new("tar") ++// .args([ ++// "xvfC", ++// "libcubeb_vendored.tar", ++// &env::var("OUT_DIR").unwrap(), ++// ]) ++// .status()); + "WRKDIR/libcubeb".to_owned() }; - if !Path::new(&libcubeb_path).exists() { + let target = env::var("TARGET").unwrap(); +@@ -144,23 +143,23 @@ fn main() { + // Ignore the result of find_library. We don't care if the + // libraries are missing. + let _ = pkg_config::find_library("alsa"); +- if pkg_config::find_library("libpulse").is_ok() { +- // Do not link the rust backends for tests: doing so causes duplicate +- // symbol definitions. +- #[cfg(not(feature = "unittest-build"))] +- { +- println!("cargo:rustc-link-lib=static=cubeb_pulse"); +- let mut search_path = std::env::current_dir().unwrap(); +- search_path.push(&(libcubeb_path + "/src/cubeb-pulse-rs/target")); +- search_path.push(&target); +- if debug { +- search_path.push("debug"); +- } else { +- search_path.push("release"); +- } +- println!("cargo:rustc-link-search=native={}", search_path.display()); +- } +- } ++// if pkg_config::find_library("libpulse").is_ok() { ++// // Do not link the rust backends for tests: doing so causes duplicate ++// // symbol definitions. ++// #[cfg(not(feature = "unittest-build"))] ++// { ++// println!("cargo:rustc-link-lib=static=cubeb_pulse"); ++// let mut search_path = std::env::current_dir().unwrap(); ++// search_path.push(&(libcubeb_path + "/src/cubeb-pulse-rs/target")); ++// search_path.push(&target); ++// if debug { ++// search_path.push("debug"); ++// } else { ++// search_path.push("release"); ++// } ++// println!("cargo:rustc-link-search=native={}", search_path.display()); ++// } ++// } + let _ = pkg_config::find_library("jack"); + let _ = pkg_config::find_library("speexdsp"); + if android { |