This fixes a couple of problems with the meson build support for the recent omx tizonia integration, namely that it breaks a lot of previously working meson configurations.
The biggest change in here is the reintroduction of the 'auto' flag to -Dgallium-omx. This allows configurations that lack tizonia, or that otherwise can't build the omx tracker (i965, and gallium drivers other than r600, radeon, or nouveau) to build without intervention. This also fixes some style things, but those are pretty trivial. Dylan Baker (5): meson: combine state trackers and target if blocks meson: fix tizonia compilation meson: Re-add auto option for omx meson: Use include directory variables instead of traversing meson: Fix indent in omx meson.build meson.build | 67 +++++++++++++++++++---------- meson_options.txt | 4 +- src/egl/meson.build | 5 ++- src/gallium/meson.build | 30 ++++--------- src/gallium/state_trackers/dri/meson.build | 2 + src/gallium/state_trackers/omx/meson.build | 69 +++++++++++++++--------------- src/gbm/meson.build | 2 +- 7 files changed, 95 insertions(+), 84 deletions(-) -- 2.16.2 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
