meson/gbm: clean up dependencies
- move everything that's actually only used by the DRI backend to the backend - remove some things that aren't used at all Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31223>
This commit is contained in:
@@ -1,10 +1,20 @@
|
||||
deps_gbm_dri = []
|
||||
|
||||
# TODO: fix includes to delete this
|
||||
incs_gbm_dri = [inc_mesa]
|
||||
|
||||
if with_platform_wayland
|
||||
deps_gbm_dri += dep_wayland_server
|
||||
incs_gbm_dri += inc_wayland_drm
|
||||
endif
|
||||
|
||||
libgbm_dri = shared_library(
|
||||
'dri_gbm',
|
||||
files('gbm_dri.c', 'gbm_driint.h'),
|
||||
include_directories : incs_gbm,
|
||||
include_directories : [incs_gbm, incs_gbm_dri, inc_st_dri, inc_gallium_aux],
|
||||
link_args : [ld_args_gc_sections],
|
||||
link_with : [libloader, libgallium_dri],
|
||||
dependencies : [deps_gbm, dep_dl, dep_thread, dep_libdrm, idep_mesautil, idep_xmlconfig],
|
||||
dependencies : [deps_gbm_dri, dep_dl, dep_libdrm, idep_mesautil, idep_xmlconfig],
|
||||
gnu_symbol_visibility : 'hidden',
|
||||
install : true,
|
||||
install_dir: join_paths(get_option('libdir'), 'gbm'),
|
||||
|
@@ -10,22 +10,10 @@ files_gbm = files(
|
||||
'main/gbm.h',
|
||||
'main/gbmint.h',
|
||||
)
|
||||
deps_gbm = []
|
||||
args_gbm = [
|
||||
'-DDEFAULT_BACKENDS_PATH="@0@"'.format(gbm_backends_path),
|
||||
]
|
||||
deps_gbm = []
|
||||
incs_gbm = [
|
||||
include_directories('main'), inc_include, inc_src, inc_loader, inc_gallium, inc_st_dri, inc_gallium_aux
|
||||
]
|
||||
|
||||
# TODO: fix includes to delete this
|
||||
incs_gbm += inc_mesa
|
||||
|
||||
if with_platform_wayland
|
||||
deps_gbm += dep_wayland_server
|
||||
incs_gbm += inc_wayland_drm
|
||||
endif
|
||||
incs_gbm = [include_directories('main'), inc_loader, inc_gallium]
|
||||
|
||||
if with_dri2
|
||||
subdir('backends/dri')
|
||||
@@ -44,7 +32,7 @@ libgbm = shared_library(
|
||||
c_args : [args_gbm],
|
||||
link_args : [ld_args_gc_sections],
|
||||
link_with : [libloader],
|
||||
dependencies : [deps_gbm, dep_dl, dep_thread, dep_libdrm, idep_mesautil, idep_xmlconfig],
|
||||
dependencies : [dep_libdrm, idep_xmlconfig],
|
||||
gnu_symbol_visibility : 'hidden',
|
||||
version : '1.0.0',
|
||||
install : true,
|
||||
|
Reference in New Issue
Block a user