Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (d436140328044b4babd80b916c06cda7e9e412f0)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (d436140328044b4babd80b916c06cda7e9e412f0)
  • Date: Sat, 18 Jul 2009 01:45:02 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

xorg-app/setxkbmap/DETAILS | 4 +-
xorg-app/setxkbmap/HISTORY | 3 ++
xorg-app/xkbcomp/DETAILS | 4 +-
xorg-app/xkbcomp/HISTORY | 3 ++
xorg-xserver/xorg-server/BUILD | 1
xorg-xserver/xorg-server/CONFIGURE | 30
--------------------
xorg-xserver/xorg-server/DEPENDS | 19 ++++++------
xorg-xserver/xorg-server/DETAILS | 4 +-
xorg-xserver/xorg-server/HISTORY | 11 +++++++
xorg-xserver/xorg-server/PRE_SUB_DEPENDS | 1
xorg-xserver/xorg-server/REPAIR^all^PRE_SUB_DEPENDS | 6 ++++
xorg-xserver/xorg-server/SUB_DEPENDS | 1
12 files changed, 40 insertions(+), 47 deletions(-)

New commits:
commit d436140328044b4babd80b916c06cda7e9e412f0
Author: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xorg-server: update to 1.6.2

Cherry-picked commit 816e5d3 from devel-xorg-modular
Tested and runs okay

commit 4b99721680ec46a1b3d296a68fe68b7fbd643911
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xorg-server: finalized DPMS sub dependency
(cherry picked from commit 504928cb5620babc72ea76a5e50deca67d1b3d44)

commit df03aa21de5a52275f721c6c04b0c8a15dc25a4e
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xorg-server: added DPMS as a sub dependency - needed by ati-fglrx

commit e048d8870739b55850a0cd41d9e657f50c5f57b5
Author: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xkbcomp: update to 1.1.0
(cherry picked from commit c962fa641d9c6ab17c6f81756358fe7ee3ac94c7)

commit 51a243e37a107440185a326f3d02c11c467a1f0d
Author: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
Commit: Eric Sandall <sandalle AT sourcemage.org>

setxkbmap: update to 1.1.0
(cherry picked from commit d2e82fc15068e4b9a6b34da9fdec0ec6f9d37bdd)

diff --git a/xorg-app/setxkbmap/DETAILS b/xorg-app/setxkbmap/DETAILS
index 8cc506b..6316383 100755
--- a/xorg-app/setxkbmap/DETAILS
+++ b/xorg-app/setxkbmap/DETAILS
@@ -1,10 +1,10 @@
SPELL=setxkbmap
PKG=setxkbmap
- VERSION=1.0.4
+ VERSION=1.1.0
XORG_VER=X11R7.1
SOURCE=${PKG}-${VERSION}.tar.bz2

SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/app/${SOURCE}
-
SOURCE_HASH=sha512:ae8709b948ca6dd00f63d082d1b4352fa8213d71c47bbfd8952a0710832f95be10aba4354623aacfd44c8f5ae50957626e7ba2146c7194c9ae8e4448c5177fbc
+
SOURCE_HASH=sha512:ca006e59b097c4cbb3434dc84eef3e0fcfb25af0f6a2b85b900a2db11c471592cd206ff048c3b8887d6e4bf48aa9168ed12f4e54b5b3b16d10ca8aa6a189ae45
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
diff --git a/xorg-app/setxkbmap/HISTORY b/xorg-app/setxkbmap/HISTORY
index 6ee63cc..7fee4ac 100644
--- a/xorg-app/setxkbmap/HISTORY
+++ b/xorg-app/setxkbmap/HISTORY
@@ -1,3 +1,6 @@
+2009-07-09 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * DETAILS: updated spell to 1.1.0
+
2008-03-17 Eric Sandall <sandalle AT sourcemage.org>
* CONFLICTS: Auto-conflicts with xorg as well

diff --git a/xorg-app/xkbcomp/DETAILS b/xorg-app/xkbcomp/DETAILS
index a3c3fdb..5d285ee 100755
--- a/xorg-app/xkbcomp/DETAILS
+++ b/xorg-app/xkbcomp/DETAILS
@@ -1,10 +1,10 @@
SPELL=xkbcomp
PKG=xkbcomp
- VERSION=1.0.5
+ VERSION=1.1.0
XORG_VER=X11R7.1
SOURCE=${PKG}-${VERSION}.tar.bz2

SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/app/${SOURCE}
-
SOURCE_HASH=sha512:5613c7ebbb0394b33bc8da3f689de565ae6650e8229dd7ed021ec8cd940e60abab09a649d24128185b6d0418ffd04e5299a855f552b2275bd03b043ac8503028
+
SOURCE_HASH=sha512:f31245c2c9c9364dc22416c3fbb65c66e84d3052d0a7b2a4c743cce46bc8296843ba2cbc3631b29b366fc6963a9e2c40f1c26da42cc1fc0ab471853ebc6bad6a
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
WEB_SITE=http://xorg.freedesktop.org/wiki
ENTERED=20051125
diff --git a/xorg-app/xkbcomp/HISTORY b/xorg-app/xkbcomp/HISTORY
index 05c07e5..cdbd2a1 100644
--- a/xorg-app/xkbcomp/HISTORY
+++ b/xorg-app/xkbcomp/HISTORY
@@ -1,3 +1,6 @@
+2009-07-09 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * DETAILS: updated spell to 1.1.0
+
2008-05-21 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: updated spell to 1.0.5

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 81a0227..c2bdd10 100755
--- a/xorg-xserver/xorg-server/DETAILS
+++ b/xorg-xserver/xorg-server/DETAILS
@@ -1,8 +1,8 @@
SPELL=xorg-server
- VERSION=1.6.1
+ VERSION=1.6.2
SOURCE=$SPELL-$VERSION.tar.bz2

SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/xserver/$SOURCE
-
SOURCE_HASH=sha512:debd35fb83683b8442e314997733606bfaf5b78d46120848ed18a8e9948092d023a0a3d2b97b6bbe16ca99bbf39d7ce95f2c8cfb4d833414e3f030550c79039c
+
SOURCE_HASH=sha512:66dcc6b26ab7d1e24814c5e650cbb5942ec9d20642cebe82cb4a66e4d7a6cdd472573c17d769a490e0426b826e98774f98a61459ad078fedf4abe38f79e189fc
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 5da65ab..4de0e61 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,14 @@
+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
+ * SUB_DEPENDS: DPMS as sub_dependency
+
2009-04-18 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS, BUILD, PRE_BUILD: MesaLib source is no longer required at
build

diff --git a/xorg-xserver/xorg-server/PRE_SUB_DEPENDS
b/xorg-xserver/xorg-server/PRE_SUB_DEPENDS
index 8af592e..5de1740 100755
--- a/xorg-xserver/xorg-server/PRE_SUB_DEPENDS
+++ b/xorg-xserver/xorg-server/PRE_SUB_DEPENDS
@@ -1,5 +1,6 @@
case $THIS_SUB_DEPENDS in
XCOMPOSITE) is_depends_enabled $SPELL libxcomposite ;;
+ DPMS) list_find XORG_SERVER_OPTS "--enable-dpms" ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
return 1;;
esac
diff --git a/xorg-xserver/xorg-server/REPAIR^all^PRE_SUB_DEPENDS
b/xorg-xserver/xorg-server/REPAIR^all^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..5de1740
--- /dev/null
+++ b/xorg-xserver/xorg-server/REPAIR^all^PRE_SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+ XCOMPOSITE) is_depends_enabled $SPELL libxcomposite ;;
+ DPMS) list_find XORG_SERVER_OPTS "--enable-dpms" ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+ return 1;;
+esac
diff --git a/xorg-xserver/xorg-server/SUB_DEPENDS
b/xorg-xserver/xorg-server/SUB_DEPENDS
index ed7a3b0..8125f11 100755
--- a/xorg-xserver/xorg-server/SUB_DEPENDS
+++ b/xorg-xserver/xorg-server/SUB_DEPENDS
@@ -1,5 +1,6 @@
case "$THIS_SUB_DEPENDS" in
XCOMPOSITE) depends libxcomposite "--enable-composite" ;;
+ DPMS) list_add XORG_SERVER_OPTS "--enable-dpms" ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
return 1;;
esac



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (d436140328044b4babd80b916c06cda7e9e412f0), Eric Sandall, 07/18/2009

Archive powered by MHonArc 2.6.24.

Top of Page