From 92c51e676e886c19142f752d706fdf3ff5abab0d Mon Sep 17 00:00:00 2001 From: Mario Limonciello Date: Mon, 23 Jun 2025 22:42:25 -0500 Subject: [PATCH] Add compatibility define for `pci_device_is_boot_display()` It will take some time for a new libpciaccess to be released and even then bumping the dependency for libpciaccess isn't attractive. If an older libpciaccess is used just add a static inline define. Part-of: --- hw/xfree86/common/xf86platformBus.h | 7 +++++++ include/meson.build | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/hw/xfree86/common/xf86platformBus.h b/hw/xfree86/common/xf86platformBus.h index e91c44328..a351d2823 100644 --- a/hw/xfree86/common/xf86platformBus.h +++ b/hw/xfree86/common/xf86platformBus.h @@ -132,4 +132,11 @@ static inline void xf86MergeOutputClassOptions(int index, void **options) {} #endif +#ifndef HAVE_PCI_DEVICE_IS_BOOT_DISPLAY +static inline Bool pci_device_is_boot_display(struct pci_device *dev) +{ + return FALSE; +} +#endif + #endif diff --git a/include/meson.build b/include/meson.build index 1944c4e3a..94b31efce 100644 --- a/include/meson.build +++ b/include/meson.build @@ -334,6 +334,11 @@ conf_data.set('PCVT_SUPPORT', supports_pcvt ? '1' : false) conf_data.set('SYSCONS_SUPPORT', supports_syscons ? '1' : false) conf_data.set('WSCONS_SUPPORT', supports_wscons ? '1' : false) conf_data.set('XSERVER_LIBPCIACCESS', get_option('pciaccess') ? '1' : false) +if get_option('pciaccess') + pciaccess_dep = dependency('pciaccess', required: build_xorg) + conf_data.set('HAVE_PCI_DEVICE_IS_BOOT_DISPLAY', + cc.has_function('pci_device_is_boot_display', dependencies: pciaccess_dep) ? '1' : false) +endif conf_data.set('XSERVER_PLATFORM_BUS', build_udev_kms ? '1' : false) conf_data.set('XSERVER_SCREEN_VRR', '1')