meson: remove version checks for < 0.59

Which is now required, so these are useless Reviewed-by: Eric Engestrom <eric@igalia.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20752>
2025-01-22 05:33:55 +08:00 · 2023-01-17 09:46:41 -08:00 · 2023-01-17 09:46:41 -08:00 · c31629ee78
commit c31629ee78
parent 8c0531cf91
14 changed files with 161 additions and 196 deletions
--- a/meson.build
+++ b/meson.build
@ -22,8 +22,7 @@ project(
  'mesa',
  ['c', 'cpp'],
  version : run_command(
-    [find_program('python3', 'python'), 'bin/meson_get_version.py',
-     meson.version().version_compare('>= 0.56') ? meson.project_source_root() : meson.source_root()],
+    [find_program('python3', 'python'), 'bin/meson_get_version.py', meson.project_source_root()],
    check : true
  ).stdout(),
  license : 'MIT',
@ -2082,22 +2081,14 @@ gcc_lto_quirk = (cc.get_id() == 'gcc') ? ['-fno-lto'] : []
 devenv = environment()

 dir_compiler_nir = join_paths(meson.current_source_dir(), 'src/compiler/nir/')
-if meson.version().version_compare('>= 0.56')
-  dir_source_root = meson.project_source_root()
-else
-  # source_root() returns a source root of the parent project if called from
-  # a subproject, which makes impossible to use Mesa as a meson subproject.
-  dir_source_root = meson.source_root()
-endif
+dir_source_root = meson.project_source_root()


 subdir('include')
 subdir('bin')
 subdir('src')

-if meson.version().version_compare('>= 0.58')
-  meson.add_devenv(devenv)
-endif
+meson.add_devenv(devenv)

 lines = ['',
  'prefix:          ' + get_option('prefix'),
--- a/src/amd/vulkan/meson.build
+++ b/src/amd/vulkan/meson.build
@ -245,20 +245,18 @@ radeon_icd = custom_target(
  install : true,
 )

-if meson.version().version_compare('>= 0.58')
-  _dev_icdname = 'radeon_devenv_icd.@0@.json'.format(host_machine.cpu())
-  custom_target(
-    'radeon_devenv_icd',
-    input : [vk_icd_gen, vk_api_xml],
-    output : _dev_icdname,
-    command : [
-      prog_python, '@INPUT0@',
-      '--api-version', '1.3', '--xml', '@INPUT1@',
-      '--lib-path', meson.current_build_dir() / icd_file_name,
-      '--out', '@OUTPUT@',
-    ],
-    build_by_default : true,
-  )
+_dev_icdname = 'radeon_devenv_icd.@0@.json'.format(host_machine.cpu())
+custom_target(
+  'radeon_devenv_icd',
+  input : [vk_icd_gen, vk_api_xml],
+  output : _dev_icdname,
+  command : [
+    prog_python, '@INPUT0@',
+    '--api-version', '1.3', '--xml', '@INPUT1@',
+    '--lib-path', meson.current_build_dir() / icd_file_name,
+    '--out', '@OUTPUT@',
+  ],
+  build_by_default : true,
+)

-  devenv.append('VK_ICD_FILENAMES', meson.current_build_dir() / _dev_icdname)
-endif
+devenv.append('VK_ICD_FILENAMES', meson.current_build_dir() / _dev_icdname)
--- a/src/broadcom/vulkan/meson.build
+++ b/src/broadcom/vulkan/meson.build
@ -167,20 +167,18 @@ broadcom_icd = custom_target(
  install : true,
 )

-if meson.version().version_compare('>= 0.58')
-  _dev_icdname = 'broadcom_devenv_icd.@0@.json'.format(host_machine.cpu())
-  custom_target(
-    'broadcom_devenv_icd',
-    input : [vk_icd_gen, vk_api_xml],
-    output : _dev_icdname,
-    command : [
-      prog_python, '@INPUT0@',
-      '--api-version', '1.3', '--xml', '@INPUT1@',
-      '--lib-path', meson.current_build_dir() / 'libvulkan_broadcom.so',
-      '--out', '@OUTPUT@',
-    ],
-    build_by_default : true,
-  )
+_dev_icdname = 'broadcom_devenv_icd.@0@.json'.format(host_machine.cpu())
+custom_target(
+  'broadcom_devenv_icd',
+  input : [vk_icd_gen, vk_api_xml],
+  output : _dev_icdname,
+  command : [
+    prog_python, '@INPUT0@',
+    '--api-version', '1.3', '--xml', '@INPUT1@',
+    '--lib-path', meson.current_build_dir() / 'libvulkan_broadcom.so',
+    '--out', '@OUTPUT@',
+  ],
+  build_by_default : true,
+)

-  devenv.append('VK_ICD_FILENAMES', meson.current_build_dir() / _dev_icdname)
-endif
+devenv.append('VK_ICD_FILENAMES', meson.current_build_dir() / _dev_icdname)
--- a/src/freedreno/vulkan/meson.build
+++ b/src/freedreno/vulkan/meson.build
@ -162,20 +162,18 @@ freedreno_icd = custom_target(
  install : true,
 )

-if meson.version().version_compare('>= 0.58')
-  _dev_icdname = 'freedreno_devenv_icd.@0@.json'.format(host_machine.cpu())
-  custom_target(
-    'freedreno_devenv_icd',
-    input : [vk_icd_gen, vk_api_xml],
-    output : _dev_icdname,
-    command : [
-      prog_python, '@INPUT0@',
-      '--api-version', '1.1', '--xml', '@INPUT1@',
-      '--lib-path', meson.current_build_dir() / 'libvulkan_freedreno.so',
-      '--out', '@OUTPUT@',
-    ],
-    build_by_default : true,
-  )
+_dev_icdname = 'freedreno_devenv_icd.@0@.json'.format(host_machine.cpu())
+custom_target(
+  'freedreno_devenv_icd',
+  input : [vk_icd_gen, vk_api_xml],
+  output : _dev_icdname,
+  command : [
+    prog_python, '@INPUT0@',
+    '--api-version', '1.1', '--xml', '@INPUT1@',
+    '--lib-path', meson.current_build_dir() / 'libvulkan_freedreno.so',
+    '--out', '@OUTPUT@',
+  ],
+  build_by_default : true,
+)

-  devenv.append('VK_ICD_FILENAMES', meson.current_build_dir() / _dev_icdname)
-endif
+devenv.append('VK_ICD_FILENAMES', meson.current_build_dir() / _dev_icdname)
--- a/src/gallium/targets/dri/meson.build
+++ b/src/gallium/targets/dri/meson.build
@ -121,22 +121,20 @@ foreach d : [[with_gallium_kmsro, [
  endif
 endforeach

-if meson.version().version_compare('>= 0.58')
-  # This only works on Unix-like oses, which is probably fine for dri
-  prog_ln = find_program('ln', required : false)
-  if prog_ln.found()
-    devenv.set('LIBGL_DRIVERS_PATH', meson.current_build_dir())
+# This only works on Unix-like oses, which is probably fine for dri
+prog_ln = find_program('ln', required : false)
+if prog_ln.found()
+  devenv.set('LIBGL_DRIVERS_PATH', meson.current_build_dir())

-    foreach d : gallium_dri_drivers
-      custom_target(
-        'devenv_@0@'.format(d),
-        input : libgallium_dri,
-        output : d,
-        command : [prog_ln, '-f', '@INPUT@', '@OUTPUT@'],
-        build_by_default : true,
-      )
-    endforeach
-  endif
+  foreach d : gallium_dri_drivers
+    custom_target(
+      'devenv_@0@'.format(d),
+      input : libgallium_dri,
+      output : d,
+      command : [prog_ln, '-f', '@INPUT@', '@OUTPUT@'],
+      build_by_default : true,
+    )
+  endforeach
 endif

 meson.add_install_script(
--- a/src/gallium/targets/lavapipe/meson.build
+++ b/src/gallium/targets/lavapipe/meson.build
@ -41,20 +41,18 @@ lvp_icd = custom_target(
  install : true,
 )

-if meson.version().version_compare('>= 0.58')
-  _dev_icdname = 'lvp_devenv_icd.@0@.json'.format(host_machine.cpu())
-  custom_target(
-    'lvp_devenv_icd',
-    input : [vk_icd_gen, vk_api_xml],
-    output : _dev_icdname,
-    command : [
-      prog_python, '@INPUT0@',
-      '--api-version', '1.1', '--xml', '@INPUT1@',
-      '--lib-path', meson.current_build_dir() / 'libvulkan_lvp.so',
-      '--out', '@OUTPUT@',
-    ],
-    build_by_default : true,
-  )
+_dev_icdname = 'lvp_devenv_icd.@0@.json'.format(host_machine.cpu())
+custom_target(
+  'lvp_devenv_icd',
+  input : [vk_icd_gen, vk_api_xml],
+  output : _dev_icdname,
+  command : [
+    prog_python, '@INPUT0@',
+    '--api-version', '1.1', '--xml', '@INPUT1@',
+    '--lib-path', meson.current_build_dir() / 'libvulkan_lvp.so',
+    '--out', '@OUTPUT@',
+  ],
+  build_by_default : true,
+)

-  devenv.append('VK_ICD_FILENAMES', meson.current_build_dir() / _dev_icdname)
-endif
+devenv.append('VK_ICD_FILENAMES', meson.current_build_dir() / _dev_icdname)
--- a/src/gallium/targets/opencl/meson.build
+++ b/src/gallium/targets/opencl/meson.build
@ -127,11 +127,9 @@ if with_opencl_icd
    install_dir : join_paths(get_option('sysconfdir'), 'OpenCL', 'vendors'),
  )

-  if meson.version().version_compare('>= 0.58')
-    # .so is hardcoded in the icd as well
-    devenv.prepend(
-      'OCL_ICD_FILENAMES',
-      meson.current_build_dir() / 'libMesaOpenCL.so.@0@'.format(opencl_version)
-    )
-  endif
+  # .so is hardcoded in the icd as well
+  devenv.prepend(
+    'OCL_ICD_FILENAMES',
+    meson.current_build_dir() / 'libMesaOpenCL.so.@0@'.format(opencl_version)
+  )
 endif
--- a/src/gallium/targets/rusticl/meson.build
+++ b/src/gallium/targets/rusticl/meson.build
@ -63,10 +63,8 @@ configure_file(
  install_dir : join_paths(get_option('sysconfdir'), 'OpenCL', 'vendors'),
 )

-if meson.version().version_compare('>= 0.58')
-  # .so is hardcoded in the icd as well
-  devenv.prepend(
-    'OCL_ICD_VENDORS',
-    meson.current_build_dir() / 'libRusticlOpenCL.so.@0@'.format(opencl_version)
-  )
-endif
+# .so is hardcoded in the icd as well
+devenv.prepend(
+  'OCL_ICD_VENDORS',
+  meson.current_build_dir() / 'libRusticlOpenCL.so.@0@'.format(opencl_version)
+)
--- a/src/imagination/vulkan/meson.build
+++ b/src/imagination/vulkan/meson.build
@ -161,20 +161,18 @@ powervr_mesa_icd = custom_target(
  install : true,
 )

-if meson.version().version_compare('>= 0.58')
-  _dev_icdname = 'powervr_mesa_devenv_icd.@0@.json'.format(host_machine.cpu())
-  custom_target(
-    'powervr_mesa_devenv_icd',
-    input : [vk_icd_gen, vk_api_xml],
-    output : _dev_icdname,
-    command : [
-      prog_python, '@INPUT0@',
-      '--api-version', '1.0', '--xml', '@INPUT1@',
-      '--lib-path', meson.current_build_dir() / 'libvulkan_powervr_mesa.so',
-      '--out', '@OUTPUT@',
-    ],
-    build_by_default : true,
-  )
+_dev_icdname = 'powervr_mesa_devenv_icd.@0@.json'.format(host_machine.cpu())
+custom_target(
+  'powervr_mesa_devenv_icd',
+  input : [vk_icd_gen, vk_api_xml],
+  output : _dev_icdname,
+  command : [
+    prog_python, '@INPUT0@',
+    '--api-version', '1.0', '--xml', '@INPUT1@',
+    '--lib-path', meson.current_build_dir() / 'libvulkan_powervr_mesa.so',
+    '--out', '@OUTPUT@',
+  ],
+  build_by_default : true,
+)

-  devenv.append('VK_ICD_FILENAMES', meson.current_build_dir() / _dev_icdname)
-endif
+devenv.append('VK_ICD_FILENAMES', meson.current_build_dir() / _dev_icdname)
--- a/src/intel/vulkan/meson.build
+++ b/src/intel/vulkan/meson.build
@ -77,23 +77,21 @@ intel_icd = custom_target(
  install : true,
 )

-if meson.version().version_compare('>= 0.58')
-  _dev_icdname = 'intel_devenv_icd.@0@.json'.format(host_machine.cpu())
-  custom_target(
-    'intel_devenv_icd',
-    input : [vk_icd_gen, vk_api_xml],
-    output : _dev_icdname,
-    command : [
-      prog_python, '@INPUT0@',
-      '--api-version', '1.3', '--xml', '@INPUT1@',
-      '--lib-path', meson.current_build_dir() / 'libvulkan_intel.so',
-      '--out', '@OUTPUT@',
-    ],
-    build_by_default : true,
-  )
+_dev_icdname = 'intel_devenv_icd.@0@.json'.format(host_machine.cpu())
+custom_target(
+  'intel_devenv_icd',
+  input : [vk_icd_gen, vk_api_xml],
+  output : _dev_icdname,
+  command : [
+    prog_python, '@INPUT0@',
+    '--api-version', '1.3', '--xml', '@INPUT1@',
+    '--lib-path', meson.current_build_dir() / 'libvulkan_intel.so',
+    '--out', '@OUTPUT@',
+  ],
+  build_by_default : true,
+)

-  devenv.append('VK_ICD_FILENAMES', meson.current_build_dir() / _dev_icdname)
-endif
+devenv.append('VK_ICD_FILENAMES', meson.current_build_dir() / _dev_icdname)

 libanv_per_hw_ver_libs = []
 anv_per_hw_ver_files = files(
--- a/src/intel/vulkan_hasvk/meson.build
+++ b/src/intel/vulkan_hasvk/meson.build
@ -48,23 +48,21 @@ intel_hasvk_icd = custom_target(
  install : true,
 )

-if meson.version().version_compare('>= 0.58')
-  _dev_icdname = 'intel_hasvk_devenv_icd.@0@.json'.format(host_machine.cpu())
-  custom_target(
-    'intel_hasvk_devenv_icd',
-    input : [vk_icd_gen, vk_api_xml],
-    output : _dev_icdname,
-    command : [
-      prog_python, '@INPUT0@',
-      '--api-version', '1.3', '--xml', '@INPUT1@',
-      '--lib-path', meson.current_build_dir() / 'libvulkan_intel_hasvk.so',
-      '--out', '@OUTPUT@',
-    ],
-    build_by_default : true,
-  )
+_dev_icdname = 'intel_hasvk_devenv_icd.@0@.json'.format(host_machine.cpu())
+custom_target(
+  'intel_hasvk_devenv_icd',
+  input : [vk_icd_gen, vk_api_xml],
+  output : _dev_icdname,
+  command : [
+    prog_python, '@INPUT0@',
+    '--api-version', '1.3', '--xml', '@INPUT1@',
+    '--lib-path', meson.current_build_dir() / 'libvulkan_intel_hasvk.so',
+    '--out', '@OUTPUT@',
+  ],
+  build_by_default : true,
+)

-  devenv.append('VK_ICD_FILENAMES', meson.current_build_dir() / _dev_icdname)
-endif
+devenv.append('VK_ICD_FILENAMES', meson.current_build_dir() / _dev_icdname)

 libanv_per_hw_ver_libs = []
 anv_per_hw_ver_files = files(
--- a/src/microsoft/vulkan/meson.build
+++ b/src/microsoft/vulkan/meson.build
@ -130,15 +130,13 @@ dzn_icd = custom_target(
  install : true,
 )

-if meson.version().version_compare('>= 0.58')
-  _dev_icdname = 'dzn_devenv_icd.@0@.json'.format(host_machine.cpu())
-  custom_target(
-    'dzn_devenv_icd',
-    input : [vk_icd_gen, vk_api_xml],
-    output : _dev_icdname,
-    command : icd_dev_command,
-    build_by_default : true,
-  )
+_dev_icdname = 'dzn_devenv_icd.@0@.json'.format(host_machine.cpu())
+custom_target(
+  'dzn_devenv_icd',
+  input : [vk_icd_gen, vk_api_xml],
+  output : _dev_icdname,
+  command : icd_dev_command,
+  build_by_default : true,
+)

-  devenv.append('VK_ICD_FILENAMES', meson.current_build_dir() / _dev_icdname)
-endif
+devenv.append('VK_ICD_FILENAMES', meson.current_build_dir() / _dev_icdname)
--- a/src/panfrost/vulkan/meson.build
+++ b/src/panfrost/vulkan/meson.build
@ -155,20 +155,18 @@ panfrost_icd = custom_target(
  install : true,
 )

-if meson.version().version_compare('>= 0.58')
-  _dev_icdname = 'panfrost_devenv_icd.@0@.json'.format(host_machine.cpu())
-  custom_target(
-    'panfrost_devenv_icd',
-    input : [vk_icd_gen, vk_api_xml],
-    output : _dev_icdname,
-    command : [
-      prog_python, '@INPUT0@',
-      '--api-version', '1.1', '--xml', '@INPUT1@',
-      '--lib-path', meson.current_build_dir() / 'libvulkan_panfrost.so',
-      '--out', '@OUTPUT@',
-    ],
-    build_by_default : true,
-  )
+_dev_icdname = 'panfrost_devenv_icd.@0@.json'.format(host_machine.cpu())
+custom_target(
+  'panfrost_devenv_icd',
+  input : [vk_icd_gen, vk_api_xml],
+  output : _dev_icdname,
+  command : [
+    prog_python, '@INPUT0@',
+    '--api-version', '1.1', '--xml', '@INPUT1@',
+    '--lib-path', meson.current_build_dir() / 'libvulkan_panfrost.so',
+    '--out', '@OUTPUT@',
+  ],
+  build_by_default : true,
+)

-  devenv.append('VK_ICD_FILENAMES', meson.current_build_dir() / _dev_icdname)
-endif
+devenv.append('VK_ICD_FILENAMES', meson.current_build_dir() / _dev_icdname)
--- a/src/virtio/vulkan/meson.build
+++ b/src/virtio/vulkan/meson.build
@ -30,23 +30,21 @@ virtio_icd = custom_target(
  install : true,
 )

-if meson.version().version_compare('>= 0.58')
-  _dev_icdname = 'virtio_devenv_icd.@0@.json'.format(host_machine.cpu())
-  custom_target(
-    'virtio_devenv_icd',
-    input : [vk_icd_gen, vk_api_xml],
-    output : _dev_icdname,
-    command : [
-      prog_python, '@INPUT0@',
-      '--api-version', '1.2', '--xml', '@INPUT1@',
-      '--lib-path', meson.current_build_dir() / 'libvulkan_virtio.so',
-      '--out', '@OUTPUT@',
-    ],
-    build_by_default : true,
-  )
+_dev_icdname = 'virtio_devenv_icd.@0@.json'.format(host_machine.cpu())
+custom_target(
+  'virtio_devenv_icd',
+  input : [vk_icd_gen, vk_api_xml],
+  output : _dev_icdname,
+  command : [
+    prog_python, '@INPUT0@',
+    '--api-version', '1.2', '--xml', '@INPUT1@',
+    '--lib-path', meson.current_build_dir() / 'libvulkan_virtio.so',
+    '--out', '@OUTPUT@',
+  ],
+  build_by_default : true,
+)

-  devenv.append('VK_ICD_FILENAMES', meson.current_build_dir() / _dev_icdname)
-endif
+devenv.append('VK_ICD_FILENAMES', meson.current_build_dir() / _dev_icdname)

 libvn_files = files(
  'vn_buffer.c',