xorg-server: => 1.18.0

4 files changed, 18 insertions, 13 deletions

diff --git a/xorg-xserver/xorg-server/CONFIGURE b/xorg-xserver/xorg-server/CONFIGURE
index 8f1ae3a7ff..0dc52a28e2 100755
--- a/xorg-xserver/xorg-server/CONFIGURE
+++ b/xorg-xserver/xorg-server/CONFIGURE
@@ -74,12 +74,6 @@ config_query_option XORG_SERVER_OPTS                                        \
                     "--disable-aiglx"                                       &&
 
 config_query_option XORG_SERVER_OPTS                                        \
-                    "Build GLX with Thread Local Storage support?"          \
-                    n                                                       \
-                    "--enable-glx-tls"                                      \
-                    "--disable-glx-tls"                                     &&
-
-config_query_option XORG_SERVER_OPTS                                        \
                     "Build DRI extension?"                                  \
                     y                                                       \
                     "--enable-dri"                                          \
diff --git a/xorg-xserver/xorg-server/DEPENDS b/xorg-xserver/xorg-server/DEPENDS
index 8b205fe40e..57adc138c7 100755
--- a/xorg-xserver/xorg-server/DEPENDS
+++ b/xorg-xserver/xorg-server/DEPENDS
@@ -51,6 +51,11 @@ optional_depends  libxvmc                          \
                   "--disable-xvmc"                 \
                   "Enable support for XvMC"        &&
 
+optional_depends  LOGIN-DAEMON \
+                 '--enable-systemd-logind' \
+                 '--disable-systemd-logind' \
+                 'login daemon' &&
+depends dbus &&
 #
 # May only select one:
 # configure: error: Hotplugging through both libudev and dbus/hal not allowed
@@ -60,20 +65,19 @@ optional_depends  libxvmc                          \
 #
 # hal is preferred by upstream:
 #  --enable-config-udev    Build udev support (default: auto)
-#  --enable-config-dbus    Build D-BUS API support (default: no)
 #  --disable-config-hal    Build HAL support (default: auto)
 #
 
 message "You can either use hal+dbus OR udev for hotplugging" &&
 message "but NOT both" &&
 optional_depends  hal \
-         "--enable-config-hal --enable-config-dbus --disable-config-udev" \
-         "--disable-config-hal --disable-config-dbus" \
+         "--enable-config-hal  --disable-config-udev" \
+         "--disable-config-hal " \
          "Enable HAL support" &&
 
 if ! is_depends_enabled $SPELL hal; then
   optional_depends DEVICE-MANAGER \
-    "--enable-config-udev --disable-config-dbus --disable-config-hal" \
+    "--enable-config-udev --disable-config-hal" \
     "--disable-config-udev" \
     "enable udev kernel config support"
 fi &&
@@ -163,12 +167,13 @@ depends  libxtst                                   &&
 
 message 'additional fonts are not needed, but can be installed indiviually' &&
 
-message 'choose an input driver' &&
+message 'choose an input or video driver' &&
 message 'if these drivers are not suitable, choose from the xorg-drivers section' &&
 
 suggest_depends xf86-input-evdev '' ''  'modern input drivers' &&
 suggest_depends xf86-input-synaptics '' '' 'modern input drivers' &&
 suggest_depends xf86-input-libinput '' '' 'modern input drivers' &&
 suggest_depends xf86-video-ati   '' '' 'modern ATI drivers' &&
+suggest_depends xf86-video-amdgpu '' '' 'hardware accellerated AMD drivers' &&
 suggest_depends xf86-video-intel '' '' 'modern Intel drivers' &&
 suggest_depends xf86-video-nouveau '' '' 'modern NVidia drivers'
diff --git a/xorg-xserver/xorg-server/DETAILS b/xorg-xserver/xorg-server/DETAILS
index f71845dc54..031cd7ef7f 100755
--- a/xorg-xserver/xorg-server/DETAILS
+++ b/xorg-xserver/xorg-server/DETAILS
@@ -1,6 +1,6 @@
             SPELL=xorg-server
-          VERSION=1.17.4
-      SOURCE_HASH=sha512:4b8377b86ca88f27dcf59db2996b2ee620ce6f181a37dc47600365db588d48f2f3ca66a3149e7c856e686e5783b1cccb2ba0827aa7413299163dfca869f4d376
+          VERSION=1.18.0
+      SOURCE_HASH=sha512:c7b1403e79e26ea96690f5634eb2fa424f9436a8a3c8a17779f71d254a813ae9b2ff1eb3dc8c6b4c37da125f3108ee86f6f5b1c27c1db6ab28eb6c8ee62e5768
            SOURCE=$SPELL-$VERSION.tar.bz2
 #       SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"
     SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/xserver/$SOURCE
diff --git a/xorg-xserver/xorg-server/HISTORY b/xorg-xserver/xorg-server/HISTORY
index cc88d6c4b4..785291ac27 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,9 @@
+2015-11-10 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: 1.18.0
+	* DEPENDS: add LOGIN-DAEMON, xf86-video-amdgpu, dbus
+	  remove obsolete config-dbus options
+	* CONFIGURE: remove obsolete options
+
 2015-10-31 Treeve Jelbert <treeve@sourcemage.org>
 	* DETAILS: 1.17.4