[PATCH xserver 3/3] meson: Add pixman-1 to required modules in xorg-server.pc

Thierry Reding thierry.reding at gmail.com
Thu Mar 29 11:07:56 UTC 2018


From: Thierry Reding <treding at nvidia.com>

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).

Signed-off-by: Thierry Reding <treding at nvidia.com>
---
 meson.build | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 0582d6f9ae6b..f9341dc9a371 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', '')
 
-- 
2.16.3



More information about the xorg-devel mailing list