meson: link dri3 xcb libs into vlwinsys instead of into each target
This makes the dependencies easier to manage, since each media target
doesn't need to worry about linking to half a dozen libraries.
Fixes: b1b65397d0
("meson: Build gallium auxiliary")
Signed-off-by: Dylan Baker <dylan.c.baker@intel.com>
Acked-by: Eric Engestrom <eric.engestrom@imgtec.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
parent
424e654cb0
commit
7023b373ec
|
@ -452,10 +452,15 @@ files_libgalliumvl = files(
|
|||
'vl/vl_zscan.h',
|
||||
)
|
||||
|
||||
vlwinsys_deps = []
|
||||
files_libgalliumvlwinsys = files('vl/vl_winsys.h')
|
||||
if with_dri2
|
||||
files_libgalliumvlwinsys += files('vl/vl_winsys_dri.c')
|
||||
if with_dri3
|
||||
vlwinsys_deps += [
|
||||
dep_xcb_sync, dep_xcb_present, dep_xshmfence, dep_xcb_xfixes,
|
||||
dep_xcb_dri3,
|
||||
]
|
||||
files_libgalliumvlwinsys += files('vl/vl_winsys_dri3.c')
|
||||
endif
|
||||
endif
|
||||
|
@ -526,6 +531,6 @@ libgalliumvlwinsys = static_library(
|
|||
'galliumvlwinsys',
|
||||
files_libgalliumvlwinsys,
|
||||
include_directories : [inc_gallium, inc_include, inc_loader, inc_src],
|
||||
dependencies : [dep_libdrm],
|
||||
dependencies : [dep_libdrm, vlwinsys_deps],
|
||||
build_by_default : false,
|
||||
)
|
||||
|
|
|
@ -44,10 +44,7 @@ libomx_gallium = shared_library(
|
|||
libpipe_loader_static, libws_null, libwsw,
|
||||
],
|
||||
link_depends : omx_link_depends,
|
||||
dependencies : [
|
||||
dep_xcb, dep_x11_xcb, dep_xcb_dri2, dep_xcb_dri3, dep_libdrm, dep_thread,
|
||||
driver_r600, driver_radeonsi, driver_nouveau,
|
||||
],
|
||||
dependencies : [dep_thread, driver_r600, driver_radeonsi, driver_nouveau],
|
||||
install : true,
|
||||
install_dir : omx_drivers_path,
|
||||
)
|
||||
|
|
|
@ -22,7 +22,6 @@
|
|||
# Static targets are always enabled in autotools (unless you modify
|
||||
# configure.ac)
|
||||
|
||||
va_deps = []
|
||||
va_link_args = []
|
||||
va_link_depends = []
|
||||
va_drivers = []
|
||||
|
@ -31,9 +30,6 @@ if with_ld_version_script
|
|||
va_link_args += ['-Wl,--version-script', join_paths(meson.current_source_dir(), 'va.sym')]
|
||||
va_link_depends += files('va.sym')
|
||||
endif
|
||||
if with_platform_x11
|
||||
va_deps += [dep_xcb, dep_x11_xcb, dep_xcb_dri2, dep_xcb_dri3]
|
||||
endif
|
||||
|
||||
libva_gallium = shared_library(
|
||||
'gallium_drv_video',
|
||||
|
@ -49,7 +45,7 @@ libva_gallium = shared_library(
|
|||
libpipe_loader_static, libws_null, libwsw,
|
||||
],
|
||||
dependencies : [
|
||||
dep_libdrm, dep_thread, va_deps, driver_r600, driver_radeonsi, driver_nouveau,
|
||||
dep_libdrm, dep_thread, driver_r600, driver_radeonsi, driver_nouveau,
|
||||
],
|
||||
link_depends : va_link_depends,
|
||||
install : true,
|
||||
|
|
|
@ -49,8 +49,7 @@ libvdpau_gallium = shared_library(
|
|||
libpipe_loader_static, libws_null, libwsw,
|
||||
],
|
||||
dependencies : [
|
||||
dep_thread, dep_xcb, dep_x11_xcb, dep_xcb_dri2, dep_libdrm,
|
||||
driver_r300, driver_r600, driver_radeonsi, driver_nouveau,
|
||||
dep_thread, driver_r300, driver_r600, driver_radeonsi, driver_nouveau,
|
||||
],
|
||||
link_depends : vdpau_link_depends,
|
||||
)
|
||||
|
|
|
@ -45,8 +45,7 @@ libxatracker = shared_library(
|
|||
],
|
||||
link_depends : xa_link_depends,
|
||||
dependencies : [
|
||||
dep_xcb, dep_x11_xcb, dep_xcb_dri2, dep_xcb_dri3, dep_libdrm, dep_thread,
|
||||
driver_nouveau, driver_i915, driver_svga, driver_freedreno,
|
||||
dep_thread, driver_nouveau, driver_i915, driver_svga, driver_freedreno,
|
||||
],
|
||||
install : true,
|
||||
)
|
||||
|
|
|
@ -44,10 +44,7 @@ libxvmc_gallium = shared_library(
|
|||
libxvmc_st, libgalliumvlwinsys, libgalliumvl, libgallium, libmesa_util,
|
||||
libpipe_loader_static, libws_null, libwsw,
|
||||
],
|
||||
dependencies : [
|
||||
dep_xcb, dep_x11_xcb, dep_xcb_dri2, dep_xcb_dri3, dep_libdrm, dep_thread,
|
||||
driver_r600, driver_nouveau,
|
||||
],
|
||||
dependencies : [dep_thread, driver_r600, driver_nouveau],
|
||||
link_depends : xvmc_link_depends,
|
||||
)
|
||||
|
||||
|
|
Loading…
Reference in New Issue