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

[Adam Jackson]

On Thu, 2018-03-29 at 13:07 +0200, Thierry Reding wrote:
> From: Thierry Reding 
> 
> 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 

Series merged, thanks:

remote: I: patch #213710 updated using rev 
f3b0a2aee21f12f3332bf598d3ba0fcbd2832f95.
remote: I: patch #213711 updated using rev 
88c7b8bf4bae080ecb879fe7e3f8be2bede6f0a6.
remote: I: patch #213712 updated using rev 
80d4098411ad96b662e830db06e59a7ab7f5c9d3.
remote: I: 3 patch(es) updated to state Accepted.
To ssh://git.freedesktop.org/git/xorg/xserver
   1c002bc434..80d4098411  master -> master

- ajax
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

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

[Thierry Reding]

From: Thierry Reding 

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

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel