From 2b53b0d584457a020d79ba5f61ffeb976131e079 Mon Sep 17 00:00:00 2001
From: Zach van Rijn <me@zv.io>
Date: Sun, 4 Sep 2022 22:24:44 -0500
Subject: user/xf86-video-vmware: patch to reorder headers. fixes #791.

---
 user/xf86-video-vmware/APKBUILD                   |  9 ++--
 user/xf86-video-vmware/fix-stdbool-includes.patch | 60 +++++++++++++++++++++++
 2 files changed, 66 insertions(+), 3 deletions(-)
 create mode 100644 user/xf86-video-vmware/fix-stdbool-includes.patch

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

diff --git a/user/xf86-video-vmware/APKBUILD b/user/xf86-video-vmware/APKBUILD
index d5cca69a2..511336412 100644
--- a/user/xf86-video-vmware/APKBUILD
+++ b/user/xf86-video-vmware/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=xf86-video-vmware
 pkgver=13.3.0
-pkgrel=0
+pkgrel=1
 pkgdesc="X.Org driver for VMware's SVGA adaptor"
 url="https://www.X.Org/"
 # Requires kernel interfaces unavailable on ARM.
@@ -11,7 +11,9 @@ license="X11"
 depends=""
 makedepends="eudev-dev util-macros xorg-server-dev xorgproto-dev"
 subpackages="$pkgname-doc"
-source="https://www.X.Org/releases/individual/driver/xf86-video-vmware-$pkgver.tar.bz2"
+source="https://www.X.Org/releases/individual/driver/xf86-video-vmware-$pkgver.tar.bz2
+	fix-stdbool-includes.patch
+	"
 
 build() {
 	./configure \
@@ -32,4 +34,5 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="c318de893cae7b2b11e11c1b389ee47478b7c8d1f52c27099dbe453efec28f3e9da449217307a8c2251999eada66312f766996be1a6ead413b8b6dedc42c68ca  xf86-video-vmware-13.3.0.tar.bz2"
+sha512sums="c318de893cae7b2b11e11c1b389ee47478b7c8d1f52c27099dbe453efec28f3e9da449217307a8c2251999eada66312f766996be1a6ead413b8b6dedc42c68ca  xf86-video-vmware-13.3.0.tar.bz2
+b607f875143213015a839336b453131a477387ca9c8422957697628b3b7d1667b1a196f6aa41ea93f262589a8bea560d3e1f2337aea5fbf466610191a78ad5f4  fix-stdbool-includes.patch"
diff --git a/user/xf86-video-vmware/fix-stdbool-includes.patch b/user/xf86-video-vmware/fix-stdbool-includes.patch
new file mode 100644
index 000000000..27a8e7592
--- /dev/null
+++ b/user/xf86-video-vmware/fix-stdbool-includes.patch
@@ -0,0 +1,60 @@
+From 50ab008cb965dc9e47e0a84a1950e2485bbd3c44 Mon Sep 17 00:00:00 2001
+From: Martin Krastev <krastevm@vmware.com>
+Date: Tue, 30 Nov 2021 11:47:39 -0800
+Subject: [PATCH] vmwgfx: 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.
+
+Signed-off-by: Martin Krastev <krastevm@vmware.com>
+Reviewed-by: Zack Rusin <zackr@vmware.com>
+Signed-off-by: Zack Rusin <zackr@vmware.com>
+---
+ vmwgfx/vmwgfx_driver.h | 6 +++---
+ vmwgfx/vmwgfx_saa.c    | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/vmwgfx/vmwgfx_driver.h b/vmwgfx/vmwgfx_driver.h
+index fa8e308..467fb21 100644
+--- a/vmwgfx/vmwgfx_driver.h
++++ b/vmwgfx/vmwgfx_driver.h
+@@ -36,15 +36,15 @@
+ #include <stddef.h>
+ #include <stdint.h>
+ #include <errno.h>
+-#include <drm.h>
+-#include <xf86drm.h>
+-#include <xf86drmMode.h>
+ #include <xorg-server.h>
+ #include <xf86.h>
+ #include <xf86Crtc.h>
+ #include <xf86xv.h>
+ #include <xa_tracker.h>
+ #include <xf86Module.h>
++#include <drm.h>
++#include <xf86drm.h>
++#include <xf86drmMode.h>
+ 
+ #include "../src/compat-api.h"
+ #ifdef DRI2
+diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
+index 0881e2f..457f397 100644
+--- a/vmwgfx/vmwgfx_saa.c
++++ b/vmwgfx/vmwgfx_saa.c
+@@ -29,11 +29,11 @@
+ #include <xorgVersion.h>
+ #include <mi.h>
+ #include <fb.h>
+-#include <xf86drmMode.h>
+ #include <xa_context.h>
+ #include "vmwgfx_saa.h"
+ #include "vmwgfx_drmi.h"
+ #include "vmwgfx_saa_priv.h"
++#include <xf86drmMode.h>
+ 
+ /*
+  * Damage to be added as soon as we attach storage to the pixmap.
+-- 
+GitLab
+
-- 
cgit v1.2.3-70-g09d2