[SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (798fda0c0c85fbc9d7b42f100fb05d90e3bec2f1)

Eric Sandall scm at sourcemage.org
Sun Apr 13 22:01:41 EDT 2008


GIT changes to devel-xorg-modular grimoire by Eric Sandall <sandalle at sourcemage.org>:

 xorg-xserver/xorg-server/BUILD     |    1 +
 xorg-xserver/xorg-server/CONFIGURE |    6 ------
 xorg-xserver/xorg-server/HISTORY   |    3 +++
 3 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 798fda0c0c85fbc9d7b42f100fb05d90e3bec2f1
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    xorg-server: Disable XWin (Bug #13476)

diff --git a/xorg-xserver/xorg-server/BUILD b/xorg-xserver/xorg-server/BUILD
index 83f9c78..4359fa8 100755
--- a/xorg-xserver/xorg-server/BUILD
+++ b/xorg-xserver/xorg-server/BUILD
@@ -18,5 +18,6 @@ OPTS="${XORG_SERVER_OPTS}                                     \
       --with-dri-driver-path=$TRACK_ROOT/usr/lib/modules/dri  \
       --disable-xprint                                        \
       --disable-dmx                                           \
+      --disable-xwin                                          \
       ${OPTS}"                                                &&
 default_build
diff --git a/xorg-xserver/xorg-server/CONFIGURE b/xorg-xserver/xorg-server/CONFIGURE
index 0d76b9d..0cf90cc 100755
--- a/xorg-xserver/xorg-server/CONFIGURE
+++ b/xorg-xserver/xorg-server/CONFIGURE
@@ -150,12 +150,6 @@ config_query_option XORG_SERVER_OPTS                                        \
                     "--disable-xnest"                                       &&
 
 config_query_option XORG_SERVER_OPTS                                        \
-                    "Build XWin server?"                                    \
-                    n                                                       \
-                    "--enable-xwin"                                         \
-                    "--disable-xwin"                                        &&
-
-config_query_option XORG_SERVER_OPTS                                        \
                     "Build Xgl server (EXPERIMENTAL)?"                      \
                     n                                                       \
                     "--enable-xgl"                                          \
diff --git a/xorg-xserver/xorg-server/HISTORY b/xorg-xserver/xorg-server/HISTORY
index 24c2d4c..f448be4 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,7 +1,10 @@
 2008-04-13 Eric Sandall <sandalle at sourcemage.org>
 	* PRE_SUB_DEPENDS, SUB_DEPENDS: Allow forcing composite support
 	  Bug #13360
+	* CONFIGURE: Remove XWin option, only used for Cygwin anyways
+	  Bug #13476
 	* DEPENDS: TLS -> Transport Layer Security
+	* BUILD: Disable XWin (Bug #13476)
 
 2008-03-17 Eric Sandall <sandalle at sourcemage.org>
 	* CONFLICTS: Auto-conflicts with xorg as well



More information about the SM-Commit mailing list