mirrors/envision
0
0
Fork 0
mirror of https://gitlab.com/gabmus/envision.git synced 2025-09-25 10:48:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: add glvnd as dependency for monado

Browse source
This commit is contained in:
Gabriele Musco 2024-08-13 23:29:00 +02:00
commit be6c9b3abe
3 changed files with 21 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/dependencies/basalt_deps.rs
View file

@ -1,6 +1,6 @@
use crate::{ use crate::{
depcheck::{DepType, Dependency, DependencyCheckResult}, depcheck::{DepType, Dependency, DependencyCheckResult},
dependencies::common::{dep_cmake, dep_eigen, dep_gpp, dep_ninja, dep_opencv}, dependencies::common::{dep_cmake, dep_eigen, dep_gpp, dep_libglvnd, dep_ninja, dep_opencv},
linux_distro::LinuxDistro, linux_distro::LinuxDistro,
}; };
use std::collections::HashMap; use std::collections::HashMap;
@ -10,19 +10,7 @@ fn basalt_deps() -> Vec<Dependency> {
dep_gpp(), dep_gpp(),
dep_cmake(), dep_cmake(),
dep_ninja(), dep_ninja(),
Dependency { dep_libglvnd(),
name: "libglvnd-dev".into(),
dep_type: DepType::Include,
filename: "GL/gl.h".into(),
packages: HashMap::from([
(LinuxDistro::Arch, "libglvnd".into()),
(LinuxDistro::Debian, "libglvnd-dev".into()),
(LinuxDistro::Fedora, "libglvnd-devel".into()),
// WARN: can't find anything exact for alpine, mesa-dev offers
// GL/gl.h hopefully that's the only one needed
(LinuxDistro::Alpine, "mesa-dev".into()),
]),
},
Dependency { Dependency {
name: "lz4-dev".into(), name: "lz4-dev".into(),
dep_type: DepType::Include, dep_type: DepType::Include,

16
src/dependencies/common.rs
View file

@ -208,3 +208,19 @@ pub fn dep_libudev() -> Dependency {
]), ]),
} }
} }
pub fn dep_libglvnd() -> Dependency {
Dependency {
name: "libglvnd-dev".into(),
dep_type: DepType::Include,
filename: "GL/gl.h".into(),
packages: HashMap::from([
(LinuxDistro::Arch, "libglvnd".into()),
(LinuxDistro::Debian, "libglvnd-dev".into()),
(LinuxDistro::Fedora, "libglvnd-devel".into()),
// WARN: can't find anything exact for alpine, mesa-dev offers
// GL/gl.h hopefully that's the only one needed
(LinuxDistro::Alpine, "mesa-dev".into()),
]),
}
}

4
src/dependencies/monado_deps.rs
View file

@ -2,7 +2,8 @@ use crate::{
depcheck::{DepType, Dependency, DependencyCheckResult}, depcheck::{DepType, Dependency, DependencyCheckResult},
dependencies::common::{ dependencies::common::{
dep_cmake, dep_eigen, dep_gcc, dep_git, dep_glslang_validator, dep_gpp, dep_libdrm, dep_cmake, dep_eigen, dep_gcc, dep_git, dep_glslang_validator, dep_gpp, dep_libdrm,
dep_libudev, dep_ninja, dep_openxr, dep_vulkan_headers, dep_vulkan_icd_loader, dep_libglvnd, dep_libudev, dep_ninja, dep_openxr, dep_vulkan_headers,
dep_vulkan_icd_loader,
}, },
linux_distro::LinuxDistro, linux_distro::LinuxDistro,
}; };
@ -67,6 +68,7 @@ fn monado_deps() -> Vec<Dependency> {
(LinuxDistro::Suse, "Mesa-dri-devel".into()), (LinuxDistro::Suse, "Mesa-dri-devel".into()),
]), ]),
}, },
dep_libglvnd(),
] ]
} }