[SM-Commit] GIT changes to master grimoire by Andraž Levstik (847586fbfb32cb23bfcdb18c3c01faaad6f35349)

Andraž Levstik scm at sourcemage.org
Tue Oct 13 13:53:54 EDT 2009


GIT changes to master grimoire by Andraž Levstik <ruskie+2054d253 at codemages.net>:

 dev/null                                               |binary
 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 |    0 
 6 files changed, 24 insertions(+), 4 deletions(-)

New commits:
commit 847586fbfb32cb23bfcdb18c3c01faaad6f35349
Author: Andraž Levstik <ruskie+2054d253 at codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 at codemages.net>

    Revert "Revert "xorg-server: update to 1.7.0""
    
    After discussing on IRC it was decided to keep the 1.7.0 in. People seem
    to be having probs with 1.6.x.
    
    This reverts commit c39203bc0e1233ca24c70c0d099c59ae966e62ae.

diff --git a/xorg-xserver/xorg-server/DEPENDS b/xorg-xserver/xorg-server/DEPENDS
index a70d334..7ae685f 100755
--- a/xorg-xserver/xorg-server/DEPENDS
+++ b/xorg-xserver/xorg-server/DEPENDS
@@ -1,3 +1,5 @@
+. $GRIMOIRE/FUNCTIONS
+
 #
 ## Check this every release as X.org likes to change things on us...
 #
@@ -60,7 +62,9 @@ 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                                  &&
@@ -70,22 +74,33 @@ 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 4335b6c..bfcb8cf 100755
--- a/xorg-xserver/xorg-server/DETAILS
+++ b/xorg-xserver/xorg-server/DETAILS
@@ -1,9 +1,9 @@
             SPELL=xorg-server
-          VERSION=1.6.3
+          VERSION=1.7.0
            SOURCE=$SPELL-$VERSION.tar.bz2
     SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/xserver/$SOURCE
 #      SOURCE_HASH=sha512:66dcc6b26ab7d1e24814c5e650cbb5942ec9d20642cebe82cb4a66e4d7a6cdd472573c17d769a490e0426b826e98774f98a61459ad078fedf4abe38f79e189fc
-       SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"
+      SOURCE_HASH=sha512:0c598aa5b2089c667fddd93fd56d222ecd6e23489090c778c566c6c67b779d9c99544d3f24a06990000f65b654e46ec1ba604177ab764cd5a5c9777fdec53cfa
  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 bde1de2..ac3447b 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,8 @@
+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 c4f688a..db24e5c 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 $(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"; \
++		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/"; \
 +	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
deleted file mode 100644
index 19ea688..0000000
Binary files a/xorg-xserver/xorg-server/xorg-server-1.6.3.tar.bz2.sig and /dev/null differ



More information about the SM-Commit mailing list