[Mesa-dev] [PATCH v4 00/12] meson: fix gallium media target linkage

Dylan Baker dylan at pnwbakers.com
Mon Feb 12 19:27:40 UTC 2018


The linkage of all of the gallium media targets is broken in various
ways in the meson build. This series should correct that by doing more
what the autotools build does.

Changes since v2:
- Add patch to fix va-api version checking
- link xcb libs into vlwinsys instead of into each media state
  tracker/target
- Split the remaining bits into patches that fix one problem.

Changes since v3:
- Define libswdri and libswkmsdri as empty lists if they're not going to
  be built, this allows them to be unconditionally included in the
  targets that want them
- Change the d3dadaptor and dri targets to take advantage of that change
- Make the media drivers take advantage of that change as well

Dylan Baker (12):
  meson: define empty variables for libswdri and libswkmsdri
  meson: add libswdri and libswkmsdri to link_with unconditionally
  meson: Unconditionally add libswdri and libswkmsdri to dri link_with
  meson: use va-api version reported by pkg-config
  meson: link dri3 xcb libs into vlwinsys instead of into each target
  meson: actually link with libomxil-bellagio
  meson: Actually link xvmc target with libxvmc
  meson: fix vdpau target linkage
  meson: fix va target linkage
  meson: Fix omx-bellagio target linkage
  meson: Fix xa target linkage
  meson: fix xvmc target linkage

 meson.build                                  | 10 +---------
 src/gallium/auxiliary/meson.build            |  7 ++++++-
 src/gallium/meson.build                      | 12 ++++++++++--
 src/gallium/state_trackers/va/meson.build    |  6 +++---
 src/gallium/targets/d3dadapter9/meson.build  | 13 +++----------
 src/gallium/targets/dri/meson.build          | 11 ++---------
 src/gallium/targets/omx-bellagio/meson.build | 12 +++++-------
 src/gallium/targets/va/meson.build           | 13 +++++--------
 src/gallium/targets/vdpau/meson.build        | 11 ++++++-----
 src/gallium/targets/xa/meson.build           | 11 ++++++-----
 src/gallium/targets/xvmc/meson.build         | 13 ++++++-------
 src/gallium/winsys/sw/dri/meson.build        |  2 +-
 src/gallium/winsys/sw/kms-dri/meson.build    |  3 +--
 13 files changed, 55 insertions(+), 69 deletions(-)

base-commit: bd87bd178ce59b46a875f4bb0aa2332ea03bb735
-- 
git-series 0.9.1


More information about the mesa-dev mailing list