sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to devel-xorg-modular grimoire by Andraž 'ruskie' Levstik (816e5d3ca66ff0dd0bb937b5844ec3355a73d070)

From: Andraž 'ruskie' Levstik <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Andraž 'ruskie' Levstik (816e5d3ca66ff0dd0bb937b5844ec3355a73d070)
Date: Thu, 9 Jul 2009 04:13:24 -0500

GIT changes to devel-xorg-modular grimoire by Andraž 'ruskie' Levstik
<ruskie+2054d253 AT codemages.net>:

xorg-xserver/xorg-server/BUILD | 1 -
xorg-xserver/xorg-server/CONFIGURE | 30 ------------------------------
xorg-xserver/xorg-server/DEPENDS | 19 +++++++++----------
xorg-xserver/xorg-server/DETAILS | 8 ++++----
xorg-xserver/xorg-server/HISTORY | 6 ++++++
5 files changed, 19 insertions(+), 45 deletions(-)

New commits:
commit 816e5d3ca66ff0dd0bb937b5844ec3355a73d070
Author: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>

xorg-server: update to 1.6.2 so far only cast test

diff --git a/xorg-xserver/xorg-server/BUILD b/xorg-xserver/xorg-server/BUILD
index e978772..1808f36 100755
--- a/xorg-xserver/xorg-server/BUILD
+++ b/xorg-xserver/xorg-server/BUILD
@@ -18,6 +18,5 @@ OPTS="${XORG_SERVER_OPTS}
\
--disable-dmx \
--disable-xwin \
--enable-dbe \
- --enable-shm \
${OPTS}" &&
default_build
diff --git a/xorg-xserver/xorg-server/CONFIGURE
b/xorg-xserver/xorg-server/CONFIGURE
index d9a3a18..0fdc639 100755
--- a/xorg-xserver/xorg-server/CONFIGURE
+++ b/xorg-xserver/xorg-server/CONFIGURE
@@ -67,12 +67,6 @@ config_query_option XORG_SERVER_OPTS
\
"--disable-dri"
&&

config_query_option XORG_SERVER_OPTS \
- "Build DRI2 extension?" \
- y \
- "--enable-dri2" \
- "--disable-dri2"
&&
-
-config_query_option XORG_SERVER_OPTS \
"Build Security extension?" \
y \
"--enable-xcsecurity" \
@@ -123,24 +117,6 @@ config_query XORG_SERVER_ADVANCED "Do you wish the
advanced options" n &&

if [[ $XORG_SERVER_ADVANCED == y ]] ; then
config_query_option XORG_SERVER_OPTS \
- "Build Xgl server (EXPERIMENTAL)?" \
- n \
- "--enable-xgl" \
- "--disable-xgl"
&&
-
-config_query_option XORG_SERVER_OPTS \
- "Build Xglx xgl module (EXPERIMENTAL)?" \
- n \
- "--enable-xglx" \
- "--disable-xglx"
&&
-
-config_query_option XORG_SERVER_OPTS \
- "Build Xegl xgl module EXPERIMENTAL" \
- n \
- "--enable-xegl" \
- "--disable-xegl"
&&
-
-config_query_option XORG_SERVER_OPTS \
"Build kdrive servers (EXPERIMENTAL)?" \
n \
"--enable-kdrive" \
@@ -196,12 +172,6 @@ config_query_option XORG_SERVER_OPTS
\
"--enable-registry" \
"--disable-registry"
&&

-config_query_option XORG_SERVER_OPTS \
- "Enable builtin bitmap fonts?" \
- n \
- "--enable-builtin-fonts" \
- "--disable-builtin-fonts"
&&
-
config_query_multi XORG_SERVER_FONT_100DPI \
"Which 100dpi fonts do you want?" \
all \
diff --git a/xorg-xserver/xorg-server/DEPENDS
b/xorg-xserver/xorg-server/DEPENDS
index e3b71af..a70d334 100755
--- a/xorg-xserver/xorg-server/DEPENDS
+++ b/xorg-xserver/xorg-server/DEPENDS
@@ -18,14 +18,13 @@ optional_depends libselinux \
"--enable-xselinux" \
"--disable-xselinux" \
"Enable SELinux support" &&
-optional_depends libxevie \
- "--enable-xevie" \
- "--disable-xevie" \
- "Build XEvIE extension" &&
-optional_depends libxtrap \
- "--enable-xtrap" \
- "--disable-xtrap" \
- "Build XTrap extension" &&
+optional_depends dri2proto \
+ "--enable-dri2" \
+ "--disable-dri2" \
+ "Enable DRI2 extension" &&
+if is_depends_enabled $SPELL dri2proto ; then
+force_depends dri2proto
+fi &&
optional_depends libxscrnsaver \
"--enable-screensaver" \
"--disable-screensaver" \
@@ -48,8 +47,8 @@ optional_depends hal \
# "--disable-dmx" \
# "Build DMX server" &&
# apparently now needed forcing/or breaks way to much
-depends freetype2 "--enable-freetype" &&
-depends libxfontcache "--enable-fontcache" &&
+depends freetype2 &&
+depends libxfontcache &&
depends libxxf86dga "--enable-dga" &&
depends libxcomposite "--enable-composite" &&
#depends libxxf86misc "--enable-xf86misc" &&
diff --git a/xorg-xserver/xorg-server/DETAILS
b/xorg-xserver/xorg-server/DETAILS
index c8551cf..3deae6f 100755
--- a/xorg-xserver/xorg-server/DETAILS
+++ b/xorg-xserver/xorg-server/DETAILS
@@ -1,11 +1,11 @@
SPELL=xorg-server
- VERSION=1.6.1
- VERSION2=7.4
+ VERSION=1.6.2
+ VERSION2=7.4.4
SOURCE=$SPELL-$VERSION.tar.bz2

SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/xserver/$SOURCE
SOURCE2_URL[0]=$SOURCEFORGE_URL/mesa3d/$SOURCE2
-
SOURCE_HASH=sha512:debd35fb83683b8442e314997733606bfaf5b78d46120848ed18a8e9948092d023a0a3d2b97b6bbe16ca99bbf39d7ce95f2c8cfb4d833414e3f030550c79039c
- SOURCE2_GPG="gurus.gpg:$SOURCE2.sig:UPSTREAM_HASH"
+
SOURCE_HASH=sha512:66dcc6b26ab7d1e24814c5e650cbb5942ec9d20642cebe82cb4a66e4d7a6cdd472573c17d769a490e0426b826e98774f98a61459ad078fedf4abe38f79e189fc
+
SOURCE2_HASH=sha512:cb3a9abba1b4594341ad6e0bd17fbd613913b7348648c2269c855ff9ab10452784f479fdd7368fbdc56460354c3b9d48b6db82c56852b3b761240fe754e49c5f
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://xorg.freedesktop.org/
ENTERED=20051125
diff --git a/xorg-xserver/xorg-server/HISTORY
b/xorg-xserver/xorg-server/HISTORY
index ef87068..4de0e61 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,9 @@
+2009-07-09 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * DETAILS: updated spell to 1.6.2
+ * BUILD: updated
+ * CONFIGURE: removed options
+ * DEPENDS: updated
+
2009-04-25 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* REPAIR^all^PRE_SUB_DEPENDS: added
* PRE_SUB_DEPENDS: DPMS as sub_dependency

[SM-Commit] GIT changes to devel-xorg-modular grimoire by Andraž 'ruskie' Levstik (816e5d3ca66ff0dd0bb937b5844ec3355a73d070), Andraž 'ruskie' Levstik, 07/09/2009