meson: Fix placeholder dependencies

Using empty lists ([]) for placeholder dependencies causes warnings from
recent versions of Meson about how dependency types cannot be compared
to a list.

To fix that, use proper placeholder dependencies using:

	dependency('', required : False)

This creates an object that can be used in the same context as normal
dependencies, but it is marked as not found and doesn't provide any
flags or libraries on compiler command-lines.

Signed-off-by: Thierry Reding <treding@nvidia.com>

3 files changed, 45 insertions, 45 deletions

diff --git a/meson.build b/meson.build
index f6313f66f4d..ef5eafe249f 100644
--- a/meson.build
+++ b/meson.build
@@ -422,7 +422,7 @@ elif _vdpau == 'auto'
   _vdpau = 'true'
 endif
 with_gallium_vdpau = _vdpau == 'true'
-dep_vdpau = []
+dep_vdpau = dependency('', required : false)
 if with_gallium_vdpau
   dep_vdpau = dependency('vdpau', version : '>= 1.1')
   dep_vdpau = declare_dependency(
@@ -461,7 +461,7 @@ elif _xvmc == 'auto'
   _xvmc = 'true'
 endif
 with_gallium_xvmc = _xvmc == 'true'
-dep_xvmc = []
+dep_xvmc = dependency('', required : false)
 if with_gallium_xvmc
   dep_xvmc = dependency('xvmc', version : '>= 1.0.6')
 endif
@@ -491,8 +491,8 @@ elif not (with_gallium_r600 or with_gallium_radeonsi or with_gallium_nouveau)
     error('OMX state tracker requires at least one of the following gallium drivers: r600, radeonsi, nouveau.')
   endif
 endif
-dep_omx = []
-dep_omx_other = []
+dep_omx = dependency('', required : false)
+dep_omx_other = dependency('', required : false)
 if ['auto', 'bellagio'].contains(_omx)
   dep_omx = dependency(
     'libomxil-bellagio', required : _omx == 'bellagio'
@@ -579,7 +579,7 @@ elif _va == 'auto'
   _va = 'true'
 endif
 with_gallium_va = _va == 'true'
-dep_va = []
+dep_va = dependency('', required : false)
 if with_gallium_va
   dep_va = dependency('libva', version : '>= 0.38.0')
   dep_va_headers = declare_dependency(
@@ -638,7 +638,7 @@ if _opencl != 'disabled'
   with_gallium_opencl = true
   with_opencl_icd = _opencl == 'icd'
 else
-  dep_clc = []
+  dep_clc = dependency('', required : false)
   with_gallium_opencl = false
   with_gallium_icd = false
 endif
@@ -976,7 +976,7 @@ endif
 
 # check for dl support
 if cc.has_function('dlopen')
-  dep_dl = []
+  dep_dl = dependency('', required : false)
 else
   dep_dl = cc.find_library('dl')
 endif
@@ -995,7 +995,7 @@ endif
 
 # Determine whether or not the rt library is needed for time functions
 if cc.has_function('clock_gettime')
-  dep_clock = []
+  dep_clock = dependency('', required : false)
 else
   dep_clock = cc.find_library('rt')
 endif
@@ -1013,7 +1013,7 @@ if with_amd_vk or with_gallium_radeonsi or with_gallium_r600 or with_gallium_ope
     dep_elf = cc.find_library('elf')
   endif
 else
-  dep_elf = []
+  dep_elf = dependency('', required : false)
 endif
 dep_expat = dependency('expat')
 # this only exists on linux so either this is linux and it will be found, or
@@ -1024,12 +1024,12 @@ dep_m = cc.find_library('m', required : false)
 # but we always want to use the same version for all libdrm modules. That means
 # even if driver foo requires 2.4.0 and driver bar requires 2.4.3, if foo and
 # bar are both on use 2.4.3 for both of them
-dep_libdrm_amdgpu = []
-dep_libdrm_radeon = []
-dep_libdrm_nouveau = []
-dep_libdrm_etnaviv = []
-dep_libdrm_freedreno = []
-dep_libdrm_intel = []
+dep_libdrm_amdgpu = dependency('', required : false)
+dep_libdrm_radeon = dependency('', required : false)
+dep_libdrm_nouveau = dependency('', required : false)
+dep_libdrm_etnaviv = dependency('', required : false)
+dep_libdrm_freedreno = dependency('', required : false)
+dep_libdrm_intel = dependency('', required : false)
 
 _drm_amdgpu_ver = '2.4.91'
 _drm_radeon_ver = '2.4.71'
@@ -1114,7 +1114,7 @@ elif _llvm == 'true'
   dep_llvm = dependency('llvm', version : _llvm_version, modules : llvm_modules)
   with_llvm = true
 else
-  dep_llvm = []
+  dep_llvm = dependency('', required : false)
   with_llvm = false
 endif
 if with_llvm
@@ -1144,7 +1144,7 @@ elif with_amd_vk or with_gallium_radeonsi or with_gallium_swr
   error('The following drivers require LLVM: Radv, RadeonSI, SWR. One of these is enabled, but LLVM is disabled.')
 endif
 
-dep_glvnd = []
+dep_glvnd = dependency('', required : false)
 if with_glvnd
   dep_glvnd = dependency('libglvnd', version : '>= 0.2.0')
   pre_args += '-DUSE_LIBGLVND=1'
@@ -1156,7 +1156,7 @@ if with_valgrind != 'false'
     pre_args += '-DHAVE_VALGRIND'
   endif
 else
-  dep_valgrind = []
+  dep_valgrind = dependency('', required : false)
 endif
 
 # pthread stubs. Lets not and say we didn't
@@ -1164,7 +1164,7 @@ endif
 prog_bison = find_program('bison', required : with_any_opengl)
 prog_flex = find_program('flex', required : with_any_opengl)
 
-dep_selinux = []
+dep_selinux = dependency('', required : false)
 if get_option('selinux')
   dep_selinux = dependency('libselinux')
   pre_args += '-DMESA_SELINUX'
@@ -1178,7 +1178,7 @@ if with_libunwind != 'false'
     pre_args += '-DHAVE_LIBUNWIND'
   endif
 else
-  dep_unwind = []
+  dep_unwind = dependency('', required : false)
 endif
 
 # TODO: gallium-hud
@@ -1217,29 +1217,29 @@ if with_platform_wayland
   pre_args += ['-DHAVE_WAYLAND_PLATFORM', '-DWL_HIDE_DEPRECATED']
 else
   prog_wl_scanner = []
-  dep_wl_protocols = []
-  dep_wayland_client = []
-  dep_wayland_server = []
+  dep_wl_protocols = dependency('', required : false)
+  dep_wayland_client = dependency('', required : false)
+  dep_wayland_server = dependency('', required : false)
   wayland_dmabuf_xml = ''
 endif
 
-dep_x11 = []
-dep_xext = []
-dep_xdamage = []
-dep_xfixes = []
-dep_x11_xcb = []
-dep_xcb = []
-dep_xcb_glx = []
-dep_xcb_dri2 = []
-dep_xcb_dri3 = []
-dep_dri2proto = []
-dep_glproto = []
-dep_xxf86vm = []
-dep_xcb_dri3 = []
-dep_xcb_present = []
-dep_xcb_sync = []
-dep_xcb_xfixes = []
-dep_xshmfence = []
+dep_x11 = dependency('', required : false)
+dep_xext = dependency('', required : false)
+dep_xdamage = dependency('', required : false)
+dep_xfixes = dependency('', required : false)
+dep_x11_xcb = dependency('', required : false)
+dep_xcb = dependency('', required : false)
+dep_xcb_glx = dependency('', required : false)
+dep_xcb_dri2 = dependency('', required : false)
+dep_xcb_dri3 = dependency('', required : false)
+dep_dri2proto = dependency('', required : false)
+dep_glproto = dependency('', required : false)
+dep_xxf86vm = dependency('', required : false)
+dep_xcb_dri3 = dependency('', required : false)
+dep_xcb_present = dependency('', required : false)
+dep_xcb_sync = dependency('', required : false)
+dep_xcb_xfixes = dependency('', required : false)
+dep_xshmfence = dependency('', required : false)
 if with_platform_x11
   if with_glx == 'xlib' or with_glx == 'gallium-xlib'
     dep_x11 = dependency('x11')
@@ -1299,7 +1299,7 @@ if _sensors != 'false'
     pre_args += '-DHAVE_LIBSENSORS=1'
   endif
 else
-  dep_lmsensors = []
+  dep_lmsensors = dependency('', required : false)
 endif
 
 # TODO: gallium tests
@@ -1334,7 +1334,7 @@ gl_priv_reqs = [
 if dep_libdrm.found()
   gl_priv_reqs += 'libdrm >= 2.4.75'
 endif
-if dep_xxf86vm != [] and dep_xxf86vm.found()
+if dep_xxf86vm.found()
   gl_priv_reqs += 'xxf86vm'
 endif
 if with_dri_platform == 'drm'
@@ -1348,7 +1348,7 @@ endif
 if dep_m.found()
   gl_priv_libs += '-lm'
 endif
-if dep_dl != [] and dep_dl.found()
+if dep_dl.found()
   gl_priv_libs += '-ldl'
 endif
 
diff --git a/src/gallium/auxiliary/meson.build b/src/gallium/auxiliary/meson.build
index 00d8e5148a9..d31aeabef9d 100644
--- a/src/gallium/auxiliary/meson.build
+++ b/src/gallium/auxiliary/meson.build
@@ -341,7 +341,7 @@ files_libgallium = files(
   'nir/tgsi_to_nir.h',
 )
 
-if dep_libdrm != [] and dep_libdrm.found()
+if dep_libdrm.found()
   files_libgallium += files(
     'renderonly/renderonly.c',
     'renderonly/renderonly.h',
diff --git a/src/glx/meson.build b/src/glx/meson.build
index 7ac46ac0662..90ab552ac4d 100644
--- a/src/glx/meson.build
+++ b/src/glx/meson.build
@@ -137,7 +137,7 @@ gl_lib_cargs = [
   '-DDEFAULT_DRIVER_DIR="@0@"'.format(dri_search_path),
 ]
 
-if dep_xxf86vm != [] and dep_xxf86vm.found()
+if dep_xxf86vm.found()
   gl_lib_cargs += '-DHAVE_XF86VIDMODE'
 endif