Add compatibility define for pci_device_is_boot_display()
Some checks are pending
Build X servers / xserver-build-ubuntu (push) Waiting to run
Build X servers / drivers-build-ubuntu (push) Waiting to run
Build X servers / xserver-build-mingw32-ubuntu (push) Waiting to run
Build X servers / xserver-build-macos (push) Waiting to run
Build X servers / xserver-build-freebsd (push) Waiting to run
Build X servers / xserver-build-dragonflybsd (push) Waiting to run
Build X servers / xserver-build-netbsd (push) Waiting to run
Build X servers / xserver-build-cygwin (push) Waiting to run
Build X servers / Check Signed-Off-By (push) Waiting to run
Build X servers / Release pushed tag (push) Blocked by required conditions
check PRs for merge conflicts / notify (push) Waiting to run

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: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2038>
This commit is contained in:
Mario Limonciello 2026-03-19 21:38:08 +02:00 • committed by Enrico Weigelt
commit a86be24e6e
2 changed files with 6 additions and 1 deletions

View file

@ -18,7 +18,7 @@ struct pci_device;
* callee code is already prepared for using it, but for the time being
* we need a dummy - until the actual one is really there.
*/
#ifndef pci_device_is_boot_display
#ifndef HAVE_PCI_DEVICE_IS_BOOT_DISPLAY
static inline int pci_device_is_boot_display(struct pci_device *dev)
{
return 0;

View file

@ -327,6 +327,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')