Skip to Content.
Sympa Menu

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

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 (c39203bc0e1233ca24c70c0d099c59ae966e62ae)
  • Date: Sun, 11 Oct 2009 22:25:17 -0500

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

xorg-xserver/xorg-server/DEPENDS | 15 ---------------
xorg-xserver/xorg-server/DETAILS | 4 ++--
xorg-xserver/xorg-server/HISTORY | 5 -----
xorg-xserver/xorg-server/gl_select.patch | 4 ++--
xorg-xserver/xorg-server/xorg-server-1.6.3.tar.bz2.sig |binary
5 files changed, 4 insertions(+), 24 deletions(-)

New commits:
commit c39203bc0e1233ca24c70c0d099c59ae966e62ae
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Revert "xorg-server: update to 1.7.0"

This reverts commit 8dc2abc7683947f34bb2b95b68484a8dc96f3b4f.

Breaks nvidia_driver and possibly others, needs more testing.

diff --git a/xorg-xserver/xorg-server/DEPENDS
b/xorg-xserver/xorg-server/DEPENDS
index 7ae685f..a70d334 100755
--- a/xorg-xserver/xorg-server/DEPENDS
+++ b/xorg-xserver/xorg-server/DEPENDS
@@ -1,5 +1,3 @@
-. $GRIMOIRE/FUNCTIONS
-
#
## Check this every release as X.org likes to change things on us...
#
@@ -62,9 +60,7 @@ depends bitmap &&
depends xhost &&
depends xauth &&
depends bigreqsproto &&
-simple_version_check_force_depends bigreqsproto 103 3 &&
depends pixman &&
-simple_version_check_force_depends pixman 160 3 &&
depends compositeproto &&
depends damageproto &&
depends dmxproto &&
@@ -74,33 +70,22 @@ depends fontcacheproto &&
depends fontsproto &&
depends glproto &&
depends inputproto &&
-simple_version_check_force_depends inputproto 20 2 &&
depends kbproto &&
depends randrproto &&
depends recordproto &&
-simple_version_check_force_depends recordproto 113 3 &&
depends renderproto &&
-# to complicated to figure out atm since it goes from 0.9.3 -> 0.11
-if spell_ok renderproto
- then
- force_depends renderproto
-fi &&
depends resourceproto &&
depends scrnsaverproto &&
depends trapproto &&
depends videoproto &&
depends xcmiscproto &&
-simple_version_check_force_depends xcmiscproto 11 2 &&
depends xextproto &&
depends xf86bigfontproto &&
depends xf86dgaproto &&
-simple_version_check_force_depends xf86dgaproto 21 2 &&
depends xf86driproto &&
-simple_version_check_force_depends xf86driproto 205 3 &&
#depends xf86miscproto &&
depends xf86rushproto &&
depends xf86vidmodeproto &&
-simple_version_check_force_depends xf86vidmodeproto 23 2 &&
depends xineramaproto &&
depends xproto &&
depends xproxymanagementprotocol &&
diff --git a/xorg-xserver/xorg-server/DETAILS
b/xorg-xserver/xorg-server/DETAILS
index bfcb8cf..4335b6c 100755
--- a/xorg-xserver/xorg-server/DETAILS
+++ b/xorg-xserver/xorg-server/DETAILS
@@ -1,9 +1,9 @@
SPELL=xorg-server
- VERSION=1.7.0
+ VERSION=1.6.3
SOURCE=$SPELL-$VERSION.tar.bz2

SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/xserver/$SOURCE
#
SOURCE_HASH=sha512:66dcc6b26ab7d1e24814c5e650cbb5942ec9d20642cebe82cb4a66e4d7a6cdd472573c17d769a490e0426b826e98774f98a61459ad078fedf4abe38f79e189fc
-
SOURCE_HASH=sha512:0c598aa5b2089c667fddd93fd56d222ecd6e23489090c778c566c6c67b779d9c99544d3f24a06990000f65b654e46ec1ba604177ab764cd5a5c9777fdec53cfa
+ SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"
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 ac3447b..bde1de2 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,8 +1,3 @@
-2009-10-10 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
- * DETAILS: updated spell to 1.7.0
- * DEPENDS: updated
- * gl_select.diff: patch
-
2009-08-01 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.6.3
SOURCE matches upstream posted MD5
diff --git a/xorg-xserver/xorg-server/gl_select.patch
b/xorg-xserver/xorg-server/gl_select.patch
index db24e5c..c4f688a 100755
--- a/xorg-xserver/xorg-server/gl_select.patch
+++ b/xorg-xserver/xorg-server/gl_select.patch
@@ -19,8 +19,8 @@ diff -Nuar hw.orig/xfree86/dixmods/Makefile.in
hw/xfree86/dixmods/Makefile.in
+ @lst='$(GLXMODS)'; for r in $$lst; do \
+ if test -f $$r; then \
+ h=$(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS)
--mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) '$$r'
'$(DESTDIR)$(extsmoduledir)/mesa/'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install
$(INSTALL) $(INSTALL_STRIP_FLAG) $$r "$(DESTDIR)$(extsmoduledir)/mesa/"; \
++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS)
--mode=install $(extsmoduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$r'
'$(DESTDIR)$(extsmoduledir)/mesa/$$h'"; \
++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install
$(extsmoduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$r"
"$(DESTDIR)$(extsmoduledir)/mesa/$$h"; \
+ else :; fi; \
+ done
test -z "$(extsmoduledir)" || $(MKDIR_P) "$(DESTDIR)$(extsmoduledir)"
diff --git a/xorg-xserver/xorg-server/xorg-server-1.6.3.tar.bz2.sig
b/xorg-xserver/xorg-server/xorg-server-1.6.3.tar.bz2.sig
new file mode 100644
index 0000000..19ea688
Binary files /dev/null and
b/xorg-xserver/xorg-server/xorg-server-1.6.3.tar.bz2.sig differ



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (c39203bc0e1233ca24c70c0d099c59ae966e62ae), Eric Sandall, 10/11/2009

Archive powered by MHonArc 2.6.24.

Top of Page