Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Commit

Permalink
xf86-video-nouveau: Rootless xorg
Browse files Browse the repository at this point in the history
  • Loading branch information
dylanaraps committed Mar 7, 2020
1 parent 184a882 commit 93b6a53
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 1 deletion.
2 changes: 2 additions & 0 deletions xorg/xf86-video-nouveau/build
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/bin/sh -e

patch -p1 < rootless-nouveau.patch

export LDFLAGS="-Wl,-z,lazy"

./configure \
Expand Down
1 change: 1 addition & 0 deletions xorg/xf86-video-nouveau/checksums
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
304060806415579cdb5c1f71f1c54d11cacb431b5552b170decbc883ed43bf06 xf86-video-nouveau-1.0.16.tar.bz2
e9197c97db81da40b9f1abc76ae349b4fe42a7563fbe9ac80821a68327e28c01 rootless-nouveau.patch
1 change: 0 additions & 1 deletion xorg/xf86-video-nouveau/depends
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
eudev
libdrm
xorgproto
15 changes: 15 additions & 0 deletions xorg/xf86-video-nouveau/patches/rootless-nouveau.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
diff --git a/src/nv_driver.c b/src/nv_driver.c
index 185bba7..7927128 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -501,6 +501,10 @@ NVEnterVT(VT_FUNC_ARGS_DECL)
(pNVEnt->platform_dev->flags & XF86_PDEV_SERVER_FD)))
#endif
{
+ ret = drmIsMaster(pNv->dev->fd);
+ if (ret)
+ return TRUE;
+
ret = drmSetMaster(pNv->dev->fd);
if (ret)
ErrorF("Unable to get master: %s\n", strerror(errno));
1 change: 1 addition & 0 deletions xorg/xf86-video-nouveau/sources
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
https://x.org/releases/individual/driver/xf86-video-nouveau-1.0.16.tar.bz2
patches/rootless-nouveau.patch

0 comments on commit 93b6a53

Please sign in to comment.