From 48a9d0a5b86dddb885044dddeb8af63de39f0586 Mon Sep 17 00:00:00 2001
From: Zach van Rijn <me@zv.io>
Date: Sun, 4 Sep 2022 22:30:47 -0500
Subject: user/xf86-video-qxl: patch libdrm include. fixes #792.

---
 user/xf86-video-qxl/APKBUILD     |  9 ++++++---
 user/xf86-video-qxl/libdrm.patch | 25 +++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 user/xf86-video-qxl/libdrm.patch

(limited to 'user/xf86-video-qxl')

diff --git a/user/xf86-video-qxl/APKBUILD b/user/xf86-video-qxl/APKBUILD
index 57c54f403..17de825f4 100644
--- a/user/xf86-video-qxl/APKBUILD
+++ b/user/xf86-video-qxl/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=xf86-video-qxl
 pkgver=0.1.5
-pkgrel=0
+pkgrel=1
 pkgdesc="QXL video driver for X11"
 url="https://www.X.Org/"
 arch="all"
@@ -11,7 +11,9 @@ depends=""
 makedepends="eudev-dev libxfont2-dev spice-protocol util-macros xorgproto-dev
 	xorg-server-dev"
 subpackages=""
-source="https://www.x.org/releases/individual/driver/xf86-video-qxl-$pkgver.tar.bz2"
+source="https://www.x.org/releases/individual/driver/xf86-video-qxl-$pkgver.tar.bz2
+	libdrm.patch
+	"
 
 build() {
 	./configure \
@@ -32,4 +34,5 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="7510b2d037b3e978df6063b29e2406f3d1270695a239f29fdaec9b1dc65a30ab10cb959f15eb336f78e93aa708d41c64c5ea43803958feffc64542229605b782  xf86-video-qxl-0.1.5.tar.bz2"
+sha512sums="7510b2d037b3e978df6063b29e2406f3d1270695a239f29fdaec9b1dc65a30ab10cb959f15eb336f78e93aa708d41c64c5ea43803958feffc64542229605b782  xf86-video-qxl-0.1.5.tar.bz2
+9f8bc0c32fa1633c95dfdfba630c3bfa766d4d137a37e28900256223b0a0b31d9cd368981d8b95392ef9ace8db4e11ef62fa1e7c4fcc895ff206e3e35b32c853  libdrm.patch"
diff --git a/user/xf86-video-qxl/libdrm.patch b/user/xf86-video-qxl/libdrm.patch
new file mode 100644
index 000000000..8e95dd77a
--- /dev/null
+++ b/user/xf86-video-qxl/libdrm.patch
@@ -0,0 +1,25 @@
+From: Matteo Bernardini <ponce@slackbuilds.org>
+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 <sys/ioctl.h>
+-#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);
+ 
-- 
cgit v1.2.3-70-g09d2