sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master xorg-modular grimoire by Andra?? Levstik (d46326d2501881dd4927b791d28863e4ecb6b5b2)

From: Andra?? Levstik <scm AT mail.sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master xorg-modular grimoire by Andra?? Levstik (d46326d2501881dd4927b791d28863e4ecb6b5b2)
Date: Thu, 1 Feb 2007 16:39:09 -0600

GIT changes to master xorg-modular grimoire by Andra?? Levstik
<ruskie AT mages.ath.cx>:

xorg-xserver/xorg-server/CONFIGURE | 6 ++++++
xorg-xserver/xorg-server/DEPENDS | 6 +-----
xorg-xserver/xorg-server/DETAILS | 1 +
xorg-xserver/xorg-server/HISTORY | 6 +++---
4 files changed, 11 insertions(+), 8 deletions(-)

New commits:
commit d46326d2501881dd4927b791d28863e4ecb6b5b2
Author: Andra?? Levstik <ruskie AT mages.ath.cx>
Commit: Andra?? Levstik <ruskie AT mages.ath.cx>

xorg-server: fixing bug #13489

diff --git a/xorg-xserver/xorg-server/CONFIGURE
b/xorg-xserver/xorg-server/CONFIGURE
index 5294b8c..afbd71d 100755
--- a/xorg-xserver/xorg-server/CONFIGURE
+++ b/xorg-xserver/xorg-server/CONFIGURE
@@ -24,6 +24,12 @@ config_query_option XORG_SERVER_OPTS
"--disable-xres"
&&

config_query_option XORG_SERVER_OPTS \
+ "Build XInput extension?" \
+ y \
+ "--enable-xinput" \
+ "--disable-xinput"
&&
+
+config_query_option XORG_SERVER_OPTS \
"Build Record extension?" \
y \
"--enable-record" \
diff --git a/xorg-xserver/xorg-server/DEPENDS
b/xorg-xserver/xorg-server/DEPENDS
index c9e8aea..935ceed 100755
--- a/xorg-xserver/xorg-server/DEPENDS
+++ b/xorg-xserver/xorg-server/DEPENDS
@@ -49,11 +49,7 @@ optional_depends libxfontcache
"--enable-fontcache" \
"--disable-fontcache" \
"Build FontCache extension" &&
-optional_depends libxi \
- "--enable-xinput" \
- "--disable-xinput" \
- "Build XInput extension" &&
-
+depends libxi &&
depends util-macros &&
depends xinit &&
depends bitmap &&
diff --git a/xorg-xserver/xorg-server/DETAILS
b/xorg-xserver/xorg-server/DETAILS
index 0d4f41c..af945ef 100755
--- a/xorg-xserver/xorg-server/DETAILS
+++ b/xorg-xserver/xorg-server/DETAILS
@@ -13,6 +13,7 @@ SOURCE2_DIRECTORY=${BUILD_DIRECTORY}/Mes
WEB_SITE=http://xorg.freedesktop.org/
ENTERED=20051125
LICENSE[0]=XCL
+ PATCHLEVEL=1
SECURITY_PATCH=3
SHORT="X servers (including Xorg, Xprt, Xvfb, Xnest, & Xdmx)"
cat << EOF
diff --git a/xorg-xserver/xorg-server/HISTORY
b/xorg-xserver/xorg-server/HISTORY
index 4e91d73..5ae6f5b 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,10 +1,10 @@
2007-02-01 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
- * DETAILS: version update to 1.2.0
+ * DETAILS: version update to 1.2.0, PATCHLEVEL++
* xorg-server-1.1.99.903-fixes-1.patch: removed
* PRE_BUILD: removed patch
- * DEPENDS: dmx causing probs
+ * DEPENDS: dmx causing probs, added libxi
* BUILD: dmx causing probs
- * CONFIGURE: minor fixups
+ * CONFIGURE: minor fixups, enable/disable XInput

2006-12-31 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS, PRE_BUILD, xorg-server-1.1.99.903-fixes-1.patch:

[SM-Commit] GIT changes to master xorg-modular grimoire by Andra?? Levstik (d46326d2501881dd4927b791d28863e4ecb6b5b2), Andra?? Levstik, 02/01/2007