diff options
| author | Thierry Reding <treding@nvidia.com> | 2018-03-29 13:07:56 +0200 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2018-04-02 13:42:11 -0400 |
| commit | 80d4098411ad96b662e830db06e59a7ab7f5c9d3 (patch) | |
| tree | 99ebfb8f185951fc76def097c65412d75fb4a081 | |
| parent | 88c7b8bf4bae080ecb879fe7e3f8be2bede6f0a6 (diff) | |
meson: Add pixman-1 to required modules in xorg-server.pc
pixman headers will be included for builds of external modules against
the xorg-server SDK. Make sure pixman is listed as a required module so
that the correct CFLAGS will be added.
Note that the xorg-server.pc generated by the autotools-based build has
many more modules listed, but this seems to be enough to build at least
some of the external drivers against an X server built with Meson (I've
tested with xf86-input-libinput, xf86-video-nouveau and xf86-video-ati).
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
| -rw-r--r-- | meson.build | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/meson.build b/meson.build index 0582d6f9a..f9341dc9a 100644 --- a/meson.build +++ b/meson.build @@ -624,9 +624,13 @@ if build_xorg ).stdout() ) + sdk_required_modules = [ + 'pixman-1 >= 0.27.2', + ] + # XXX this isn't trying very hard, but hard enough. sdkconfig.set('PACKAGE_VERSION', meson.project_version()) - sdkconfig.set('SDK_REQUIRED_MODULES', '') + sdkconfig.set('SDK_REQUIRED_MODULES', ' '.join(sdk_required_modules)) sdkconfig.set('symbol_visibility', '-fvisibility=hidden') sdkconfig.set('XORG_DRIVER_LIBS', '') |