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

fix: deduplicate glslc dependency
Some checks failed
/ cargo-fmtcheck (push) Has been cancelled
Details
/ cargo-clippy (push) Has been cancelled
Details
/ cargo-test (push) Has been cancelled
Details
/ appimage (push) Has been cancelled
Details

Browse source
This commit is contained in:
Gabriele Musco 2025-05-10 10:39:53 +02:00
commit fc4a2d3993
3 changed files with 23 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/depcheck/common.rs
View file

@ -319,3 +319,19 @@ pub fn dep_getcap_setcap() -> Dependency {
]), ]),
} }
} }
pub fn dep_glslc() -> Dependency {
Dependency {
name: "glslc".into(),
dep_type: DepType::Executable,
filename: "glslc".into(),
packages: HashMap::from([
(LinuxDistro::Arch, "shaderc".into()),
(LinuxDistro::Debian, "glslc".into()),
(LinuxDistro::Fedora, "glslc".into()),
(LinuxDistro::Alpine, "shaderc".into()),
(LinuxDistro::Gentoo, "media-libs/shaderc".into()),
(LinuxDistro::Suse, "shaderc".into()),
]),
}
}

19
src/depcheck/monado_deps.rs
View file

@ -6,7 +6,10 @@ use super::{
}, },
DepType, DepcheckResultGetMissing, Dependency, DependencyCheckResult, DepType, DepcheckResultGetMissing, Dependency, DependencyCheckResult,
}; };
use crate::{depcheck::common::dep_libxrandr, linux_distro::LinuxDistro}; use crate::{
depcheck::common::{dep_glslc, dep_libxrandr},
linux_distro::LinuxDistro,
};
use std::collections::HashMap; use std::collections::HashMap;
fn monado_deps() -> Vec<Dependency> { fn monado_deps() -> Vec<Dependency> {
@ -60,19 +63,7 @@ fn monado_deps() -> Vec<Dependency> {
dep_ninja(), dep_ninja(),
dep_gcc(), dep_gcc(),
dep_gpp(), dep_gpp(),
Dependency { dep_glslc(),
name: "glslc".into(),
dep_type: DepType::Executable,
filename: "glslc".into(),
packages: HashMap::from([
(LinuxDistro::Arch, "shaderc".into()),
(LinuxDistro::Debian, "glslc".into()),
(LinuxDistro::Fedora, "glslc".into()),
(LinuxDistro::Alpine, "shaderc".into()),
(LinuxDistro::Gentoo, "media-libs/shaderc".into()),
(LinuxDistro::Suse, "shaderc".into()),
]),
},
dep_glslang_validator(), dep_glslang_validator(),
Dependency { Dependency {
name: "sdl2".into(), name: "sdl2".into(),

16
src/depcheck/xrizer_deps.rs
View file

@ -1,22 +1,10 @@
use super::{DepType, DepcheckResultGetMissing, Dependency, DependencyCheckResult}; use super::{DepType, DepcheckResultGetMissing, Dependency, DependencyCheckResult};
use crate::linux_distro::LinuxDistro; use crate::{depcheck::common::dep_glslc, linux_distro::LinuxDistro};
use std::collections::HashMap; use std::collections::HashMap;
fn xrizer_deps() -> Vec<Dependency> { fn xrizer_deps() -> Vec<Dependency> {
vec![ vec![
Dependency { dep_glslc(),
name: "glslc".into(),
dep_type: DepType::Executable,
filename: "glslc".into(),
packages: HashMap::from([
(LinuxDistro::Arch, "shaderc".into()),
(LinuxDistro::Debian, "glslc".into()),
(LinuxDistro::Fedora, "glslc".into()),
(LinuxDistro::Alpine, "glslc".into()),
(LinuxDistro::Gentoo, "dev-util/glslang".into()),
(LinuxDistro::Suse, "shaderc".into()),
]),
},
Dependency { Dependency {
name: "libxcb-glx".into(), name: "libxcb-glx".into(),
dep_type: DepType::Include, dep_type: DepType::Include,