From fae0732c746ba22d9a41f0f48c4e08d8c970c3b4 Mon Sep 17 00:00:00 2001
From: Gabriele Musco <gabmus@disroot.org>
Date: Sat, 14 Oct 2023 14:51:45 +0200
Subject: [PATCH] fix: add vulkan, libdrm, openxr deps to wivrn

---
 src/dependencies/common.rs      | 52 +++++++++++++++++++++++++++++++++
 src/dependencies/monado_deps.rs | 47 ++++-------------------------
 src/dependencies/wivrn_deps.rs  |  7 ++++-
 3 files changed, 64 insertions(+), 42 deletions(-)

diff --git a/src/dependencies/common.rs b/src/dependencies/common.rs
index 5539f51..675eb0d 100644
--- a/src/dependencies/common.rs
+++ b/src/dependencies/common.rs
@@ -91,3 +91,55 @@ pub fn dep_gpp() -> Dependency {
         ]),
     }
 }
+
+pub fn dep_libdrm() -> Dependency {
+    Dependency {
+        name: "libdrm".into(),
+        dep_type: DepType::SharedObject,
+        filename: "libdrm.so".into(),
+        packages: HashMap::from([
+            (LinuxDistro::Arch, "libdrm".into()),
+            (LinuxDistro::Debian, "libdrm-dev".into()),
+            (LinuxDistro::Fedora, "libdrm".into()),
+        ]),
+    }
+}
+
+pub fn dep_openxr() -> Dependency {
+    Dependency {
+        name: "openxr".into(),
+        dep_type: DepType::SharedObject,
+        filename: "libopenxr_loader.so".into(),
+        packages: HashMap::from([
+            (LinuxDistro::Arch, "openxr".into()),
+            (LinuxDistro::Debian, "libopenxr-dev".into()),
+            (LinuxDistro::Fedora, "openxr-devel".into()),
+        ]),
+    }
+}
+
+pub fn dep_vulkan_icd_loader() -> Dependency {
+    Dependency {
+        name: "vulkan-icd-loader".into(),
+        dep_type: DepType::SharedObject,
+        filename: "libvulkan.so".into(),
+        packages: HashMap::from([
+            (LinuxDistro::Arch, "vulkan-icd-loader".into()),
+            (LinuxDistro::Debian, "libvulkan-dev".into()),
+            (LinuxDistro::Fedora, "vulkan-loader-devel".into()),
+        ]),
+    }
+}
+
+pub fn dep_vulkan_headers() -> Dependency {
+    Dependency {
+        name: "vulkan-headers".into(),
+        dep_type: DepType::Include,
+        filename: "vulkan/vulkan.h".into(),
+        packages: HashMap::from([
+            (LinuxDistro::Arch, "vulkan-headers".into()),
+            (LinuxDistro::Debian, "libvulkan-dev".into()),
+            (LinuxDistro::Fedora, "vulkan-devel".into()),
+        ]),
+    }
+}
diff --git a/src/dependencies/monado_deps.rs b/src/dependencies/monado_deps.rs
index 0968e4c..df3e124 100644
--- a/src/dependencies/monado_deps.rs
+++ b/src/dependencies/monado_deps.rs
@@ -1,7 +1,8 @@
 use crate::{
     depcheck::{check_dependencies, DepType, Dependency, DependencyCheckResult},
     dependencies::common::{
-        dep_cmake, dep_eigen, dep_gcc, dep_git, dep_glslang_validator, dep_gpp, dep_ninja,
+        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,
     },
     linux_distro::LinuxDistro,
 };
@@ -9,46 +10,10 @@ use std::collections::HashMap;
 
 fn monado_deps() -> Vec<Dependency> {
     vec![
-        Dependency {
-            name: "libdrm".into(),
-            dep_type: DepType::SharedObject,
-            filename: "libdrm.so".into(),
-            packages: HashMap::from([
-                (LinuxDistro::Arch, "libdrm".into()),
-                (LinuxDistro::Debian, "libdrm-dev".into()),
-                (LinuxDistro::Fedora, "libdrm".into()),
-            ]),
-        },
-        Dependency {
-            name: "openxr".into(),
-            dep_type: DepType::SharedObject,
-            filename: "libopenxr_loader.so".into(),
-            packages: HashMap::from([
-                (LinuxDistro::Arch, "openxr".into()),
-                (LinuxDistro::Debian, "libopenxr-dev".into()),
-                (LinuxDistro::Fedora, "openxr-devel".into()),
-            ]),
-        },
-        Dependency {
-            name: "vulkan-icd-loader".into(),
-            dep_type: DepType::SharedObject,
-            filename: "libvulkan.so".into(),
-            packages: HashMap::from([
-                (LinuxDistro::Arch, "vulkan-icd-loader".into()),
-                (LinuxDistro::Debian, "libvulkan-dev".into()),
-                (LinuxDistro::Fedora, "vulkan-loader-devel".into()),
-            ]),
-        },
-        Dependency {
-            name: "vulkan-headers".into(),
-            dep_type: DepType::Include,
-            filename: "vulkan/vulkan.h".into(),
-            packages: HashMap::from([
-                (LinuxDistro::Arch, "vulkan-headers".into()),
-                (LinuxDistro::Debian, "libvulkan-dev".into()),
-                (LinuxDistro::Fedora, "vulkan-devel".into()),
-            ]),
-        },
+        dep_libdrm(),
+        dep_openxr(),
+        dep_vulkan_icd_loader(),
+        dep_vulkan_headers(),
         Dependency {
             name: "wayland".into(),
             dep_type: DepType::SharedObject,
diff --git a/src/dependencies/wivrn_deps.rs b/src/dependencies/wivrn_deps.rs
index cb3b33a..e4c3b3d 100644
--- a/src/dependencies/wivrn_deps.rs
+++ b/src/dependencies/wivrn_deps.rs
@@ -1,7 +1,8 @@
 use crate::{
     depcheck::{check_dependencies, DepType, Dependency, DependencyCheckResult},
     dependencies::common::{
-        dep_cmake, dep_eigen, dep_gcc, dep_git, dep_glslang_validator, dep_gpp, dep_ninja,
+        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,
     },
     linux_distro::LinuxDistro,
 };
@@ -15,6 +16,10 @@ fn wivrn_deps() -> Vec<Dependency> {
         dep_git(),
         dep_gcc(),
         dep_gpp(),
+        dep_libdrm(),
+        dep_openxr(),
+        dep_vulkan_icd_loader(),
+        dep_vulkan_headers(),
         Dependency {
             name: "x264-dev".into(),
             dep_type: DepType::Include,