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>
This commit is contained in:
Thierry Reding 2018-03-29 13:07:56 +02:00 committed by Adam Jackson
parent 88c7b8bf4b
commit 80d4098411

View File

@ -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', '')