From 0d37a1ef234c38b27faba43bc3a22f985d311deb Mon Sep 17 00:00:00 2001
From: davidovski <david@davidovski.xyz>
Date: Wed, 17 May 2023 17:01:27 +0100
Subject: Remove all firmware

---
 repo/xorg-server/xorg-server.xibuild | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'repo/xorg-server')

diff --git a/repo/xorg-server/xorg-server.xibuild b/repo/xorg-server/xorg-server.xibuild
index 4fde3aa..99aef61 100644
--- a/repo/xorg-server/xorg-server.xibuild
+++ b/repo/xorg-server/xorg-server.xibuild
@@ -2,7 +2,7 @@
 
 MAKEDEPS="meson ninja doxygen xmlto libxcvt pixman font-util xkeyboardconfig elogind libepoxy libtirpc polkit acpid nettle libgcrypt xcb-util-keysyms xcb-util-image xcb-util-renderutil xcb-util-wm xkbcomp libxfont2"
 
-PKG_VER=21.1.4
+PKG_VER=21.1.6
 SOURCE=https://www.x.org/pub/individual/xserver/xorg-server-$PKG_VER.tar.xz
 
 build () {
@@ -11,6 +11,7 @@ build () {
 
     meson --prefix=/usr \
     		-Dxorg=true \
+		-Dxorg=true \
 		-Dxephyr=true \
 		-Dglamor=true \
 		-Dxnest=true \
@@ -43,6 +44,11 @@ build () {
 package () {
     DESTDIR=$PKG_DEST ninja install
 
+	chmod u+s "$PKG_DEST"/usr/libexec/Xorg.wrap
+
+	# Don't conflict with xf86-input-evdev
+	rm -f "$PKG_DEST"/usr/share/X11/xorg.conf.d/10-evdev.conf
+
     mkdir -p $PKG_DEST/etc/X11/xorg.conf.d &&
     mkdir -p $PKG_DEST/etc/sysconfig &&
 cat >> $PKG_DEST/etc/sysconfig/createfiles << "EOF"
-- 
cgit v1.2.1