rpms/xorg-x11-server
5
0
Fork 0
Code Issues Pull Requests Releases Activity

* Wed Jan 24 2007 Adam Jackson <ajax@redhat.com> 1.2.0-2

Browse Source 
- Delete ModulePath lines rather than attempt to munge them.  (#186338)
This commit is contained in:
Adam Jackson 2007-01-29 23:01:28 +00:00
parent 1401267395
commit d0f52e010b
3 changed files with 49 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
xorg-x11-server.spec
View File

@ -8,7 +8,7 @@
Summary: X.Org X11 X server Summary: X.Org X11 X server
Name: xorg-x11-server Name: xorg-x11-server
Version: 1.2.0 Version: 1.2.0
Release: 2%{?dist} Release: 3%{?dist}
URL: http://www.x.org URL: http://www.x.org
License: MIT/X11 License: MIT/X11
Group: User Interface/X Group: User Interface/X
@ -45,8 +45,10 @@ Patch1005: xorg-x11-server-1.1.1-builtin-fonts.patch
Patch1006: xorg-x11-server-1.1.1-no-scanpci.patch Patch1006: xorg-x11-server-1.1.1-no-scanpci.patch
Patch1007: xorg-x11-server-1.1.1-spurious-libxf1bpp-link.patch Patch1007: xorg-x11-server-1.1.1-spurious-libxf1bpp-link.patch
Patch1008: xorg-x11-server-1.2.0-xf86config-comment-less.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 moduledir %{_libdir}/xorg/modules
%define drimoduledir %{_libdir}/dri %define drimoduledir %{_libdir}/dri
@ -323,7 +325,10 @@ drivers, input drivers, or other X modules should install this package.
%patch1006 -p1 -b .no-scanpci %patch1006 -p1 -b .no-scanpci
%patch1007 -p1 -b .xf1bpp %patch1007 -p1 -b .xf1bpp
%patch1008 -p1 -b .comment-less %patch1008 -p1 -b .comment-less
%patch3001 -p1 -b .maxpixclock %patch1009 -p1 -b .maxpixclock
%patch2001 -p1 -b .geode-mmx
%patch2002 -p1 -b .xephyr-keysym
%build %build
#FONTDIR="${datadir}/X11/fonts" #FONTDIR="${datadir}/X11/fonts"
@ -632,6 +637,10 @@ rm -rf $RPM_BUILD_ROOT
# ------------------------------------------------------------------- # -------------------------------------------------------------------
%changelog %changelog
* Mon Jan 29 2007 Adam Jackson <ajax@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@redhat.com> 1.2.0-2 * Wed Jan 24 2007 Adam Jackson <ajax@redhat.com> 1.2.0-2
- Delete ModulePath lines rather than attempt to munge them. (#186338) - Delete ModulePath lines rather than attempt to munge them. (#186338)

13
xserver-1.2.0-geode-mmx.patch Normal file
View File

@ -0,0 +1,13 @@
--- 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;

24
xserver-1.2.0-xephyr-keysym-madness.patch Normal file
View File

@ -0,0 +1,24 @@
--- 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;