[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xorg-server: Changes to 'ubuntu'



 ChangeLog                                                       | 5745 +++++-
 Xext/Makefile.am                                                |   10 
 Xext/bigreq.c                                                   |    2 
 Xext/dpms.c                                                     |   16 
 Xext/geext.c                                                    |    8 
 Xext/geint.h                                                    |    3 
 Xext/mbuf.c                                                     | 2014 --
 Xext/mbufbf.c                                                   | 1007 -
 Xext/mbufpx.c                                                   |  648 
 Xext/panoramiX.c                                                |  204 
 Xext/panoramiX.h                                                |   22 
 Xext/panoramiXprocs.c                                           |  542 
 Xext/panoramiXsrv.h                                             |    3 
 Xext/saver.c                                                    |   76 
 Xext/security.c                                                 |   54 
 Xext/shape.c                                                    |  123 
 Xext/shm.c                                                      |  109 
 Xext/sleepuntil.c                                               |    6 
 Xext/sync.c                                                     |  101 
 Xext/xace.c                                                     |   23 
 Xext/xcalibrate.c                                               |   10 
 Xext/xcmisc.c                                                   |   10 
 Xext/xf86bigfont.c                                              |   50 
 Xext/xres.c                                                     |   16 
 Xext/xselinux_ext.c                                             |   22 
 Xext/xselinux_hooks.c                                           |   62 
 Xext/xselinux_label.c                                           |    8 
 Xext/xselinuxint.h                                              |   13 
 Xext/xtest.c                                                    |   43 
 Xext/xvdisp.c                                                   |  248 
 Xext/xvdix.h                                                    |    2 
 Xext/xvmain.c                                                   |   73 
 Xext/xvmc.c                                                     |   60 
 Xi/closedev.c                                                   |    2 
 Xi/exevents.c                                                   |  164 
 Xi/exglobals.h                                                  |    4 
 Xi/extinit.c                                                    |    8 
 Xi/getdctl.c                                                    |    4 
 Xi/getfctl.c                                                    |    4 
 Xi/getkmap.c                                                    |    4 
 Xi/getmmap.c                                                    |    2 
 Xi/getprop.c                                                    |    6 
 Xi/getselev.c                                                   |    4 
 Xi/gtmotion.c                                                   |    3 
 Xi/listdev.c                                                    |   10 
 Xi/opendev.c                                                    |    2 
 Xi/queryst.c                                                    |    4 
 Xi/sendexev.c                                                   |    5 
 Xi/stubs.c                                                      |    8 
 Xi/xichangecursor.c                                             |    4 
 Xi/xichangehierarchy.c                                          |   12 
 Xi/xipassivegrab.c                                              |    6 
 Xi/xiproperty.c                                                 |   61 
 Xi/xiquerydevice.c                                              |   13 
 Xi/xiquerypointer.c                                             |   13 
 Xi/xiselectev.c                                                 |    6 
 composite/compalloc.c                                           |   39 
 composite/compext.c                                             |   25 
 composite/compinit.c                                            |   33 
 composite/compint.h                                             |   16 
 composite/compoverlay.c                                         |    6 
 composite/compwindow.c                                          |  181 
 config/Makefile.am                                              |    2 
 config/config.c                                                 |    6 
 config/dbus.c                                                   |   21 
 config/fdi2iclass.py                                            |  202 
 config/hal.c                                                    |  124 
 config/udev.c                                                   |   86 
 configure.ac                                                    |   90 
 damageext/damageext.c                                           |   50 
 damageext/damageextint.h                                        |    3 
 dbe/dbe.c                                                       |  186 
 dbe/dbestruct.h                                                 |   12 
 dbe/midbe.c                                                     |   56 
 dbe/midbe.h                                                     |   11 
 dbe/midbestr.h                                                  |   16 
 debian/changelog                                                |  114 
 debian/control                                                  |   20 
 debian/copyright                                                |    2 
 debian/gbp.conf                                                 |    7 
 debian/inputabiver                                              |    2 
 debian/patches/02_Add-libnettle-as-option-for-sha1.diff         |   16 
 debian/patches/07-xfree86-fix-build-with-xv-disabled.diff       |   12 
 debian/patches/100_rethrow_signals.patch                        |  111 
 debian/patches/111_armel-drv-fallbacks.patch                    |   14 
 debian/patches/15-nouveau.diff                                  |   30 
 debian/patches/16-xaa-fbcomposite-fix-negative-size.diff        |    6 
 debian/patches/17-fix-DRI2-segfault-when-clientGone.diff        |   33 
 debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch |  108 
 debian/patches/196_xvfb-fbscreeninit-handling.patch             |   28 
 debian/patches/197_xvfb-randr.patch                             |   20 
 debian/patches/series                                           |    2 
 debian/prune/non-free                                           |    1 
 debian/rules                                                    |    2 
 debian/serverminver                                             |    2 
 debian/videoabiver                                              |    2 
 debian/watch                                                    |    2 
 dix/Makefile.am                                                 |    1 
 dix/atom.c                                                      |   54 
 dix/colormap.c                                                  |  320 
 dix/cursor.c                                                    |   75 
 dix/devices.c                                                   |  213 
 dix/dispatch.c                                                  |  674 
 dix/dixfonts.c                                                  |  192 
 dix/dixutils.c                                                  |   66 
 dix/enterleave.c                                                |   12 
 dix/eventconvert.c                                              |    8 
 dix/events.c                                                    |  434 
 dix/extension.c                                                 |   49 
 dix/gc.c                                                        |  436 
 dix/getevents.c                                                 |   91 
 dix/globals.c                                                   |    6 
 dix/glyphcurs.c                                                 |    9 
 dix/grabs.c                                                     |   38 
 dix/inpututils.c                                                |   88 
 dix/main.c                                                      |   39 
 dix/pixmap.c                                                    |   19 
 dix/privates.c                                                  |  561 
 dix/property.c                                                  |   93 
 dix/ptrveloc.c                                                  |   43 
 dix/region.c                                                    | 1659 +
 dix/registry.c                                                  |   14 
 dix/resource.c                                                  |  129 
 dix/selection.c                                                 |   27 
 dix/swaprep.c                                                   |   12 
 dix/swapreq.c                                                   |    2 
 dix/window.c                                                    |  441 
 doc/Makefile.am                                                 |    2 
 doc/xml/.gitignore                                              |    5 
 doc/xml/Makefile.am                                             |   33 
 doc/xml/Xserver-spec.xml                                        | 5182 +++++
 doc/xml/xmlrules.in                                             |   68 
 doc/xml/xserver.ent.in                                          |    3 
 exa/exa.c                                                       |   85 
 exa/exa_accel.c                                                 |   98 
 exa/exa_classic.c                                               |   15 
 exa/exa_driver.c                                                |    7 
 exa/exa_glyphs.c                                                |   16 
 exa/exa_migration_classic.c                                     |   60 
 exa/exa_mixed.c                                                 |   14 
 exa/exa_offscreen.c                                             |    8 
 exa/exa_priv.h                                                  |   30 
 exa/exa_render.c                                                |   50 
 exa/exa_unaccel.c                                               |   88 
 fb/Makefile.am                                                  |    2 
 fb/fb.h                                                         |   26 
 fb/fb24_32.c                                                    |    8 
 fb/fballpriv.c                                                  |   44 
 fb/fbarc.c                                                      |    2 
 fb/fbbits.h                                                     |    4 
 fb/fbcmap.c                                                     |   32 
 fb/fbcopy.c                                                     |    4 
 fb/fbfill.c                                                     |    2 
 fb/fbfillrect.c                                                 |    6 
 fb/fbfillsp.c                                                   |    6 
 fb/fbgc.c                                                       |    2 
 fb/fbglyph.c                                                    |    6 
 fb/fbimage.c                                                    |    8 
 fb/fbline.c                                                     |    4 
 fb/fboverlay.c                                                  |   70 
 fb/fbpict.c                                                     |   14 
 fb/fbpixmap.c                                                   |   22 
 fb/fbpoint.c                                                    |    2 
 fb/fbpush.c                                                     |    4 
 fb/fbscreen.c                                                   |   19 
 fb/fbseg.c                                                      |    8 
 fb/fbsetsp.c                                                    |    4 
 fb/fbtrap.c                                                     |    3 
 fb/fbwindow.c                                                   |   14 
 fb/wfbrename.h                                                  |    8 
 fix-miregion                                                    |   29 
 fix-miregion-private                                            |   14 
 fix-patch-whitespace                                            |    4 
 fix-region                                                      |   38 
 glx/glxcmds.c                                                   |   29 
 glx/glxdri.c                                                    |   74 
 glx/glxdri2.c                                                   |   75 
 glx/glxdricommon.c                                              |   15 
 glx/glxdricommon.h                                              |    3 
 glx/glxdriswrast.c                                              |   37 
 glx/glxext.c                                                    |   20 
 glx/glxscreens.c                                                |   21 
 glx/indirect_util.c                                             |    2 
 glx/single2.c                                                   |   26 
 glx/single2swap.c                                               |    4 
 glx/singlesize.c                                                |    4 
 glx/unpack.h                                                    |    2 
 glx/xfont.c                                                     |   25 
 hw/dmx/config/dmxparse.c                                        |    4 
 hw/dmx/dmx.c                                                    |   76 
 hw/dmx/dmx.h                                                    |   29 
 hw/dmx/dmx_glxvisuals.c                                         |   12 
 hw/dmx/dmxclient.h                                              |    2 
 hw/dmx/dmxcmap.c                                                |   10 
 hw/dmx/dmxcmap.h                                                |    3 
 hw/dmx/dmxcursor.c                                              |   66 
 hw/dmx/dmxextension.c                                           |   40 
 hw/dmx/dmxfont.c                                                |   46 
 hw/dmx/dmxgc.c                                                  |   10 
 hw/dmx/dmxgc.h                                                  |    3 
 hw/dmx/dmxgcops.c                                               |   18 
 hw/dmx/dmxinit.c                                                |   20 
 hw/dmx/dmxpict.c                                                |   38 
 hw/dmx/dmxpict.h                                                |    4 
 hw/dmx/dmxpixmap.c                                              |   28 
 hw/dmx/dmxpixmap.h                                              |    3 
 hw/dmx/dmxprop.c                                                |    8 
 hw/dmx/dmxscrinit.c                                             |   40 
 hw/dmx/dmxscrinit.h                                             |    3 
 hw/dmx/dmxshadow.c                                              |    4 
 hw/dmx/dmxstat.c                                                |    2 
 hw/dmx/dmxsync.c                                                |    2 
 hw/dmx/dmxwindow.c                                              |   30 
 hw/dmx/dmxwindow.h                                              |    7 
 hw/dmx/doc/Makefile.am                                          |   35 
 hw/dmx/doc/dmx.sgml                                             | 2778 --
 hw/dmx/doc/dmx.xml                                              | 3442 +++
 hw/dmx/doc/scaled.sgml                                          |  707 
 hw/dmx/doc/scaled.xml                                           |  725 
 hw/dmx/glxProxy/compsize.c                                      |    8 
 hw/dmx/glxProxy/g_renderswap.c                                  |  151 
 hw/dmx/glxProxy/glxcmds.c                                       |   36 
 hw/dmx/glxProxy/glxcmdsswap.c                                   |    9 
 hw/dmx/glxProxy/glxext.c                                        |    6 
 hw/dmx/glxProxy/glxfbconfig.c                                   |    6 
 hw/dmx/glxProxy/glxscreens.c                                    |   27 
 hw/dmx/glxProxy/glxsingle.c                                     |   40 
 hw/dmx/glxProxy/glxswap.c                                       |   10 
 hw/dmx/glxProxy/glxutil.c                                       |    6 
 hw/dmx/glxProxy/glxvendor.c                                     |   18 
 hw/dmx/glxProxy/glxvisuals.c                                    |   25 
 hw/dmx/glxProxy/render2swap.c                                   |   11 
 hw/dmx/glxProxy/renderpixswap.c                                 |    2 
 hw/dmx/glxProxy/unpack.h                                        |    6 
 hw/dmx/input/atKeynames.h                                       |    2 
 hw/dmx/input/dmxbackend.c                                       |    2 
 hw/dmx/input/dmxcommon.c                                        |    9 
 hw/dmx/input/dmxconsole.c                                       |   29 
 hw/dmx/input/dmxinputinit.c                                     |   35 
 hw/dmx/input/dmxinputinit.h                                     |    4 
 hw/dmx/input/dmxmotion.c                                        |    2 
 hw/dmx/input/dmxxinput.c                                        |   57 
 hw/dmx/input/lnx-keyboard.c                                     |    4 
 hw/dmx/input/lnx-ms.c                                           |    2 
 hw/dmx/input/lnx-ps2.c                                          |    2 
 hw/dmx/input/usb-common.c                                       |    2 
 hw/dmx/input/usb-keyboard.c                                     |    4 
 hw/kdrive/ephyr/XF86dri.c                                       |   10 
 hw/kdrive/ephyr/ephyr.c                                         |  133 
 hw/kdrive/ephyr/ephyr_draw.c                                    |   27 
 hw/kdrive/ephyr/ephyrdriext.c                                   |   71 
 hw/kdrive/ephyr/ephyrglxext.c                                   |   10 
 hw/kdrive/ephyr/ephyrhostvideo.c                                |   31 
 hw/kdrive/ephyr/ephyrvideo.c                                    |   36 
 hw/kdrive/ephyr/hostx.c                                         |   27 
 hw/kdrive/fake/fake.c                                           |   13 
 hw/kdrive/fbdev/fbdev.c                                         |   14 
 hw/kdrive/linux/evdev.c                                         |   20 
 hw/kdrive/linux/keyboard.c                                      |    4 
 hw/kdrive/linux/mouse.c                                         |    4 
 hw/kdrive/linux/tslib.c                                         |    4 
 hw/kdrive/src/kcmap.c                                           |    2 
 hw/kdrive/src/kdrive.c                                          |   43 
 hw/kdrive/src/kdrive.h                                          |    4 
 hw/kdrive/src/kinfo.c                                           |   36 
 hw/kdrive/src/kinput.c                                          |   36 
 hw/kdrive/src/kshadow.c                                         |    6 
 hw/kdrive/src/kxv.c                                             |  254 
 hw/vfb/InitInput.c                                              |    2 
 hw/vfb/InitOutput.c                                             |  159 
 hw/vfb/Makefile.am                                              |    1 
 hw/vfb/lk201kbd.h                                               |  158 
 hw/xfree86/common/Makefile.am                                   |    1 
 hw/xfree86/common/xf86.h                                        |   85 
 hw/xfree86/common/xf86AutoConfig.c                              |  267 
 hw/xfree86/common/xf86Bus.c                                     |  334 
 hw/xfree86/common/xf86Bus.h                                     |    1 
 hw/xfree86/common/xf86Config.c                                  |   59 
 hw/xfree86/common/xf86Configure.c                               |   72 
 hw/xfree86/common/xf86Cursor.c                                  |  108 
 hw/xfree86/common/xf86DGA.c                                     |   59 
 hw/xfree86/common/xf86DPMS.c                                    |    9 
 hw/xfree86/common/xf86Events.c                                  |    8 
 hw/xfree86/common/xf86Globals.c                                 |   12 
 hw/xfree86/common/xf86Helper.c                                  |  583 
 hw/xfree86/common/xf86Init.c                                    |  354 
 hw/xfree86/common/xf86Mode.c                                    |  204 
 hw/xfree86/common/xf86Module.h                                  |    6 
 hw/xfree86/common/xf86Opt.h                                     |    4 
 hw/xfree86/common/xf86Option.c                                  |   63 
 hw/xfree86/common/xf86Priv.h                                    |    7 
 hw/xfree86/common/xf86Privstr.h                                 |    3 
 hw/xfree86/common/xf86RandR.c                                   |   16 
 hw/xfree86/common/xf86ShowOpts.c                                |    8 
 hw/xfree86/common/xf86VGAarbiter.c                              |   39 
 hw/xfree86/common/xf86VGAarbiterPriv.h                          |    6 
 hw/xfree86/common/xf86VidMode.c                                 |   20 
 hw/xfree86/common/xf86Xinput.c                                  |  249 
 hw/xfree86/common/xf86Xinput.h                                  |    1 
 hw/xfree86/common/xf86cmap.c                                    |  122 
 hw/xfree86/common/xf86cmap.h                                    |    4 
 hw/xfree86/common/xf86fbman.c                                   |  190 
 hw/xfree86/common/xf86pciBus.c                                  |  943 -
 hw/xfree86/common/xf86pciBus.h                                  |    4 
 hw/xfree86/common/xf86sbusBus.c                                 |   21 
 hw/xfree86/common/xf86str.h                                     |    3 
 hw/xfree86/common/xf86xv.c                                      |  340 
 hw/xfree86/common/xf86xvmc.c                                    |   23 
 hw/xfree86/common/xisb.c                                        |   24 
 hw/xfree86/ddc/ddc.c                                            |   42 
 hw/xfree86/ddc/ddcProperty.c                                    |    2 
 hw/xfree86/ddc/interpret_edid.c                                 |    4 
 hw/xfree86/dixmods/extmod/modinit.c                             |   13 
 hw/xfree86/dixmods/extmod/modinit.h                             |    5 
 hw/xfree86/dixmods/extmod/xf86dga2.c                            |  175 
 hw/xfree86/dixmods/extmod/xf86vmode.c                           |  126 
 hw/xfree86/doc/Makefile.am                                      |    4 
 hw/xfree86/doc/README.rapidaccess                               |   48 
 hw/xfree86/doc/man/xorg.conf.man.pre                            |   82 
 hw/xfree86/doc/sgml/DESIGN.sgml                                 | 7414 -------
 hw/xfree86/doc/sgml/DESIGN.xml                                  | 9402 ++++++++++
 hw/xfree86/doc/sgml/Makefile.am                                 |   35 
 hw/xfree86/dri/dri.c                                            |   91 
 hw/xfree86/dri/dristruct.h                                      |    3 
 hw/xfree86/dri/xf86dri.c                                        |   28 
 hw/xfree86/dri2/dri2.c                                          |  280 
 hw/xfree86/dri2/dri2.h                                          |   19 
 hw/xfree86/dri2/dri2ext.c                                       |   64 
 hw/xfree86/exa/examodule.c                                      |   13 
 hw/xfree86/fbdevhw/Makefile.am                                  |    3 
 hw/xfree86/fbdevhw/fbdevhw.c                                    |    2 
 hw/xfree86/i2c/bt829.c                                          |    4 
 hw/xfree86/i2c/fi1236.c                                         |    6 
 hw/xfree86/i2c/msp3430.c                                        |   18 
 hw/xfree86/i2c/tda8425.c                                        |    6 
 hw/xfree86/i2c/tda9850.c                                        |    6 
 hw/xfree86/i2c/tda9885.c                                        |    6 
 hw/xfree86/i2c/uda1380.c                                        |    6 
 hw/xfree86/i2c/xf86i2c.c                                        |    8 
 hw/xfree86/int10/Makefile.am                                    |    1 
 hw/xfree86/int10/generic.c                                      |   22 
 hw/xfree86/int10/helper_exec.c                                  |    2 
 hw/xfree86/int10/helper_mem.c                                   |   11 
 hw/xfree86/loader/loadext.c                                     |   20 
 hw/xfree86/loader/loadmod.c                                     |   82 
 hw/xfree86/loader/sdksyms.sh                                    |    1 
 hw/xfree86/modes/xf86Crtc.c                                     |  163 
 hw/xfree86/modes/xf86Cursors.c                                  |   20 
 hw/xfree86/modes/xf86DiDGA.c                                    |    5 
 hw/xfree86/modes/xf86DisplayIDModes.c                           |    2 
 hw/xfree86/modes/xf86EdidModes.c                                |    2 
 hw/xfree86/modes/xf86Modes.c                                    |    8 
 hw/xfree86/modes/xf86RandR12.c                                  |   77 
 hw/xfree86/modes/xf86RandR12.h                                  |    1 
 hw/xfree86/modes/xf86Rotate.c                                   |   30 
 hw/xfree86/os-support/bsd/alpha_video.c                         |   10 
 hw/xfree86/os-support/bsd/arm_video.c                           |   12 
 hw/xfree86/os-support/bsd/bsd_VTsw.c                            |   16 
 hw/xfree86/os-support/bsd/bsd_init.c                            |   10 
 hw/xfree86/os-support/bsd/i386_video.c                          |   22 
 hw/xfree86/os-support/bsd/sparc64_video.c                       |    2 
 hw/xfree86/os-support/bus/Pci.c                                 |    1 
 hw/xfree86/os-support/bus/Pci.h                                 |    8 
 hw/xfree86/os-support/bus/Sbus.c                                |   16 
 hw/xfree86/os-support/linux/int10/linux.c                       |   18 
 hw/xfree86/os-support/linux/lnx_agp.c                           |    4 
 hw/xfree86/os-support/linux/lnx_init.c                          |   12 
 hw/xfree86/os-support/linux/lnx_video.c                         |   10 
 hw/xfree86/os-support/sco/VTsw_sco.c                            |   12 
 hw/xfree86/os-support/sco/sco_init.c                            |   16 
 hw/xfree86/os-support/shared/VTsw_noop.c                        |    8 
 hw/xfree86/os-support/shared/VTsw_usl.c                         |   14 
 hw/xfree86/os-support/shared/bios_devmem.c                      |    8 
 hw/xfree86/os-support/shared/bios_mmap.c                        |   12 
 hw/xfree86/os-support/shared/posix_tty.c                        |   63 
 hw/xfree86/os-support/shared/vidmem.c                           |    4 
 hw/xfree86/os-support/solaris/sun_VTsw.c                        |   20 
 hw/xfree86/os-support/solaris/sun_agp.c                         |   12 
 hw/xfree86/os-support/solaris/sun_bell.c                        |    2 
 hw/xfree86/os-support/sysv/sysv_init.c                          |   10 
 hw/xfree86/os-support/sysv/sysv_video.c                         |    4 
 hw/xfree86/parser/Configint.h                                   |    4 
 hw/xfree86/parser/Device.c                                      |    4 
 hw/xfree86/parser/Flags.c                                       |   21 
 hw/xfree86/parser/Input.c                                       |   12 
 hw/xfree86/parser/InputClass.c                                  |  191 
 hw/xfree86/parser/Layout.c                                      |   10 
 hw/xfree86/parser/Monitor.c                                     |   20 
 hw/xfree86/parser/Screen.c                                      |   12 
 hw/xfree86/parser/Video.c                                       |    4 
 hw/xfree86/parser/read.c                                        |   16 
 hw/xfree86/parser/scan.c                                        |   86 
 hw/xfree86/parser/xf86Parser.h                                  |   20 
 hw/xfree86/parser/xf86tokens.h                                  |    4 
 hw/xfree86/ramdac/IBM.c                                         |    8 
 hw/xfree86/ramdac/TI.c                                          |    2 
 hw/xfree86/ramdac/xf86Cursor.c                                  |   30 
 hw/xfree86/ramdac/xf86CursorPriv.h                              |    3 
 hw/xfree86/ramdac/xf86HWCurs.c                                  |   32 
 hw/xfree86/ramdac/xf86RamDac.c                                  |   16 
 hw/xfree86/shadowfb/shadow.c                                    |   94 
 hw/xfree86/utils/gtf/gtf.c                                      |    6 
 hw/xfree86/vbe/vbe.c                                            |   87 
 hw/xfree86/vbe/vbe.h                                            |    6 
 hw/xfree86/vbe/vbeModes.c                                       |    2 
 hw/xfree86/vgahw/vgaCmap.c                                      |   32 
 hw/xfree86/vgahw/vgaHW.c                                        |   27 
 hw/xfree86/xaa/xaa.h                                            |    7 
 hw/xfree86/xaa/xaaBitBlt.c                                      |   38 
 hw/xfree86/xaa/xaaCpyArea.c                                     |   38 
 hw/xfree86/xaa/xaaCpyPlane.c                                    |   20 
 hw/xfree86/xaa/xaaCpyWin.c                                      |   20 
 hw/xfree86/xaa/xaaDashLine.c                                    |    4 
 hw/xfree86/xaa/xaaFillArc.c                                     |    4 
 hw/xfree86/xaa/xaaFillPoly.c                                    |   12 
 hw/xfree86/xaa/xaaFillRect.c                                    |   24 
 hw/xfree86/xaa/xaaGC.c                                          |    7 
 hw/xfree86/xaa/xaaImage.c                                       |    8 
 hw/xfree86/xaa/xaaInit.c                                        |   67 
 hw/xfree86/xaa/xaaInitAccel.c                                   |    4 
 hw/xfree86/xaa/xaaLine.c                                        |    4 
 hw/xfree86/xaa/xaaLineMisc.c                                    |    5 
 hw/xfree86/xaa/xaaNonTEText.c                                   |   28 
 hw/xfree86/xaa/xaaOffscreen.c                                   |    8 
 hw/xfree86/xaa/xaaOverlay.c                                     |   22 
 hw/xfree86/xaa/xaaOverlayDF.c                                   |   47 
 hw/xfree86/xaa/xaaPCache.c                                      |   72 
 hw/xfree86/xaa/xaaPict.c                                        |   44 
 hw/xfree86/xaa/xaaRect.c                                        |    4 
 hw/xfree86/xaa/xaaSpans.c                                       |   10 
 hw/xfree86/xaa/xaaStateChange.c                                 |   13 
 hw/xfree86/xaa/xaaTEGlyph.c                                     |    8 
 hw/xfree86/xaa/xaaTEText.c                                      |   17 
 hw/xfree86/xaa/xaaWideLine.c                                    |    4 
 hw/xfree86/xaa/xaaWrapper.c                                     |   27 
 hw/xfree86/xaa/xaalocal.h                                       |    9 
 hw/xfree86/xaa/xaawrap.h                                        |    4 
 hw/xnest/Color.c                                                |   63 
 hw/xnest/Cursor.c                                               |    4 
 hw/xnest/Display.c                                              |    4 
 hw/xnest/Drawable.h                                             |    2 
 hw/xnest/Events.c                                               |    4 
 hw/xnest/Font.c                                                 |    4 
 hw/xnest/GC.c                                                   |   21 
 hw/xnest/GCOps.c                                                |   16 
 hw/xnest/Keyboard.c                                             |   14 
 hw/xnest/Pixmap.c                                               |   28 
 hw/xnest/Screen.c                                               |   35 
 hw/xnest/Window.c                                               |   47 
 hw/xnest/XNCursor.h                                             |    3 
 hw/xnest/XNGC.h                                                 |    3 
 hw/xnest/XNPixmap.h                                             |    3 
 hw/xnest/XNWindow.h                                             |    5 
 hw/xquartz/GL/glcontextmodes.c                                  |    6 
 hw/xquartz/GL/indirect.c                                        |   40 
 hw/xquartz/GL/visualConfigs.c                                   |    2 
 hw/xquartz/applewm.c                                            |   58 
 hw/xquartz/bundle/Info.plist.cpp                                |    4 
 hw/xquartz/darwin.c                                             |   56 
 hw/xquartz/darwin.h                                             |    3 
 hw/xquartz/darwinEvents.c                                       |    4 
 hw/xquartz/darwinXinput.c                                       |    8 
 hw/xquartz/mach-startup/bundle-main.c                           |    2 
 hw/xquartz/mach-startup/launchd_fd.h                            |    1 
 hw/xquartz/pseudoramiX.c                                        |   16 
 hw/xquartz/quartz.c                                             |   27 
 hw/xquartz/quartzCocoa.m                                        |   11 
 hw/xquartz/quartzCommon.h                                       |   18 
 hw/xquartz/quartzKeyboard.c                                     |   30 
 hw/xquartz/xpr/appledri.c                                       |   22 
 hw/xquartz/xpr/dri.c                                            |   61 
 hw/xquartz/xpr/driWrap.c                                        |   20 
 hw/xquartz/xpr/x-hook.c                                         |    8 
 hw/xquartz/xpr/xprCursor.c                                      |   24 
 hw/xquartz/xpr/xprFrame.c                                       |   10 
 hw/xquartz/xpr/xprScreen.c                                      |    8 
 hw/xwin/InitOutput.c                                            |   61 
 hw/xwin/Makefile.am                                             |   26 
 hw/xwin/glx/.gitignore                                          |    8 
 hw/xwin/glx/Makefile.am                                         |   60 
 hw/xwin/glx/gen_gl_wrappers.py                                  |  319 
 hw/xwin/glx/glwindows.h                                         |  102 
 hw/xwin/glx/glwrap.c                                            |  661 
 hw/xwin/glx/indirect.c                                          | 3215 ++-
 hw/xwin/glx/wgl_ext_api.c                                       |   75 
 hw/xwin/glx/wgl_ext_api.h                                       |   87 
 hw/xwin/glx/winpriv.c                                           |  126 
 hw/xwin/glx/winpriv.h                                           |   11 
 hw/xwin/win.h                                                   |   32 
 hw/xwin/winallpriv.c                                            |   20 
 hw/xwin/winauth.c                                               |    4 
 hw/xwin/winclipboardxevents.c                                   |    9 
 hw/xwin/winconfig.c                                             |   51 
 hw/xwin/winconfig.h                                             |    2 
 hw/xwin/windialogs.c                                            |    2 
 hw/xwin/winerror.c                                              |    6 
 hw/xwin/winfillsp.c                                             |    6 
 hw/xwin/wingc.c                                                 |    2 
 hw/xwin/winglobals.c                                            |   21 
 hw/xwin/winkeybd.c                                              |    2 
 hw/xwin/winkeynames.h                                           |    1 
 hw/xwin/winmultiwindowshape.c                                   |   21 
 hw/xwin/winmultiwindowwindow.c                                  |    3 
 hw/xwin/winprefs.c                                              |   12 
 hw/xwin/winpriv.c                                               |  134 
 hw/xwin/winpriv.h                                               |   15 
 hw/xwin/winprocarg.c                                            |  632 
 hw/xwin/winscrinit.c                                            |   10 
 hw/xwin/winsetsp.c                                              |    4 
 hw/xwin/winshaddd.c                                             |    6 
 hw/xwin/winshadddnl.c                                           |    6 
 hw/xwin/winshadgdi.c                                            |    6 
 hw/xwin/winvalargs.c                                            |   31 
 hw/xwin/winvideo.c                                              |    4 
 hw/xwin/winwin32rootless.c                                      |    4 
 hw/xwin/winwin32rootlesswindow.c                                |    2 
 hw/xwin/winwindow.c                                             |   39 
 hw/xwin/winwindowswm.c                                          |   40 
 include/Makefile.am                                             |    1 
 include/callback.h                                              |   87 
 include/colormap.h                                              |    6 
 include/cursor.h                                                |    5 
 include/cursorstr.h                                             |    4 
 include/dix-config.h.in                                         |    9 
 include/dix.h                                                   |   43 
 include/dixfont.h                                               |    8 
 include/dixstruct.h                                             |    7 
 include/extnsionst.h                                            |    2 
 include/gc.h                                                    |   20 
 include/gcstruct.h                                              |    5 
 include/globals.h                                               |    9 
 include/input.h                                                 |   13 
 include/inputstr.h                                              |   18 
 include/list.h                                                  |    6 
 include/os.h                                                    |   96 
 include/pixmap.h                                                |    3 
 include/privates.h                                              |  252 
 include/protocol-versions.h                                     |    2 
 include/ptrveloc.h                                              |    5 
 include/regionstr.h                                             |  429 
 include/resource.h                                              |   17 
 include/scrnintstr.h                                            |   42 
 include/windowstr.h                                             |   13 
 include/xkbsrv.h                                                |   28 
 include/xorg-config.h.in                                        |    3 
 include/xserver-properties.h                                    |    7 
 mi/Makefile.am                                                  |    5 
 mi/mi.h                                                         |   21 
 mi/miarc.c                                                      |  224 
 mi/mibank.c                                                     | 2314 --
 mi/mibank.h                                                     |  112 
 mi/mibitblt.c                                                   |  130 
 mi/micmap.c                                                     |   43 
 mi/micmap.h                                                     |    8 
 mi/micopy.c                                                     |   40 
 mi/midispcur.c                                                  |  437 
 mi/mieq.c                                                       |    4 
 mi/miexpose.c                                                   |  154 
 mi/mifillarc.c                                                  |   40 
 mi/mifillrct.c                                                  |   12 
 mi/mifpolycon.c                                                 |   20 
 mi/migc.c                                                       |   52 
 mi/miglblt.c                                                    |   36 
 mi/miinitext.c                                                  |   26 
 mi/miline.h                                                     |    3 
 mi/mioverlay.c                                                  |  536 
 mi/mipointer.c                                                  |   80 
 mi/mipointer.h                                                  |   11 
 mi/mipolycon.c                                                  |   26 
 mi/mipolygen.c                                                  |   14 
 mi/mipolypnt.c                                                  |   16 
 mi/mipolyrect.c                                                 |    4 
 mi/mipolyutil.c                                                 |    6 
 mi/mipushpxl.c                                                  |    4 
 mi/miregion.c                                                   | 1845 -
 mi/miscrinit.c                                                  |   19 
 mi/mispans.c                                                    |   76 
 mi/mispans.h                                                    |   10 
 mi/misprite.c                                                   |  180 
 mi/misprite.h                                                   |   81 
 mi/mivaltree.c                                                  |  150 
 mi/miwideline.c                                                 |  283 
 mi/miwideline.h                                                 |   72 
 mi/miwindow.c                                                   |  225 
 mi/mizerarc.c                                                   |   18 
 mi/mizerline.c                                                  |    8 
 miext/cw/cw.c                                                   |   76 
 miext/cw/cw.h                                                   |   15 
 miext/cw/cw_render.c                                            |    9 
 miext/damage/damage.c                                           |  178 
 miext/damage/damagestr.h                                        |    4 
 miext/rootless/rootlessCommon.c                                 |   57 
 miext/rootless/rootlessCommon.h                                 |   21 
 miext/rootless/rootlessGC.c                                     |    2 
 miext/rootless/rootlessScreen.c                                 |   44 
 miext/rootless/rootlessValTree.c                                |  111 
 miext/rootless/rootlessWindow.c                                 |  123 
 miext/rootless/rootlessWindow.h                                 |    2 
 miext/shadow/shadow.c                                           |   23 
 miext/shadow/shadow.h                                           |    2 
 miext/shadow/shalloc.c                                          |    2 
 miext/shadow/shpacked.c                                         |    4 
 miext/shadow/shplanar.c                                         |    4 
 miext/shadow/shplanar8.c                                        |    4 
 miext/shadow/shrotate.c                                         |    4 
 miext/shadow/shrotpack.h                                        |    4 
 miext/shadow/shrotpackYX.h                                      |    4 
 os/WaitFor.c                                                    |    6 
 os/access.c                                                     |   75 
 os/auth.c                                                       |   15 
 os/connection.c                                                 |   33 
 os/io.c                                                         |   68 
 os/log.c                                                        |   11 
 os/mitauth.c                                                    |   22 
 os/osdep.h                                                      |   23 
 os/osinit.c                                                     |    5 
 os/rpcauth.c                                                    |   14 
 os/strcasecmp.c                                                 |    2 
 os/strcasestr.c                                                 |    2 
 os/strlcpy.c                                                    |    2 
 os/utils.c                                                      |  231 
 os/xdmauth.c                                                    |   62 
 os/xdmcp.c                                                      |   80 
 os/xprintf.c                                                    |    4 
 os/xsha1.c                                                      |   20 
 randr/randr.c                                                   |   29 
 randr/randrstr.h                                                |   14 
 randr/rrcrtc.c                                                  |  115 
 randr/rrdispatch.c                                              |    8 
 randr/rrinfo.c                                                  |   14 
 randr/rrmode.c                                                  |   17 
 randr/rroutput.c                                                |   49 
 randr/rrproperty.c                                              |  160 
 randr/rrscreen.c                                                |   53 
 randr/rrtransform.c                                             |   36 
 randr/rrxinerama.c                                              |   14 
 record/record.c                                                 |  111 
 record/set.c                                                    |   12 
 render/animcur.c                                                |   91 
 render/filter.c                                                 |   28 
 render/glyph.c                                                  |   57 
 render/miindex.c                                                |   12 
 render/mipict.c                                                 |   44 
 render/mirect.c                                                 |   30 
 render/mitri.c                                                  |    8 
 render/picture.c                                                |   92 
 render/picture.h                                                |    1 
 render/picturestr.h                                             |   18 
 render/render.c                                                 |  423 
 test/.gitignore                                                 |   13 
 test/input.c                                                    |  133 
 test/xi2/protocol-common.c                                      |   17 
 test/xi2/protocol-eventconvert.c                                |   18 
 test/xtest.c                                                    |    4 
 xfixes/cursor.c                                                 |  105 
 xfixes/region.c                                                 |  153 
 xfixes/saveset.c                                                |   12 
 xfixes/select.c                                                 |   12 
 xfixes/xfixes.c                                                 |    9 
 xfixes/xfixes.h                                                 |    5 
 xkb/Makefile.am                                                 |    4 
 xkb/XKBAlloc.c                                                  |   58 
 xkb/XKBGAlloc.c                                                 |   74 
 xkb/XKBMAlloc.c                                                 |  179 
 xkb/XKBMisc.c                                                   |   10 
 xkb/ddxDevBtn.c                                                 |   69 
 xkb/ddxFakeMtn.c                                                |   64 
 xkb/ddxList.c                                                   |   13 
 xkb/ddxLoad.c                                                   |   21 
 xkb/maprules.c                                                  |   78 
 xkb/xkb.c                                                       |  184 
 xkb/xkbAccessX.c                                                |   33 
 xkb/xkbActions.c                                                |  134 
 xkb/xkbEvents.c                                                 |    8 
 xkb/xkbInit.c                                                   |   79 
 xkb/xkbLEDs.c                                                   |   50 
 xkb/xkbUtils.c                                                  |  406 
 xkb/xkbfmisc.c                                                  |    2 
 xkb/xkbout.c                                                    |    9 
 xkb/xkmread.c                                                   |   12 
 xorg-server.pc.in                                               |    1 
 681 files changed, 43005 insertions(+), 36605 deletions(-)

New commits:
commit 0c5af4ee70fdde3a703aff80f651e9e44db7945f
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date:   Thu Jul 15 16:56:15 2010 +1000

    Update changelog

diff --git a/debian/changelog b/debian/changelog
index 04cf192..8eb66fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.8.99.904-2) UNRELEASED; urgency=low
+xorg-server (2:1.8.99.905-1) UNRELEASED; urgency=low
 
   [ Julien Cristau ]
   * Drop recommends on xbase-clients.
