gfxstream: use canonical Mesa dependencies

drm_dep -> dep_libdrm, essentially.

Reviewed-by: Aaron Ruby <aruby@blackberry.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32062>
This commit is contained in:
Gurchetan Singh
2024-11-08 10:14:26 -08:00
committed by Marge Bot
parent 5e9c14395d
commit 1794ff7309
5 changed files with 4 additions and 15 deletions
@@ -21,5 +21,5 @@ lib_goldfish_address_space = static_library(
inc_aemu,
inc_src],
link_with: [libplatform_virtgpu],
dependencies: drm_dep
dependencies: dep_libdrm
)
@@ -19,5 +19,5 @@ libconnection_manager = static_library(
inc_platform_virtgpu, inc_src, inc_aemu],
link_with: [lib_guest_iostream, lib_goldfish_address_space,
libplatform_virtgpu],
dependencies: drm_dep
dependencies: dep_libdrm
)
-11
View File
@@ -24,10 +24,6 @@ gfxstream_guest_args += '-DVK_GFXSTREAM_STRUCTURE_TYPE_EXT'
# Dependencies #
#===============#
dl_dep = cc.find_library('dl', required: false)
drm_dep = dependency('libdrm')
thread_dep = dependency('threads')
with_kumquat = false
virtgpu_kumquat_dep = dependency('virtgpu_kumquat_ffi', required: false)
if virtgpu_kumquat_dep.found()
@@ -42,13 +38,6 @@ inc_include_mesa = include_directories('../../../include')
inc_vulkan_headers = include_directories('../../../include/vulkan')
inc_vulkan_enc = include_directories('vulkan_enc')
#================#
# Mesa compat #
#================#
# dep_libdrm = drm_dep
# dep_dl = dl_dep
# dep_thread = thread_dep
#================#
# Subdirectories #
#================#
@@ -13,5 +13,5 @@ libplatform_virtgpu_linux = static_library(
files_libplatform_virtgpu_linux,
cpp_args: gfxstream_guest_args,
include_directories: [inc_platform_virtgpu, inc_src, inc_include],
dependencies: drm_dep,
dependencies: dep_libdrm,
)
+1 -1
View File
@@ -32,7 +32,7 @@ lib_vulkan_gfxstream = shared_library(
libconnection_manager, libaemu],
link_args: [vulkan_icd_link_args, ld_args_bsymbolic, ld_args_gc_sections],
link_depends: vulkan_icd_link_depends,
dependencies: [dependency('libdrm'), idep_vulkan_wsi_headers,
dependencies: [dep_libdrm, idep_vulkan_wsi_headers,
idep_vulkan_lite_runtime, idep_vulkan_util_headers,
idep_vulkan_wsi, dep_valgrind],
install: true,