xorg-server: remove prev patch, it's unnecessary; set SHMDIR correctly.

This commit is contained in:
Juan RP 2014-09-04 17:41:16 +02:00
parent 7eba153c65
commit 47fd60ec49
2 changed files with 2 additions and 29 deletions

View file

@ -1,27 +0,0 @@
linux: do not initialize dbus/systemd-logind if it's disabled.
How to reproduce the issue:
- system has booted with no systemd and dbus has been started.
- system contains systemd installed (dbus services, libs, etc)
- InitOutput() thinks that systemd is running and issues dbus requests
for logind, resulting in an error like this:
/dev/dri/card0: failed to set DRM interface version 1.4: Permission denied
See https://github.com/voidlinux/void-packages/issues/532
for more information.
--- hw/xfree86/common/xf86Init.c.orig 2014-09-04 16:18:20.866121037 +0200
+++ hw/xfree86/common/xf86Init.c 2014-09-04 16:19:28.401962814 +0200
@@ -463,8 +463,10 @@ InitOutput(ScreenInfo * pScreenInfo, int
if (xf86DoShowOptions)
DoShowOptions();
+#ifdef SYSTEMD_LOGIND
dbus_core_init();
systemd_logind_init();
+#endif
/* Do a general bus probe. This will be a PCI probe for x86 platforms */
xf86BusProbe();

View file

@ -1,7 +1,7 @@
# Template build file for 'xorg-server'.
pkgname=xorg-server
version=1.16.0
revision=11
revision=12
build_style=gnu-configure
configure_args="--enable-ipv6 --enable-xcsecurity --enable-record
--enable-xnest --enable-xephyr --enable-composite --enable-xvfb
@ -13,7 +13,7 @@ configure_args="--enable-ipv6 --enable-xcsecurity --enable-record
--enable-kdrive --enable-kdrive-evdev --enable-kdrive-kbd
--enable-kdrive-mouse --enable-xorg --enable-xcsecurity
--disable-linux-acpi --disable-linux-apm --enable-xwayland
--enable-suid-wrapper"
--enable-suid-wrapper --with-shared-memory-dir=/dev/shm"
short_desc="The X11 server from X.org"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://xorg.freedesktop.org"