Date: Thu, 2 Dec 2021 14:10:01 GMT From: Emmanuel Vadot <manu@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 40e9ad50deb0 - main - x11-drivers/xf86-video-vmware: Fix build with latest libdrm Message-ID: <202112021410.1B2EA1V9096928@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/ports/commit/?id=40e9ad50deb01802e7c8ae1aed068d3e2ab78d69 commit 40e9ad50deb01802e7c8ae1aed068d3e2ab78d69 Author: Emmanuel Vadot <manu@FreeBSD.org> AuthorDate: 2021-12-02 13:56:56 +0000 Commit: Emmanuel Vadot <manu@FreeBSD.org> CommitDate: 2021-12-02 14:09:36 +0000 x11-drivers/xf86-video-vmware: Fix build with latest libdrm libdrm includes stdbool.h but xorg redefines it in xf86Opt.h Simply undef our bool to fix this failure. PR: 259949 Sponsored by: Beckhoff Automation GmbH & Co. KG --- x11-drivers/xf86-video-vmware/files/patch-saa_saa.h | 10 ++++++++++ .../xf86-video-vmware/files/patch-vmwgfx_vmwgfx__driver.h | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/x11-drivers/xf86-video-vmware/files/patch-saa_saa.h b/x11-drivers/xf86-video-vmware/files/patch-saa_saa.h new file mode 100644 index 000000000000..f730407cefcf --- /dev/null +++ b/x11-drivers/xf86-video-vmware/files/patch-saa_saa.h @@ -0,0 +1,10 @@ +--- saa/saa.h.orig 2021-12-02 13:55:48 UTC ++++ saa/saa.h +@@ -40,6 +40,7 @@ + #else + #include <xorg-server.h> + #endif ++#undef bool + #include <xf86.h> + #include <damage.h> + #include <picturestr.h> diff --git a/x11-drivers/xf86-video-vmware/files/patch-vmwgfx_vmwgfx__driver.h b/x11-drivers/xf86-video-vmware/files/patch-vmwgfx_vmwgfx__driver.h new file mode 100644 index 000000000000..36a748b34756 --- /dev/null +++ b/x11-drivers/xf86-video-vmware/files/patch-vmwgfx_vmwgfx__driver.h @@ -0,0 +1,10 @@ +--- vmwgfx/vmwgfx_driver.h.orig 2021-12-02 13:55:36 UTC ++++ vmwgfx/vmwgfx_driver.h +@@ -40,6 +40,7 @@ + #include <xf86drm.h> + #include <xf86drmMode.h> + #include <xorg-server.h> ++#undef bool + #include <xf86.h> + #include <xf86Crtc.h> + #include <xf86xv.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202112021410.1B2EA1V9096928>