rpms/xorg-x11-server/devel xserver-1.2.0-geode-mmx.patch, NONE, 1.1 xserver-1.2.0-xephyr-keysym-madness.patch, NONE, 1.1 xorg-x11-server.spec, 1.199, 1.200

[fedora-cvs-commits at redhat.com]

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14848

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.2.0-geode-mmx.patch 
	xserver-1.2.0-xephyr-keysym-madness.patch 
Log Message:
* Wed Jan 24 2007 Adam Jackson <ajax at redhat.com> 1.2.0-2
- Delete ModulePath lines rather than attempt to munge them.  (#186338)


xserver-1.2.0-geode-mmx.patch:
 fbpict.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE xserver-1.2.0-geode-mmx.patch ---
--- a/fb/fbpict.c	
+++ a/fb/fbpict.c	
@@ -1516,7 +1516,9 @@ static unsigned int detectCPUFeatures(void) {
             features |= SSE;
         if (result & (1 << 26))
             features |= SSE2;
-        if ((result & MMX) && !(result & SSE) && (strcmp(vendor, "AuthenticAMD") == 0)) {
+        if ((features & MMX) && !(features & SSE) &&
+            (strcmp(vendor, "AuthenticAMD") == 0 ||
+             strcmp(vendor, "Geode by NSC") == 0)) {
             /* check for AMD MMX extensions */
 
             unsigned int result;            

xserver-1.2.0-xephyr-keysym-madness.patch:
 hostx.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE xserver-1.2.0-xephyr-keysym-madness.patch ---
--- xorg-server-1.1.1/hw/kdrive/ephyr/hostx.c.jx	2006-07-05 14:31:39.000000000 -0400
+++ xorg-server-1.1.1/hw/kdrive/ephyr/hostx.c	2007-01-29 17:56:34.000000000 -0500
@@ -77,9 +77,10 @@
 
 static int            HostXWantDamageDebug = 0;
 
-extern KeySym         EphyrKeymap[];
+/* these two need to be 32-bits. do not say KeySym, that way lies madness */
+extern unsigned int   EphyrKeymap[];
+extern unsigned int   kdKeymap[];
 
-extern KeySym	      kdKeymap[];
 extern int	      kdMinScanCode;
 extern int	      kdMaxScanCode;
 extern int	      kdMinKeyCode;
@@ -668,7 +669,7 @@
 void
 hostx_load_keymap(void)
 {
-  KeySym          *keymap;
+  unsigned int	   *keymap;
   int              mapWidth, min_keycode, max_keycode;
   int              i,j;
 


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- xorg-x11-server.spec	24 Jan 2007 22:51:48 -0000	1.199
+++ xorg-x11-server.spec	29 Jan 2007 23:01:28 -0000	1.200
@@ -8,7 +8,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.2.0
-Release:   2%{?dist}
+Release:   3%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -45,8 +45,10 @@
 Patch1006:  xorg-x11-server-1.1.1-no-scanpci.patch
 Patch1007:  xorg-x11-server-1.1.1-spurious-libxf1bpp-link.patch
 Patch1008:  xorg-x11-server-1.2.0-xf86config-comment-less.patch
+Patch1009:  xorg-x11-server-1.2.0-maxpixclock-option.patch
 
-Patch3001:  xorg-x11-server-1.2.0-maxpixclock-option.patch
+Patch2001:  xserver-1.2.0-geode-mmx.patch
+Patch2002:  xserver-1.2.0-xephyr-keysym-madness.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -323,7 +325,10 @@
 %patch1006 -p1 -b .no-scanpci
 %patch1007 -p1 -b .xf1bpp
 %patch1008 -p1 -b .comment-less
-%patch3001 -p1 -b .maxpixclock
+%patch1009 -p1 -b .maxpixclock
+
+%patch2001 -p1 -b .geode-mmx
+%patch2002 -p1 -b .xephyr-keysym
 
 %build
 #FONTDIR="${datadir}/X11/fonts"
@@ -632,6 +637,10 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Mon Jan 29 2007 Adam Jackson <ajax at redhat.com> 1.2.0-3
+- Fix MMX check on AMD CPUs. (#222332)
+- Fix Xephyr keysym init on LP64. (#224311)
+
 * Wed Jan 24 2007 Adam Jackson <ajax at redhat.com> 1.2.0-2
 - Delete ModulePath lines rather than attempt to munge them.  (#186338)