xorg-server: Changes to 'ubuntu'
debian/changelog | 13 +++++
debian/patches/157_fix_exa_pixmap_width.diff | 23 ++++++++++
debian/patches/158_xkb_wrapping.diff | 62 +++++++++++++++++++++++++++
debian/patches/series | 4 +
4 files changed, 101 insertions(+), 1 deletion(-)
New commits:
commit 3845b5c425c576d79dcb61fd1b03f2e05bba3d77
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Sun Mar 30 19:20:21 2008 +0300
Prepare the changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 473ebf4..f7d92eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.4.1~git20080131-1ubuntu6) UNRELEASED; urgency=low
+xorg-server (2:1.4.1~git20080131-1ubuntu6) hardy; urgency=low
* 157_fix_exa_pixmap_width.diff:
A patch from upstream to allow wider pixmaps with EXA (LP: #205599)
@@ -9,7 +9,7 @@ xorg-server (2:1.4.1~git20080131-1ubuntu6) UNRELEASED; urgency=low
Re-enable. Ignore SIGALRM around calls to Popen()/Pclose() to fix a hang
when opening menus in OpenOffice.org. (LP: #204137)
- -- Timo Aaltonen <tepsipakki@ubuntu.com> Sun, 30 Mar 2008 19:11:07 +0300
+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Sun, 30 Mar 2008 19:18:32 +0300
xorg-server (2:1.4.1~git20080131-1ubuntu5) hardy; urgency=low
commit a91b7549676185253aa19276b08409cb9f2910cd
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Sun Mar 30 19:12:47 2008 +0300
Re-enable 51_xkb-and-loathing.diff:
Ignore SIGALRM around calls to Popen()/Pclose() to fix a hang
when opening menus in OpenOffice.org. (LP: #204137)
diff --git a/debian/changelog b/debian/changelog
index 4471078..473ebf4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,11 @@ xorg-server (2:1.4.1~git20080131-1ubuntu6) UNRELEASED; urgency=low
* 158_xkb_wrapping.diff:
A patch reviewed by upstream that prevents keys from getting stuck under
certain situations. (LP: #194214)
+ * 51_xkb-and-loathing.diff:
+ Re-enable. Ignore SIGALRM around calls to Popen()/Pclose() to fix a hang
+ when opening menus in OpenOffice.org. (LP: #204137)
- -- Timo Aaltonen <tepsipakki@ubuntu.com> Sun, 30 Mar 2008 16:32:23 +0300
+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Sun, 30 Mar 2008 19:11:07 +0300
xorg-server (2:1.4.1~git20080131-1ubuntu5) hardy; urgency=low
diff --git a/debian/patches/series b/debian/patches/series
index 60626ea..83f6f69 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,7 +17,7 @@
44_preferredmode_infinite_loop.diff
45_only_XF86_APM_CAPABILITY_CHANGED_for_video_change_acpi_events.diff
#47_fbdevhw_magic_numbers.diff
-#51_xkb-and-loathing.diff
+51_xkb-and-loathing.diff
91_ttf2pt1
91_ttf2pt1_updates
92_xprint-security-holes-fix.patch
commit 0137b08e1da0d88382a6890046c745cade35946a
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Sun Mar 30 16:37:20 2008 +0300
158_xkb_wrapping.diff
A patch reviewed by upstream that prevents keys from getting stuck under
certain situations. (LP: #194214)
diff --git a/debian/changelog b/debian/changelog
index 93f89a5..4471078 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,11 @@ xorg-server (2:1.4.1~git20080131-1ubuntu6) UNRELEASED; urgency=low
* 157_fix_exa_pixmap_width.diff:
A patch from upstream to allow wider pixmaps with EXA (LP: #205599)
+ * 158_xkb_wrapping.diff:
+ A patch reviewed by upstream that prevents keys from getting stuck under
+ certain situations. (LP: #194214)
- -- Timo Aaltonen <tepsipakki@ubuntu.com> Sun, 30 Mar 2008 16:12:54 +0300
+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Sun, 30 Mar 2008 16:32:23 +0300
xorg-server (2:1.4.1~git20080131-1ubuntu5) hardy; urgency=low
diff --git a/debian/patches/158_xkb_wrapping.diff b/debian/patches/158_xkb_wrapping.diff
new file mode 100644
index 0000000..5d7bb60
--- /dev/null
+++ b/debian/patches/158_xkb_wrapping.diff
@@ -0,0 +1,62 @@
+diff --git a/include/xkbsrv.h b/include/xkbsrv.h
+index ef99e94..040bb93 100644
+--- a/include/xkbsrv.h
++++ b/include/xkbsrv.h
+@@ -237,6 +237,14 @@ typedef struct _XkbSrvLedInfo {
+ typedef struct
+ {
+ ProcessInputProc processInputProc;
++ /* If processInputProc is set to something different than realInputProc,
++ * UNWRAP and COND_WRAP will not touch processInputProc and update only
++ * realInputProc. This ensures that
++ * processInputProc == (frozen ? EnqueueEvent : realInputProc)
++ *
++ * WRAP_PROCESS_INPUT_PROC should only be called during initialization,
++ * since it may destroy this invariant.
++ */
+ ProcessInputProc realInputProc;
+ DeviceUnwrapProc unwrapProc;
+ } xkbDeviceInfoRec, *xkbDeviceInfoPtr;
+@@ -254,14 +262,14 @@ typedef struct
+ device->public.processInputProc = proc; \
+ oldprocs->processInputProc = \
+ oldprocs->realInputProc = device->public.realInputProc; \
+- if (proc != device->public.enqueueInputProc) \
+- device->public.realInputProc = proc; \
++ device->public.realInputProc = proc; \
+ oldprocs->unwrapProc = device->unwrapProc; \
+ device->unwrapProc = unwrapproc;
+
+ #define UNWRAP_PROCESS_INPUT_PROC(device, oldprocs, backupproc) \
+- backupproc = device->public.processInputProc; \
+- device->public.processInputProc = oldprocs->processInputProc; \
++ backupproc = device->public.realInputProc; \
++ if (device->public.processInputProc == device->public.realInputProc)\
++ device->public.processInputProc = oldprocs->realInputProc; \
+ device->public.realInputProc = oldprocs->realInputProc; \
+ device->unwrapProc = oldprocs->unwrapProc;
+
+diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c
+index 890cf42..8c72874 100644
+--- a/xkb/xkbActions.c
++++ b/xkb/xkbActions.c
+@@ -49,15 +49,14 @@ xkbUnwrapProc(DeviceIntPtr device, DeviceHandleProc proc,
+ pointer data)
+ {
+ xkbDeviceInfoPtr xkbPrivPtr = XKBDEVICEINFO(device);
+- ProcessInputProc tmp = device->public.processInputProc;
+- ProcessInputProc dummy; /* unused, but neede for macro */
++ ProcessInputProc backupproc;
+ if(xkbPrivPtr->unwrapProc)
+ xkbPrivPtr->unwrapProc = NULL;
+
+- UNWRAP_PROCESS_INPUT_PROC(device,xkbPrivPtr, dummy);
++ UNWRAP_PROCESS_INPUT_PROC(device,xkbPrivPtr, backupproc);
+ proc(device,data);
+- WRAP_PROCESS_INPUT_PROC(device,xkbPrivPtr,
+- tmp,xkbUnwrapProc);
++ COND_WRAP_PROCESS_INPUT_PROC(device,xkbPrivPtr,
++ backupproc,xkbUnwrapProc);
+ }
+
+
diff --git a/debian/patches/series b/debian/patches/series
index 2591414..60626ea 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -52,3 +52,4 @@
155_exa_fix_off-by-one.diff
156_resize_composite_overlay.diff
157_fix_exa_pixmap_width.diff
+158_xkb_wrapping.diff
commit fabab6995b1e38b5f88bae23345b078f5e58a0d1
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Sun Mar 30 16:18:13 2008 +0300
157_fix_exa_pixmap_width.diff
A patch from upstream to allow wider pixmaps with EXA (LP: #205599)
diff --git a/debian/changelog b/debian/changelog
index 01388d4..93f89a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.4.1~git20080131-1ubuntu6) UNRELEASED; urgency=low
+
+ * 157_fix_exa_pixmap_width.diff:
+ A patch from upstream to allow wider pixmaps with EXA (LP: #205599)
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Sun, 30 Mar 2008 16:12:54 +0300
+
xorg-server (2:1.4.1~git20080131-1ubuntu5) hardy; urgency=low
* Add some patches from upstream 1.4-branch or proposed set:
diff --git a/debian/patches/157_fix_exa_pixmap_width.diff b/debian/patches/157_fix_exa_pixmap_width.diff
new file mode 100644
index 0000000..74ab039
--- /dev/null
+++ b/debian/patches/157_fix_exa_pixmap_width.diff
@@ -0,0 +1,23 @@
+From bc2d516f16d94c805b4dfa8e5b9eef40ff0cbe98 Mon Sep 17 00:00:00 2001
+From: Eric Anholt <eric@anholt.net>
+Date: Fri, 17 Aug 2007 19:14:16 +0000
+Subject: Fix overly-restrictive integer overflow check in EXA pixmap creation.
+
+The result was that at 32bpp, pixmaps of width 8192 or greater couldn't be
+created, due to treating a pitch value as a width.
+---
+diff --git a/exa/exa.c b/exa/exa.c
+index aa42b92..b2faf2f 100644
+--- a/exa/exa.c
++++ b/exa/exa.c
+@@ -253,7 +253,7 @@ exaCreatePixmap(ScreenPtr pScreen, int w, int h, int depth)
+ pExaScr->info->pixmapPitchAlign);
+ pExaPixmap->fb_size = pExaPixmap->fb_pitch * h;
+
+- if (pExaPixmap->fb_pitch > 32767) {
++ if (pExaPixmap->fb_pitch > 131071) {
+ fbDestroyPixmap(pPixmap);
+ return NULL;
+ }
+--
+cgit v0.7.2-37-g538c
diff --git a/debian/patches/series b/debian/patches/series
index 173c089..2591414 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -51,3 +51,4 @@
154_fix_rotation_for_multimon.diff
155_exa_fix_off-by-one.diff
156_resize_composite_overlay.diff
+157_fix_exa_pixmap_width.diff
Reply to: