secondary commit

7 files changed, 83 insertions, 0 deletions

diff --git a/xorg/xorg-server/build b/xorg/xorg-server/build
new file mode 100755
index 00000000..499f3435
--- /dev/null
+++ b/xorg/xorg-server/build
@@ -0,0 +1,25 @@
+#!/bin/sh -e
+
+patch -p1 < rootless_modesetting.patch
+
+./configure \
+    --prefix=/usr \
+    --localstatedir=/var \
+    --disable-systemd-logind \
+    --disable-xwayland \
+    --disable-unit-tests \
+    --enable-glx \
+    --enable-dri \
+    --enable-dri2 \
+    --enable-dri3 \
+    --enable-glamor \
+    --enable-xorg \
+    --enable-config-udev \
+    --enable-config-udev-kms \
+    --with-sha1=libcrypto \
+    --with-systemd-daemon=off
+
+make
+make DESTDIR="$1" install
+
+rm -f "$1/usr/share/X11/xorg.conf.d/10-evdev.conf"
diff --git a/xorg/xorg-server/checksums b/xorg/xorg-server/checksums
new file mode 100644
index 00000000..709b48f7
--- /dev/null
+++ b/xorg/xorg-server/checksums
@@ -0,0 +1,2 @@
+6316146304e6e8a36d5904987ae2917b5d5b195dc9fc63d67f7aca137e5a51d1  xorg-server-1.20.6.tar.bz2
+c98ad9376f20ab25463ef74bb19f2dbe874a19918b27b430c8e632d272379129  rootless_modesetting.patch
diff --git a/xorg/xorg-server/depends b/xorg/xorg-server/depends
new file mode 100644
index 00000000..51901117
--- /dev/null
+++ b/xorg/xorg-server/depends
@@ -0,0 +1,24 @@
+bzip2
+eudev
+freetype-harfbuzz
+libX11
+libXau
+libXdamage
+libXext
+libXfixes
+libXfont2
+libXxf86vm
+libdrm
+libepoxy
+libfontenc
+libpciaccess
+libressl
+libxcb
+libxkbfile
+libxshmfence
+mesa
+pixman
+xinit
+xkeyboard-config
+xtrans make
+zlib
diff --git a/xorg/xorg-server/patches/rootless_modesetting.patch b/xorg/xorg-server/patches/rootless_modesetting.patch
new file mode 100644
index 00000000..d578208d
--- /dev/null
+++ b/xorg/xorg-server/patches/rootless_modesetting.patch
@@ -0,0 +1,14 @@
+--- xorg-server-1.20.3/hw/xfree86/drivers/modesetting/driver.c
++++ xorg-server-1.20.3/hw/xfree86/drivers/modesetting/driver.c
+@@ -1528,6 +1528,10 @@
+     if (ms->fd_passed)
+         return TRUE;
+
++    ret = drmIsMaster(ms->fd);
++    if (ret)
++      return TRUE;
++
+     ret = drmSetMaster(ms->fd);
+     if (ret)
+         xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "drmSetMaster failed: %s\n",
+
diff --git a/xorg/xorg-server/post-install b/xorg/xorg-server/post-install
new file mode 100755
index 00000000..4185f793
--- /dev/null
+++ b/xorg/xorg-server/post-install
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+cat <<EOF
+
+NOTE: You must be a part of the video group
+      for rootless xorg-server to work.
+
+NOTE: This groups based permissions model may not
+      be suitable if KISS will be used as a multi
+      user system. Further configuration can be
+      done at your own discretion.
+
+-> addgroup USER video
+
+EOF
diff --git a/xorg/xorg-server/sources b/xorg/xorg-server/sources
new file mode 100644
index 00000000..1f481ed7
--- /dev/null
+++ b/xorg/xorg-server/sources
@@ -0,0 +1,2 @@
+https://www.x.org/releases/individual/xserver/xorg-server-1.20.6.tar.bz2
+patches/rootless_modesetting.patch
diff --git a/xorg/xorg-server/version b/xorg/xorg-server/version
new file mode 100644
index 00000000..7c34a547
--- /dev/null
+++ b/xorg/xorg-server/version
@@ -0,0 +1 @@
+1.20.6 1