xserver: Branch 'master'

[GitLab Mirror]

 hw/xfree86/os-support/meson.build |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit eb6125f20c7ad175b5e344a99e0bfc46a9abf918
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sat Dec 2 11:35:13 2023 -0800

    Revert "Compile lnx_platform.c on FreeBSD too."
    
    This reverts commit 947d1c7ecf5571cdb4028d20e3b06e70d18c2672.
    
    lnx_platform.c doesn't exist in this branch since commit 54681238
    renamed it to shared/drm_platform.c and added it to the BSD build.
    
    Fixes build failures in CI of:
    ../hw/xfree86/os-support/meson.build:163:18: ERROR: File linux/lnx_platform.c does not exist.
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/hw/xfree86/os-support/meson.build b/hw/xfree86/os-support/meson.build
index 04b218183..bcedf97dc 100644
--- a/hw/xfree86/os-support/meson.build
+++ b/hw/xfree86/os-support/meson.build
@@ -97,13 +97,9 @@ elif host_machine.system().endswith('bsd')
         'bsd/bsd_bell.c',
         'bsd/bsd_init.c',
         'shared/drm_platform.c',
-        'shared/pm_noop.c'
+	'shared/pm_noop.c'
     ]
 
-    if host_machine.system() == 'freebsd'
-        srcs_xorg_os_support += ['linux/lnx_platform.c', 'misc/SlowBcopy.c']
-    endif
-
     if host_machine.cpu_family() == 'x86_64'
         srcs_xorg_os_support += 'bsd/i386_video.c'
         if host_machine.system() == 'netbsd'