xserver 1.5.2
This commit is contained in:
Adam Jackson
parent
2847baa8cb
commit
861a625c46
@ -1 +1 @@
|
||||
xorg-server-1.5.1.tar.bz2
|
||||
xorg-server-1.5.2.tar.bz2
|
||||
|
||||
@ -1,2 +1,3 @@
|
||||
xorg-x11-server-1_5_0-1_fc10:HEAD:xorg-x11-server-1.5.0-1.fc10.src.rpm:1220485219
|
||||
xorg-x11-server-1_5_1-1_fc10:HEAD:xorg-x11-server-1.5.1-1.fc10.src.rpm:1222198557
|
||||
xorg-x11-server-1_5_2-1_fc10:HEAD:xorg-x11-server-1.5.2-1.fc10.src.rpm:1223667007
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
d16f5a033f001c9069b4141194614da2 xorg-server-1.5.1.tar.bz2
|
||||
376a1c790f7519f3ab3e047409c659f0 xorg-server-1.5.2.tar.bz2
|
||||
|
||||
@ -18,8 +18,8 @@
|
||||
|
||||
Summary: X.Org X11 X server
|
||||
Name: xorg-x11-server
|
||||
Version: 1.5.1
|
||||
Release: 11%{?dist}
|
||||
Version: 1.5.2
|
||||
Release: 1%{?dist}
|
||||
URL: http://www.x.org
|
||||
License: MIT
|
||||
Group: User Interface/X
|
||||
@ -59,7 +59,6 @@ Patch1005: xserver-1.4.99-builtin-fonts.patch
|
||||
|
||||
Patch2013: xserver-1.4.99-document-fontpath-correctly.patch
|
||||
Patch2014: xserver-1.5.0-projector-fb-size.patch
|
||||
Patch2015: xserver-1.5.0-comment-out-glxdri2.c
|
||||
|
||||
# Trivial things to never merge upstream ever
|
||||
# Don't merge this without protecting the gccisms.
|
||||
@ -75,20 +74,14 @@ Patch5011: xserver-1.4.99-endian.patch
|
||||
|
||||
# evdev keyboard map fix
|
||||
#Patch5013: xserver-1.5.0-xkb-fix-ProcXkbSetXYZ-to-work-on-all.patch
|
||||
Patch5014: xserver-1.5.0-force-SwitchCoreKeyboard-for-evdev.patch
|
||||
Patch5013: xserver-1.5.0-force-SwitchCoreKeyboard-for-evdev.patch
|
||||
# Patch5015: xserver-1.5.0-enable-selinux.patch
|
||||
Patch6000: xserver-1.5.0-hide-cursor.patch
|
||||
Patch6001: xserver-1.5.0-edid-backport.patch
|
||||
|
||||
# FDO bug 14373 (FIXED), RH bug #460545
|
||||
Patch6002: xserver-1.5.0-xkb-core-kbd-map-fix.patch
|
||||
|
||||
# force mode debugging on for randr 1.2 drivers
|
||||
Patch6003: xserver-1.5.1-mode-debug.patch
|
||||
|
||||
# backport int10 silence and memory leaks
|
||||
Patch6004: xserver-1.5.1-int10-leaks.patch
|
||||
|
||||
%define moduledir %{_libdir}/xorg/modules
|
||||
%define drimoduledir %{_libdir}/dri
|
||||
%define sdkdir %{_includedir}/xorg
|
||||
@ -519,6 +512,12 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Oct 10 2008 Adam Jackson <ajax@redhat.com> 1.5.2-1
|
||||
- xserver 1.5.2
|
||||
- xserver-1.5.0-comment-out-glxdri2.c: Drop, no longer relevant.
|
||||
- xserver-1.5.0-xkb-core-kbd-map-fix.patch: Drop, merged.
|
||||
- xserver-1.5.1-int10-leaks.patch: Drop, merged.
|
||||
|
||||
* Fri Oct 10 2008 Adam Jackson <ajax@redhat.com> 1.5.1-11
|
||||
- xserver-1.3.0-no-prerelease-warning.patch: Drop.
|
||||
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
From 70cd71bc194060b58c0973ba931f69b4de0f698d Mon Sep 17 00:00:00 2001
|
||||
From: =?utf-8?q?S=C3=B8ren=20Sandmann=20Pedersen?= <sandmann@redhat.com>
|
||||
Date: Thu, 11 Sep 2008 14:28:25 -0400
|
||||
Subject: [PATCH] Comment out glxdri2.c
|
||||
|
||||
---
|
||||
glx/glxdri2.c | 2 ++
|
||||
1 files changed, 2 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/glx/glxdri2.c b/glx/glxdri2.c
|
||||
index 9a3bc1f..4862124 100644
|
||||
--- a/glx/glxdri2.c
|
||||
+++ b/glx/glxdri2.c
|
||||
@@ -1,3 +1,4 @@
|
||||
+#if 0
|
||||
/*
|
||||
* Copyright © 2007 Red Hat, Inc
|
||||
*
|
||||
@@ -582,3 +583,4 @@ __GLXprovider __glXDRI2Provider = {
|
||||
"DRI2",
|
||||
NULL
|
||||
};
|
||||
+#endif
|
||||
--
|
||||
1.6.0.1
|
||||
|
||||
@ -1,131 +0,0 @@
|
||||
From 707503f8455da9cbbb97a030f242a7edf75526b6 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Hutterer <peter.hutterer@redhat.com>
|
||||
Date: Fri, 19 Sep 2008 18:27:24 +0930
|
||||
Subject: [PATCH] xkb: fix core keyboard map generation. #14373
|
||||
|
||||
According to Section 12.4 of the XKB Protocol Spec, if a key only has a single
|
||||
group but the keyboard has multiple groups defined, the core description of
|
||||
the key is a duplication of the single group across all symbols. i.e.
|
||||
G1L1 G1L2 G1L1 G1L2 G1L3 G1L4 G1L3 G1L4
|
||||
|
||||
The previous code generated G1L1 G1L2 G1L3 G1L4 G1L3 G1L4, leading to
|
||||
"invented" groups when the process is reversed.
|
||||
|
||||
Note that this creates wrong key types on reconstruction from core to xkb,
|
||||
i.e. any single-group key with a key type that is not one of the canonical
|
||||
four (Sec 12.2.3), will get the assigned type on group 1, and a canonical type
|
||||
for the other gruops.
|
||||
|
||||
X.Org Bug 14373 <http://bugs.freedesktop.org/show_bug.cgi?id=14373>
|
||||
---
|
||||
xkb/xkbUtils.c | 39 ++++++++++++++++++++++++++++++++++-----
|
||||
1 files changed, 34 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c
|
||||
index 8339cef..b5c0ac2 100644
|
||||
--- a/xkb/xkbUtils.c
|
||||
+++ b/xkb/xkbUtils.c
|
||||
@@ -486,6 +486,40 @@ CARD8 keysPerMod[XkbNumModifiers];
|
||||
if (groupWidth>2)
|
||||
nOut= groupWidth;
|
||||
}
|
||||
+
|
||||
+ /* See XKB Protocol Sec, Section 12.4.
|
||||
+ A 1-group key with ABCDE on a 2 group keyboard must be
|
||||
+ duplicated across all groups as ABABCDECDE.
|
||||
+ */
|
||||
+ if (nGroups == 1)
|
||||
+ {
|
||||
+ int idx;
|
||||
+
|
||||
+ groupWidth = XkbKeyGroupWidth(xkb, key, XkbGroup1Index);
|
||||
+
|
||||
+ /* AB..CDE... -> ABABCDE... */
|
||||
+ if (groupWidth > 0 && maxSymsPerKey >= 3)
|
||||
+ pCore[2] = pCore[0];
|
||||
+ if (groupWidth > 1 && maxSymsPerKey >= 4)
|
||||
+ pCore[3] = pCore[1];
|
||||
+
|
||||
+ /* ABABCDE... -> ABABCDECDE */
|
||||
+ idx = 2 + groupWidth;
|
||||
+ while (groupWidth > 2 &&
|
||||
+ idx < maxSymsPerKey &&
|
||||
+ idx < groupWidth * 2)
|
||||
+ {
|
||||
+ pCore[idx] = pCore[idx - groupWidth + 2];
|
||||
+ idx++;
|
||||
+ }
|
||||
+ idx = 2 * groupWidth;
|
||||
+ if (idx < 4)
|
||||
+ idx = 4;
|
||||
+ /* 3 or more groups: ABABCDECDEABCDEABCDE */
|
||||
+ for (n = 0; n < groupWidth && idx < maxSymsPerKey; n++)
|
||||
+ pCore[idx++] = pXKB[n];
|
||||
+ }
|
||||
+
|
||||
pXKB+= XkbKeyGroupsWidth(xkb,key);
|
||||
nOut+= 2;
|
||||
if (nGroups>1) {
|
||||
@@ -507,11 +541,6 @@ CARD8 keysPerMod[XkbNumModifiers];
|
||||
}
|
||||
pXKB+= XkbKeyGroupsWidth(xkb,key);
|
||||
}
|
||||
- if (!pCore[2] && !pCore[3] && maxSymsPerKey >= 6 &&
|
||||
- (pCore[4] || pCore[5])) {
|
||||
- pCore[2] = pCore[4];
|
||||
- pCore[3] = pCore[5];
|
||||
- }
|
||||
}
|
||||
if (keyc->modifierMap[key]!=0) {
|
||||
register unsigned bit,i,mask;
|
||||
--
|
||||
1.5.5.2
|
||||
|
||||
From cd6b5a8da00219a1f14a3ab498af416296398483 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Hutterer <peter.hutterer@redhat.com>
|
||||
Date: Mon, 22 Sep 2008 11:10:46 +0930
|
||||
Subject: [PATCH] xkb: squash canonical types into explicit ones on core reconstruction.
|
||||
|
||||
If we update key types from core, and groups 2 - n have a canonical type but
|
||||
the same symbols as the explicit type of group 1, assume that it was a core
|
||||
sym duplication according to Section 12.4 of the XKB Protocol Spec.
|
||||
Ignore the canonical types and pretend there's only one group for the key -
|
||||
with the explicit key type.
|
||||
---
|
||||
xkb/XKBMisc.c | 13 ++++++++++---
|
||||
1 files changed, 10 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/xkb/XKBMisc.c b/xkb/XKBMisc.c
|
||||
index 85415a4..ac81395 100644
|
||||
--- a/xkb/XKBMisc.c
|
||||
+++ b/xkb/XKBMisc.c
|
||||
@@ -178,16 +178,23 @@ int nGroups,tmp,groupsWidth;
|
||||
}
|
||||
}
|
||||
|
||||
- /* step 7: check for all groups identical or all width 1 */
|
||||
+ /* step 7: check for all groups identical or all width 1
|
||||
+ *
|
||||
+ * Special feature: if group 1 has an explicit type and all other groups
|
||||
+ * have canonical types with same symbols, we assume it's info lost from
|
||||
+ * the core replication.
|
||||
+ */
|
||||
if (nGroups>1) {
|
||||
- Bool sameType,allOneLevel;
|
||||
+ Bool sameType,allOneLevel, canonical = True;
|
||||
allOneLevel= (xkb->map->types[types_inout[0]].num_levels==1);
|
||||
for (i=1,sameType=True;(allOneLevel||sameType)&&(i<nGroups);i++) {
|
||||
sameType=(sameType&&(types_inout[i]==types_inout[XkbGroup1Index]));
|
||||
if (allOneLevel)
|
||||
allOneLevel= (xkb->map->types[types_inout[i]].num_levels==1);
|
||||
+ if (types_inout[i] > XkbLastRequiredType)
|
||||
+ canonical = False;
|
||||
}
|
||||
- if ((sameType)&&
|
||||
+ if (((sameType) || canonical)&&
|
||||
(!(protected&(XkbExplicitKeyTypesMask&~XkbExplicitKeyType1Mask)))){
|
||||
register int s;
|
||||
Bool identical;
|
||||
--
|
||||
1.5.5.2
|
||||
|
||||
@ -1,38 +0,0 @@
|
||||
From ce4ce1c26d9b7db94e36c72523ef2b05f0716287 Mon Sep 17 00:00:00 2001
|
||||
From: Adam Jackson <ajax@redhat.com>
|
||||
Date: Tue, 7 Oct 2008 13:45:58 -0400
|
||||
Subject: [PATCH] Plug int10 memory leak and shut up useless warnings.
|
||||
|
||||
---
|
||||
hw/xfree86/int10/helper_exec.c | 14 +-------------
|
||||
1 files changed, 1 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/hw/xfree86/int10/helper_exec.c b/hw/xfree86/int10/helper_exec.c
|
||||
index c3af5bc..fa1516b 100644
|
||||
--- a/hw/xfree86/int10/helper_exec.c
|
||||
+++ b/hw/xfree86/int10/helper_exec.c
|
||||
@@ -480,20 +480,8 @@ pci_device_for_cfg_address (CARD32 addr)
|
||||
pci_slot_match_iterator_create (&slot_match);
|
||||
if (iter)
|
||||
dev = pci_device_next(iter);
|
||||
- if (!dev) {
|
||||
- char buf[128]; /* enough to store "%u@%u" */
|
||||
- xf86FormatPciBusNumber(tag >> 16, buf);
|
||||
- ErrorF("Failed to find device matching %s:%u:%u\n",
|
||||
- buf, slot_match.dev, slot_match.func);
|
||||
- return NULL;
|
||||
- }
|
||||
|
||||
- if (pci_device_next(iter)) {
|
||||
- char buf[128]; /* enough to store "%u@%u" */
|
||||
- xf86FormatPciBusNumber(tag >> 16, buf);
|
||||
- ErrorF("Multiple devices matching %s:%u:%u\n",
|
||||
- buf, slot_match.dev, slot_match.func);
|
||||
- }
|
||||
+ pci_iterator_destroy(iter);
|
||||
|
||||
return dev;
|
||||
}
|
||||
--
|
||||
1.6.0.1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user