ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/mesa/dual-osmesa.patch

   1 diff --git a/include/meson.build b/include/meson.build
   2 index a64d9373a92..22c50eb5eb7 100644
   3 --- a/include/meson.build
   4 +++ b/include/meson.build
   5 @@ -89,7 +89,7 @@ if with_egl
   6    )
   7  endif
   8
   9 -if with_osmesa != 'none'
  10 +if with_osmesa != []
  11    install_headers('GL/osmesa.h', subdir : 'GL')
  12  endif
  13
  14 diff --git a/meson.build b/meson.build
  15 index 898d025f066..d73818e7ce5 100644
  16 --- a/meson.build
  17 +++ b/meson.build
  18 @@ -444,7 +444,7 @@ if with_any_vk and (with_platform_x11 and not with_dri3)
  19    error('Vulkan drivers require dri3 for X11 support')
  20  endif
  21  if with_dri
  22 -  if with_glx == 'disabled' and not with_egl and not with_gbm and with_osmesa != 'classic'
  23 +  if with_glx == 'disabled' and not with_egl and not with_gbm and not with_osmesa.contains('classic')
  24      error('building dri drivers require at least one windowing system or classic osmesa')
  25    endif
  26  endif
  27 @@ -1508,8 +1508,8 @@ else
  28    dep_unwind = null_dep
  29  endif
  30
  31 -if with_osmesa != 'none'
  32 -  if with_osmesa == 'gallium' and not with_gallium_softpipe
  33 +if with_osmesa != []
  34 +  if with_osmesa.contains('gallium') and not with_gallium_softpipe
  35      error('OSMesa gallium requires gallium softpipe or llvmpipe.')
  36    endif
  37    if host_machine.system() == 'windows'
  38 @@ -1710,10 +1710,10 @@ lines = ['',
  39                                                      with_gles2 ? 'yes' : 'no'),
  40  ]
  41
  42 -if with_osmesa != 'none'
  43 +if with_osmesa != []
  44    lines += ''
  45    suffix = ''
  46 -  if with_osmesa == 'gallium'
  47 +  if with_osmesa.contains('gallium')
  48      suffix = '(Gallium)'
  49    endif
  50    lines += 'OSMesa:          lib' + osmesa_lib_name + suffix
  51 diff --git a/meson_options.txt b/meson_options.txt
  52 index 626baf3d5c2..cb3dc3b383f 100644
  53 --- a/meson_options.txt
  54 +++ b/meson_options.txt
  55 @@ -295,9 +295,9 @@ option(
  56  )
  57  option(
  58    'osmesa',
  59 -  type : 'combo',
  60 -  value : 'none',
  61 -  choices : ['none', 'classic', 'gallium'],
  62 +  type : 'array',
  63 +  value : [],
  64 +  choices : ['classic', 'gallium'],
  65    description : 'Build OSmesa.'
  66  )
  67  option(
  68 diff --git a/src/mesa/meson.build b/src/mesa/meson.build
  69 index fa5c54cc6fb..f7b223862fa 100644
  70 --- a/src/mesa/meson.build
  71 +++ b/src/mesa/meson.build
  72 @@ -744,7 +744,7 @@ libmesa_gallium = static_library(
  73  )
  74
  75  subdir('drivers/dri')
  76 -if with_osmesa == 'classic'
  77 +if with_osmesa.contains('classic')
  78    subdir('drivers/osmesa')
  79  endif
  80  if with_glx == 'xlib'