Merge branch 'meson-modernize' into 'master'

meson: use meson.override_dependency when possible

See merge request glvnd/libglvnd!269

meson.build

@@ -105,7 +105,6 @@ elif not get_option('glx').disabled() and dep_x11.found()
   dep_glproto = dependency('glproto', required : get_option('glx'))
   with_glx = true
 endif
-dep_glx = [dep_xext, dep_glproto]
 
 if cc.compiles('typeof(int *);', name : 'typeof')
   add_project_arguments('-DHAVE_TYPEOF', language : ['c'])

src/EGL/meson.build

@@ -62,6 +62,15 @@ pkg.generate(
   version : '1.5',
 )
 
+dep_egl = declare_dependency(
+  link_with : libEGL,
+  include_directories : inc_include,
+)
+
+if meson.version().version_compare('>= 0.54')
+  meson.override_dependency('egl', dep_egl)
+endif
+
 test(
   'EGL symbols check',
   prog_py,

src/GL/meson.build

@@ -28,7 +28,7 @@ libGL = shared_library(
   include_directories : [inc_include],
   link_args : '-Wl,-Bsymbolic',
   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',
   gnu_symbol_visibility : 'hidden',
@@ -42,6 +42,15 @@ pkg.generate(
   version : '1.2',
 )
 
+dep_gl = declare_dependency(
+  link_with : libGL,
+  include_directories : inc_include,
+)
+
+if meson.version().version_compare('>= 0.54')
+  meson.override_dependency('gl', dep_gl)
+endif
+
 test(
   'GL symbols check',
   prog_py,

src/GLESv1/meson.build

@@ -39,6 +39,15 @@ pkg.generate(
   version : '1.0',
 )
 
+dep_glesv1 = declare_dependency(
+  link_with : libGLESv1,
+  include_directories : inc_include,
+)
+
+if meson.version().version_compare('>= 0.54')
+  meson.override_dependency('glesv1_cm', dep_glesv1)
+endif
+
 test(
   'GLESv1 symbols check',
   prog_py,

src/GLESv2/meson.build

@@ -40,6 +40,15 @@ pkg.generate(
   version : '3.2',
 )
 
+dep_glesv2 = declare_dependency(
+  link_with : libGLESv2,
+  include_directories : inc_include,
+)
+
+if meson.version().version_compare('>= 0.54')
+  meson.override_dependency('glesv2', dep_glesv2)
+endif
+
 test(
   'GLESv2 symbols check',
   prog_py,

src/GLX/meson.build

@@ -41,7 +41,8 @@ libGLX = shared_library(
   include_directories : [inc_include],
   link_args : '-Wl,-Bsymbolic',
   dependencies : [
-    dep_dl, dep_x11, dep_glx, idep_gldispatch, idep_trace,
+    dep_dl, dep_x11, dep_xext, dep_glproto,
+    idep_gldispatch, idep_trace,
     idep_glvnd_pthread, idep_utils_misc,
     idep_app_error_check, idep_winsys_dispatch,
   ],
@@ -52,11 +53,15 @@ libGLX = shared_library(
 
 inc_glx = include_directories('.')
 
-idep_glx = declare_dependency(
+dep_glx = declare_dependency(
   link_with : libGLX,
-  include_directories : inc_glx,
+  include_directories : [inc_include, inc_glx],
 )
 
+if meson.version().version_compare('>= 0.54')
+  meson.override_dependency('glx', dep_glx)
+endif
+
 pkg.generate(
   libGLX,
   filebase : 'glx',

src/OpenGL/meson.build

@@ -44,6 +44,15 @@ pkg.generate(
   version : '4.5',
 )
 
+dep_opengl = declare_dependency(
+  link_with : libOpenGL,
+  include_directories : inc_include,
+)
+
+if meson.version().version_compare('>= 0.54')
+  meson.override_dependency('opengl', dep_opengl)
+endif
+
 test(
   'OpenGL symbols check',
   prog_py,

tests/meson.build

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