From d2c1f5b4a592862e9507f394a5f2de8c9402eae1 Mon Sep 17 00:00:00 2001 From: Gabriele Musco Date: Fri, 14 Jun 2024 07:34:20 +0200 Subject: [PATCH] feat: dri_interface and libudev dependency for monado --- src/dependencies/common.rs | 14 ++++++++++++++ src/dependencies/monado_deps.rs | 13 ++++++++++++- src/dependencies/wivrn_deps.rs | 14 ++------------ 3 files changed, 28 insertions(+), 13 deletions(-) diff --git a/src/dependencies/common.rs b/src/dependencies/common.rs index d7f9908..e885268 100644 --- a/src/dependencies/common.rs +++ b/src/dependencies/common.rs @@ -194,3 +194,17 @@ pub fn dep_opencv() -> Dependency { ]), } } + +pub fn dep_libudev() -> Dependency { + Dependency { + name: "libudev".into(), + dep_type: DepType::Include, + filename: "libudev.h".into(), + packages: HashMap::from([ + (LinuxDistro::Arch, "systemd-libs".into()), + (LinuxDistro::Debian, "libudev-dev".into()), + (LinuxDistro::Fedora, "systemd-devel".into()), + (LinuxDistro::Gentoo, "virtual/libudev".into()), + ]), + } +} diff --git a/src/dependencies/monado_deps.rs b/src/dependencies/monado_deps.rs index 1ac803c..46e1202 100644 --- a/src/dependencies/monado_deps.rs +++ b/src/dependencies/monado_deps.rs @@ -2,7 +2,7 @@ use crate::{ depcheck::{DepType, Dependency, DependencyCheckResult}, dependencies::common::{ dep_cmake, dep_eigen, dep_gcc, dep_git, dep_glslang_validator, dep_gpp, dep_libdrm, - dep_ninja, dep_openxr, dep_vulkan_headers, dep_vulkan_icd_loader, + dep_libudev, dep_ninja, dep_openxr, dep_vulkan_headers, dep_vulkan_icd_loader, }, linux_distro::LinuxDistro, }; @@ -55,6 +55,17 @@ fn monado_deps() -> Vec { (LinuxDistro::Gentoo, "media-libs/libsdl2".into()), ]), }, + dep_libudev(), + Dependency { + name: "mesa-common-dev".into(), + dep_type: DepType::Include, + filename: "GL/internal/dri_interface.h".into(), + packages: HashMap::from([ + (LinuxDistro::Arch, "mesa".into()), + (LinuxDistro::Debian, "mesa-common-dev".into()), + (LinuxDistro::Fedora, "mesa-libGL-devel".into()), + ]), + }, ] } diff --git a/src/dependencies/wivrn_deps.rs b/src/dependencies/wivrn_deps.rs index 996c8bb..6dc98a5 100644 --- a/src/dependencies/wivrn_deps.rs +++ b/src/dependencies/wivrn_deps.rs @@ -2,7 +2,7 @@ use crate::{ depcheck::{DepType, Dependency, DependencyCheckResult}, dependencies::common::{ dep_cmake, dep_eigen, dep_gcc, dep_git, dep_glslang_validator, dep_gpp, dep_libdrm, - dep_ninja, dep_openxr, dep_vulkan_headers, dep_vulkan_icd_loader, + dep_libudev, dep_ninja, dep_openxr, dep_vulkan_headers, dep_vulkan_icd_loader, }, linux_distro::LinuxDistro, }; @@ -120,17 +120,7 @@ fn wivrn_deps() -> Vec { ]), }, dep_glslang_validator(), - Dependency { - name: "libudev".into(), - dep_type: DepType::Include, - filename: "libudev.h".into(), - packages: HashMap::from([ - (LinuxDistro::Arch, "systemd-libs".into()), - (LinuxDistro::Debian, "libudev-dev".into()), - (LinuxDistro::Fedora, "systemd-devel".into()), - (LinuxDistro::Gentoo, "virtual/libudev".into()), - ]), - }, + dep_libudev(), Dependency { name: "gstreamer".into(), dep_type: DepType::SharedObject,