mirrors/envision
0
0
Fork 0
mirror of https://gitlab.com/gabmus/envision.git synced 2025-08-04 07:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(dependencies): correct packages for GL/gl.h

Browse source
This commit is contained in:
Gabriele Musco 2024-11-03 10:51:02 +01:00
commit a813015885
4 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/depcheck/basalt_deps.rs
View file

@ -1,6 +1,6 @@
use super::{ use super::{
boost_deps::boost_deps, boost_deps::boost_deps,
common::{dep_cmake, dep_eigen, dep_gpp, dep_libglvnd, dep_ninja, dep_opencv}, common::{dep_cmake, dep_eigen, dep_gpp, dep_libgl, dep_ninja, dep_opencv},
DepType, Dependency, DependencyCheckResult, DepType, Dependency, DependencyCheckResult,
}; };
use crate::linux_distro::LinuxDistro; use crate::linux_distro::LinuxDistro;
@ -11,7 +11,7 @@ fn basalt_deps() -> Vec<Dependency> {
dep_gpp(), dep_gpp(),
dep_cmake(), dep_cmake(),
dep_ninja(), dep_ninja(),
dep_libglvnd(), dep_libgl(),
Dependency { Dependency {
name: "lz4-dev".into(), name: "lz4-dev".into(),
dep_type: DepType::Include, dep_type: DepType::Include,

13
src/depcheck/common.rs
View file

@ -223,19 +223,20 @@ pub fn dep_libudev() -> Dependency {
} }
} }
pub fn dep_libglvnd() -> Dependency { pub fn dep_libgl() -> Dependency {
Dependency { Dependency {
name: "libglvnd-dev".into(), name: "libglvnd-dev".into(),
dep_type: DepType::Include, dep_type: DepType::Include,
filename: "GL/gl.h".into(), filename: "GL/gl.h".into(),
packages: HashMap::from([ packages: HashMap::from([
(LinuxDistro::Arch, "libglvnd".into()), (LinuxDistro::Arch, "libglvnd".into()),
(LinuxDistro::Debian, "libglvnd-dev".into()), // the right debian package would be libgl-dev but the mesa one
(LinuxDistro::Fedora, "libglvnd-devel".into()), // has it as a dependency
// WARN: can't find anything exact for alpine, mesa-dev offers (LinuxDistro::Debian, "libgl1-mesa-dev".into()),
// GL/gl.h hopefully that's the only one needed // as above, the right package would be libglvnd-devel
(LinuxDistro::Fedora, "mesa-libGL-devel".into()),
(LinuxDistro::Alpine, "mesa-dev".into()), (LinuxDistro::Alpine, "mesa-dev".into()),
(LinuxDistro::Suse, "libglvnd-devel".into()), (LinuxDistro::Suse, "Mesa-libGL-devel".into()),
]), ]),
} }
} }

4
src/depcheck/monado_deps.rs
View file

@ -1,7 +1,7 @@
use super::{ use super::{
common::{ 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_libglvnd, dep_libudev, dep_libx11, dep_libxcb, dep_ninja, dep_openxr, dep_libgl, dep_libudev, dep_libx11, dep_libxcb, dep_ninja, dep_openxr,
dep_vulkan_headers, dep_vulkan_icd_loader, dep_vulkan_headers, dep_vulkan_icd_loader,
}, },
DepType, Dependency, DependencyCheckResult, DepType, Dependency, DependencyCheckResult,
@ -74,7 +74,7 @@ fn monado_deps() -> Vec<Dependency> {
(LinuxDistro::Suse, "Mesa-dri-devel".into()), (LinuxDistro::Suse, "Mesa-dri-devel".into()),
]), ]),
}, },
dep_libglvnd(), dep_libgl(),
] ]
} }

6
src/depcheck/wivrn_deps.rs
View file

@ -6,7 +6,10 @@ use super::{
}, },
DepType, Dependency, DependencyCheckResult, DepType, Dependency, DependencyCheckResult,
}; };
use crate::{depcheck::common::dep_libxrandr, linux_distro::LinuxDistro}; use crate::{
depcheck::common::{dep_libgl, dep_libxrandr},
linux_distro::LinuxDistro,
};
use std::collections::HashMap; use std::collections::HashMap;
fn wivrn_deps() -> Vec<Dependency> { fn wivrn_deps() -> Vec<Dependency> {
@ -23,6 +26,7 @@ fn wivrn_deps() -> Vec<Dependency> {
dep_libxcb(), dep_libxcb(),
dep_libx11(), dep_libx11(),
dep_libxrandr(), dep_libxrandr(),
dep_libgl(),
Dependency { Dependency {
name: "patch".into(), name: "patch".into(),
dep_type: DepType::Executable, dep_type: DepType::Executable,