Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

GIT changes to devel-xorg-modular grimoire by Treeve Jelbert 
<treeve AT sourcemage.org>:

 xorg-xserver/xorg-server/CONFIGURE |    5 -----
 xorg-xserver/xorg-server/CONFLICTS |    2 ++
 xorg-xserver/xorg-server/DEPENDS   |    6 +-----
 xorg-xserver/xorg-server/DETAILS   |   23 +++++++++--------------
 xorg-xserver/xorg-server/HISTORY   |    7 +++++++
 5 files changed, 19 insertions(+), 24 deletions(-)

New commits:
commit 11068b9a574500e26909788cc9eb43dd0cc20e0b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    xorg-server: => 1.17.0

diff --git a/xorg-xserver/xorg-server/CONFIGURE 
b/xorg-xserver/xorg-server/CONFIGURE
index 5a303b7..872c802 100755
--- a/xorg-xserver/xorg-server/CONFIGURE
+++ b/xorg-xserver/xorg-server/CONFIGURE
@@ -166,11 +166,6 @@ config_query_option XORG_SERVER_OPTS                     
                   \
                     "--enable-xfree86-utils"                                \
                     "--disable-xfree86-utils"                               
&&
 
-config_query_option XORG_SERVER_OPTS                                        \
-                    "Build string registry module?"                         \
-                    y                                                       \
-                    "--enable-registry"                                     \
-                    "--disable-registry"                                    
&&
 
 message "${MESSAGE_COLOR}Note:"                                             
&&
 message "Default font search prefix is now /usr/share/fonts/X11 ."          
&& 
diff --git a/xorg-xserver/xorg-server/CONFLICTS 
b/xorg-xserver/xorg-server/CONFLICTS
new file mode 100755
index 0000000..886f6ec
--- /dev/null
+++ b/xorg-xserver/xorg-server/CONFLICTS
@@ -0,0 +1,2 @@
+conflicts glamor 
+conflicts xf86-video-modesetting
diff --git a/xorg-xserver/xorg-server/DEPENDS 
b/xorg-xserver/xorg-server/DEPENDS
index 0287847..10aa4e6 100755
--- a/xorg-xserver/xorg-server/DEPENDS
+++ b/xorg-xserver/xorg-server/DEPENDS
@@ -5,7 +5,7 @@ depends xcb-util &&
 depends xcb-util-image &&
 depends xcb-util-wm &&
 depends xcb-util-keysyms &&
-
+depends presentproto &&
 
 #
 ## Check this every release as X.org likes to change things on us...
@@ -95,10 +95,6 @@ depends  glproto                                   &&
 depends  inputproto                                &&
 depends  kbproto                                   &&
 depends  randrproto                                &&
-optional_depends  presentproto  \
-         '' \
-         '--disable-present' \
-         'build Present extension' &&
 depends  libxshmfence  &&
 
 if list_find "$XORG_SERVER_OPTS" "--enable-record"; then
diff --git a/xorg-xserver/xorg-server/DETAILS 
b/xorg-xserver/xorg-server/DETAILS
index 2c62dd5..d9f2ac4 100755
--- a/xorg-xserver/xorg-server/DETAILS
+++ b/xorg-xserver/xorg-server/DETAILS
@@ -1,6 +1,6 @@
             SPELL=xorg-server
-          VERSION=1.16.3
-      
SOURCE_HASH=sha512:c0459ed95a6682b2094340b6b8fc7b59fcda5227ee2f13e87f68eb5c29b91cd3f05c5fc2126e33d6303beb3ad04d19466951ef4eb53f2e9918684cdaf3692c5a
+          VERSION=1.17.0
+      
SOURCE_HASH=sha512:95e8fec64a05d56f12c29843d0d7b659e37bb5b8afa86bb8ca27bb94c88a41bff0177d1debc44189788269911eecd688393c13fad700b6fd1c8f40fcae22a2b7
            SOURCE=$SPELL-$VERSION.tar.bz2
 #       SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"
     
SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/xserver/$SOURCE
@@ -15,17 +15,12 @@ cat << EOF
 X servers (including Xorg, Xprt, Xvfb, Xnest & Xdmx), the core of the X
 Window System.
 
-The XOrg Foundation, (a.k.a. X.org) has changed to an Open Source model to
-maintain the official Public Implementation of X11.
+The X server accepts requests from client applications to create windows,
+which are (normally rectangular) "virtual screens" that the client program
+can draw into.
 
-The XOrg Foundation invites anyone who has an interest to join in. Anyone
-may create and work on a branch in the repository. See XOrgRepository for
-more information about the XOrg Foundation repository.
-
-The repository consists of an imported XFree86 tree that is very close
-to their 4.4 release. Just before its 4.4 release, XFree86 adopted a
-new licensing scheme incompatible with the GPL. For this reason, we have
-recreated its tree as closely as possible without importing files affected
-by the new license. Our tree is being referred to as simply "XOrg", and a
-public release will be made shortly.
+Windows are then composed on the actual screen by the X server
+(or by a separate composite manager) as directed by the window manager,
+which usually communicates with the user via graphical controls such as 
buttons
+and draggable titlebars and borders.
 EOF
diff --git a/xorg-xserver/xorg-server/HISTORY 
b/xorg-xserver/xorg-server/HISTORY
index 3a4f3e1..123e386 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,10 @@
+2015-02-05 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: 1.17.0
+         update description
+       * CONFLICTS: add xf86-video-modesetting, glamor
+       * CONFIGURE: delete obsolete options
+       * DEPENDS: presentproto is required
+
 2014-12-20 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: 1.16.3
          CVE-2014-8092..8103