[Mesa-dev] [PATCH 11/13] meson: build gallium omx state tracker

[Dylan Baker]

Quoting Marc Dietrich (2017-11-03 03:06:17)
> Am Mittwoch, 1. November 2017, 23:49:46 CET schrieb Dylan Baker:
> > ---
> >  meson.build                                        | 54 ++++++++++++++-
> >  meson_options.txt                                  | 13 ++++
> >  src/gallium/meson.build                            |  7 +-
> >  .../state_trackers/omx_bellagio/meson.build        | 30 +++++++++
> >  src/gallium/targets/omx-bellagio/meson.build       | 77
> > ++++++++++++++++++++++ 5 files changed, 179 insertions(+), 2 deletions(-)
> >  create mode 100644 src/gallium/state_trackers/omx_bellagio/meson.build
> >  create mode 100644 src/gallium/targets/omx-bellagio/meson.build
> > 
> > diff --git a/meson.build b/meson.build
> > index 48fa4ca5e5e..32b9d96e5be 100644
> > --- a/meson.build
> > +++ b/meson.build
> > @@ -365,6 +365,58 @@ if xvmc_drivers_path == ''
> >    xvmc_drivers_path = get_option('libdir')
> >  endif
> > 
> > +dep_omx = []
> > +_omx = get_option('gallium-omx')
> > +if _omx == 'auto'
> > +  if not ['linux', 'bsd'].contains(host_machine.system())
> > +    with_gallium_omx = false
> > +  elif not with_platform_x11
> > +    with_gallium_omx = false
> > +  elif not (with_gallium_r600 or with_gallium_radeonsi or
> > with_gallium_nouveau) +    with_gallium_omx = false
> > +  else
> > +    dep_omx = dependency('libomxil-bellagio', required : false)
> > +    with_gallium_omx = dep_omx.found()
> > +  endif
> > +elif _omx == 'true'
> > +  if not ['linux', 'bsd'].contains(host_machine.system())
> > +    error('OMX state tracker can only be built on unix-like OSes.')
> > +  elif not (with_platform_x11 or with_platform_drm)
> > +    error('OMX state tracker requires X11 or drm platform support.')
> > +    with_gallium_omx = false
> > +  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
> > +  dep_omx = dependency('libomxil-bellagio')
> > +else
> > +  with_gallium_omx = false
> > +endif
> > +
> > +omx_drivers_path = get_option('omx-libs-path')
> > +if with_gallium_omx
> > +  # Figure out where to put the omx driver.
> > +  # FIXME: this could all be vastly simplified by adding a
> > 'defined_variable' +  # argument to meson's get_pkgconfig_variable method.
> > +  if omx_drivers_path == ''
> > +    _omx_libdir = dep_omx.get_pkgconfig_variable('libdir')
> > +    _omx_drivers_dir = dep_omx.get_pkgconfig_variable('pluginsdir')
> > +    if _omx_libdir == get_option('libdir')
> > +      omx_drivers_path = _omx_drivers_dir
> > +    else
> > +      _omx_base_dir = []
> > +      # This will fail on windows. Does OMX run on windows?
> > +      _omx_libdir = _omx_libdir.split('/')
> > +      _omx_drivers_dir = _omx_drivers_dir.split('/')
> > +      foreach o : _omx_libdir
> > +        if not _omx_drivers_dir.contains(o)
> > +          _omx_base_dir += o
> > +        endif
> > +      endforeach
> > +      omx_drivers_path = join_paths(get_option('libdir'), _omx_drivers_dir)
> > +    endif
> > +  endif
> > +endif
> 
> This results in omx_drivers_path /usr/lib64/usr/lib64/bellagio here. I did not  
> set omx_drivers_path or libdir.
> 
> but meson log seems correct:
> Got pkgconfig variable libdir : /usr/lib64
> Got pkgconfig variable pluginsdir : /usr/lib64/bellagio
> 
> I can try to debug this later.
> 
> Marc

I think the `get_option('libdir')` call in `join_paths` is actually not
necessary (or helpful).

Realistically I should just write the meson patch mentioned in the fixme so we
can drop this whole hunk.

Dylan
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: signature
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20171103/3a6eabb0/attachment.sig>