diff --git a/local/recipes/gpu/redox-drm/recipe.toml b/local/recipes/gpu/redox-drm/recipe.toml index c43c4866..1a57fc78 100644 --- a/local/recipes/gpu/redox-drm/recipe.toml +++ b/local/recipes/gpu/redox-drm/recipe.toml @@ -4,6 +4,12 @@ path = "source" [build] template = "cargo" dependencies = [ + "amdgpu", "redox-driver-sys", "linux-kpi", ] + +[package] +dependencies = [ + "amdgpu", +] diff --git a/local/recipes/gpu/redox-drm/source/build.rs b/local/recipes/gpu/redox-drm/source/build.rs index 2c84d90e..71063dfb 100644 --- a/local/recipes/gpu/redox-drm/source/build.rs +++ b/local/recipes/gpu/redox-drm/source/build.rs @@ -31,6 +31,8 @@ fn find_amdgpu_dc_library(manifest_dir: &Path) -> Option { } } + push_candidate_dirs(&mut candidates, &manifest_dir.join("../../amdgpu")); + push_candidate_dirs(&mut candidates, &manifest_dir.join("../../amdgpu/stage")); push_candidate_dirs(&mut candidates, &manifest_dir.join("../amdgpu")); push_candidate_dirs(&mut candidates, &manifest_dir.join("../amdgpu/stage")); diff --git a/local/recipes/system/redbear-meta/recipe.toml b/local/recipes/system/redbear-meta/recipe.toml index 8fe4b584..9b8bd67a 100644 --- a/local/recipes/system/redbear-meta/recipe.toml +++ b/local/recipes/system/redbear-meta/recipe.toml @@ -11,6 +11,7 @@ # - firmware-loader: firmware loading daemon used by GPU and Wi-Fi bring-up # - redbear-wifictl: Wi-Fi control daemon and scheme # - redox-drm: DRM display driver (AMD + Intel) +# - amdgpu: AMD display-core backend shared library for redox-drm # - evdevd: Event device daemon (input translation) # - udev-shim: udev-compatible device enumeration shim @@ -37,6 +38,7 @@ Installed components: - firmware-loader: firmware daemon - redbear-wifictl: Wi-Fi control plane - redox-drm: DRM display driver (AMD + Intel) + - amdgpu: AMD display-core backend shared library - evdevd: Input event translation - udev-shim: Device enumeration @@ -54,6 +56,7 @@ dependencies = [ "redbear-iwlwifi", "redbear-firmware", "redox-drm", + "amdgpu", "firmware-loader", "redbear-wifictl", "evdevd",