xserver: Branch 'master' - 4 commits

[GitLab Mirror]

 .appveyor.yml                    |    7 ++++---
 hw/xwin/meson.build              |    6 +++++-
 hw/xwin/winclipboard/meson.build |    1 +
 meson.build                      |    7 +++++++
 4 files changed, 17 insertions(+), 4 deletions(-)

New commits:
commit d7d6e6a4edb646b239b4b9037eb40b23091711a1
Author: Jon Turney <jon.turney at dronecode.org.uk>
Date:   Mon Nov 1 14:22:07 2021 +0000

    appveyor: Add libxcvt build dep
    
    Install libxcvt build dep on appveyor.
    
    Explicitly install python3.8 lxml to ensure it matches python version
    installed (to workaround issues with Cygwin installer).
    
    Drop explicit configuration of hal and udev, as meson.build now knows to
    turn those off for Cygwin.

diff --git a/.appveyor.yml b/.appveyor.yml
index 80032b867..c023790cf 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -26,7 +26,7 @@ gcc-core,\
 meson,\
 ninja,\
 pkg-config,\
-python3,\
+python38,\
 windowsdriproto,\
 xorgproto,\
 libepoxy-devel,\
@@ -58,10 +58,11 @@ libxcb-render-util-devel,\
 libxcb-shape-devel,\
 libxcb-util-devel,\
 libxcb-xkb-devel,\
+libxcvt-devel,\
 libxkbfile-devel,\
 font-util,\
 khronos-opengl-registry,\
-python3-lxml,\
+python38-lxml,\
 xkbcomp-devel,\
 xkeyboard-config,\
 xtrans"
@@ -72,7 +73,7 @@ cache:
 - '%CYGWIN_ROOT%\home\%USERNAME%\.ccache'
 build_script:
 - SET PATH=%CYGWIN_ROOT%/bin
-- '%CYGWIN_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; meson setup --prefix=/usr -Dxv=false -Dxf86bigfont=true -Dxephyr=true -Dxnest=true -Dxvfb=true -Dxwin=true -Dxorg=true -Dhal=false -Dudev=false -Dpciaccess=false -Dint10=false build"'
+- '%CYGWIN_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; meson setup --prefix=/usr -Dxv=false -Dxf86bigfont=true -Dxephyr=true -Dxnest=true -Dxvfb=true -Dxwin=true -Dxorg=true -Dpciaccess=false -Dint10=false -Dglamor=false build"'
 - '%CYGWIN_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; meson configure build"'
 - '%CYGWIN_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; ninja -C build"'
 - '%CYGWIN_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; ccache -s"'
commit 8218c2383ccaabb3d3bb7d84c0f5a4c53fd193cc
Author: Jon Turney <jon.turney at dronecode.org.uk>
Date:   Wed May 6 16:55:43 2020 +0100

    meson: Fix build of xwinclip tool when xcb is installed in non-default location

diff --git a/hw/xwin/winclipboard/meson.build b/hw/xwin/winclipboard/meson.build
index 2a46c670e..8db06a485 100644
--- a/hw/xwin/winclipboard/meson.build
+++ b/hw/xwin/winclipboard/meson.build
@@ -28,6 +28,7 @@ srcs_xwinclip = [
 executable(
     'xwinclip',
     srcs_xwinclip,
+    dependencies: dependency('xcb'),
     link_with: xwin_clipboard,
     link_args: ['-lgdi32', '-lpthread'],
     install: true,
commit 37b1c3d074f58290fa01a5f16206a47eeef20ae6
Author: Jon Turney <jon.turney at dronecode.org.uk>
Date:   Wed Jun 6 16:25:49 2018 +0100

    meson: Correctly set Libs: in xorg-server.pc for Windows
    
    c.f. configure.ac:1663
    
    v2:
    Also drop -lfb from XORG_DRIVER_LIBS, since it's linked statically into
    the Xorg server since c1703cdf.

diff --git a/meson.build b/meson.build
index 9201428a8..997b07616 100644
--- a/meson.build
+++ b/meson.build
@@ -860,6 +860,13 @@ if build_xorg
     sdkconfig.set('symbol_visibility', '-fvisibility=hidden')
     sdkconfig.set('XORG_DRIVER_LIBS', '')
 
+    # On Windows, modules built with the SDK will need to link with server and
+    # module implibs to resolve symbols
+    if (host_machine.system() == 'cygwin' or
+        host_machine.system() == 'windows')
+        sdkconfig.set('XORG_DRIVER_LIBS', '-lXorg.exe -L\${moduledir} -lshadow -no-undefined')
+    endif
+
     configure_file(
         input: 'xorg-server.pc.in',
         output: 'xorg-server.pc',
commit 0f9aaa2c6fd8c97a586be7d44ce963225090431f
Author: Jon Turney <jon.turney at dronecode.org.uk>
Date:   Mon Oct 17 20:48:49 2016 +0100

    meson: Add dependencies for hw/xwin/ resource compilation
    
    Add depend_files: to indicate dependencies for hw/xwin/ resource compilation
    (only has effect with meson >= 0.47.0).

diff --git a/hw/xwin/meson.build b/hw/xwin/meson.build
index e9940ccc3..546777c64 100644
--- a/hw/xwin/meson.build
+++ b/hw/xwin/meson.build
@@ -107,7 +107,11 @@ srcs_windows += [
     '../../mi/miinitext.h',
 ]
 
-rsrc = windows.compile_resources('XWin.rc', include_directories: include_directories('../../include/'))
+rsrc = windows.compile_resources(
+     'XWin.rc',
+     include_directories: include_directories('../../include/'),
+     depend_files: ['XWin.exe.manifest', 'X.ico'],
+)
 srcs_windows += rsrc
 
 flex = find_program('flex')