@@ -7,6 +7,7 @@ xorg-server (2:1.8.99.904-2) UNRELEASED; urgency=low
   * Don't install serverminver, drivers shouldn't use this anymore.
 
   [ Christopher James Halse Rogers ]
+  * New upstream RC
   * Drop 17-fix-DRI2-segfault-when-clientGone.diff: fixed upstream in more
     generality.
 

commit 0bd72632ac7b81de9603962595fb2a3149b2e542
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date:   Thu Jul 15 15:37:44 2010 +1000

    Drop DRI2 segfault fix patch.
    
    This is fixed upstream in commit 660f6ab5

diff --git a/debian/changelog b/debian/changelog
index b728f4b..04cf192 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,16 @@
 xorg-server (2:1.8.99.904-2) UNRELEASED; urgency=low
 
+  [ Julien Cristau ]
   * Drop recommends on xbase-clients.
   * Add xauth to xserver-common recommends.
   * Bump Standards-Version to 3.9.0.
   * Don't install serverminver, drivers shouldn't use this anymore.
 
- -- Julien Cristau <jcristau@debian.org>  Fri, 09 Jul 2010 13:20:31 +0100
+  [ Christopher James Halse Rogers ]
+  * Drop 17-fix-DRI2-segfault-when-clientGone.diff: fixed upstream in more
+    generality.
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com>  Thu, 15 Jul 2010 15:32:38 +1000
 
 xorg-server (2:1.8.99.904-1) experimental; urgency=low
 
