From a8f638cd023abde226ea045ef0e26a9a5b3a6cf2 Mon Sep 17 00:00:00 2001 From: Matteo Bernardini Date: Thu, 10 Feb 2022 09:08:16 +0100 Subject: [PATCH] system/xf86-video-qxl: Patch for the newer libdrm. Signed-off-by: Matteo Bernardini Signed-off-by: Willy Sudiarto Raharjo --- system/xf86-video-qxl/libdrm.patch | 25 +++++++++++++++++++ .../xf86-video-qxl/xf86-video-qxl.SlackBuild | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 system/xf86-video-qxl/libdrm.patch diff --git a/system/xf86-video-qxl/libdrm.patch b/system/xf86-video-qxl/libdrm.patch new file mode 100644 index 0000000000..8e95dd77ac --- /dev/null +++ b/system/xf86-video-qxl/libdrm.patch @@ -0,0 +1,25 @@ +From: Matteo Bernardini +Subject: Change header inclusion order to avoid xorg headers catching stdbool.h + +libdrm commit e641e2a632d779f638ac2ba983b9fceb20b3fac4 added +stdbool.h to the library headers which conflicts with xorg headers. + +diff -Naur xf86-video-qxl-0.1.5.orig/src/qxl_drmmode.c xf86-video-qxl-0.1.5/src/qxl_drmmode.c +--- xf86-video-qxl-0.1.5.orig/src/qxl_drmmode.c 2015-03-30 16:58:56.000000000 +0200 ++++ xf86-video-qxl-0.1.5/src/qxl_drmmode.c 2022-02-10 08:59:13.221017000 +0100 +@@ -33,7 +33,6 @@ + #ifdef XF86DRM_MODE + + #include +-#include "qxl_drmmode.h" + #include "X11/Xatom.h" + #include "xf86DDC.h" + /* DPMS */ +@@ -47,6 +46,7 @@ + + #include "qxl.h" + #include "qxl_surface.h" ++#include "qxl_drmmode.h" + + static void drmmode_show_cursor (xf86CrtcPtr crtc); + diff --git a/system/xf86-video-qxl/xf86-video-qxl.SlackBuild b/system/xf86-video-qxl/xf86-video-qxl.SlackBuild index 93fdbae889..c6dd319505 100644 --- a/system/xf86-video-qxl/xf86-video-qxl.SlackBuild +++ b/system/xf86-video-qxl/xf86-video-qxl.SlackBuild @@ -84,6 +84,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +patch -p1 < $CWD/libdrm.patch + # autogen.sh can be used in place of configure CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \