picnoir/libglvnd
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

meson: rename idep_glx -> dep_glx

Browse source 
Since we use idep as a convention to mean "internal dep"
This commit is contained in:
Dylan Baker 2022-07-05 15:55:04 -07:00
parent 8ee0213413
commit a1a4123c7e
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/GL/meson.build
View file

@ -28,7 +28,7 @@ libGL = shared_library(
include_directories : [inc_include], include_directories : [inc_include],
link_args : '-Wl,-Bsymbolic', link_args : '-Wl,-Bsymbolic',
dependencies : [ dependencies : [
dep_dl, idep_gldispatch, idep_glapi_gl, idep_glx, idep_utils_misc, dep_x11_headers dep_dl, idep_gldispatch, idep_glapi_gl, dep_glx, idep_utils_misc, dep_x11_headers
], ],
version : '1.7.0', version : '1.7.0',
gnu_symbol_visibility : 'hidden', gnu_symbol_visibility : 'hidden',

4
src/GLX/meson.build
View file

@ -53,13 +53,13 @@ libGLX = shared_library(
inc_glx = include_directories('.') inc_glx = include_directories('.')
idep_glx = declare_dependency( dep_glx = declare_dependency(
link_with : libGLX, link_with : libGLX,
include_directories : [inc_include, inc_glx], include_directories : [inc_include, inc_glx],
) )
if meson.version().version_compare('>= 0.54') if meson.version().version_compare('>= 0.54')
meson.override_dependency('glx', idep_glx) meson.override_dependency('glx', dep_glx)
endif endif
pkg.generate( pkg.generate(

12
tests/meson.build
View file

@ -75,7 +75,7 @@ if with_glx
['testglxcreatecontext.c', 'test_utils.c'], ['testglxcreatecontext.c', 'test_utils.c'],
include_directories : [inc_include], include_directories : [inc_include],
link_with : libOpenGL, link_with : libOpenGL,
dependencies : [idep_glx, dep_x11], dependencies : [dep_glx, dep_x11],
), ),
env : env_glx, env : env_glx,
suite : ['glx'], suite : ['glx'],
@ -89,7 +89,7 @@ if with_glx
link_with : [libOpenGL], link_with : [libOpenGL],
dependencies : [ dependencies : [
dep_dl, dep_x11, idep_glvnd_pthread, idep_trace, idep_utils_misc, dep_dl, dep_x11, idep_glvnd_pthread, idep_trace, idep_utils_misc,
idep_glx, dep_glx,
], ],
) )
@ -128,7 +128,7 @@ if with_glx
'glxgetprocaddress', 'glxgetprocaddress',
['testglxgetprocaddress.c'], ['testglxgetprocaddress.c'],
include_directories : [inc_include], include_directories : [inc_include],
dependencies : [dep_x11, idep_glx, idep_gldispatch], dependencies : [dep_x11, dep_glx, idep_gldispatch],
) )
test( test(
@ -153,7 +153,7 @@ if with_glx
'testglxgetprocaddress_genentry', 'testglxgetprocaddress_genentry',
['testglxgetprocaddress_genentry.c'], ['testglxgetprocaddress_genentry.c'],
include_directories : [inc_include], include_directories : [inc_include],
dependencies : [dep_x11, idep_glx], dependencies : [dep_x11, dep_glx],
), ),
env : env_glx, env : env_glx,
suite : ['glx'], suite : ['glx'],
@ -167,7 +167,7 @@ if with_glx
['testglxgetclientstr.c'], ['testglxgetclientstr.c'],
include_directories : [inc_include], include_directories : [inc_include],
link_with : libOpenGL, link_with : libOpenGL,
dependencies : [dep_x11, idep_glx, idep_trace, idep_utils_misc], dependencies : [dep_x11, dep_glx, idep_trace, idep_utils_misc],
), ),
env : env_glx, env : env_glx,
suite : ['glx'], suite : ['glx'],
@ -181,7 +181,7 @@ if with_glx
['testglxqueryversion.c'], ['testglxqueryversion.c'],
include_directories : [inc_include], include_directories : [inc_include],
link_with : libOpenGL, link_with : libOpenGL,
dependencies : [dep_x11, idep_glx], dependencies : [dep_x11, dep_glx],
), ),
env : env_glx, env : env_glx,
suite : ['glx'], suite : ['glx'],