diff --git a/src/depcheck/basalt_deps.rs b/src/depcheck/basalt_deps.rs index 57c2a63..2a05826 100644 --- a/src/depcheck/basalt_deps.rs +++ b/src/depcheck/basalt_deps.rs @@ -1,6 +1,6 @@ use super::{ 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, }; use crate::linux_distro::LinuxDistro; @@ -11,7 +11,7 @@ fn basalt_deps() -> Vec { dep_gpp(), dep_cmake(), dep_ninja(), - dep_libglvnd(), + dep_libgl(), Dependency { name: "lz4-dev".into(), dep_type: DepType::Include, diff --git a/src/depcheck/common.rs b/src/depcheck/common.rs index 2830a4b..56ac4ef 100644 --- a/src/depcheck/common.rs +++ b/src/depcheck/common.rs @@ -223,19 +223,20 @@ pub fn dep_libudev() -> Dependency { } } -pub fn dep_libglvnd() -> Dependency { +pub fn dep_libgl() -> 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 + // the right debian package would be libgl-dev but the mesa one + // has it as a dependency + (LinuxDistro::Debian, "libgl1-mesa-dev".into()), + // as above, the right package would be libglvnd-devel + (LinuxDistro::Fedora, "mesa-libGL-devel".into()), (LinuxDistro::Alpine, "mesa-dev".into()), - (LinuxDistro::Suse, "libglvnd-devel".into()), + (LinuxDistro::Suse, "Mesa-libGL-devel".into()), ]), } } diff --git a/src/depcheck/monado_deps.rs b/src/depcheck/monado_deps.rs index 3b74d2f..0660030 100644 --- a/src/depcheck/monado_deps.rs +++ b/src/depcheck/monado_deps.rs @@ -1,7 +1,7 @@ use super::{ common::{ 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, }, DepType, Dependency, DependencyCheckResult, @@ -74,7 +74,7 @@ fn monado_deps() -> Vec { (LinuxDistro::Suse, "Mesa-dri-devel".into()), ]), }, - dep_libglvnd(), + dep_libgl(), ] } diff --git a/src/depcheck/wivrn_deps.rs b/src/depcheck/wivrn_deps.rs index cbda2b0..ee430cb 100644 --- a/src/depcheck/wivrn_deps.rs +++ b/src/depcheck/wivrn_deps.rs @@ -6,7 +6,10 @@ use super::{ }, 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; fn wivrn_deps() -> Vec { @@ -23,6 +26,7 @@ fn wivrn_deps() -> Vec { dep_libxcb(), dep_libx11(), dep_libxrandr(), + dep_libgl(), Dependency { name: "patch".into(), dep_type: DepType::Executable,