diff --git a/debian/patches/17-fix-DRI2-segfault-when-clientGone.diff b/debian/patches/17-fix-DRI2-segfault-when-clientGone.diff
deleted file mode 100644
index 08ee08b..0000000
--- a/debian/patches/17-fix-DRI2-segfault-when-clientGone.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-From c1c59e7d5f0c6f0eea88657f892175166679da4f Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Sat, 15 May 2010 19:24:30 +0100
-Subject: [PATCH] dri2: Only send the swap event if the client hasn't gone fishing
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes:
-
-  Bug 27497 - xorg crashes after update to 1.8.0
-  https://bugs.freedesktop.org/show_bug.cgi?id=27497
-
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-Cc: Kristian Høgsberg <krh@bitplanet.net>
----
- hw/xfree86/dri2/dri2ext.c |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-Index: xorg-server/hw/xfree86/dri2/dri2ext.c
-===================================================================
---- xorg-server.orig/hw/xfree86/dri2/dri2ext.c	2010-06-18 12:59:17.534477001 +1000
-+++ xorg-server/hw/xfree86/dri2/dri2ext.c	2010-06-18 13:06:30.914477000 +1000
-@@ -355,6 +355,9 @@
-     xDRI2BufferSwapComplete event;
-     DrawablePtr pDrawable = data;
- 
-+    if (client->clientGone)
-+	return;
-+
-     event.type = DRI2EventBase + DRI2_BufferSwapComplete;
-     event.sequenceNumber = client->sequence;
-     event.event_type = type;
diff --git a/debian/patches/series b/debian/patches/series
index f850a70..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
-17-fix-DRI2-segfault-when-clientGone.diff

commit a2c13f0d6548310e3cd115cf486d3e43edf23dcc
Author: Keith Packard <keithp@keithp.com>
Date:   Wed Jul 14 12:57:29 2010 -0700

    Bump to version 1.8.99.905 (1.9 RC5)
    
    Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/configure.ac b/configure.ac
index b3b752c..baa0b5c 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.8.99.904, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2010-07-01"
+AC_INIT([xorg-server], 1.8.99.905, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2010-07-14"
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE

commit 6de6f5eb2a53ee7200bad99b423c4282c883c250
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date:   Wed Jul 14 15:09:28 2010 +1000

    Drop unused xvfb patch

diff --git a/debian/patches/196_xvfb-fbscreeninit-handling.patch b/debian/patches/196_xvfb-fbscreeninit-handling.patch
deleted file mode 100644
index bda41f4..0000000
--- a/debian/patches/196_xvfb-fbscreeninit-handling.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-=== modified file 'hw/vfb/InitOutput.c'
-Index: xorg-server/hw/vfb/InitOutput.c
-===================================================================
---- xorg-server.orig/hw/vfb/InitOutput.c	2010-07-14 14:02:26.000000000 +1000
-+++ xorg-server/hw/vfb/InitOutput.c	2010-07-14 14:53:33.951453001 +1000
-@@ -66,6 +66,7 @@
- #endif /* HAS_SHM */
- #include "dix.h"
- #include "miline.h"
-+#include "randrstr.h"
- 
- #define VFB_DEFAULT_WIDTH      1280
- #define VFB_DEFAULT_HEIGHT     1024

commit 6fc2491bc199e45bd8fde92eb800a087e85cf7b7
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date:   Wed Jul 14 15:09:04 2010 +1000

    Refresh patches for new upstream

diff --git a/debian/changelog b/debian/changelog
index bbfde82..b057785 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -46,7 +46,7 @@ xorg-server (2:1.8.99.904-1ubuntu1) maverick; urgency=low
         Cache keyboard settings.
       + 191-Xorg-add-an-extra-module-path.patch:
         Add support for the alternatives module path.
-      + 196_xvfb-fbscreeninit-handling.patch, 197_xvfb-randr.patch:
+      + 197_xvfb-randr.patch:
         Adds xrandr support to xvfb. (LP 516123)
       + 198_nohwaccess.patch:
         Adds a -nohwaccess argument to make X not access the hardware
@@ -54,6 +54,8 @@ xorg-server (2:1.8.99.904-1ubuntu1) maverick; urgency=low
       + 200_randr-null.patch:
         Clarify a pointer initialization.
   * Update changelog entries for 1.8.1.902-1 which became 1.8.99.904-1
+  * Drop 196_xvfbscreeninit-handling.patch: it's semantically empty, and now 
+    doesn't apply.  Merge remaining #include change into 197_xvfb-randr.patch
 
  -- Christopher James Halse Rogers <raof@ubuntu.com>  Wed, 14 Jul 2010 13:57:50 +1000
 
diff --git a/debian/patches/100_rethrow_signals.patch b/debian/patches/100_rethrow_signals.patch
index b5b330f..187310d 100644
--- a/debian/patches/100_rethrow_signals.patch
+++ b/debian/patches/100_rethrow_signals.patch
@@ -1,6 +1,8 @@
---- a/hw/dmx/dmxinit.c
-+++ b/hw/dmx/dmxinit.c
-@@ -834,7 +834,7 @@ static void dmxSetDefaultFontPath(char *
+Index: xorg-server/hw/dmx/dmxinit.c
+===================================================================
+--- xorg-server.orig/hw/dmx/dmxinit.c	2010-07-14 13:21:02.000000000 +1000
++++ xorg-server/hw/dmx/dmxinit.c	2010-07-14 14:02:26.161453002 +1000
+@@ -830,7 +830,7 @@
  /** This function is called in Xserver/os/utils.c from \a AbortServer().
   * We must ensure that backend and console state is restored in the
   * event the server shutdown wasn't clean. */
@@ -9,7 +11,7 @@
  {
      int i;
  
-@@ -852,6 +852,11 @@ void ddxBeforeReset(void)
+@@ -848,6 +848,11 @@
  }
  #endif
  
@@ -21,9 +23,11 @@
  /** This function is called in Xserver/dix/main.c from \a main() when
   * dispatchException & DE_TERMINATE (which is the only way to exit the
   * main loop without an interruption. */
---- a/hw/kdrive/src/kdrive.c
-+++ b/hw/kdrive/src/kdrive.c
-@@ -322,7 +322,7 @@ KdProcessSwitch (void)
+Index: xorg-server/hw/kdrive/src/kdrive.c
+===================================================================
+--- xorg-server.orig/hw/kdrive/src/kdrive.c	2010-07-14 13:21:02.000000000 +1000
++++ xorg-server/hw/kdrive/src/kdrive.c	2010-07-14 14:02:26.161453002 +1000
+@@ -321,7 +321,7 @@
  }
  
  void
@@ -32,7 +36,7 @@
  {
      KdDisableScreens ();
      if (kdOsFuncs)
-@@ -339,6 +339,12 @@ AbortDDX(void)
+@@ -338,6 +338,12 @@
  }
  
  void
@@ -45,9 +49,11 @@
  ddxGiveUp (void)
  {
      AbortDDX ();
---- a/hw/vfb/InitOutput.c
-+++ b/hw/vfb/InitOutput.c
-@@ -214,11 +214,17 @@ ddxGiveUp(void)
+Index: xorg-server/hw/vfb/InitOutput.c
+===================================================================
+--- xorg-server.orig/hw/vfb/InitOutput.c	2010-07-14 13:21:02.000000000 +1000
++++ xorg-server/hw/vfb/InitOutput.c	2010-07-14 14:02:26.161453002 +1000
+@@ -201,11 +201,17 @@
  }
  
  void
@@ -66,9 +72,11 @@
  #ifdef __APPLE__
  void
  DarwinHandleGUI(int argc, char *argv[])
---- a/hw/xfree86/common/xf86Events.c
-+++ b/hw/xfree86/common/xf86Events.c
-@@ -348,6 +348,8 @@ xf86InterceptSigIll(void (*sigillhandler
+Index: xorg-server/hw/xfree86/common/xf86Events.c
+===================================================================
+--- xorg-server.orig/hw/xfree86/common/xf86Events.c	2010-07-14 13:21:02.000000000 +1000
++++ xorg-server/hw/xfree86/common/xf86Events.c	2010-07-14 14:02:26.171453002 +1000
+@@ -348,6 +348,8 @@
  int
  xf86SigWrapper(int signo)
  {
@@ -77,9 +85,11 @@
    if ((signo == SIGILL) && xf86SigIllHandler) {
      (*xf86SigIllHandler)();
      return 0; /* continue */
---- a/hw/xfree86/common/xf86Init.c
-+++ b/hw/xfree86/common/xf86Init.c
-@@ -1197,14 +1197,17 @@ OsVendorInit(void)
+Index: xorg-server/hw/xfree86/common/xf86Init.c
+===================================================================
+--- xorg-server.orig/hw/xfree86/common/xf86Init.c	2010-07-14 13:21:02.000000000 +1000
++++ xorg-server/hw/xfree86/common/xf86Init.c	2010-07-14 14:02:26.171453002 +1000
+@@ -899,14 +899,17 @@
  }
  
  /*
@@ -99,7 +109,7 @@
  {
      int i;
  
-@@ -1231,24 +1234,45 @@ ddxGiveUp(void)
+@@ -933,24 +936,45 @@
      if (xorgHWOpenConsole)
  	xf86CloseConsole();
  
@@ -149,7 +159,7 @@
  {
    int i;
  
-@@ -1281,7 +1305,20 @@ AbortDDX(void)
+@@ -983,7 +1007,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)
     */
@@ -171,9 +181,11 @@
  }
  
  void
---- a/hw/xnest/Init.c
-+++ b/hw/xnest/Init.c
-@@ -117,12 +117,17 @@ CloseInput(void)
+Index: xorg-server/hw/xnest/Init.c
+===================================================================
+--- xorg-server.orig/hw/xnest/Init.c	2010-07-05 15:56:19.000000000 +1000
++++ xorg-server/hw/xnest/Init.c	2010-07-14 14:02:26.171453002 +1000
+@@ -117,12 +117,17 @@
  /*
   * DDX - specific abort routine.  Called by AbortServer().
   */
@@ -192,9 +204,11 @@
  /* Called by GiveUp(). */
  void ddxGiveUp(void)
  {
---- a/hw/xquartz/darwin.c
-+++ b/hw/xquartz/darwin.c
-@@ -765,17 +765,22 @@ void ddxGiveUp( void )


Reply to: