ChangeLog | 518 +
Xi/exevents.c | 11
Xi/extinit.c | 2
Xi/xipassivegrab.c | 16
configure.ac | 6
dbe/dbe.c | 25
debian/changelog | 107
debian/control | 2
debian/inputabiver | 1
debian/patches/121_only_switch_vt_when_active.diff | 36
debian/patches/20-workaround-36986.diff | 14
debian/patches/215_glx_drawable_refcounting.diff | 113
debian/patches/500_xi2.1.patch | 52
debian/patches/series | 3
debian/rules | 9
debian/videoabiver | 1
debian/xserver-xorg-dev.install | 4
dix/devices.c | 47
dix/main.c | 25
dix/ptrveloc.c | 2
glx/Makefile.am | 6
glx/glapi.c | 558 -
glx/glapi.h | 28
glx/glapitemp.h | 6655 ---------------------
glx/glxcmds.c | 109
glx/glxdri2.c | 1
glx/glxdriswrast.c | 8
glx/glxext.c | 53
glx/glxserver.h | 7
hw/xfree86/Makefile.am | 2
hw/xquartz/GL/indirect.c | 9
hw/xquartz/X11Application.m | 2
hw/xquartz/applewmExt.h | 13
hw/xquartz/bundle/Info.plist.cpp | 4
hw/xquartz/darwinEvents.c | 28
hw/xquartz/mach-startup/bundle-main.c | 47
hw/xquartz/pbproxy/app-main.m | 6
hw/xquartz/pbproxy/main.m | 16
hw/xquartz/pbproxy/x-selection.m | 11
hw/xquartz/quartz.c | 15
hw/xquartz/quartzRandR.c | 219
hw/xquartz/xpr/xprAppleWM.c | 4
hw/xquartz/xpr/xprScreen.c | 1
include/input.h | 5
include/inputstr.h | 2
mi/mieq.c | 16
miext/rootless/rootlessScreen.c | 2
os/access.c | 2
os/log.c | 4
os/xstrans.c | 5
record/record.c | 2
test/input.c | 24
52 files changed, 1112 insertions(+), 7746 deletions(-)
New commits:
commit 68799ef241c38ff735a95e9192896c674cf9ca60
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Tue May 31 17:29:28 2011 +0300
XC-SECURITY is enabled in debian, drop the diff
diff --git a/debian/changelog b/debian/changelog
index 7455532..8ff744b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,6 @@ xorg-server (2:1.10.2-1ubuntu1) UNRELEASED; urgency=low
* Merge from Debian unstable, remaining changes:
- rules:
+ Disable SELinux, libaudit-dev is not in main yet. (LP #406226)
- + Enable xcsecurity. (LP #247537)
+ Add --with-extra-module-dir to support GL alternatives.
+ Mention Ubuntu support in builderstring rather than package uploader's
email address.
diff --git a/debian/rules b/debian/rules
index c15f518..2f6bc12 100755
--- a/debian/rules
+++ b/debian/rules
@@ -108,6 +108,7 @@ confflags += \
--disable-install-libxf86config \
--enable-mitshm \
--enable-xres \
+ --disable-xcsecurity \
--disable-xcalibrate \
--disable-tslib \
--enable-dbe \
@@ -136,7 +137,6 @@ confflags_main = \
--enable-xdm-auth-1 \
--enable-glx \
$(dri) \
- --enable-xcsecurity \
--enable-xinerama \
--enable-xf86vidmode \
--enable-xace \
@@ -164,7 +164,6 @@ confflags_udeb = \
--disable-xvmc \
--enable-dga \
--disable-screensaver \
- --disable-xcsecurity \
--disable-xdmcp \
--disable-xdm-auth-1 \
--disable-glx \
commit cd9fb4e60be76f71a19982d5f882fcfda3d8acc6
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Tue May 31 17:22:52 2011 +0300
videoabiver, inputabiver, xserver-xorg-dev.install: Drop changes that are
obsolete post-natty.
diff --git a/debian/changelog b/debian/changelog
index 725c089..7455532 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -77,6 +77,8 @@ xorg-server (2:1.10.2-1ubuntu1) UNRELEASED; urgency=low
upstream.
* Drop patch 121_only_switch_vt_when_active.diff, doesn't seem to
work anymore.
+ * videoabiver, inputabiver, xserver-xorg-dev.install:
+ Drop changes that are obsolete post-natty.
-- Timo Aaltonen <tjaal...@ubuntu.com> Tue, 31 May 2011 14:12:19 +0300
diff --git a/debian/inputabiver b/debian/inputabiver
deleted file mode 100644
index 48082f7..0000000
--- a/debian/inputabiver
+++ /dev/null
@@ -1 +0,0 @@
-12
diff --git a/debian/videoabiver b/debian/videoabiver
deleted file mode 100644
index f599e28..0000000
--- a/debian/videoabiver
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/debian/xserver-xorg-dev.install b/debian/xserver-xorg-dev.install
index c08fa52..9ec3c60 100644
--- a/debian/xserver-xorg-dev.install
+++ b/debian/xserver-xorg-dev.install
@@ -4,7 +4,3 @@ main/usr/share/aclocal usr/share
../../debian/local/dh_xsf_substvars usr/bin
../../debian/local/xsf.pm /usr/share/perl5/Debian/Debhelper/Sequence/
-
-# Temporary, so we don't have a driver flag day:
-../../debian/inputabiver usr/share/xserver-xorg
-../../debian/videoabiver usr/share/xserver-xorg
commit f0f2af0ef23b455ed82190287b385b04fd21fd77
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Tue May 31 17:16:41 2011 +0300
Drop patch 121_only_switch_vt_when_active.diff, doesn't seem to work
anymore.
diff --git a/debian/changelog b/debian/changelog
index 2d8ede7..725c089 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,9 +27,6 @@ xorg-server (2:1.10.2-1ubuntu1) UNRELEASED; urgency=low
resume. (LP #371405)
+ 111_armel-drv-fallbacks.patch:
Add support for armel driver fallbacks.
- + 121_only_switch_vt_when_active.diff:
- Add a check to prevent the X server from changing the VT when killing
- GDM from the console.
+ 122_xext_fix_card32_overflow_in_xauth.patch:
Fix server crash when “xauth generate” is called with large timeout.
+ 157_check_null_modes.patch, 162_null_crtc_in_rotation.patch,
@@ -78,6 +75,8 @@ xorg-server (2:1.10.2-1ubuntu1) UNRELEASED; urgency=low
Fix masked transformed valuator handling (LP #774938)
* Drop patch 215_glx_drawable_refcounting.diff, similar fix included
upstream.
+ * Drop patch 121_only_switch_vt_when_active.diff, doesn't seem to
+ work anymore.
-- Timo Aaltonen <tjaal...@ubuntu.com> Tue, 31 May 2011 14:12:19 +0300
diff --git a/debian/patches/121_only_switch_vt_when_active.diff
b/debian/patches/121_only_switch_vt_when_active.diff
deleted file mode 100644
index 14c06e5..0000000
--- a/debian/patches/121_only_switch_vt_when_active.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: xorg-server/hw/xfree86/os-support/linux/lnx_init.c
-===================================================================
---- xorg-server.orig/hw/xfree86/os-support/linux/lnx_init.c 2011-04-09
10:36:57.000000000 +0300
-+++ xorg-server/hw/xfree86/os-support/linux/lnx_init.c 2011-04-09
10:44:31.000000000 +0300
-@@ -273,11 +273,26 @@
-
- if (VTSwitch)
- {
-- /*
-- * Perform a switch back to the active VT when we were started
-- */
-- if (activeVT >= 0) {
-- switch_to(activeVT, "xf86CloseConsole");
-+ struct vt_stat vts;
-+
-+ /*
-+ * Perform a switch back to the active VT when we were started.
-+ * We cannot rely on vtSema to determine if the server was the
-+ * active VT at the time of shutdown since it has already been
-+ * released. Instead, we manually check the current VT and
-+ * compare it with the VT we were running on.
-+ */
-+ if (ioctl(xf86Info.consoleFd, VT_GETSTATE, &vts) < 0)
-+ {
-+ /* If this failed, fall back to old behaviour
-+ * of always switching. */
-+ xf86Msg(X_WARNING,"xf86OpenConsole: VT_GETSTATE failed: %s\n",
-+ strerror(errno));
-+ vts.v_active = xf86Info.vtno;
-+ }
-+
-+ if (activeVT >= 0 && vts.v_active == xf86Info.vtno) {
-+ switch_to(activeVT, "xf86CloseConsole");
- activeVT = -1;
- }
- }
diff --git a/debian/patches/series b/debian/patches/series
index 6d5ffcb..868040d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,7 +11,6 @@
100_rethrow_signals.patch
105_nvidia_fglrx_autodetect.patch
111_armel-drv-fallbacks.patch
-121_only_switch_vt_when_active.diff
122_xext_fix_card32_overflow_in_xauth.patch
157_check_null_modes.patch
162_null_crtc_in_rotation.patch
commit 1983781e982509368674e66548f76a65d9f97137
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Tue May 31 17:13:15 2011 +0300
Drop patch 215, refresh 500_xi2.1.patch to apply
update the changelog as well.
diff --git a/debian/changelog b/debian/changelog
index d347675..2d8ede7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,86 @@
+xorg-server (2:1.10.2-1ubuntu1) UNRELEASED; urgency=low
+
+ * Merge from Debian unstable, remaining changes:
+ - rules:
+ + Disable SELinux, libaudit-dev is not in main yet. (LP #406226)
+ + Enable xcsecurity. (LP #247537)
+ + Add --with-extra-module-dir to support GL alternatives.
+ + Mention Ubuntu support in builderstring rather than package uploader's
+ email address.
+ + Enable multitouch gestures.
+ - control:
+ + Xvfb depends on xauth, x11-xkb-utils, recommends libgl1-mesa-dri.
+ (LP #500102)
+ + Add breaks for incompatible drivers. (LP #614993)
+ + Drop libaudit-dev from build-deps.
+ + Build-depend on newer mesa to pick up DRI search paths variable.
+ + Bump dependency on x11proto-input-dev for Xi 2.1
+ + Drop linux-any specifier to make pbuilder less narky.
+ - local/xvfb-run*: Add correct docs about error codes. (LP #328205)
+ - debian/patches:
+ + 100_rethrow_signals.patch:
+ When aborting, re-raise signals for apport
+ + 105_nvidia_fglrx_autodetect.patch:
+ Load proprietary drivers automatically when installed.
+ + 109_fix-swcursor-crash.patch:
+ Avoid dereferencing null pointer while reloading cursors during
+ resume. (LP #371405)
+ + 111_armel-drv-fallbacks.patch:
+ Add support for armel driver fallbacks.
+ + 121_only_switch_vt_when_active.diff:
+ Add a check to prevent the X server from changing the VT when killing
+ GDM from the console.
+ + 122_xext_fix_card32_overflow_in_xauth.patch:
+ Fix server crash when “xauth generate” is called with large timeout.
+ + 157_check_null_modes.patch, 162_null_crtc_in_rotation.patch,
+ 166_nullptr_xinerama_keyrepeat.patch, 167_nullptr_xisbread.patch
+ 172_cwgetbackingpicture_nullptr_check.patch:
+ Fix various segfaults in xserver by checking pointers for NULL
+ values before dereferencing them.
+ + 165_man_xorg_conf_no_device_ident.patch
+ Correct man page
+ + 168_glibc_trace_to_stderr.patch:
+ Report abort traces to stderr instead of terminal
+ + 188_default_primary_to_first_busid.patch:
+ Pick the first device and carry on (LP #459512)
+ + 190_cache-xkbcomp_output_for_fast_start_up.patch:
+ Cache keyboard settings.
+ + 191-Xorg-add-an-extra-module-path.patch:
+ Add support for the alternative module path.
+ + 198_nohwaccess.patch:
+ Adds a -nohwaccess argument to make X not access the hardware
+ ports directly.
+ + 200_randr-null.patch:
+ Clarify a pointer initialization.
+ + 206_intel_8xx_default_to_fbdev.patch:
+ Makes 8xx class intel GPUs default to fbdev for stability. (LP #633593)
+ + 208_switch_on_release.diff:
+ Switch keyboard layouts on key-release rather than key-press
+ (LP #36812)
+ + 209_add_legacy_bgnone_option.patch:
+ Add -nr as a synonym for -background none until all ?DM are updated for
+ the new option.
+ + 210_pixman_null_ptr_check.patch:
+ Catch NULL pointer access after pixman_image_create_bits() failure
+ (LP #705078)
+ + 214_glx_dri_searchdirs.patch:
+ Search in same paths as mesa for DRI drivers for AIGLX so we can handle
+ UMS fallback for radeon gracefully.
+ + 217_revert_bgnonevisitwindow.patch:
+ Revert a commit that causes brief graphical corruption. (LP: 726807)
+ + 218_randr-check-rotated-virtual-size-limits-correctly.diff:
+ Fix rotation with nvidia driver. (LP: 740933)
+ + 500_xi2.1.patch,
+ 501_xf86CoordinatesToWindow.patch,
+ 502_gestures-extension.patch:
+ Add Xi 2.1 and Gesture extension support.
+ + 503_fix_masked_transformed_valuators.patch:
+ Fix masked transformed valuator handling (LP #774938)
+ * Drop patch 215_glx_drawable_refcounting.diff, similar fix included
+ upstream.
+
+ -- Timo Aaltonen <tjaal...@ubuntu.com> Tue, 31 May 2011 14:12:19 +0300
+
xorg-server (2:1.10.2-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/patches/215_glx_drawable_refcounting.diff
b/debian/patches/215_glx_drawable_refcounting.diff
deleted file mode 100644
index 67096ff..0000000
--- a/debian/patches/215_glx_drawable_refcounting.diff
+++ /dev/null
@@ -1,113 +0,0 @@
-From: Chris Wilson <ch...@chris-wilson.co.uk>
-Subject: [PATCH] glx: Refcnt the GLXDrawable to avoid use after free with
- multiple FreeResource
-
-Although there may be more than one resource handles pointing to the
-Drawable, we only want to destroy it once and only reference the
-resource which may have just been deleted on the first instance.
-
-v2: Apply fixes and combine with another bug fix from Michel Dänzer,
- https://bugs.freedesktop.org/show_bug.cgi?id=28181
-
-Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
-Cc: Kristian Høgsberg <k...@bitplanet.net>
-Cc: Michel Dänzer <daen...@vmware.com>
----
- glx/glxcmds.c | 23 +++++++++++++++--------
- glx/glxdrawable.h | 3 +++
- glx/glxext.c | 15 ++++++++++-----
- 3 files changed, 28 insertions(+), 13 deletions(-)
-
-Index: xorg-server/glx/glxcmds.c
-===================================================================
---- xorg-server.orig/glx/glxcmds.c 2011-04-06 18:25:24.000000000 +0300
-+++ xorg-server/glx/glxcmds.c 2011-04-09 10:39:42.000000000 +0300
-@@ -541,6 +541,7 @@
- *error = BadAlloc;
- return NULL;
- }
-+ pGlxDraw->refcnt++;
-
- return pGlxDraw;
- }
-@@ -1145,8 +1146,10 @@
- drawable->pDraw = pDraw;
- drawable->type = type;
- drawable->drawId = drawId;
-+ drawable->otherId = 0;
- drawable->config = config;
- drawable->eventMask = 0;
-+ drawable->refcnt = 0;
-
- return GL_TRUE;
- }
-@@ -1176,14 +1179,18 @@
- pGlxDraw->destroy (pGlxDraw);
- return BadAlloc;
- }
-+ pGlxDraw->refcnt++;
-
-- /* Add the glx drawable under the XID of the underlying X drawable
-- * too. That way we'll get a callback in DrawableGone and can
-- * clean up properly when the drawable is destroyed. */
-- if (drawableId != glxDrawableId &&
-- !AddResource(pDraw->id, __glXDrawableRes, pGlxDraw)) {
-- pGlxDraw->destroy (pGlxDraw);
-- return BadAlloc;
-+ if (drawableId != glxDrawableId) {
-+ /* Add the glx drawable under the XID of the underlying X drawable
-+ * too. That way we'll get a callback in DrawableGone and can
-+ * clean up properly when the drawable is destroyed. */
-+ if (!AddResource(drawableId, __glXDrawableRes, pGlxDraw)) {
-+ pGlxDraw->destroy (pGlxDraw);
-+ return BadAlloc;
-+ }
-+ pGlxDraw->refcnt++;
-+ pGlxDraw->otherId = drawableId;
- }
-
- return Success;
-Index: xorg-server/glx/glxdrawable.h
-===================================================================
---- xorg-server.orig/glx/glxdrawable.h 2011-04-06 18:25:24.000000000 +0300
-+++ xorg-server/glx/glxdrawable.h 2011-04-09 10:39:42.000000000 +0300
-@@ -51,8 +51,11 @@
- void (*waitX)(__GLXdrawable *);
- void (*waitGL)(__GLXdrawable *);
-
-+ int refcnt; /* number of resources handles referencing this */
-+
- DrawablePtr pDraw;
- XID drawId;
-+ XID otherId; /* for glx1.3 we need to track the original Drawable as well
*/
-
- /*
- ** Either GLX_DRAWABLE_PIXMAP, GLX_DRAWABLE_WINDOW or
-Index: xorg-server/glx/glxext.c
-===================================================================
---- xorg-server.orig/glx/glxext.c 2011-04-06 18:25:24.000000000 +0300
-+++ xorg-server/glx/glxext.c 2011-04-09 10:39:42.000000000 +0300
-@@ -128,13 +128,18 @@
- * constructors, we added it as a glx drawable resource under both
- * its glx drawable ID and it X drawable ID. Remove the other
- * resource now so we don't a callback for freed memory. */
-- if (glxPriv->drawId != glxPriv->pDraw->id) {
-- if (xid == glxPriv->drawId)
-- FreeResourceByType(glxPriv->pDraw->id, __glXDrawableRes, TRUE);
-- else
-- FreeResourceByType(glxPriv->drawId, __glXDrawableRes, TRUE);
-+ if (glxPriv->otherId) {
-+ XID other = glxPriv->otherId;
-+ glxPriv->otherId = 0;
-+ if (xid == other)
-+ FreeResourceByType(glxPriv->drawId, __glXDrawableRes, TRUE);
-+ else
-+ FreeResourceByType(other, __glXDrawableRes, TRUE);
- }
-
-+ if (--glxPriv->refcnt)
-+ return True;
-+
- for (c = glxAllContexts; c; c = next) {
- next = c->next;
- if (c->isCurrent && (c->drawPriv == glxPriv || c->readPriv == glxPriv))
{
diff --git a/debian/patches/500_xi2.1.patch b/debian/patches/500_xi2.1.patch
index 56d3916..6dc7c66 100644
--- a/debian/patches/500_xi2.1.patch
+++ b/debian/patches/500_xi2.1.patch
@@ -94,7 +94,7 @@ Index: xorg-server/Xi/exevents.c
/**
* @return the device matching the deviceid of the device set in the event, or
* NULL if the event is not an XInput event.
-@@ -725,6 +767,46 @@
+@@ -722,6 +764,46 @@
XISendDeviceChangedEvent(slave, device, dce);
}
@@ -141,7 +141,7 @@ Index: xorg-server/Xi/exevents.c
/**
* Update the device state according to the data in the event.
*
-@@ -732,8 +814,6 @@
+@@ -729,8 +811,6 @@
* DEFAULT ... process as normal
* DONT_PROCESS ... return immediately from caller
*/
@@ -150,7 +150,7 @@ Index: xorg-server/Xi/exevents.c
int
UpdateDeviceState(DeviceIntPtr device, DeviceEvent* event)
{
-@@ -857,34 +937,9 @@
+@@ -854,34 +934,9 @@
if (!button_is_down(device, key, BUTTON_PROCESSED))
return DONT_PROCESS;
@@ -186,7 +186,7 @@ Index: xorg-server/Xi/exevents.c
/* Add state and motionMask to the filter for this event */
mask = DevicePointerMotionMask | b->state | b->motionMask;
-@@ -926,6 +981,955 @@
+@@ -923,6 +978,955 @@
}
/**
@@ -1142,7 +1142,7 @@ Index: xorg-server/Xi/exevents.c
* Main device event processing function.
* Called from when processing the events from the event queue.
*
-@@ -954,6 +1958,33 @@
+@@ -951,6 +1955,33 @@
{
ProcessRawEvent(&ev->raw_event, device);
return;
@@ -1176,7 +1176,7 @@ Index: xorg-server/Xi/exevents.c
}
if (IsPointerDevice(device))
-@@ -1152,6 +2183,50 @@
+@@ -1149,6 +2180,50 @@
dev->proximity->in_proximity = FALSE;
}
@@ -1227,7 +1227,7 @@ Index: xorg-server/Xi/exevents.c
static void
FixDeviceStateNotify(DeviceIntPtr dev, deviceStateNotify * ev, KeyClassPtr k,
ButtonClassPtr b, ValuatorClassPtr v, int first)
-@@ -1562,6 +2637,38 @@
+@@ -1559,6 +2634,38 @@
return AddPassiveGrabToList(client, grab);
}
@@ -1266,7 +1266,7 @@ Index: xorg-server/Xi/exevents.c
int
SelectForWindow(DeviceIntPtr dev, WindowPtr pWin, ClientPtr client,
Mask mask, Mask exclusivemasks)
-@@ -1699,10 +2806,65 @@
+@@ -1696,10 +2803,65 @@
}
}
@@ -1332,7 +1332,7 @@ Index: xorg-server/Xi/exevents.c
if (!wOtherInputMasks(pWin))
return Success;
-@@ -1738,6 +2900,54 @@
+@@ -1735,6 +2897,54 @@
FatalError("client not on device event list");
}
@@ -1600,7 +1600,7 @@ Index: xorg-server/Xi/xipassivegrab.c
===================================================================
--- xorg-server.orig/Xi/xipassivegrab.c 2011-04-06 18:25:23.000000000
+0300
+++ xorg-server/Xi/xipassivegrab.c 2011-04-09 10:42:15.000000000 +0300
-@@ -105,19 +105,30 @@
+@@ -110,19 +110,30 @@
if (stuff->grab_type != XIGrabtypeButton &&
stuff->grab_type != XIGrabtypeKeycode &&
stuff->grab_type != XIGrabtypeEnter &&
@@ -1633,7 +1633,7 @@ Index: xorg-server/Xi/xipassivegrab.c
if (XICheckInvalidMaskBits(client, (unsigned char*)&stuff[1],
stuff->mask_len * 4) != Success)
return BadValue;
-@@ -185,6 +196,9 @@
+@@ -192,6 +203,9 @@
status = GrabWindow(client, dev, stuff->grab_type,
¶m, &mask);
break;
@@ -1893,7 +1893,7 @@ Index: xorg-server/dix/devices.c
FreeDeviceClass(ButtonClass, (pointer)&classes->button);
FreeDeviceClass(FocusClass, (pointer)&classes->focus);
FreeDeviceClass(ProximityClass, (pointer)&classes->proximity);
-@@ -1547,6 +1562,151 @@
+@@ -1574,6 +1589,151 @@
InitPtrFeedbackClassDeviceStruct(dev, controlProc));
}
@@ -2045,8 +2045,8 @@ Index: xorg-server/dix/devices.c
/*
* Check if the given buffer contains elements between low (inclusive) and
* high (inclusive) only.
-@@ -2419,6 +2579,58 @@
- FreeEventList(eventlist, GetMaximumEventsNum());
+@@ -2406,6 +2566,58 @@
+ }
}
+static void
@@ -2104,7 +2104,7 @@ Index: xorg-server/dix/devices.c
/**
* Attach device 'dev' to device 'master'.
* Client is set to the client that issued the request, or NULL if it comes
-@@ -2486,6 +2698,12 @@
+@@ -2471,6 +2683,12 @@
dev->spriteInfo->spriteOwner = FALSE;
RecalculateMasterButtons(master);
@@ -3871,8 +3871,8 @@ Index: xorg-server/include/input.h
===================================================================
--- xorg-server.orig/include/input.h 2011-04-06 18:25:23.000000000 +0300
+++ xorg-server/include/input.h 2011-04-09 10:42:15.000000000 +0300
-@@ -104,6 +104,8 @@
- typedef struct _DeviceIntRec *DeviceIntPtr;
+@@ -105,6 +105,8 @@
+ typedef struct _ValuatorClassRec *ValuatorClassPtr;
typedef struct _ClassesRec *ClassesPtr;
typedef struct _SpriteRec *SpritePtr;
+typedef struct _TouchClassRec *TouchClassPtr;
@@ -3880,7 +3880,7 @@ Index: xorg-server/include/input.h
typedef union _GrabMask GrabMask;
typedef struct _EventList {
-@@ -314,6 +316,12 @@
+@@ -319,6 +321,12 @@
extern _X_EXPORT Bool InitFocusClassDeviceStruct(
DeviceIntPtr /*device*/);
@@ -3893,7 +3893,7 @@ Index: xorg-server/include/input.h
typedef void (*BellProcPtr)(
int /*percent*/,
DeviceIntPtr /*device*/,
-@@ -463,6 +471,22 @@
+@@ -468,6 +476,22 @@
int key_code,
const ValuatorMask *mask);
@@ -3916,7 +3916,7 @@ Index: xorg-server/include/input.h
extern int GetProximityEvents(
EventListPtr events,
DeviceIntPtr pDev,
-@@ -525,6 +549,18 @@
+@@ -530,6 +554,18 @@
extern _X_EXPORT InputAttributes *DuplicateInputAttributes(InputAttributes
*attrs);
extern _X_EXPORT void FreeInputAttributes(InputAttributes *attrs);
@@ -3983,7 +3983,7 @@ Index: xorg-server/include/inputstr.h
@@ -284,6 +289,75 @@
ValuatorAccelerationRec accelScheme;
- } ValuatorClassRec, *ValuatorClassPtr;
+ } ValuatorClassRec;
+typedef enum {
+ TOUCH_GRAB,
@@ -4221,8 +4221,8 @@ Index: xorg-server/test/input.c
}
static void test_bits_to_byte(int i)
-@@ -1199,6 +1262,101 @@
- }
+@@ -1223,6 +1286,101 @@
+ free(v);
}
+static void touch_create(void)
@@ -4323,7 +4323,7 @@ Index: xorg-server/test/input.c
int main(int argc, char** argv)
{
g_test_init(&argc, &argv,NULL);
-@@ -1209,6 +1367,7 @@
+@@ -1233,6 +1391,7 @@
g_test_add_func("/dix/input/init-valuators", dix_init_valuators);
g_test_add_func("/dix/input/event-core-conversion",
dix_event_to_core_conversion);
g_test_add_func("/dix/input/event-xi1-conversion",
dix_event_to_xi1_conversion);
@@ -4331,11 +4331,11 @@ Index: xorg-server/test/input.c
g_test_add_func("/dix/input/check-grab-values", dix_check_grab_values);
g_test_add_func("/dix/input/xi2-struct-sizes", xi2_struct_sizes);
g_test_add_func("/dix/input/grab_matching", dix_grab_matching);
-@@ -1216,7 +1375,9 @@
+@@ -1240,7 +1399,10 @@
g_test_add_func("/include/byte_padding_macros",
include_byte_padding_macros);
g_test_add_func("/include/bit_test_macros", include_bit_test_macros);
g_test_add_func("/Xi/xiproperty/register-unregister",
xi_unregister_handlers);
--
+ g_test_add_func("/dix/input/valuator-alloc", dix_valuator_alloc);
+ g_test_add_func("/dix/input/touch-create", touch_create);
+ g_test_add_func("/dix/input/touch-find-point", touch_find_point);
+ g_test_add_func("/dix/input/touch-finish", touch_finish);
diff --git a/debian/patches/series b/debian/patches/series
index ca2ec4c..6d5ffcb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -31,7 +31,6 @@
209_add_legacy_bgnone_option.patch
210_pixman_null_ptr_check.patch
214_glx_dri_searchdirs.patch
-215_glx_drawable_refcounting.diff
217_revert_bgnonevisitwindow.patch
218_randr-check-rotated-virtual-size-limits-correctly.diff
500_xi2.1.patch
commit d4bb09823fa9a7cd78366e7a3cf4319e1f69f1b5
Author: Cyril Brulebois <k...@debian.org>
Date: Mon May 30 11:37:48 2011 +0200
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index f4da03e..607e7f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xorg-server (2:1.10.2-1) UNRELEASED; urgency=low
+xorg-server (2:1.10.2-1) unstable; urgency=low
* New upstream release.
* Add 20-workaround-36986.diff to avoid test failures on *i386.
* On GNU/kFreeBSD, enable HAL support for the main build, but disable it
for the udeb build, thanks to Robert Millan (Closes: #596586).
- -- Cyril Brulebois <k...@debian.org> Mon, 30 May 2011 11:22:21 +0200
+ -- Cyril Brulebois <k...@debian.org> Mon, 30 May 2011 11:37:37 +0200
xorg-server (2:1.10.1.901-1) experimental; urgency=low
commit 4ee10d0849a2642ba1ef342a843a7d574d1ee30d
Author: Cyril Brulebois <k...@debian.org>
Date: Mon May 30 11:37:22 2011 +0200
On GNU/kFreeBSD, enable HAL support for the main build, but disable it for
the udeb build, thanks to Robert Millan (Closes: #596586).
diff --git a/debian/changelog b/debian/changelog
index d1da2d0..f4da03e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ xorg-server (2:1.10.2-1) UNRELEASED; urgency=low
* New upstream release.
* Add 20-workaround-36986.diff to avoid test failures on *i386.
+ * On GNU/kFreeBSD, enable HAL support for the main build, but disable it
+ for the udeb build, thanks to Robert Millan (Closes: #596586).
-- Cyril Brulebois <k...@debian.org> Mon, 30 May 2011 11:22:21 +0200
diff --git a/debian/rules b/debian/rules
index 87880af..7d1c012 100755
--- a/debian/rules
+++ b/debian/rules
@@ -69,7 +69,9 @@ config_backend = --disable-config-dbus
ifeq ($(DEB_HOST_ARCH_OS), linux)
config_backend += --enable-config-udev --disable-config-hal
else ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
- config_backend += --disable-config-udev --enable-config-hal
+ config_backend += --disable-config-udev
+ config_backend_main += --enable-config-hal
+ config_backend_udeb += --disable-config-hal
else # hurd
config_backend += --disable-config-udev --disable-config-hal
endif
@@ -146,6 +148,7 @@ confflags_main = \
$(build_xfbdev) \
--with-sha1=libgcrypt \
--enable-xcsecurity \
+ $(config_backend_main) \
$(void)
confflags_udeb = \
@@ -176,6 +179,7 @@ confflags_udeb = \
--disable-xephyr \
--disable-xfbdev \
--with-sha1=nettle \
+ $(config_backend_udeb) \
$(void)
$(STAMP_DIR)/autoreconf: $(STAMP_DIR)/stampdir $(QUILT_STAMPFN)
commit 4c8fbd4a01ee7146ed2451a3a0d248a3b802e1d3
Author: Cyril Brulebois <k...@debian.org>
Date: Mon May 30 11:32:13 2011 +0200
Add 20-workaround-36986.diff to avoid test failures on *i386.
diff --git a/debian/changelog b/debian/changelog
index c062eee..d1da2d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xorg-server (2:1.10.2-1) UNRELEASED; urgency=low
* New upstream release.
+ * Add 20-workaround-36986.diff to avoid test failures on *i386.
-- Cyril Brulebois <k...@debian.org> Mon, 30 May 2011 11:22:21 +0200
diff --git a/debian/patches/20-workaround-36986.diff
b/debian/patches/20-workaround-36986.diff
new file mode 100644
index 0000000..24b3cb9
--- /dev/null
+++ b/debian/patches/20-workaround-36986.diff
@@ -0,0 +1,14 @@
+Workaround fdo#36986 <http://bugs.freedesktop.org/show_bug.cgi?id=36986>
+--- a/test/input.c
++++ b/test/input.c
+@@ -1213,8 +1213,10 @@
+
+ g_assert(v);
+ g_assert(v->numAxes == num_axes);
++#if 0
+ g_assert(((void*)v->axisVal - (void*)v) % sizeof(double) == 0);
+ g_assert(((void*)v->axes - (void*)v) % sizeof(double) == 0);
++#endif
+ num_axes ++;
+ }
+
diff --git a/debian/patches/series b/debian/patches/series
index 2e0f947..a9c30f6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
07-xfree86-fix-build-with-xv-disabled.diff
#13_debian_add_xkbpath_env_variable.diff
15-nouveau.diff
+20-workaround-36986.diff
commit 4b44aa8a9dca344ab61ee7e0d511a2d44124e65b
Author: Cyril Brulebois <k...@debian.org>
Date: Mon May 30 11:22:34 2011 +0200
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index 047e8cf..a914e76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,181 @@
+commit d784fd09dc277610d5f4e98d577c4fdcd9215f9c
+Author: Jeremy Huddleston <jerem...@apple.com>
+Date: Sat May 28 16:59:05 2011 -0700
+
+ configure.ac: Bump version to 1.10.2
+
+ Signed-off-by: Jeremy Huddleston <jerem...@apple.com>
+
+commit 398114c1489fbfc9fe487de38ff4a4176755eee6
+Author: Jeremy Huddleston <jerem...@apple.com>
+Date: Sun May 22 10:18:36 2011 -0700
+
+ XQuartz: Don't crash if CG increases our display resolution
+
+ miPaintWindow would cause fbFill() to overwrite pScreen's pixmap which was
+ sized for the old resolution.
+
+ Signed-off-by: Jeremy Huddleston <jerem...@apple.com>
+ (cherry picked from commit 1fb501ad1521cfedaa5cf3052d45a924ef1866cf)
+
+commit dc6efd99887c90bb14e066e46b69ca5ba19b6a09
+Author: Jeremy Huddleston <jerem...@apple.com>
+Date: Sun May 22 09:32:57 2011 -0700
+
+ XQuartz: RandR: Don't crash if X11 is launched while there are no attached
displays
+
+ If CG reports no displays when launching, we could crash in RandR.
Instead, just
+ provide a fake 800x600 display until we are notified about displays being
attached.
+
+ Signed-off-by: Jeremy Huddleston <jerem...@apple.com>
+ (cherry picked from commit 60af79e35ee8546a99d15a1358aac3deabfa22be)
+
+commit 1a665a8abd0ce1dbc50a1d889f11d5b74c78539e
+Author: Jeremy Huddleston <jerem...@apple.com>
+Date: Fri May 20 22:59:27 2011 -0700
+
+ configure.ac: Bump version to 1.10.1.902 (1.10.2 RC2)
+
+ Signed-off-by: Jeremy Huddleston <jerem...@apple.com>
+
+commit 52e27b446a69b4b196d7e59d4e92aaa073c83dae
+Author: Jeremy Huddleston <jerem...@apple.com>
+Date: Mon May 16 21:07:13 2011 -0700
+
+ XQuartz: Bump bundle version to 2.6.3
+
+ Signed-off-by: Jeremy Huddleston <jerem...@apple.com>
+
+commit b4cb37d7255746f2ddf0ceb3334fc698cd818410
+Author: Jeremy Huddleston <jerem...@apple.com>
+Date: Sat May 14 18:33:57 2011 -0700
+
+ XQuartz: RandR: Avoid over-releasing if we are unable to determine the
current display mode.
+
+ Signed-off-by: Jeremy Huddleston <jerem...@apple.com>
+ (cherry picked from commit 384eb45b944a4386eae74a5503423c13b5f2a659)
+
+commit 69e3527e257af2aae82449bf0e0e7846ccd1ce0c
+Author: Jeremy Huddleston <jerem...@apple.com>
+Date: Sat May 14 16:11:32 2011 -0700
+
+ XQuartz: Don't call mieqEnqueue during server shutdown
+
+ Found-by: GuardMalloc
+ Signed-off-by: Jeremy Huddleston <jerem...@apple.com>
+ (cherry picked from commit 25191648b8db87735a99243697f73036255c1eb6)
+
+commit 0a61aca1ed036b17cab48725eb6ab4d860c9aad8
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Tue Apr 19 19:02:54 2011 -0700
+
+ Clean up memory better when GetVisualInfo fails in ProcDbeGetVisualInfo
+
+ Use calloc to initialize pScrVisInfo array so we don't have to check
+ which ones were already initialized when freeing them all.
+
+ On failure, set rc if necessary, and jump to code at end that already
+ frees all the necessary allocations and return rc.
+
+ Fixes parfait reported error:
+ Error: Memory leak (CWE 401)
+ Memory leak of pointer 'pScrVisInfo' allocated with malloc((count * 16))
+ at line 724 of dbe/dbe.c in function 'ProcDbeGetVisualInfo'.
+ 'pScrVisInfo' allocated at line 693 with malloc((count * 16)).
+ pScrVisInfo leaks when rc != 0 at line 710
+ and j >= i at line 716.
+
+ [ This bug was found by the Parfait 0.3.7 bug checking tool.
+ For more information see http://labs.oracle.com/projects/parfait/ ]
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+ Reviewed-by: Jeremy Huddleston <jerem...@apple.com>
+ (cherry picked from commit 043c1758652259fd12b88ae37720fe6e93eda76b)
+
+commit 5be7451367901c13a697ecefcb634920cd156cb7
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Tue Apr 19 18:53:22 2011 -0700
+
+ Only free pContext once when AddResource fails in ProcRecordCreateContext
+
+ Since RecordDeleteContext frees its argument, don't fall through to free
+ it again.
+
+ Error: Double free (CWE 415)
+ Double free of pointer 'malloc(1072)' defined by malloc
+ at line 1964 of record/record.c in function
'ProcRecordCreateContext'.
+ Previously freed at line 1960 with RecordDeleteContext.
+ 'malloc(1072)' was allocated at line 1926 with malloc.
+
+ [ This bug was found by the Parfait 0.3.7 bug checking tool.
+ For more information see http://labs.oracle.com/projects/parfait/ ]
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+ Reviewed-by: Jeremy Huddleston <jerem...@apple.com>
+ (cherry picked from commit dadb0791ebfd05cd3bb82d4addf0fbc21aad6fbb)
+
+commit ee69c1aa7c1066b2019bf916230332c60a837ecb
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Fri Mar 11 15:43:14 2011 -0800
+
+ Make xorg.conf.example rule compatible with Solaris make
+
+ Solaris make won't substitute $< in explicit rules, only implicit ones
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+ Reviewed-by: Gaetan Nadon <mems...@videotron.ca>
+ (cherry picked from commit 8d229c4cf9e5bde78373ef3dd32708817ac97152)
+
+commit 189d44e7d216cc7b13f3e5a22689f2841a08b421
+Author: Jeremy Huddleston <jerem...@apple.com>
+Date: Tue May 10 23:42:46 2011 -0700
+
+ XQuartz: Don't call into CoreFoundation after fork() and before exec()
+
+ After fork()ing, we should just limit ourselves to setting up
+ the environment, file descriptors, and exec()ing.
+
+ Signed-off-by: Jeremy Huddleston <jerem...@apple.com>
+ (cherry picked from commit c89a6f824eaf647d2b182f79fbd78f5bd1c3a27f)
+
+commit 277e18894492fdf6e5446bb90e8503c9cbc28b3b
+Author: Jeremy Huddleston <jerem...@apple.com>
+Date: Sat Apr 23 20:49:27 2011 -0700
+
+ os: Silence warnings when building with clang
+
+ access.c:1492:20: error: equality comparison with extraneous parentheses
[-Werror,-Wparentheses]
+ if ((host->family == FamilyServerInterpreted)) {
+ ~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~
+ access.c:1492:20: note: use '=' to turn this equality comparison into an
assignment
+ if ((host->family == FamilyServerInterpreted)) {
+ ^~
+ =
+ access.c:1492:20: note: remove extraneous parentheses around the
comparison to silence this warning
+ if ((host->family == FamilyServerInterpreted)) {
+ ~ ^ ~
+
+ In file included from xstrans.c:8:
+ In file included from /usr/X11/include/X11/Xtrans/transport.c:62:
+ /usr/X11/include/X11/Xtrans/Xtranssock.c:262:5: error: implicit
declaration of function 'ErrorF' is invalid in C99
+ [-Werror,-Wimplicit-function-declaration]
+ PRMSG (3,"SocketSelectFamily(%s)\n", family, 0, 0);
+ ^
+
+ log.c:180:29: error: format string is not a string literal
[-Werror,-Wformat-nonliteral]
+ if (asprintf(&logFileName, fname, display) == -1)
+ ^~~~~
+ log.c:190:26: error: format string is not a string literal
[-Werror,-Wformat-nonliteral]
+ if ((asprintf(&suffix, backup, display) == -1) ||
+ ^~~~~~
+ log.c:382:25: error: format string is not a string literal
[-Werror,-Wformat-nonliteral]
+ LogVWrite(verb, tmpBuf, args);
+ ^~~~~~
+
+ Signed-off-by: Jeremy Huddleston <jerem...@apple.com>
+ Reviewed-by: Jamey Sharp <ja...@minilop.net>
+ (cherry picked from commit c524f8bb768f886d413839bc22184098394c2559)
+
commit 164ef01bd55a1d2c31620e9868f4cc3d032223a6
Author: Jeremy Huddleston <jerem...@apple.com>
Date: Fri May 6 15:43:04 2011 -0700
diff --git a/debian/changelog b/debian/changelog
index 4c39950..c062eee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.10.2-1) UNRELEASED; urgency=low
+
+ * New upstream release.
--
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/e1qrqyo-00065m...@vasks.debian.org
