Re: [PATCH xserver 10/10] meson: Add detection of libsystemd-daemon.

[Adam Jackson]

On Wed, 2018-08-08 at 10:37 +1000, Peter Hutterer wrote:

> but either way, series is
> Reviewed-by: Peter Hutterer 

Merged (except 6/10), thanks:

remote: remote: I: patch #243247 updated using rev 
513d52d58915f291c0f706b67b8dc73f45de109f.
remote: remote: I: patch #243245 updated using rev 
843e44adf17b2828991a26ac3f8f82cf2fa63bd3.
remote: remote: I: patch #243246 updated using rev 
9869512cbf1bd87146f59106c0c71bda76cc0dcc.
remote: remote: I: patch #243244 updated using rev 
db53c439ba785a16f789918fe66da6ba161a0742.
remote: remote: I: patch #243249 updated using rev 
97bd8bc9cb6d910420627760288696e2a0c5d226.
remote: remote: I: patch #243248 updated using rev 
049d2346abee091f18e6f62bcf7331267c2ba656.
remote: remote: I: patch #243250 updated using rev 
e047da37becc23a8d2549d8f264aaa18e4965186.
remote: remote: I: patch #243252 updated using rev 
4ba786677050684c8801201f6bd83ce884f2885e.
remote: remote: I: patch #243251 updated using rev 
1fc20b985cc888345bc8c6fce7b43f10ce71fe43.
remote: remote: I: 9 patch(es) updated to state Accepted.
remote: To ssh://kemper.freedesktop.org/git/xorg/xserver
remote:d0545847a..1fc20b985  1fc20b985cc888345bc8c6fce7b43f10ce71fe43 -> 
master
To ssh://gitlab.freedesktop.org/xorg/xserver
   d0545847a0..1fc20b985c  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

Re: [PATCH xserver 10/10] meson: Add detection of libsystemd-daemon.

[Peter Hutterer]

On Tue, Aug 07, 2018 at 04:23:19PM -0700, Eric Anholt wrote:
> This enables Xtrans's systemd socket activation.
> 
> Signed-off-by: Eric Anholt 
> ---
>  include/meson.build | 3 ++-
>  meson.build | 7 +++
>  2 files changed, 9 insertions(+), 1 deletion(-)
> 
> diff --git a/include/meson.build b/include/meson.build
> index 2c139e6b0651..9a7547c4708a 100644
> --- a/include/meson.build
> +++ b/include/meson.build
> @@ -72,7 +72,8 @@ elif cc.compiles('''
>  endif
>  
>  conf_data.set('HAVE_LIBBSD', libbsd_dep.found())
> -# XXX: HAVE_SYSTEMD_DAEMON
> +# Note: this symbol is used by libXtrans.
> +conf_data.set('HAVE_SYSTEMD_DAEMON', libsystemd_daemon_dep.found())
>  conf_data.set('CONFIG_UDEV', build_udev)
>  conf_data.set('CONFIG_UDEV_KMS', build_udev)
>  conf_data.set('HAVE_DBUS', build_dbus)
> diff --git a/meson.build b/meson.build
> index 8c21c646ab89..5275373bd3b4 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -96,6 +96,12 @@ nettle_dep = dependency('nettle')
>  dbus_required = get_option('systemd_logind') == 'true'
>  dbus_dep = dependency('dbus-1', version: '>= 1.0', required: dbus_required)
>  
> +# libsystemd-daemon was moved into libsystemd in version 209
> +libsystemd_daemon_dep = dependency('libsystemd', version: '>= 209', 
> required: false)
> +if not libsystemd_daemon_dep.found()
> +libsystemd_daemon_dep = dependency('libsystemd-daemon', required: false)
> +endif

we require meson > 0.42, released Sep 2017, but check for systemd > 209,
released in Feb 2014. even e.g. RHEL7 is on systemd 219. IMO you can drop
the second three lines here. 

but either way, series is
Reviewed-by: Peter Hutterer 

Cheers,
   Peter

> +
>  build_hashtable = false
>  
>  # Resolve default values of some options
> @@ -452,6 +458,7 @@ common_dep = [
>  xcmiscproto_dep,
>  bigreqsproto_dep,
>  xtrans_dep,
> +libsystemd_daemon_dep,
>  
>  videoproto_dep,
>  compositeproto_dep,
> -- 
> 2.18.0
> 
> ___
> 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
> 
___
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