[SM-Commit] GIT changes to master grimoire by Eric Sandall (b315a850f59c7a7394fcde3ae9d4b8290bd298e7)

Eric Sandall scm at sourcemage.org
Mon Oct 11 20:08:00 EDT 2010


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

 dev/null                                               |binary
 xorg-xserver/xorg-server/DETAILS                       |    2 +-
 xorg-xserver/xorg-server/HISTORY                       |    2 --
 xorg-xserver/xorg-server/xorg-server-1.8.1.tar.bz2.sig |binary
 xorg-xserver/xorg-server/xorg-server-1.9.0.tar.bz2.sig |    0 
 5 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit b315a850f59c7a7394fcde3ae9d4b8290bd298e7
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    Revert "xorg-server: Updated to 1.9.0"
    
    This reverts commit 8bf80daf9210b0665994cb81879dccb057e0f62c.
    
    All of my machines are on "development" mesalib (7.9) so I missed the
    requirement that xorg-server requires 7.8+.
    
    George (p3pilot) caught this:
    	configure: error: Package requirements (glproto >= 1.4.10 dri >= 7.8.0) were not met:
    	Requested 'dri >= 7.8.0' but version of dri is 7.5.2
    
    The "feature" branch is at 7.7 and I believe we should only be depending
    on "stable" branches for our packages, especially something as important
    as xorg-server.
    
    Sorry for all those whom've already updated to xorg-server 1.9.0. Know
    that downgrading to 1.8.1 worked fine here when I was testing it (still
    with mesalib 7.9 ;)).
    
    Note that I did test xorg-server 1.9.0 with xf86-video-ati,
    xf86-video-nouveau, and nvidia_driver on three machines for roughly a
    month without issue.
    
    Conflicts:
    
    	xorg-xserver/xorg-server/HISTORY

diff --git a/xorg-xserver/xorg-server/DETAILS b/xorg-xserver/xorg-server/DETAILS
index a96d2b0..dc6a50e 100755
--- a/xorg-xserver/xorg-server/DETAILS
+++ b/xorg-xserver/xorg-server/DETAILS
@@ -1,5 +1,5 @@
             SPELL=xorg-server
-          VERSION=1.9.0
+          VERSION=1.8.1
            SOURCE=$SPELL-$VERSION.tar.bz2
     SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/xserver/$SOURCE
 #      SOURCE_HASH=sha512:66dcc6b26ab7d1e24814c5e650cbb5942ec9d20642cebe82cb4a66e4d7a6cdd472573c17d769a490e0426b826e98774f98a61459ad078fedf4abe38f79e189fc
diff --git a/xorg-xserver/xorg-server/HISTORY b/xorg-xserver/xorg-server/HISTORY
index f4bc487..952c53f 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,6 +1,4 @@
 2010-09-04 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Updated to 1.9.0
-	  SOURCE matches upstream posted SHA1
 	* CONFIGURE: -multibuffer no longer an option remove query and from
 	  XORG_SERVER_OPTS
 	* DEPENDS: Optionally depends on udev for configuration support
diff --git a/xorg-xserver/xorg-server/xorg-server-1.8.1.tar.bz2.sig b/xorg-xserver/xorg-server/xorg-server-1.8.1.tar.bz2.sig
new file mode 100644
index 0000000..0cc09e1
Binary files /dev/null and b/xorg-xserver/xorg-server/xorg-server-1.8.1.tar.bz2.sig differ
diff --git a/xorg-xserver/xorg-server/xorg-server-1.9.0.tar.bz2.sig b/xorg-xserver/xorg-server/xorg-server-1.9.0.tar.bz2.sig
deleted file mode 100644
index 8504f15..0000000
Binary files a/xorg-xserver/xorg-server/xorg-server-1.9.0.tar.bz2.sig and /dev/null differ



More information about the SM-Commit mailing list