fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-22 11:20:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

dri: added build dependencies for systems using non-standard prefixed X11 libs.

Browse source 
To get MacOS to build, some extra dependencies need to be added to a couple of build targets.
This mainly shows up when not installing the dependencies in the default prefix locations.
On MacOS, this happens when using a custom build of brew to install the dependencies to 'odd' locations.

Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25992>
This commit is contained in:
duncan.hopkins 2023-10-17 09:34:31 +01:00 • committed by Marge Bot
parent 96d55d784c
commit c8b64452c0
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/targets/dri/meson.build
View file

@ -49,7 +49,7 @@ libgallium_dri = shared_library(
link_depends : gallium_dri_link_depends, link_depends : gallium_dri_link_depends,
link_with : [ link_with : [
libdri, libmesa, libgalliumvl, libdri, libmesa, libgalliumvl,
libgallium, libglapi, libpipe_loader_static, libws_null, libwsw, libswdri, libgallium, libglapi, libloader, libpipe_loader_static, libws_null, libwsw, libswdri,
libswkmsdri, libswkmsdri,
], ],
dependencies : [ dependencies : [

2
src/glx/meson.build
View file

@ -136,7 +136,7 @@ libglx = static_library(
], ],
dependencies : [ dependencies : [
idep_mesautil, idep_xmlconfig, idep_mesautil, idep_xmlconfig,
dep_libdrm, dep_dri2proto, dep_glproto, dep_x11, dep_glvnd, dep_xxf86vm, dep_xshmfence dep_libdrm, dep_dri2proto, dep_glproto, dep_x11, dep_xext, dep_glvnd, dep_xxf86vm, dep_xshmfence
], ],
) )

2
src/loader/meson.build
View file

@ -47,6 +47,6 @@ libloader = static_library(
c_args : loader_c_args, c_args : loader_c_args,
gnu_symbol_visibility : 'hidden', gnu_symbol_visibility : 'hidden',
include_directories : [inc_include, inc_src, inc_util], include_directories : [inc_include, inc_src, inc_util],
dependencies : [dep_libdrm, dep_thread, dep_xcb_xrandr], dependencies : [dep_libdrm, dep_thread, dep_xcb, dep_xcb_xrandr],
build_by_default : false, build_by_default : false,
) )