From 100ea34baaca8950c529302e777eade805a6e40f Mon Sep 17 00:00:00 2001 From: "Lauren N. Liberda" Date: Sat, 20 May 2023 07:19:28 +0200 Subject: [PATCH] allow building scrap with pkg-config libraries Signed-off-by: Lauren N. Liberda --- libs/scrap/Cargo.toml | 2 ++ libs/scrap/build.rs | 30 +++++++++++++++++++++++++++++- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/libs/scrap/Cargo.toml b/libs/scrap/Cargo.toml index 5a32a38b7..5d5968b1f 100644 --- a/libs/scrap/Cargo.toml +++ b/libs/scrap/Cargo.toml @@ -12,6 +12,7 @@ edition = "2018" [features] wayland = ["gstreamer", "gstreamer-app", "gstreamer-video", "dbus", "tracing"] mediacodec = ["ndk"] +linux-pkg-config = ["dep:pkg-config"] [dependencies] block = "0.1" @@ -43,6 +44,7 @@ quest = "0.3" [build-dependencies] target_build_utils = "0.3" bindgen = "0.65" +pkg-config = { version = "0.3.27", optional = true } [target.'cfg(target_os = "linux")'.dependencies] dbus = { version = "0.9", optional = true } diff --git a/libs/scrap/build.rs b/libs/scrap/build.rs index b0d800545..3e08469b0 100644 --- a/libs/scrap/build.rs +++ b/libs/scrap/build.rs @@ -1,8 +1,28 @@ use std::{ env, fs, path::{Path, PathBuf}, + println, }; +#[cfg(all(target_os = "linux", feature = "linux-pkg-config"))] +fn link_pkg_config(name: &str) -> Vec { + // sometimes an override is needed + let pc_name = match name { + "libvpx" => "vpx", + _ => name, + }; + let lib = pkg_config::probe_library(pc_name) + .expect(format!( + "unable to find '{pc_name}' development headers with pkg-config (feature linux-pkg-config is enabled). + try installing '{pc_name}-dev' from your system package manager.").as_str()); + + lib.include_paths +} +#[cfg(not(all(target_os = "linux", feature = "linux-pkg-config")))] +fn link_pkg_config(_name: &str) -> Vec { + unimplemented!() +} + /// Link vcppkg package. fn link_vcpkg(mut path: PathBuf, name: &str) -> PathBuf { let target_os = std::env::var("CARGO_CFG_TARGET_OS").unwrap(); @@ -102,8 +122,16 @@ fn link_homebrew_m1(name: &str) -> PathBuf { } /// Find package. By default, it will try to find vcpkg first, then homebrew(currently only for Mac M1). +/// If building for linux and feature "linux-pkg-config" is enabled, will try to use pkg-config +/// unless check fails (e.g. NO_PKG_CONFIG_libyuv=1) fn find_package(name: &str) -> Vec { - if let Ok(vcpkg_root) = std::env::var("VCPKG_ROOT") { + let no_pkg_config_var_name = format!("NO_PKG_CONFIG_{name}"); + println!("cargo:rerun-if-env-changed={no_pkg_config_var_name}"); + if cfg!(all(target_os = "linux", feature = "linux-pkg-config")) + && std::env::var(no_pkg_config_var_name).as_deref() != Ok("1") { + + link_pkg_config(name) + } else if let Ok(vcpkg_root) = std::env::var("VCPKG_ROOT") { vec![link_vcpkg(vcpkg_root.into(), name)] } else { // Try using homebrew