ChangeLog | 48 ++++++++++++++++++++
configure.ac | 4 -
debian/changelog | 7 ++
debian/patches/20-Revert-for-bug-30267.diff | 28 -----------
debian/patches/series | 1
dix/eventconvert.c | 9 ---
hw/xfree86/vbe/vbe.c | 66 +---------------------------
mi/mieq.c | 4 +
8 files changed, 64 insertions(+), 103 deletions(-)
New commits:
commit 95d0569810a71a0a943201bd78303cc8c50cd941
Author: Cyril Brulebois <k...@debian.org>
Date: Sat Oct 16 15:24:54 2010 +0200
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index 27230da..015d768 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xorg-server (2:1.9.0.902-1) UNRELEASED; urgency=low
+xorg-server (2:1.9.0.902-1) experimental; urgency=low
* New upstream release (1.9.1 rc2).
* Drop 20-Revert-for-bug-30267.diff, merged upstream.
- -- Cyril Brulebois <k...@debian.org> Sat, 16 Oct 2010 15:21:36 +0200
+ -- Cyril Brulebois <k...@debian.org> Sat, 16 Oct 2010 15:24:48 +0200
xorg-server (2:1.9.0.901-1) experimental; urgency=low
commit 9792b88b384dc53f4aca5bcf9706d57792d38703
Author: Cyril Brulebois <k...@debian.org>
Date: Sat Oct 16 15:23:10 2010 +0200
Drop 20-Revert-for-bug-30267.diff, merged upstream.
diff --git a/debian/changelog b/debian/changelog
index 22cef8e..27230da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xorg-server (2:1.9.0.902-1) UNRELEASED; urgency=low
* New upstream release (1.9.1 rc2).
+ * Drop 20-Revert-for-bug-30267.diff, merged upstream.
-- Cyril Brulebois <k...@debian.org> Sat, 16 Oct 2010 15:21:36 +0200
diff --git a/debian/patches/20-Revert-for-bug-30267.diff
b/debian/patches/20-Revert-for-bug-30267.diff
deleted file mode 100644
index f0a5137..0000000
--- a/debian/patches/20-Revert-for-bug-30267.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-commit e97d9ed9a9d71abe285f9f91cfce9fe0f0f72298
-Author: Cyril Brulebois <k...@debian.org>
-Date: Mon Oct 11 00:47:26 2010 +0200
-
- Revert "dix: don't create core motion events for non-x/y valuators."
-
- This reverts commit d4ef63f602325a9920dc1cbf64e3969dfa394d5f.
-
-diff --git a/dix/eventconvert.c b/dix/eventconvert.c
-index 0f747c1..4e3de0b 100644
---- a/dix/eventconvert.c
-+++ b/dix/eventconvert.c
-@@ -102,15 +102,6 @@ EventToCore(InternalEvent *event, xEvent *core)
- switch(event->any.type)
- {
- case ET_Motion:
-- {
-- DeviceEvent *e = &event->device_event;
-- /* Don't create core motion event if neither x nor y are
-- * present */
-- if (!BitIsOn(e->valuators.mask, 0) &&
-- !BitIsOn(e->valuators.mask, 1))
-- return BadMatch;
-- }
-- /* fallthrough */
- case ET_ButtonPress:
- case ET_ButtonRelease:
- case ET_KeyPress:
diff --git a/debian/patches/series b/debian/patches/series
index 3f8b683..adf3c9c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,4 +7,3 @@
#13_debian_add_xkbpath_env_variable.diff
15-nouveau.diff
16-xaa-fbcomposite-fix-negative-size.diff
-20-Revert-for-bug-30267.diff
commit 91800fd8caa937336c4a2c4b7de3ea1d98e19dc3
Author: Cyril Brulebois <k...@debian.org>
Date: Sat Oct 16 15:22:19 2010 +0200
Update changelogs.
diff --git a/ChangeLog b/ChangeLog
index 7dca8b7..6aeeb43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,51 @@
+commit 4dd316f25261707620cd4c52e2987b93627ff260
+Author: Jeremy Huddleston <jerem...@apple.com>
+Date: Fri Oct 15 11:08:42 2010 -0700
+
+ Bump version to 1.9.0.902 (1.9.1 rc2)
+
+ Signed-off-by: Jeremy Huddleston <jerem...@apple.com>
+
+commit 712853fbcbc644575d791fa48fbd5757cd850f1d
+Author: Jon TURNEY <jon.tur...@dronecode.org.uk>
+Date: Wed Oct 13 17:34:31 2010 +0100
+
+ event_size is currently never assigned to in mieqProcessInputEvents().
+
+ event_size is never assigned to in mieqProcessInputEvents(), so realloc()
+ is always called. This is benign, but I'm guessing not intended.
+
+ Signed-off-by: Jon TURNEY <jon.tur...@dronecode.org.uk>
+ Reviewed-by: Keith Packard <kei...@keithp.com>
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+ (cherry picked from commit da4eebe58ec81e2297cc1773af1fb622fb392bbd)
+
+commit efeb2ebd7e307224a735469ff89a3a6af4cf143b
+Author: Adam Jackson <a...@redhat.com>
+Date: Tue Oct 5 11:24:28 2010 -0400
+
+ vbe: Fix copying the mode info block
+
+ Just use memcpy, seriously.
+
+ Reviewed-by: Rémi Cardona <r...@gentoo.org>
+ Signed-off-by: Adam Jackson <a...@redhat.com>
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+ (cherry picked from commit 853d7ebfa3e2d281d92890a39010ff5787a00ffd)
+
+commit e5b19f14eac609e3c315e14e20ca1935de8de0e3
+Author: Jeremy Huddleston <jerem...@apple.com>
+Date: Tue Oct 12 17:42:55 2010 -0700
+
+ Revert "dix: don't create core motion events for non-x/y valuators."
+
+ Reverting due to fallout discussed in bug #30267. See:
+ https://bugs.freedesktop.org/show_bug.cgi?id=30267
+
+ This reverts commit d4ef63f602325a9920dc1cbf64e3969dfa394d5f.
+
+ Signed-off-by: Jeremy Huddleston <jerem...@apple.com>
+
commit 8ab87dc7ff48d4db8e5f95a74df627dac9c53c0a
Author: Jeremy Huddleston <jerem...@apple.com>
Date: Fri Oct 1 13:37:49 2010 -0700
diff --git a/debian/changelog b/debian/changelog
index 7c01823..22cef8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.9.0.902-1) UNRELEASED; urgency=low
+
+ * New upstream release (1.9.1 rc2).
+
+ -- Cyril Brulebois <k...@debian.org> Sat, 16 Oct 2010 15:21:36 +0200
+
xorg-server (2:1.9.0.901-1) experimental; urgency=low
[ Christopher James Halse Rogers ]
commit 4dd316f25261707620cd4c52e2987b93627ff260
Author: Jeremy Huddleston <jerem...@apple.com>
Date: Fri Oct 15 11:08:42 2010 -0700
Bump version to 1.9.0.902 (1.9.1 rc2)
Signed-off-by: Jeremy Huddleston <jerem...@apple.com>
diff --git a/configure.ac b/configure.ac
index 407a058..fd533a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,8 +26,8 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.9.0.901,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2010-10-01"
+AC_INIT([xorg-server], 1.9.0.902,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2010-10-15"
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit 712853fbcbc644575d791fa48fbd5757cd850f1d
Author: Jon TURNEY <jon.tur...@dronecode.org.uk>
Date: Wed Oct 13 17:34:31 2010 +0100
event_size is currently never assigned to in mieqProcessInputEvents().
event_size is never assigned to in mieqProcessInputEvents(), so realloc()
is always called. This is benign, but I'm guessing not intended.
Signed-off-by: Jon TURNEY <jon.tur...@dronecode.org.uk>
Reviewed-by: Keith Packard <kei...@keithp.com>
Signed-off-by: Keith Packard <kei...@keithp.com>
(cherry picked from commit da4eebe58ec81e2297cc1773af1fb622fb392bbd)
diff --git a/mi/mieq.c b/mi/mieq.c
index fa60b40..d1441e2 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -439,7 +439,11 @@ mieqProcessInputEvents(void)
evlen = e->events->evlen;
if(evlen > event_size)
+ {
event = realloc(event, evlen);
+ event_size = evlen;
+ }
+
if (!event)
FatalError("[mi] No memory left for event processing.\n");
commit efeb2ebd7e307224a735469ff89a3a6af4cf143b
Author: Adam Jackson <a...@redhat.com>
Date: Tue Oct 5 11:24:28 2010 -0400
vbe: Fix copying the mode info block
Just use memcpy, seriously.
Reviewed-by: Rémi Cardona <r...@gentoo.org>
Signed-off-by: Adam Jackson <a...@redhat.com>
Signed-off-by: Keith Packard <kei...@keithp.com>
(cherry picked from commit 853d7ebfa3e2d281d92890a39010ff5787a00ffd)
diff --git a/hw/xfree86/vbe/vbe.c b/hw/xfree86/vbe/vbe.c
index 0b34648..7a64a4a 100644
--- a/hw/xfree86/vbe/vbe.c
+++ b/hw/xfree86/vbe/vbe.c
@@ -527,69 +527,9 @@ VBEGetModeInfo(vbeInfoPtr pVbe, int mode)
if (R16(pVbe->pInt10->ax) != 0x4f)
return NULL;
- block = calloc(sizeof(VbeModeInfoBlock), 1);
-
- block->ModeAttributes = *(CARD16*)pVbe->memory;
- block->WinAAttributes = ((char*)pVbe->memory)[2];
- block->WinBAttributes = ((char*)pVbe->memory)[3];
- block->WinGranularity = *(CARD16*)(((char*)pVbe->memory) + 4);
- block->WinSize = *(CARD16*)(((char*)pVbe->memory) + 6);
- block->WinASegment = *(CARD16*)(((char*)pVbe->memory) + 8);
- block->WinBSegment = *(CARD16*)(((char*)pVbe->memory) + 10);
- block->WinFuncPtr = *(CARD32*)(((char*)pVbe->memory) + 12);
- block->BytesPerScanline = *(CARD16*)(((char*)pVbe->memory) + 16);
-
- /* mandatory information for VBE 1.2 and above */
- block->XResolution = *(CARD16*)(((char*)pVbe->memory) + 18);
- block->YResolution = *(CARD16*)(((char*)pVbe->memory) + 20);
- block->XCharSize = ((char*)pVbe->memory)[22];
- block->YCharSize = ((char*)pVbe->memory)[23];
- block->NumberOfPlanes = ((char*)pVbe->memory)[24];
- block->BitsPerPixel = ((char*)pVbe->memory)[25];
- block->NumberOfBanks = ((char*)pVbe->memory)[26];
- block->MemoryModel = ((char*)pVbe->memory)[27];
- block->BankSize = ((char*)pVbe->memory)[28];
- block->NumberOfImages = ((char*)pVbe->memory)[29];
- block->Reserved = ((char*)pVbe->memory)[30];
-
- /* Direct color fields (required for direct/6 and YUV/7 memory models) */
- block->RedMaskSize = ((char*)pVbe->memory)[31];
- block->RedFieldPosition = ((char*)pVbe->memory)[32];
- block->GreenMaskSize = ((char*)pVbe->memory)[33];
- block->GreenFieldPosition = ((char*)pVbe->memory)[34];
- block->BlueMaskSize = ((char*)pVbe->memory)[35];
- block->BlueFieldPosition = ((char*)pVbe->memory)[36];
- block->RsvdMaskSize = ((char*)pVbe->memory)[37];
- block->RsvdFieldPosition = ((char*)pVbe->memory)[38];
- block->DirectColorModeInfo = ((char*)pVbe->memory)[39];
-
- /* Mandatory information for VBE 2.0 and above */
- if (pVbe->version >= 0x200) {
- block->PhysBasePtr = *(CARD32*)(((char*)pVbe->memory) + 40);
- block->Reserved32 = *(CARD32*)(((char*)pVbe->memory) + 44);
- block->Reserved16 = *(CARD16*)(((char*)pVbe->memory) + 48);
-
- /* Mandatory information for VBE 3.0 and above */
- if (pVbe->version >= 0x300) {
- block->LinBytesPerScanLine = *(CARD16*)(((char*)pVbe->memory) + 50);
- block->BnkNumberOfImagePages = ((char*)pVbe->memory)[52];
- block->LinNumberOfImagePages = ((char*)pVbe->memory)[53];
- block->LinRedMaskSize = ((char*)pVbe->memory)[54];
- block->LinRedFieldPosition = ((char*)pVbe->memory)[55];
- block->LinGreenMaskSize = ((char*)pVbe->memory)[56];
- block->LinGreenFieldPosition = ((char*)pVbe->memory)[57];
- block->LinBlueMaskSize = ((char*)pVbe->memory)[58];
- block->LinBlueFieldPosition = ((char*)pVbe->memory)[59];
- block->LinRsvdMaskSize = ((char*)pVbe->memory)[60];
- block->LinRsvdFieldPosition = ((char*)pVbe->memory)[61];
- block->MaxPixelClock = *(CARD32*)(((char*)pVbe->memory) + 62);
- memcpy(&block->Reserved2, ((char*)pVbe->memory) + 66, 188);
- }
- else
- memcpy(&block->LinBytesPerScanLine, ((char*)pVbe->memory) + 50, 206);
- }
- else
- memcpy(&block->PhysBasePtr, ((char*)pVbe->memory) + 40, 216);
+ block = malloc(sizeof(VbeModeInfoBlock));
+ if (block)
+ memcpy(block, pVbe->memory, sizeof(*block));
return block;
}
commit e5b19f14eac609e3c315e14e20ca1935de8de0e3
Author: Jeremy Huddleston <jerem...@apple.com>
Date: Tue Oct 12 17:42:55 2010 -0700
Revert "dix: don't create core motion events for non-x/y valuators."
Reverting due to fallout discussed in bug #30267. See:
https://bugs.freedesktop.org/show_bug.cgi?id=30267
This reverts commit d4ef63f602325a9920dc1cbf64e3969dfa394d5f.
Signed-off-by: Jeremy Huddleston <jerem...@apple.com>
diff --git a/dix/eventconvert.c b/dix/eventconvert.c
index 0f747c1..4e3de0b 100644
--- a/dix/eventconvert.c
+++ b/dix/eventconvert.c
@@ -102,15 +102,6 @@ EventToCore(InternalEvent *event, xEvent *core)
switch(event->any.type)
{
case ET_Motion:
- {
- DeviceEvent *e = &event->device_event;
- /* Don't create core motion event if neither x nor y are
- * present */
- if (!BitIsOn(e->valuators.mask, 0) &&
- !BitIsOn(e->valuators.mask, 1))
- return BadMatch;
- }
- /* fallthrough */
case ET_ButtonPress:
case ET_ButtonRelease:
case ET_KeyPress:
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1p778f-0003aj...@alioth.debian.org
