COPYING | 2
ChangeLog | 6141 +++++++++-
Makefile.am | 7
Xext/Makefile.am | 42
Xext/bigreq.c | 19
Xext/dpms.c | 67
Xext/geext.c | 21
Xext/geext.h | 2
Xext/hashtable.c | 295
Xext/hashtable.h | 137
Xext/panoramiX.c | 103
Xext/panoramiXprocs.c | 47
Xext/saver.c | 64
Xext/security.c | 44
Xext/shape.c | 83
Xext/shm.c | 83
Xext/sync.c | 344
Xext/syncsrv.h | 56
Xext/xcmisc.c | 46
Xext/xf86bigfont.c | 38
Xext/xf86bigfontsrv.h | 1
Xext/xres.c | 901 +
Xext/xselinux_ext.c | 46
Xext/xtest.c | 32
Xext/xvdisp.c | 186
Xext/xvdix.h | 8
Xext/xvmain.c | 35
Xext/xvmc.c | 133
Xext/xvmcext.h | 4
Xi/chgdctl.c | 25
Xi/chgptr.h | 6
Xi/exevents.c | 310
Xi/extinit.c | 22
Xi/getbmap.c | 16
Xi/getdctl.c | 12
Xi/getfctl.c | 14
Xi/getfocus.c | 12
Xi/getkmap.c | 14
Xi/getmmap.c | 16
Xi/getprop.c | 14
Xi/getselev.c | 16
Xi/getvers.c | 19
Xi/grabdev.c | 12
Xi/grabdevb.c | 15
Xi/grabdevk.c | 15
Xi/gtmotion.c | 20
Xi/listdev.c | 13
Xi/opendev.c | 17
Xi/queryst.c | 16
Xi/setbmap.c | 14
Xi/setdval.c | 14
Xi/setmmap.c | 12
Xi/setmode.c | 12
Xi/stubs.c | 1
Xi/xichangehierarchy.c | 6
Xi/xigetclientpointer.c | 16
Xi/xigrabdev.c | 14
Xi/xipassivegrab.c | 18
Xi/xiproperty.c | 111
Xi/xiquerydevice.c | 17
Xi/xiquerypointer.c | 21
Xi/xiqueryversion.c | 49
Xi/xiselectev.c | 22
Xi/xisetdevfocus.c | 12
composite/compalloc.c | 9
composite/compext.c | 63
composite/compinit.c | 4
composite/compint.h | 11
composite/compositeext.h | 2
composite/compwindow.c | 32
config/config-backends.h | 2
config/config.c | 65
config/udev.c | 131
configure.ac | 127
damageext/Makefile.am | 1
damageext/damageext.c | 33
damageext/damageextint.h | 1
dbe/dbe.c | 47
dbe/dbestruct.h | 2
debian/changelog | 16
debian/control | 11
debian/patches/02_Add-libnettle-as-option-for-sha1.diff | 30
debian/patches/03_fix-disable-xv.diff | 15
debian/patches/100_rethrow_signals.patch | 18
debian/patches/226_fall_back_to_autoconfiguration.patch | 16
debian/patches/510-dix-return-early-from-DisableDevice-if-the-device-is.patch | 29
debian/patches/511-dix-move-freeing-the-sprite-into-a-function.patch | 70
debian/patches/512-dix-free-the-sprite-when-disabling-the-device.patch | 31
debian/patches/513-dix-disable-non-sprite-owners-first-when-disabling-p.patch | 45
debian/patches/514-Xi-drop-forced-unpairing-when-changing-the-hierarchy.patch | 33
debian/patches/515-dix-disable-all-devices-before-shutdown.patch | 104
debian/patches/series | 9
debian/serverminver | 6
dix/Xserver-dtrace.h.in | 7
dix/Xserver.d | 2
dix/colormap.c | 40
dix/devices.c | 256
dix/dispatch.c | 433
dix/dixfonts.c | 35
dix/dixutils.c | 16
dix/enterleave.c | 250
dix/enterleave.h | 13
dix/events.c | 229
dix/extension.c | 22
dix/gc.c | 112
dix/getevents.c | 118
dix/globals.c | 3
dix/grabs.c | 5
dix/inpututils.c | 13
dix/main.c | 26
dix/pixmap.c | 149
dix/privates.c | 414
dix/property.c | 76
dix/ptrveloc.c | 6
dix/registry.c | 4
dix/resource.c | 383
dix/selection.c | 19
dix/swaprep.c | 88
dix/swapreq.c | 2
dix/touch.c | 39
dix/window.c | 211
doc/Xserver-spec.xml | 61
doc/dtrace/Xserver-DTrace.xml | 153
exa/exa.c | 36
exa/exa.h | 8
exa/exa_glyphs.c | 6
exa/exa_mixed.c | 33
exa/exa_offscreen.c | 4
exa/exa_priv.h | 21
fb/fb.h | 25
fb/fballpriv.c | 29
fb/fboverlay.c | 6
fb/fboverlay.h | 2
fb/fbscreen.c | 6
fb/fbwindow.c | 2
fb/wfbrename.h | 4
glx/Makefile.am | 2
glx/clientinfo.c | 66
glx/createcontext.c | 312
glx/extension_string.c | 40
glx/extension_string.h | 6
glx/glxcmds.c | 222
glx/glxcmdsswap.c | 18
glx/glxcontext.h | 18
glx/glxdri.c | 28
glx/glxdri2.c | 273
glx/glxdricommon.c | 2
glx/glxdriswrast.c | 12
glx/glxext.c | 25
glx/glxext.h | 2
glx/glxscreens.c | 4
glx/glxscreens.h | 7
glx/glxserver.h | 6
glx/indirect_util.c | 8
glx/single2.c | 20
glx/single2swap.c | 18
glx/unpack.h | 12
hw/dmx/dmx.c | 263
hw/dmx/dmxextension.c | 2
hw/dmx/dmxinit.c | 2
hw/dmx/dmxlog.c | 3
hw/dmx/dmxscrinit.c | 26
hw/dmx/dmxscrinit.h | 4
hw/dmx/glxProxy/glxcmds.c | 149
hw/dmx/glxProxy/glxcmdsswap.c | 43
hw/dmx/glxProxy/glxext.c | 11
hw/dmx/glxProxy/glxext.h | 2
hw/dmx/glxProxy/glxsingle.c | 56
hw/dmx/glxProxy/glxvendor.c | 12
hw/dmx/glxProxy/unpack.h | 12
hw/dmx/input/dmxconsole.c | 4
hw/dmx/input/dmxevents.c | 24
hw/dmx/input/dmxsigio.c | 22
hw/dmx/input/dmxsigio.h | 2
hw/kdrive/ephyr/Makefile.am | 1
hw/kdrive/ephyr/ephyr.c | 39
hw/kdrive/ephyr/ephyrdriext.c | 146
hw/kdrive/ephyr/ephyrglxext.c | 98
hw/kdrive/ephyr/ephyrinit.c | 2
hw/kdrive/ephyr/ephyrproxyext.c | 2
hw/kdrive/src/kdrive.c | 8
hw/kdrive/src/kdrive.h | 13
hw/kdrive/src/kinput.c | 50
hw/kdrive/src/kxv.c | 16
hw/vfb/InitOutput.c | 19
hw/vfb/Makefile.am | 2
hw/xfree86/Makefile.am | 37
hw/xfree86/common/Makefile.am | 20
hw/xfree86/common/compiler.h | 17
hw/xfree86/common/dgaproc.h | 110
hw/xfree86/common/vidmodeproc.h | 2
hw/xfree86/common/xaarop.h | 311
hw/xfree86/common/xf86.h | 37
hw/xfree86/common/xf86AutoConfig.c | 13
hw/xfree86/common/xf86Bus.c | 49
hw/xfree86/common/xf86Bus.h | 1
hw/xfree86/common/xf86Config.c | 32
hw/xfree86/common/xf86Cursor.c | 34
hw/xfree86/common/xf86DGA.c | 1182 +
hw/xfree86/common/xf86DPMS.c | 16
hw/xfree86/common/xf86Events.c | 34
hw/xfree86/common/xf86Extensions.c | 142
hw/xfree86/common/xf86Extensions.h | 55
hw/xfree86/common/xf86Globals.c | 11
hw/xfree86/common/xf86Helper.c | 144
hw/xfree86/common/xf86Init.c | 87
hw/xfree86/common/xf86Mode.c | 4
hw/xfree86/common/xf86Module.h | 21
hw/xfree86/common/xf86PM.c | 26
hw/xfree86/common/xf86Priv.h | 5
hw/xfree86/common/xf86Privstr.h | 2
hw/xfree86/common/xf86RandR.c | 23
hw/xfree86/common/xf86VGAarbiter.c | 62
hw/xfree86/common/xf86VGAarbiterPriv.h | 28
hw/xfree86/common/xf86VidMode.c | 8
hw/xfree86/common/xf86Xinput.c | 94
hw/xfree86/common/xf86Xinput.h | 9
hw/xfree86/common/xf86cmap.c | 72
hw/xfree86/common/xf86fbBus.c | 4
hw/xfree86/common/xf86fbman.c | 8
hw/xfree86/common/xf86pciBus.c | 51
hw/xfree86/common/xf86pciBus.h | 10
hw/xfree86/common/xf86platformBus.c | 492
hw/xfree86/common/xf86platformBus.h | 64
hw/xfree86/common/xf86sbusBus.c | 12
hw/xfree86/common/xf86str.h | 37
hw/xfree86/common/xf86vmode.c | 2165 +++
hw/xfree86/common/xf86xv.c | 59
hw/xfree86/common/xf86xv.h | 4
hw/xfree86/common/xf86xvmc.c | 24
hw/xfree86/common/xf86xvmc.h | 3
hw/xfree86/common/xf86xvpriv.h | 6
hw/xfree86/ddc/ddc.c | 25
hw/xfree86/ddc/xf86DDC.h | 8
hw/xfree86/dixmods/Makefile.am | 45
hw/xfree86/dixmods/dbemodule.c | 45
hw/xfree86/dixmods/extmod/Makefile.am | 30
hw/xfree86/dixmods/extmod/dgaproc.h | 114
hw/xfree86/dixmods/extmod/modinit.c | 177
hw/xfree86/dixmods/extmod/modinit.h | 49
hw/xfree86/dixmods/extmod/xf86dga2.c | 1029 -
hw/xfree86/dixmods/extmod/xf86vmode.c | 2150 ---
hw/xfree86/dixmods/extmod/xvmod.c | 22
hw/xfree86/dixmods/extmod/xvmodproc.h | 13
hw/xfree86/dixmods/glxmodule.c | 12
hw/xfree86/dixmods/recordmod.c | 43
hw/xfree86/doc/README.modes | 9
hw/xfree86/doc/ddxDesign.xml | 131
hw/xfree86/doc/exa-driver.txt | 9
hw/xfree86/dri/Makefile.am | 29
hw/xfree86/dri/dri.c | 31
hw/xfree86/dri/dri.h | 12
hw/xfree86/dri/drimodule.c | 93
hw/xfree86/dri/xf86dri.c | 156
hw/xfree86/dri2/Makefile.am | 12
hw/xfree86/dri2/dri2.c | 404
hw/xfree86/dri2/dri2.h | 58
hw/xfree86/dri2/dri2ext.c | 187
hw/xfree86/dri2/dri2int.h | 26
hw/xfree86/exa/Makefile.am | 4
hw/xfree86/exa/examodule.c | 21
hw/xfree86/exa/man/exa.man | 6
hw/xfree86/fbdevhw/Makefile.am | 2
hw/xfree86/fbdevhw/fbdevhw.c | 25
hw/xfree86/fbdevhw/fbdevhw.h | 12
hw/xfree86/fbdevhw/fbdevhwstub.c | 10
hw/xfree86/fbdevhw/man/fbdevhw.man | 2
hw/xfree86/i2c/Makefile.am | 16
hw/xfree86/i2c/xf86i2c.c | 1
hw/xfree86/i2c/xf86i2c.h | 2
hw/xfree86/int10/generic.c | 21
hw/xfree86/int10/helper_exec.c | 18
hw/xfree86/int10/helper_mem.c | 8
hw/xfree86/int10/xf86int10.c | 42
hw/xfree86/int10/xf86int10.h | 4
hw/xfree86/loader/Makefile.am | 3
hw/xfree86/loader/loader.c | 8
hw/xfree86/loader/loader.h | 1
hw/xfree86/loader/loaderProcs.h | 1
hw/xfree86/loader/loadext.c | 440
hw/xfree86/loader/loadmod.c | 34
hw/xfree86/man/Xorg.man | 118
hw/xfree86/man/xorg.conf.man | 102
hw/xfree86/modes/xf86Crtc.c | 78
hw/xfree86/modes/xf86Crtc.h | 48
hw/xfree86/modes/xf86Cursors.c | 10
hw/xfree86/modes/xf86DiDGA.c | 10
hw/xfree86/modes/xf86EdidModes.c | 13
hw/xfree86/modes/xf86RandR12.c | 185
hw/xfree86/modes/xf86Rotate.c | 51
hw/xfree86/os-support/linux/Makefile.am | 2
hw/xfree86/os-support/linux/int10/linux.c | 29
hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c | 16
hw/xfree86/os-support/linux/lnx_init.c | 3
hw/xfree86/os-support/linux/lnx_platform.c | 179
hw/xfree86/os-support/shared/platform_noop.c | 23
hw/xfree86/os-support/shared/sigio.c | 28
hw/xfree86/os-support/shared/vidmem.c | 13
hw/xfree86/os-support/xf86_OSlib.h | 2
hw/xfree86/os-support/xf86_OSproc.h | 8
hw/xfree86/parser/Device.c | 2
hw/xfree86/parser/Files.c | 2
hw/xfree86/parser/Flags.c | 2
hw/xfree86/parser/Input.c | 2
hw/xfree86/parser/InputClass.c | 2
hw/xfree86/parser/Layout.c | 2
hw/xfree86/parser/Module.c | 2
hw/xfree86/parser/Monitor.c | 2
hw/xfree86/parser/Pointer.c | 2
hw/xfree86/parser/Screen.c | 2
hw/xfree86/parser/Vendor.c | 2
hw/xfree86/parser/Video.c | 2
hw/xfree86/parser/read.c | 2
hw/xfree86/parser/scan.c | 2
hw/xfree86/parser/write.c | 2
hw/xfree86/ramdac/.gitignore | 2
hw/xfree86/ramdac/Makefile.am | 11
hw/xfree86/ramdac/xf86Cursor.c | 57
hw/xfree86/ramdac/xf86CursorPriv.h | 4
hw/xfree86/ramdac/xf86HWCurs.c | 11
hw/xfree86/ramdac/xf86RamDacCmap.c | 2
hw/xfree86/sdksyms.sh | 33
hw/xfree86/shadowfb/Makefile.am | 3
hw/xfree86/shadowfb/shadow.c | 30
hw/xfree86/utils/man/cvt.man | 10
hw/xfree86/utils/man/gtf.man | 8
hw/xfree86/vbe/Makefile.am | 5
hw/xfree86/vbe/vbe.c | 24
hw/xfree86/vbe/vbe.h | 2
hw/xfree86/vgahw/vgaCmap.c | 7
hw/xfree86/vgahw/vgaHW.c | 4
hw/xfree86/xaa/.gitignore | 4
hw/xfree86/xaa/Makefile.am | 78
hw/xfree86/xaa/XAA.HOWTO | 1427 --
hw/xfree86/xaa/xaa.h | 1038 -
hw/xfree86/xaa/xaaBitBlt.c | 229
hw/xfree86/xaa/xaaBitOrder.c | 16
hw/xfree86/xaa/xaaBitmap.c | 477
hw/xfree86/xaa/xaaCpyArea.c | 409
hw/xfree86/xaa/xaaCpyPlane.c | 204
hw/xfree86/xaa/xaaCpyWin.c | 78
hw/xfree86/xaa/xaaDashLine.c | 353
hw/xfree86/xaa/xaaFallback.c | 281
hw/xfree86/xaa/xaaFillArc.c | 202
hw/xfree86/xaa/xaaFillPoly.c | 991 -
hw/xfree86/xaa/xaaFillRect.c | 1101 -
hw/xfree86/xaa/xaaGC.c | 564
hw/xfree86/xaa/xaaGCmisc.c | 412
hw/xfree86/xaa/xaaImage.c | 534
hw/xfree86/xaa/xaaInit.c | 637 -
hw/xfree86/xaa/xaaInitAccel.c | 1571 --
hw/xfree86/xaa/xaaLine.c | 422
hw/xfree86/xaa/xaaLineMisc.c | 149
hw/xfree86/xaa/xaaNonTEGlyph.c | 192
hw/xfree86/xaa/xaaNonTEText.c | 591
hw/xfree86/xaa/xaaOffscreen.c | 163
hw/xfree86/xaa/xaaOverlay.c | 122
hw/xfree86/xaa/xaaOverlayDF.c | 906 -
hw/xfree86/xaa/xaaPCache.c | 2527 ----
hw/xfree86/xaa/xaaPict.c | 654 -
hw/xfree86/xaa/xaaROP.c | 182
hw/xfree86/xaa/xaaRect.c | 121
hw/xfree86/xaa/xaaSpans.c | 876 -
hw/xfree86/xaa/xaaStateChange.c | 1665 --
hw/xfree86/xaa/xaaStipple.c | 915 -
hw/xfree86/xaa/xaaTEGlyph.c | 1083 -
hw/xfree86/xaa/xaaTEText.c | 295
hw/xfree86/xaa/xaaTables.c | 152
hw/xfree86/xaa/xaaWideLine.c | 924 -
hw/xfree86/xaa/xaacexp.h | 126
hw/xfree86/xaa/xaalocal.h | 1437 --
hw/xfree86/xaa/xaarop.h | 311
hw/xfree86/xaa/xaawrap.h | 75
hw/xnest/Init.c | 2
hw/xnest/Makefile.am | 1
hw/xnest/Screen.c | 6
hw/xnest/Screen.h | 4
hw/xquartz/X11Application.h | 3
hw/xquartz/X11Application.m | 72
hw/xquartz/applewm.c | 6
hw/xquartz/bundle/Resources/English.lproj/Localizable.strings |binary
hw/xquartz/console_redirect.c | 14
hw/xquartz/darwin.c | 12
hw/xquartz/pseudoramiX.c | 13
hw/xquartz/pseudoramiX.h | 1
hw/xquartz/quartz.c | 25
hw/xquartz/xpr/appledri.c | 8
hw/xquartz/xpr/dri.c | 6
hw/xquartz/xpr/dri.h | 3
hw/xwin/glx/Makefile.am | 4
hw/xwin/glx/gen_gl_wrappers.py | 14
hw/xwin/glx/indirect.c | 44
hw/xwin/win.h | 11
hw/xwin/winblock.c | 6
hw/xwin/winerror.c | 2
hw/xwin/winnativegdi.c | 4
hw/xwin/winpfbdd.c | 6
hw/xwin/winscrinit.c | 14
hw/xwin/winshaddd.c | 6
hw/xwin/winshadddnl.c | 6
hw/xwin/winshadgdi.c | 6
hw/xwin/winwakeup.c | 4
hw/xwin/winwindowswm.c | 4
include/dix-config.h.in | 6
include/dix.h | 11
include/dixevents.h | 7
include/dixfont.h | 13
include/dixstruct.h | 2
include/exevents.h | 7
include/extension.h | 42
include/extinit.h | 163
include/globals.h | 80
include/hotplug.h | 40
include/input.h | 5
include/inputstr.h | 2
include/list.h | 2
include/misc.h | 40
include/opaque.h | 1
include/os.h | 26
include/pixmap.h | 23
include/pixmapstr.h | 30
include/privates.h | 56
include/protocol-versions.h | 2
include/ptrveloc.h | 15
include/resource.h | 59
include/screenint.h | 27
include/scrnintstr.h | 52
include/window.h | 5
include/xkbsrv.h | 8
include/xorg-config.h.in | 3
include/xorg-server.h.in | 5
man/Xserver.man | 7
mi/midispcur.c | 213
mi/mieq.c | 19
mi/miexpose.c | 13
mi/miinitext.c | 472
mi/mioverlay.c | 6
mi/mipointer.c | 6
mi/miscrinit.c | 4
mi/misprite.c | 13
miext/cw/cw.c | 6
miext/damage/damage.c | 4
miext/rootless/rootlessScreen.c | 4
miext/shadow/shadow.c | 4
miext/shadow/shrotpackYX.h | 3
miext/sync/misync.c | 4
os/WaitFor.c | 2
os/backtrace.c | 49
os/connection.c | 71
os/io.c | 12
os/log.c | 198
os/osinit.c | 9
os/utils.c | 127
os/xdmcp.c | 2
os/xsha1.c | 42
randr/Makefile.am | 2
randr/randr.c | 95
randr/randrstr.h | 156
randr/rrcrtc.c | 441
randr/rrdispatch.c | 25
randr/rrinfo.c | 7
randr/rrmode.c | 19
randr/rroutput.c | 92
randr/rrproperty.c | 93
randr/rrprovider.c | 411
randr/rrproviderproperty.c | 716 +
randr/rrscreen.c | 368
randr/rrtransform.h | 7
randr/rrxinerama.c | 93
record/record.c | 52
render/animcur.c | 10
render/glyph.c | 34
render/glyphstr.h | 6
render/picture.c | 41
render/picturestr.h | 7
render/render.c | 27
test/.gitignore | 2
test/Makefile.am | 19
test/ddxstubs.c | 2
test/hashtabletest.c | 162
test/input.c | 34
test/os.c | 130
test/signal-logging.c | 115
test/touch.c | 5
test/xi2/Makefile.am | 2
test/xi2/protocol-common.c | 14
test/xi2/protocol-common.h | 4
test/xi2/protocol-xipassivegrabdevice.c | 7
test/xi2/protocol-xiquerydevice.c | 16
test/xi2/protocol-xiquerypointer.c | 7
test/xi2/protocol-xiqueryversion.c | 118
test/xi2/protocol-xiselectevents.c | 1
test/xi2/protocol-xisetclientpointer.c | 1
test/xi2/protocol-xiwarppointer.c | 1
test/xtest.c | 13
xfixes/cursor.c | 45
xfixes/region.c | 6
xfixes/select.c | 23
xfixes/xfixes.c | 13
xfixes/xfixesint.h | 5
xkb/XKBGAlloc.c | 129
xkb/XKBMAlloc.c | 6
xkb/xkb.c | 367
xkb/xkb.h | 2
xkb/xkbAccessX.c | 20
xkb/xkbActions.c | 1
xkb/xkbEvents.c | 57
xkb/xkbgeom.h | 17
xorg-server.pc.in | 2
509 files changed, 23938 insertions(+), 35715 deletions(-)
New commits:
commit fc20bab30b0b5a84b1931d8a9fc0ce43dc8eb09d
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Tue Jul 17 12:25:24 2012 +0200
Bump changelog
diff --git a/debian/changelog b/debian/changelog
index 112a12d..11eae67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,14 @@ xorg-server (2:1.12.99.901-1) UNRELEASED; urgency=low
* New upstream release snapshot (on the way to 1.13).
* Bump minimum required abi, randr, dri2 and gl protos.
* Add fix for building udeb without xv
+ * Refreshed patches to apply on x1.13
+ * Remove patches merged upstream:
+ - 510-dix-return-early-from-DisableDevice-if-the-device-is.patch
+ - 511-dix-move-freeing-the-sprite-into-a-function.patch
+ - 512-dix-free-the-sprite-when-disabling-the-device.patch
+ - 513-dix-disable-non-sprite-owners-first-when-disabling-p.patch
+ - 514-Xi-drop-forced-unpairing-when-changing-the-hierarchy.patch
+ - 515-dix-disable-all-devices-before-shutdown.patch
-- Maarten Lankhorst <maarten.lankhorst@canonical.com> Thu, 12 Jul 2012 13:54:50 +0200
commit d6a2372b4d8f0e46557372d3f255b75a9b4de6b8
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Tue Jul 17 12:23:45 2012 +0200
refresh patches
diff --git a/debian/patches/100_rethrow_signals.patch b/debian/patches/100_rethrow_signals.patch
index 2a11cb9..0262427 100644
--- a/debian/patches/100_rethrow_signals.patch
+++ b/debian/patches/100_rethrow_signals.patch
@@ -79,7 +79,7 @@
return 0; /* continue */
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
-@@ -967,14 +967,17 @@
+@@ -1019,14 +1019,17 @@
}
/*
@@ -99,7 +99,7 @@
{
int i;
-@@ -1001,22 +1004,46 @@
+@@ -1053,22 +1056,46 @@
if (xorgHWOpenConsole)
xf86CloseConsole();
@@ -150,7 +150,7 @@
{
int i;
-@@ -1049,7 +1076,20 @@
+@@ -1101,7 +1128,20 @@
* This is needed for an abnormal server exit, since the normal exit stuff
* MUST also be performed (i.e. the vt must be left in a defined state)
*/
@@ -196,7 +196,7 @@
ddxGiveUp(enum ExitCode error)
--- a/hw/xquartz/darwin.c
+++ b/hw/xquartz/darwin.c
-@@ -853,15 +853,22 @@
+@@ -855,15 +855,22 @@
}
/*
@@ -248,7 +248,7 @@
static const char *
--- a/include/os.h
+++ b/include/os.h
-@@ -521,8 +521,12 @@
+@@ -532,8 +532,12 @@
};
extern _X_EXPORT void
@@ -272,7 +272,7 @@
#include "input.h"
#include "site.h"
#include "opaque.h"
-@@ -463,9 +465,12 @@
+@@ -619,9 +621,12 @@
void
AbortServer(void)
_X_NORETURN;
@@ -286,7 +286,7 @@
{
#ifdef XF86BIGFONT
XF86BigfontCleanup();
-@@ -473,11 +478,23 @@
+@@ -629,11 +634,23 @@
CloseWellKnownConnections();
OsCleanup(TRUE);
CloseDownDevices();
@@ -314,7 +314,7 @@
}
#define AUDIT_PREFIX "AUDIT: %s: %ld: "
-@@ -580,6 +597,27 @@
+@@ -736,6 +753,27 @@
}
void
@@ -349,7 +349,7 @@
case SIGILL:
case SIGFPE:
+ signal(signo, SIG_DFL);
- ErrorF("%s at address %p\n", strsignal(signo), sip->si_addr);
+ ErrorFSigSafe("%s at address %p\n", strsignal(signo), sip->si_addr);
}
}
#endif
diff --git a/debian/patches/226_fall_back_to_autoconfiguration.patch b/debian/patches/226_fall_back_to_autoconfiguration.patch
index eb6383b..70fa7e5 100644
--- a/debian/patches/226_fall_back_to_autoconfiguration.patch
+++ b/debian/patches/226_fall_back_to_autoconfiguration.patch
@@ -1,20 +1,16 @@
-diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
-index 0071004..ea66973 100644
--- a/hw/xfree86/common/xf86Globals.c
+++ b/hw/xfree86/common/xf86Globals.c
-@@ -153,6 +153,7 @@ int xf86NumDrivers = 0;
- InputDriverPtr *xf86InputDriverList = NULL;
+@@ -161,6 +161,7 @@
int xf86NumInputDrivers = 0;
int xf86NumScreens = 0;
+ int xf86NumGPUScreens = 0;
+Bool xf86AttemptedFallback = FALSE;
const char *xf86VisualNames[] = {
"StaticGray",
-diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
-index 0974893..6f313f6 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
-@@ -476,20 +476,34 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
+@@ -481,20 +481,34 @@
free(optionlist);
}
@@ -52,7 +48,7 @@ index 0974893..6f313f6 100644
}
/* Load all input driver modules specified in the config file. */
-@@ -549,8 +563,15 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
+@@ -554,8 +568,15 @@
else
xf86Info.dontVTSwitch = TRUE;
@@ -70,11 +66,9 @@ index 0974893..6f313f6 100644
xf86PostProbe();
-diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h
-index 8d9cb55..1a604d6 100644
--- a/hw/xfree86/common/xf86Priv.h
+++ b/hw/xfree86/common/xf86Priv.h
-@@ -88,6 +88,7 @@ extern _X_EXPORT int xf86NumDrivers;
+@@ -89,6 +89,7 @@
extern _X_EXPORT Bool xf86Resetting;
extern _X_EXPORT Bool xf86Initialising;
extern _X_EXPORT int xf86NumScreens;
diff --git a/debian/patches/510-dix-return-early-from-DisableDevice-if-the-device-is.patch b/debian/patches/510-dix-return-early-from-DisableDevice-if-the-device-is.patch
deleted file mode 100644
index 87ae244..0000000
--- a/debian/patches/510-dix-return-early-from-DisableDevice-if-the-device-is.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 46adcefb0e08515195d8e49985a4e210395700b3 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Thu, 10 May 2012 12:10:12 +1000
-Subject: [PATCH 07/12] dix: return early from DisableDevice if the device is
- already disabled
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
----
- dix/devices.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/dix/devices.c b/dix/devices.c
-index df46497..6acff4f 100644
---- a/dix/devices.c
-+++ b/dix/devices.c
-@@ -428,6 +428,9 @@ DisableDevice(DeviceIntPtr dev, BOOL sendevent)
- BOOL enabled;
- int flags[MAXDEVICES] = { 0 };
-
-+ if (!dev->enabled)
-+ return TRUE;
-+
- for (prev = &inputInfo.devices;
- *prev && (*prev != dev); prev = &(*prev)->next);
- if (*prev != dev)
---
-1.7.9.5
-
diff --git a/debian/patches/511-dix-move-freeing-the-sprite-into-a-function.patch b/debian/patches/511-dix-move-freeing-the-sprite-into-a-function.patch
deleted file mode 100644
index cd4db33..0000000
--- a/debian/patches/511-dix-move-freeing-the-sprite-into-a-function.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From e57d6a89027c55fef987cdc259668c48a8b4ea1b Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Thu, 10 May 2012 15:32:20 +1000
-Subject: [PATCH 08/12] dix: move freeing the sprite into a function
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
----
- dix/devices.c | 7 +------
- dix/events.c | 12 ++++++++++++
- include/dix.h | 2 ++
- 3 files changed, 15 insertions(+), 6 deletions(-)
-
-diff --git a/dix/devices.c b/dix/devices.c
-index 6acff4f..a280dee 100644
---- a/dix/devices.c
-+++ b/dix/devices.c
-@@ -918,12 +918,7 @@ CloseDevice(DeviceIntPtr dev)
- free(classes);
- }
-
-- if (DevHasCursor(dev) && dev->spriteInfo->sprite) {
-- if (dev->spriteInfo->sprite->current)
-- FreeCursor(dev->spriteInfo->sprite->current, None);
-- free(dev->spriteInfo->sprite->spriteTrace);
-- free(dev->spriteInfo->sprite);
-- }
-+ FreeSprite(dev);
-
- /* a client may have the device set as client pointer */
- for (j = 0; j < currentMaxClients; j++) {
-diff --git a/dix/events.c b/dix/events.c
-index 83ae5c9..49894fa 100644
---- a/dix/events.c
-+++ b/dix/events.c
-@@ -3192,6 +3192,18 @@ InitializeSprite(DeviceIntPtr pDev, WindowPtr pWin)
- #endif
- }
-
-+void FreeSprite(DeviceIntPtr dev)
-+{
-+ if (DevHasCursor(dev) && dev->spriteInfo->sprite) {
-+ if (dev->spriteInfo->sprite->current)
-+ FreeCursor(dev->spriteInfo->sprite->current, None);
-+ free(dev->spriteInfo->sprite->spriteTrace);
-+ free(dev->spriteInfo->sprite);
-+ }
-+ dev->spriteInfo->sprite = NULL;
-+}
-+
-+
- /**
- * Update the mouse sprite info when the server switches from a pScreen to another.
- * Otherwise, the pScreen of the mouse sprite is never updated when we switch
-diff --git a/include/dix.h b/include/dix.h
-index 5dc2ac5..3d8b0e5 100644
---- a/include/dix.h
-+++ b/include/dix.h
-@@ -395,6 +395,8 @@ DeliverTouchEvents(DeviceIntPtr /* dev */ ,
- extern void
- InitializeSprite(DeviceIntPtr /* pDev */ ,
- WindowPtr /* pWin */ );
-+extern void
-+FreeSprite(DeviceIntPtr pDev);
-
- extern void
- UpdateSpriteForScreen(DeviceIntPtr /* pDev */ ,
---
-1.7.9.5
-
diff --git a/debian/patches/512-dix-free-the-sprite-when-disabling-the-device.patch b/debian/patches/512-dix-free-the-sprite-when-disabling-the-device.patch
deleted file mode 100644
index 0ba5be4..0000000
--- a/debian/patches/512-dix-free-the-sprite-when-disabling-the-device.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From df1704365e700d3cf1d36a241bdfc479159a8df7 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Thu, 10 May 2012 15:33:15 +1000
-Subject: [PATCH 09/12] dix: free the sprite when disabling the device
-
-Disabled devices don't need sprites (they can't send events anyway) and the
-device init process is currently geared to check for whether sprite is
-present to check if the device should be paired/attached.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
----
- dix/devices.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/dix/devices.c b/dix/devices.c
-index a280dee..f134f31 100644
---- a/dix/devices.c
-+++ b/dix/devices.c
-@@ -465,6 +465,8 @@ DisableDevice(DeviceIntPtr dev, BOOL sendevent)
- (void) (*dev->deviceProc) (dev, DEVICE_OFF);
- dev->enabled = FALSE;
-
-+ FreeSprite(dev);
-+
- /* now that the device is disabled, we can reset the signal handler's
- * last.slave */
- OsBlockSignals();
---
-1.7.9.5
-
diff --git a/debian/patches/513-dix-disable-non-sprite-owners-first-when-disabling-p.patch b/debian/patches/513-dix-disable-non-sprite-owners-first-when-disabling-p.patch
deleted file mode 100644
index 0f7301a..0000000
--- a/debian/patches/513-dix-disable-non-sprite-owners-first-when-disabling-p.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From e433d1046c222f9d969c2c28a4651ff9097614f4 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Thu, 10 May 2012 12:42:59 +1000
-Subject: [PATCH 10/12] dix: disable non-sprite-owners first when disabling
- paired devices
-
-If a sprite-owner is to be disabled but still paired, disable the paired
-device first. i.e. disabling a master pointer will disable the master
-keyboard first.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
----
-Altered to apply to stable
-
- dix/devices.c | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/dix/devices.c b/dix/devices.c
-index f134f31..c5a713f 100644
---- a/dix/devices.c
-+++ b/dix/devices.c
-@@ -455,13 +455,13 @@
-
- if (IsMaster(dev) && dev->spriteInfo->sprite) {
- for (other = inputInfo.devices; other; other = other->next) {
-- if (other->spriteInfo->paired == dev) {
-- ErrorF("[dix] cannot disable device, still paired. "
-- "This is a bug. \n");
-- return FALSE;
-- }
-+ if (other->spriteInfo->paired == dev && !other->spriteInfo->spriteOwner)
-+ DisableDevice(other, sendevent);
- }
- }
-+
-+ if (dev->spriteInfo->paired)
-+ dev->spriteInfo->paired = NULL;
-
- (void) (*dev->deviceProc) (dev, DEVICE_OFF);
- dev->enabled = FALSE;
-
---
-1.7.9.5
-
diff --git a/debian/patches/514-Xi-drop-forced-unpairing-when-changing-the-hierarchy.patch b/debian/patches/514-Xi-drop-forced-unpairing-when-changing-the-hierarchy.patch
deleted file mode 100644
index 19e3d8a..0000000
--- a/debian/patches/514-Xi-drop-forced-unpairing-when-changing-the-hierarchy.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 9c0e820216cd1631f75b037b7908d55ac091692c Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Thu, 10 May 2012 12:55:44 +1000
-Subject: [PATCH 11/12] Xi: drop forced unpairing when changing the hierarchy
-
-Devices are unpaired as needed on DisableDevice now.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
----
- Xi/xichangehierarchy.c | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/Xi/xichangehierarchy.c b/Xi/xichangehierarchy.c
-index 756aaac..89f16d8 100644
---- a/Xi/xichangehierarchy.c
-+++ b/Xi/xichangehierarchy.c
-@@ -293,12 +293,6 @@ remove_master(ClientPtr client, xXIRemoveMasterInfo * r, int flags[MAXDEVICES])
- }
- }
-
-- /* can't disable until we removed pairing */
-- keybd->spriteInfo->paired = NULL;
-- ptr->spriteInfo->paired = NULL;
-- XTestptr->spriteInfo->paired = NULL;
-- XTestkeybd->spriteInfo->paired = NULL;
--
- /* disable the remove the devices, XTest devices must be done first
- else the sprites they rely on will be destroyed */
- DisableDevice(XTestptr, FALSE);
---
-1.7.9.5
-
diff --git a/debian/patches/515-dix-disable-all-devices-before-shutdown.patch b/debian/patches/515-dix-disable-all-devices-before-shutdown.patch
deleted file mode 100644
index b368b6e..0000000
--- a/debian/patches/515-dix-disable-all-devices-before-shutdown.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From 4c68f5d395c66f28b56e488cb3cd12f36820357b Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Wed, 9 May 2012 09:21:28 +1000
-Subject: [PATCH 12/12] dix: disable all devices before shutdown
-
-f3410b97cf9b48a47bee3d15d232f8a88e75f4ef introduced a regression on server
-shutdown. If any button or key was held on shutdown (ctrl, alt, backspace
-are usually still down) sending a raw event will segfault the server. The
-the root windows are set to NULL before calling CloseDownDevices().
-
-Avoid this by disabling all devices first when shutting down. Disabled
-devices won't send events anymore.
-
-Master keyboards must be disabled first, otherwise disabling the pointer
-will trigger DisableDevice(keyboard) and the keyboard is removed from the
-inputInfo.devices list and moved to inputInfo.off_devices. A regular loop
-through inputInfo.devices would thus jump to off_devices and not recover.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-Acked-by: Chase Douglas <chase.douglas@canonical.com>
-Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
----
- dix/devices.c | 20 ++++++++++++++++++++
- dix/main.c | 4 ++++
- include/input.h | 2 +-
- 3 files changed, 25 insertions(+), 1 deletion(-)
-
-diff --git a/dix/devices.c b/dix/devices.c
-index c5a713f..08875bc 100644
---- a/dix/devices.c
-+++ b/dix/devices.c
-@@ -501,6 +501,26 @@ DisableDevice(DeviceIntPtr dev, BOOL sendevent)
- return TRUE;
- }
-
-+void
-+DisableAllDevices(void)
-+{
-+ DeviceIntPtr dev, tmp;
-+
-+ nt_list_for_each_entry_safe(dev, tmp, inputInfo.devices, next) {
-+ if (!IsMaster(dev))
-+ DisableDevice(dev, FALSE);
-+ }
-+ /* master keyboards need to be disabled first */
-+ nt_list_for_each_entry_safe(dev, tmp, inputInfo.devices, next) {
-+ if (dev->enabled && IsMaster(dev) && IsKeyboardDevice(dev))
-+ DisableDevice(dev, FALSE);
-+ }
-+ nt_list_for_each_entry_safe(dev, tmp, inputInfo.devices, next) {
-+ if (dev->enabled)
-+ DisableDevice(dev, FALSE);
-+ }
-+}
-+
- /**
- * Initialise a new device through the driver and tell all clients about the
- * new device.
-diff --git a/dix/main.c b/dix/main.c
-index 70dcc94..df9023e 100644
---- a/dix/main.c
-+++ b/dix/main.c
-@@ -104,6 +104,7 @@ Equipment Corporation.
- #include "privates.h"
- #include "registry.h"
- #include "client.h"
-+#include "exevents.h"
- #ifdef PANORAMIX
- #include "panoramiXsrv.h"
- #else
-@@ -295,6 +296,7 @@ main(int argc, char *argv[], char *envp[])
- #endif
-
- UndisplayDevices();
-+ DisableAllDevices();
-
- /* Now free up whatever must be freed */