Re: X Strike Force X.Org X11 SVN commit: r795 - in branches/6.9/debian: . scripts

2005-11-16 Thread Julien Cristau 
On Mon, Oct 31, 2005 at 15:18:41 +, David Nusinow wrote:

 On Mon, Oct 31, 2005 at 07:58:19PM +0100, Julien Cristau wrote:
  Actually, I just noticed that a different fix has been committed
  upstream:
 
 Good eye. If I don't remove this patch for RC 2 please remind me.
 
Oops, I forgot this before you uploaded 6.9rc2 (although having both
patches will probably not be a problem).

Cheers,
Julien


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

Re: X Strike Force X.Org X11 SVN commit: r795 - in branches/6.9/debian: . scripts

2005-11-16 Thread David Nusinow 
On Wed, Nov 16, 2005 at 11:53:58PM +0100, Julien Cristau wrote:
 On Mon, Oct 31, 2005 at 15:18:41 +, David Nusinow wrote:
 
  On Mon, Oct 31, 2005 at 07:58:19PM +0100, Julien Cristau wrote:
   Actually, I just noticed that a different fix has been committed
   upstream:
  
  Good eye. If I don't remove this patch for RC 2 please remind me.
  
 Oops, I forgot this before you uploaded 6.9rc2 (although having both
 patches will probably not be a problem).

Ah, I'd forgotten too. Thanks :-)

 - David


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

Re: X Strike Force X.Org X11 SVN commit: r795 - in branches/6.9/debian: . scripts

2005-10-31 Thread Julien Cristau 
On Sat, Oct 29, 2005 at 18:39:43 -0500, X Strike Force SVN Repository Admin 
wrote:

 Author: dnusinow
 Date: 2005-10-29 18:39:35 -0500 (Sat, 29 Oct 2005)
 New Revision: 795
 
 Log:
 * MANIFEST and packaging updates
 + alpha thanks to Julien Cristau.
 + ia64 thanks to Dagfinn Ilmari
 + powerpc thanks to Sven Luther.
 + sparc thanks to Julien Cristau
 
Hi David,

alpha still needs the build fix I sent in
[EMAIL PROTECTED].

Cheers,
Julien Cristau


signature.asc
Description: Digital signature

Re: X Strike Force X.Org X11 SVN commit: r795 - in branches/6.9/debian: . scripts

2005-10-31 Thread David Nusinow 
On Mon, Oct 31, 2005 at 05:01:05PM +0100, Julien Cristau wrote:
 alpha still needs the build fix I sent in
 [EMAIL PROTECTED].

Crap, sorry Julien. I just uploaded -2, but I'll add this in svn now so it
can go in to -3.

 - David Nusinow


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

Re: X Strike Force X.Org X11 SVN commit: r795 - in branches/6.9/debian: . scripts

2005-10-31 Thread Julien Cristau 
On Mon, Oct 31, 2005 at 11:07:18 -0500, David Nusinow wrote:

 On Mon, Oct 31, 2005 at 05:01:05PM +0100, Julien Cristau wrote:
  alpha still needs the build fix I sent in
  [EMAIL PROTECTED].
 
 Crap, sorry Julien. I just uploaded -2, but I'll add this in svn now so it
 can go in to -3.
 
Thanks David.

Actually, I just noticed that a different fix has been committed
upstream:

revision 1.10
date: 2005-10-28 16:01:17 +;  author: alanh;  state: Exp;  lines: +1 -1;  
commitid: 24b943624b484567;
build fix on alpha

Index: programs/Xserver/hw/xfree86/common/compiler.h
===
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/common/compiler.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- programs/Xserver/hw/xfree86/common/compiler.h   24 Aug 2005 11:18:32 
-  1.9
+++ programs/Xserver/hw/xfree86/common/compiler.h   28 Oct 2005 16:01:17 
-  1.10
@@ -1694,7 +1694,7 @@
 xf86ReadMmio32(void *Base, unsigned long Offset)
 {
__asm__ __volatile__(mb  : : : memory);
-   return *(volatile CARD32*)((unsigned long)Base+(Offset));
+   return *(volatile unsigned int*)((unsigned long)Base+(Offset));
 }
 #  endif
 extern void (*xf86WriteMmio8)(int, void *, unsigned long);


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]