xserver: Branch 'master'

[GitLab Mirror]

 hw/xwayland/meson.build    |    2 ++
 hw/xwayland/xwayland.pc.in |    3 +++
 2 files changed, 5 insertions(+)

New commits:
commit 69e087caa4fdfcc303080c021ba463afcf4290c7
Author: Olivier Fourdan <ofourdan at redhat.com>
Date:   Fri Feb 5 11:36:15 2021 +0100

    xwayland: Fix path in pkg-config with autoconf
    
    When using autoconf/automake to build Xwayland, the actual path to
    Xwayland is not fully qualified and refers to the "exec_prefix".
    
    As a result, the path provided by the generated pkg-config file is wrong
    when using autoconf to build the Xserver.
    
    Fix the xwayland.pc file to also set the variable "prefix" and
    "exec_prefix" so that the path to Xwayland is fully resolved.
    
    Add those variables to the meson build as well for good measure.
    
    Signed-off-by: Olivier Fourdan <ofourdan at redhat.com>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
    Acked-by: Michel Dänzer <mdaenzer at redhat.com>

diff --git a/hw/xwayland/meson.build b/hw/xwayland/meson.build
index e848daf0d..1dea64bff 100644
--- a/hw/xwayland/meson.build
+++ b/hw/xwayland/meson.build
@@ -137,6 +137,8 @@ xwayland_server = executable(
 )
 
 xwayland_data = configuration_data()
+xwayland_data.set('prefix', get_option('prefix'))
+xwayland_data.set('exec_prefix', '${prefix}')
 xwayland_data.set('PACKAGE_VERSION', meson.project_version())
 xwayland_data.set('xwayland_path', xwayland_path)
 xwayland_data.set('have_glamor', build_glamor ? 'true' : 'false')
diff --git a/hw/xwayland/xwayland.pc.in b/hw/xwayland/xwayland.pc.in
index c42435fb7..f6165a65b 100644
--- a/hw/xwayland/xwayland.pc.in
+++ b/hw/xwayland/xwayland.pc.in
@@ -1,3 +1,6 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+
 Name: Xwayland
 Description: X Server for Wayland
 Version: @PACKAGE_VERSION@