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

xorg-server: Changes to 'debian-experimental'



 COPYING                                                              |    2 
 ChangeLog                                                            | 5567 ++++++-
 Makefile.am                                                          |    2 
 Xext/Makefile.am                                                     |    3 
 Xext/bigreq.c                                                        |   18 
 Xext/geext.c                                                         |    1 
 Xext/panoramiX.c                                                     |   16 
 Xext/panoramiXsrv.h                                                  |    1 
 Xext/saver.c                                                         |   88 
 Xext/shape.c                                                         |   54 
 Xext/shm.c                                                           |  557 
 Xext/sync.c                                                          |  954 -
 Xext/syncsdk.h                                                       |   47 
 Xext/syncsrv.h                                                       |   37 
 Xext/xcmisc.c                                                        |   26 
 Xext/xf86bigfont.c                                                   |    6 
 Xext/xtest.c                                                         |   39 
 Xi/closedev.c                                                        |    1 
 Xi/exevents.c                                                        |   21 
 Xi/extinit.c                                                         |    3 
 Xi/listdev.c                                                         |   10 
 Xi/opendev.c                                                         |    1 
 Xi/queryst.c                                                         |    3 
 Xi/setmode.c                                                         |    2 
 Xi/stubs.c                                                           |   90 
 Xi/xichangehierarchy.c                                               |  522 
 Xi/xiquerydevice.c                                                   |    2 
 composite/compalloc.c                                                |   42 
 composite/compext.c                                                  |  362 
 composite/compint.h                                                  |    3 
 composite/compoverlay.c                                              |   17 
 composite/compwindow.c                                               |   52 
 config/Makefile.am                                                   |    2 
 config/hal.c                                                         |    6 
 config/udev.c                                                        |    9 
 config/x11-input.fdi                                                 |    5 
 configure.ac                                                         |   44 
 debian/changelog                                                     |   80 
 debian/control                                                       |   33 
 debian/inputabiver                                                   |    1 
 debian/local/dh_xsf_substvars                                        |   53 
 debian/local/xsf.pm                                                  |    8 
 debian/patches/001_fedora_extramodes.patch                           |    6 
 debian/patches/02_Add-libnettle-as-option-for-sha1.diff              |   24 
 debian/patches/07-xfree86-fix-build-with-xv-disabled.diff            |   20 
 debian/patches/15-nouveau.diff                                       |   32 
 debian/patches/16-xaa-fbcomposite-fix-negative-size.diff             |   13 
 debian/patches/series                                                |    1 
 debian/rules                                                         |   54 
 debian/serverminver                                                  |    4 
 debian/videoabiver                                                   |    1 
 debian/xserver-xorg-core.NEWS                                        |   62 
 debian/xserver-xorg-core.bug.script                                  |   19 
 debian/xserver-xorg-dev.install                                      |    3 
 dix/devices.c                                                        |   71 
 dix/dispatch.c                                                       |   33 
 dix/dispatch.h                                                       |  211 
 dix/dixfonts.c                                                       |   54 
 dix/dixutils.c                                                       |    9 
 dix/enterleave.c                                                     |   13 
 dix/eventconvert.c                                                   |    8 
 dix/events.c                                                         |   76 
 dix/extension.c                                                      |    6 
 dix/gc.c                                                             |    6 
 dix/getevents.c                                                      |  353 
 dix/globals.c                                                        |    4 
 dix/grabs.c                                                          |    7 
 dix/inpututils.c                                                     |  130 
 dix/main.c                                                           |    4 
 dix/privates.c                                                       |   34 
 dix/ptrveloc.c                                                       |    8 
 dix/tables.c                                                         |  508 
 dix/window.c                                                         |  230 
 doc/.gitignore                                                       |    2 
 doc/Makefile.am                                                      |   27 
 doc/Xserver.man.pre                                                  |  592 
 doc/man/Makefile.am                                                  |   20 
 doc/man/Xserver.man                                                  |  584 
 doc/xml/.gitignore                                                   |    1 
 doc/xml/Makefile.am                                                  |   11 
 doc/xml/Xserver-spec.xml                                             |  205 
 doc/xml/dtrace/.gitignore                                            |    1 
 doc/xml/dtrace/Makefile.am                                           |   14 
 doc/xml/xmlrules-inst.in                                             |   23 
 doc/xml/xmlrules-noinst.in                                           |   22 
 doc/xml/xmlrules.in                                                  |   53 
 exa/exa_accel.c                                                      |    2 
 exa/exa_mixed.c                                                      |    2 
 exa/exa_unaccel.c                                                    |    2 
 fb/Makefile.am                                                       |    2 
 fb/fb.h                                                              |    3 
 fb/fbcmap.c                                                          |  586 
 fb/fbgc.c                                                            |   12 
 fb/fbpict.c                                                          |  125 
 fb/fbpict.h                                                          |  416 
 fb/fbtrap.c                                                          |    1 
 fb/wfbrename.h                                                       |   19 
 glx/Makefile.am                                                      |    1 
 glx/g_disptab.h                                                      |   52 
 glx/glxcmds.c                                                        |  233 
 glx/glxcmdsswap.c                                                    |    1 
 glx/glxdri.c                                                         |    5 
 glx/glxdri2.c                                                        |    5 
 glx/glxdriswrast.c                                                   |   21 
 glx/glxext.c                                                         |   19 
 glx/glxscreens.c                                                     |   27 
 glx/glxscreens.h                                                     |   18 
 glx/indirect_table.c                                                 |    1 
 glx/single2.c                                                        |    7 
 glx/xfont.c                                                          |    1 
 hw/dmx/dmx.c                                                         |   56 
 hw/dmx/dmxinit.c                                                     |    9 
 hw/dmx/dmxpict.c                                                     |    2 
 hw/dmx/dmxscrinit.c                                                  |    2 
 hw/dmx/doc/Makefile.am                                               |    8 
 hw/dmx/doc/dmx.xml                                                   |   14 
 hw/dmx/glxProxy/glxcmds.c                                            |   55 
 hw/dmx/glxProxy/glxcmdsswap.c                                        |    4 
 hw/dmx/glxProxy/glxext.c                                             |   76 
 hw/dmx/glxProxy/glxext.h                                             |   14 
 hw/dmx/glxProxy/glxscreens.c                                         |    5 
 hw/dmx/glxProxy/glxsingle.c                                          |    5 
 hw/dmx/glxProxy/glxutil.c                                            |   75 
 hw/dmx/glxProxy/glxutil.h                                            |    6 
 hw/dmx/glxProxy/glxvendor.c                                          |    5 
 hw/dmx/glxProxy/glxvisuals.c                                         |  388 
 hw/dmx/glxProxy/glxvisuals.h                                         |    8 
 hw/dmx/input/dmxevents.c                                             |   53 
 hw/dmx/input/dmxinputinit.c                                          |   16 
 hw/dmx/input/dmxmotion.c                                             |    7 
 hw/dmx/input/dmxxinput.c                                             |   17 
 hw/kdrive/ephyr/ephyrdriext.c                                        |  135 
 hw/kdrive/fake/fake.c                                                |    7 
 hw/kdrive/src/kdrive.c                                               |    6 
 hw/kdrive/src/kinput.c                                               |   39 
 hw/kdrive/src/kxv.c                                                  |    9 
 hw/vfb/InitInput.c                                                   |    2 
 hw/vfb/InitOutput.c                                                  |    7 
 hw/xfree86/Makefile.am                                               |    4 
 hw/xfree86/common/Makefile.am                                        |    2 
 hw/xfree86/common/xf86.h                                             |    4 
 hw/xfree86/common/xf86AutoConfig.c                                   |   20 
 hw/xfree86/common/xf86Config.c                                       |  215 
 hw/xfree86/common/xf86Configure.c                                    |  115 
 hw/xfree86/common/xf86Events.c                                       |   20 
 hw/xfree86/common/xf86Globals.c                                      |   10 
 hw/xfree86/common/xf86Helper.c                                       |  133 
 hw/xfree86/common/xf86InPriv.h                                       |    3 
 hw/xfree86/common/xf86Init.c                                         |   26 
 hw/xfree86/common/xf86Mode.c                                         |   27 
 hw/xfree86/common/xf86Module.h                                       |    6 
 hw/xfree86/common/xf86Opt.h                                          |    1 
 hw/xfree86/common/xf86Option.c                                       |   61 
 hw/xfree86/common/xf86Priv.h                                         |    3 
 hw/xfree86/common/xf86Privstr.h                                      |    4 
 hw/xfree86/common/xf86VGAarbiter.c                                   |  172 
 hw/xfree86/common/xf86VGAarbiter.h                                   |    2 
 hw/xfree86/common/xf86VGAarbiterPriv.h                               |   21 
 hw/xfree86/common/xf86Xinput.c                                       |  591 
 hw/xfree86/common/xf86Xinput.h                                       |  126 
 hw/xfree86/common/xf86pciBus.c                                       |   51 
 hw/xfree86/common/xf86pciBus.h                                       |    3 
 hw/xfree86/common/xf86sbusBus.c                                      |   29 
 hw/xfree86/common/xf86sbusBus.h                                      |    4 
 hw/xfree86/common/xf86str.h                                          |   17 
 hw/xfree86/common/xf86xv.c                                           |  267 
 hw/xfree86/common/xf86xv.h                                           |   10 
 hw/xfree86/common/xf86xvpriv.h                                       |    2 
 hw/xfree86/dixmods/extmod/Makefile.am                                |    2 
 hw/xfree86/dixmods/extmod/xf86dga2.c                                 |   86 
 hw/xfree86/dixmods/extmod/xf86dgaext.h                               |   10 
 hw/xfree86/dixmods/extmod/xf86vmode.c                                |  146 
 hw/xfree86/doc/devel/Registry                                        |    2 
 hw/xfree86/doc/man/Xorg.man.pre                                      |    4 
 hw/xfree86/doc/man/xorg.conf.man.pre                                 |   66 
 hw/xfree86/doc/sgml/DESIGN.xml                                       |    8 
 hw/xfree86/doc/sgml/Makefile.am                                      |   10 
 hw/xfree86/dri/dri.c                                                 |    2 
 hw/xfree86/dri/xf86dri.c                                             |   70 
 hw/xfree86/dri2/dri2.c                                               |   11 
 hw/xfree86/fbdevhw/fbdevhw.c                                         |   53 
 hw/xfree86/i2c/bt829_module.c                                        |    9 
 hw/xfree86/i2c/fi1236_module.c                                       |    9 
 hw/xfree86/i2c/msp3430_module.c                                      |    9 
 hw/xfree86/i2c/tda8425_module.c                                      |    9 
 hw/xfree86/i2c/tda9850_module.c                                      |    9 
 hw/xfree86/i2c/tda9885_module.c                                      |    9 
 hw/xfree86/i2c/uda1380_module.c                                      |    9 
 hw/xfree86/int10/helper_exec.c                                       |    5 
 hw/xfree86/int10/xf86int10module.c                                   |   23 
 hw/xfree86/loader/Makefile.am                                        |    2 
 hw/xfree86/loader/dlloader.c                                         |  178 
 hw/xfree86/loader/dlloader.h                                         |   33 
 hw/xfree86/loader/loader.c                                           |  191 
 hw/xfree86/loader/loader.h                                           |   29 
 hw/xfree86/loader/loaderProcs.h                                      |    5 
 hw/xfree86/loader/loadmod.c                                          |   85 
 hw/xfree86/loader/sdksyms.sh                                         |   23 
 hw/xfree86/modes/xf86Crtc.c                                          |  148 
 hw/xfree86/modes/xf86Crtc.h                                          |  119 
 hw/xfree86/modes/xf86Cursors.c                                       |   12 
 hw/xfree86/modes/xf86EdidModes.c                                     |   11 
 hw/xfree86/modes/xf86Modes.c                                         |   47 
 hw/xfree86/modes/xf86RandR12.c                                       |  432 
 hw/xfree86/modes/xf86Rotate.c                                        |   44 
 hw/xfree86/os-support/Makefile.am                                    |    2 
 hw/xfree86/os-support/bus/Makefile.am                                |    5 
 hw/xfree86/os-support/bus/Pci.c                                      |   11 
 hw/xfree86/os-support/bus/Pci.h                                      |    5 
 hw/xfree86/os-support/bus/linuxPci.c                                 |    4 
 hw/xfree86/os-support/linux/lnx_init.c                               |  112 
 hw/xfree86/os-support/linux/lnx_video.c                              |    5 
 hw/xfree86/os-support/shared/VTsw_usl.c                              |   15 
 hw/xfree86/os-support/shared/sigio.c                                 |    9 
 hw/xfree86/os-support/solaris/sun_agp.c                              |    2 
 hw/xfree86/os-support/solaris/sun_init.c                             |    7 
 hw/xfree86/os-support/solaris/sun_vid.c                              |    5 
 hw/xfree86/os-support/sysv/Makefile.am                               |    1 
 hw/xfree86/os-support/sysv/sysv_init.c                               |  252 
 hw/xfree86/os-support/sysv/sysv_video.c                              |  315 
 hw/xfree86/parser/Configint.h                                        |    9 
 hw/xfree86/parser/DRI.c                                              |   64 
 hw/xfree86/parser/Flags.c                                            |   10 
 hw/xfree86/parser/Monitor.c                                          |    7 
 hw/xfree86/parser/scan.c                                             |   66 
 hw/xfree86/parser/write.c                                            |    4 
 hw/xfree86/parser/xf86Parser.h                                       |   12 
 hw/xfree86/parser/xf86tokens.h                                       |    2 
 hw/xfree86/shadowfb/shadow.c                                         |   54 
 hw/xfree86/vbe/vbe.c                                                 |    5 
 hw/xfree86/vbe/vbe_module.c                                          |   10 
 hw/xfree86/x86emu/ops.c                                              |   63 
 hw/xfree86/xaa/Makefile.am                                           |    4 
 hw/xfree86/xaa/xaa.h                                                 |    2 
 hw/xfree86/xaa/xaaFallback.c                                         |    1 
 hw/xfree86/xaa/xaaGC.c                                               |    6 
 hw/xfree86/xaa/xaaWrapper.c                                          |  477 
 hw/xfree86/xaa/xaaWrapper.h                                          |   10 
 hw/xfree86/xf8_16bpp/Makefile.am                                     |   11 
 hw/xfree86/xf8_16bpp/cfb8_16.h                                       |   37 
 hw/xfree86/xf8_16bpp/xf8_16module.c                                  |   78 
 hw/xnest/Color.c                                                     |    5 
 hw/xnest/Color.h                                                     |    3 
 hw/xnest/Events.c                                                    |   14 
 hw/xnest/GC.c                                                        |    5 
 hw/xnest/Screen.c                                                    |    4 
 hw/xquartz/GL/Makefile.am                                            |    2 
 hw/xquartz/GL/indirect.c                                             |    2 
 hw/xquartz/Makefile.am                                               |    2 
 hw/xquartz/X11Application.h                                          |    1 
 hw/xquartz/X11Application.m                                          |   48 
 hw/xquartz/X11Controller.h                                           |    1 
 hw/xquartz/X11Controller.m                                           |    4 
 hw/xquartz/applewm.c                                                 |   56 
 hw/xquartz/bundle/Info.plist.cpp                                     |    8 
 hw/xquartz/bundle/Resources/Dutch.lproj/locversion.plist             |    4 
 hw/xquartz/bundle/Resources/Dutch.lproj/main.nib/designable.nib      |  440 
 hw/xquartz/bundle/Resources/Dutch.lproj/main.nib/keyedobjects.nib    |binary
 hw/xquartz/bundle/Resources/English.lproj/main.nib/designable.nib    |  320 
 hw/xquartz/bundle/Resources/English.lproj/main.nib/keyedobjects.nib  |binary
 hw/xquartz/bundle/Resources/German.lproj/locversion.plist            |    4 
 hw/xquartz/bundle/Resources/German.lproj/main.nib/designable.nib     |  208 
 hw/xquartz/bundle/Resources/German.lproj/main.nib/keyedobjects.nib   |binary
 hw/xquartz/bundle/Resources/Italian.lproj/locversion.plist           |    4 
 hw/xquartz/bundle/Resources/Italian.lproj/main.nib/designable.nib    |  434 
 hw/xquartz/bundle/Resources/Italian.lproj/main.nib/keyedobjects.nib  |binary
 hw/xquartz/bundle/Resources/Japanese.lproj/locversion.plist          |    4 
 hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/designable.nib   |  229 
 hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/keyedobjects.nib |binary
 hw/xquartz/bundle/Resources/Spanish.lproj/locversion.plist           |    4 
 hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/designable.nib    |  441 
 hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/keyedobjects.nib  |binary
 hw/xquartz/bundle/Resources/ar.lproj/locversion.plist                |    4 
 hw/xquartz/bundle/Resources/ar.lproj/main.nib/designable.nib         |  441 
 hw/xquartz/bundle/Resources/ar.lproj/main.nib/keyedobjects.nib       |binary
 hw/xquartz/bundle/Resources/da.lproj/locversion.plist                |    4 
 hw/xquartz/bundle/Resources/da.lproj/main.nib/designable.nib         |  402 
 hw/xquartz/bundle/Resources/da.lproj/main.nib/keyedobjects.nib       |binary
 hw/xquartz/bundle/Resources/fi.lproj/locversion.plist                |    4 
 hw/xquartz/bundle/Resources/fi.lproj/main.nib/designable.nib         |  209 
 hw/xquartz/bundle/Resources/fi.lproj/main.nib/keyedobjects.nib       |binary
 hw/xquartz/bundle/Resources/ko.lproj/locversion.plist                |    4 
 hw/xquartz/bundle/Resources/ko.lproj/main.nib/designable.nib         |  411 
 hw/xquartz/bundle/Resources/ko.lproj/main.nib/keyedobjects.nib       |binary
 hw/xquartz/bundle/Resources/no.lproj/locversion.plist                |    4 
 hw/xquartz/bundle/Resources/no.lproj/main.nib/designable.nib         |  448 
 hw/xquartz/bundle/Resources/no.lproj/main.nib/keyedobjects.nib       |binary
 hw/xquartz/bundle/Resources/pl.lproj/locversion.plist                |    4 
 hw/xquartz/bundle/Resources/pl.lproj/main.nib/designable.nib         |  418 
 hw/xquartz/bundle/Resources/pl.lproj/main.nib/keyedobjects.nib       |binary
 hw/xquartz/bundle/Resources/pt.lproj/locversion.plist                |    4 
 hw/xquartz/bundle/Resources/pt.lproj/main.nib/designable.nib         |  459 
 hw/xquartz/bundle/Resources/pt.lproj/main.nib/keyedobjects.nib       |binary
 hw/xquartz/bundle/Resources/pt_PT.lproj/locversion.plist             |    4 
 hw/xquartz/bundle/Resources/pt_PT.lproj/main.nib/designable.nib      |  198 
 hw/xquartz/bundle/Resources/pt_PT.lproj/main.nib/keyedobjects.nib    |binary
 hw/xquartz/bundle/Resources/ru.lproj/locversion.plist                |    4 
 hw/xquartz/bundle/Resources/ru.lproj/main.nib/designable.nib         |  424 
 hw/xquartz/bundle/Resources/ru.lproj/main.nib/keyedobjects.nib       |binary
 hw/xquartz/bundle/Resources/sv.lproj/locversion.plist                |    4 
 hw/xquartz/bundle/Resources/sv.lproj/main.nib/designable.nib         |  421 
 hw/xquartz/bundle/Resources/sv.lproj/main.nib/keyedobjects.nib       |binary
 hw/xquartz/bundle/Resources/zh_CN.lproj/Localizable.strings          |binary
 hw/xquartz/bundle/Resources/zh_CN.lproj/locversion.plist             |    4 
 hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/designable.nib      | 7106 +++++-----
 hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/keyedobjects.nib    |binary
 hw/xquartz/bundle/Resources/zh_TW.lproj/locversion.plist             |    4 
 hw/xquartz/bundle/Resources/zh_TW.lproj/main.nib/designable.nib      |  447 
 hw/xquartz/bundle/Resources/zh_TW.lproj/main.nib/keyedobjects.nib    |binary
 hw/xquartz/darwin.c                                                  |   45 
 hw/xquartz/darwinEvents.c                                            |   13 
 hw/xquartz/darwinXinput.c                                            |   91 
 hw/xquartz/mach-startup/bundle-main.c                                |    3 
 hw/xquartz/quartz.c                                                  |   35 
 hw/xquartz/quartz.h                                                  |    1 
 hw/xquartz/quartzAudio.c                                             |  329 
 hw/xquartz/quartzAudio.h                                             |   37 
 hw/xquartz/quartzKeyboard.c                                          |    1 
 hw/xquartz/quartzStartup.c                                           |    4 
 hw/xquartz/xpr/appledri.c                                            |   43 
 hw/xquartz/xpr/driWrap.c                                             |    6 
 hw/xquartz/xpr/xprFrame.c                                            |    4 
 hw/xquartz/xpr/xprScreen.c                                           |    6 
 hw/xwin/InitInput.c                                                  |   25 
 hw/xwin/InitOutput.c                                                 |   48 
 hw/xwin/Makefile.am                                                  |    4 
 hw/xwin/XWin.man.pre                                                 |    8 
 hw/xwin/glx/indirect.c                                               |   12 
 hw/xwin/win.h                                                        |   24 
 hw/xwin/winblock.c                                                   |   10 
 hw/xwin/winclipboardinit.c                                           |    2 
 hw/xwin/winclipboardthread.c                                         |    2 
 hw/xwin/winclipboardwrappers.c                                       |    6 
 hw/xwin/winclipboardxevents.c                                        |    6 
 hw/xwin/wincmap.c                                                    |    7 
 hw/xwin/winconfig.c                                                  |   12 
 hw/xwin/wincursor.c                                                  |    4 
 hw/xwin/windialogs.c                                                 |   26 
 hw/xwin/winengine.c                                                  |   24 
 hw/xwin/winerror.c                                                   |   18 
 hw/xwin/winfillsp.c                                                  |   35 
 hw/xwin/wingc.c                                                      |    5 
 hw/xwin/wingetsp.c                                                   |    8 
 hw/xwin/winglobals.c                                                 |    8 
 hw/xwin/winglobals.h                                                 |   88 
 hw/xwin/winkeybd.c                                                   |    2 
 hw/xwin/winkeyhook.c                                                 |    8 
 hw/xwin/winlayouts.h                                                 |  266 
 hw/xwin/winmouse.c                                                   |   22 
 hw/xwin/winmultiwindowicons.c                                        |    7 
 hw/xwin/winmultiwindowwindow.c                                       |   10 
 hw/xwin/winmultiwindowwm.c                                           |    4 
 hw/xwin/winmultiwindowwndproc.c                                      |    9 
 hw/xwin/winnativegdi.c                                               |    7 
 hw/xwin/winpfbdd.c                                                   |    8 
 hw/xwin/winpixmap.c                                                  |    7 
 hw/xwin/winprefs.c                                                   |   11 
 hw/xwin/winprefs.h                                                   |    3 
 hw/xwin/winprocarg.c                                                 |   26 
 hw/xwin/winscrinit.c                                                 |   21 
 hw/xwin/winsetsp.c                                                   |    8 
 hw/xwin/winshaddd.c                                                  |   57 
 hw/xwin/winshadddnl.c                                                |   55 
 hw/xwin/winshadgdi.c                                                 |   57 
 hw/xwin/winvalargs.c                                                 |    7 
 hw/xwin/winwakeup.c                                                  |   10 
 hw/xwin/winwin32rootless.c                                           |   23 
 hw/xwin/winwin32rootlesswndproc.c                                    |    8 
 hw/xwin/winwindowswm.c                                               |   84 
 hw/xwin/winwndproc.c                                                 |   18 
 include/Makefile.am                                                  |    4 
 include/XIstubs.h                                                    |   14 
 include/bstore.h                                                     |   22 
 include/bstorestr.h                                                  |   55 
 include/callback.h                                                   |    9 
 include/closestr.h                                                   |   24 
 include/colormapst.h                                                 |    4 
 include/dix.h                                                        |    2 
 include/dixstruct.h                                                  |    2 
 include/exevents.h                                                   |    7 
 include/gc.h                                                         |    4 
 include/gcstruct.h                                                   |    4 
 include/input.h                                                      |   34 
 include/inputstr.h                                                   |    5 
 include/inpututils.h                                                 |   48 
 include/opaque.h                                                     |    5 
 include/os.h                                                         |   25 
 include/pixmap.h                                                     |    6 
 include/privates.h                                                   |   52 
 include/protocol-versions.h                                          |    4 
 include/scrnintstr.h                                                 |   73 
 include/servermd.h                                                   |   21 
 include/site.h                                                       |    3 
 include/windowstr.h                                                  |    2 
 m4/dolt.m4                                                           |  181 
 mi/Makefile.am                                                       |    2 
 mi/mi.h                                                              |    4 
 mi/mibstore.c                                                        |    6 
 mi/mibstore.h                                                        |    4 
 mi/mibstorest.h                                                      |   91 
 mi/midispcur.c                                                       |   42 
 mi/miglblt.c                                                         |    2 
 mi/mipointer.c                                                       |    6 
 mi/miscrinit.c                                                       |   20 
 mi/mispans.c                                                         |    2 
 mi/misprite.c                                                        |    2 
 mi/mivalidate.h                                                      |    3 
 mi/miwindow.c                                                        |    5 
 miext/Makefile.am                                                    |    4 
 miext/cw/cw.c                                                        |    1 
 miext/damage/damage.c                                                |   30 
 miext/rootless/README.txt                                            |   75 
 miext/rootless/rootless.h                                            |   90 
 miext/rootless/rootlessCommon.c                                      |   39 
 miext/rootless/rootlessConfig.h                                      |    4 
 miext/rootless/rootlessGC.c                                          |   57 
 miext/rootless/rootlessScreen.c                                      |    3 
 miext/rootless/rootlessValTree.c                                     |   12 
 miext/rootless/rootlessWindow.c                                      |   29 
 miext/sync/Makefile.am                                               |   14 
 miext/sync/misync.c                                                  |  201 
 miext/sync/misync.h                                                  |   77 
 miext/sync/misyncstr.h                                               |   86 
 os/access.c                                                          |  141 
 os/connection.c                                                      |   15 
 os/log.c                                                             |   35 
 os/osinit.c                                                          |   10 
 os/utils.c                                                           |   95 
 os/xdmcp.c                                                           |    2 
 randr/Makefile.am                                                    |    7 
 randr/mirandr.c                                                      |  165 
 randr/mirrcrtc.c                                                     |  174 
 randr/randr.c                                                        |   15 
 randr/randrstr.h                                                     |  244 
 randr/rrcrtc.c                                                       |  562 
 randr/rrdispatch.c                                                   |    6 
 randr/rrinfo.c                                                       |    2 
 randr/rrpixmap.c                                                     |  154 
 randr/rrscreen.c                                                     |   44 
 randr/rrsdispatch.c                                                  |  132 
 randr/rrsprite.c                                                     |  104 
 randr/rrtransform.c                                                  |   64 
 randr/rrtransform.h                                                  |   15 
 render/Makefile.am                                                   |    5 
 render/animcur.c                                                     |    8 
 render/glyphstr.h                                                    |    3 
 render/miindex.c                                                     |   14 
 render/picture.c                                                     |   13 
 render/picturestr.h                                                  |   15 
 render/renderedge.c                                                  |   91 
 render/renderedge.h                                                  |  105 
 test/input.c                                                         |  128 
 xfixes/region.c                                                      |   78 
 xfixes/xfixes.c                                                      |   30 
 xfixes/xfixesint.h                                                   |   13 
 xkb/XKBAlloc.c                                                       |    6 
 xkb/XKBGAlloc.c                                                      |   30 
 xkb/XKBMAlloc.c                                                      |   40 
 xkb/ddxList.c                                                        |    6 
 xkb/ddxLoad.c                                                        |    6 
 xkb/xkb.c                                                            |   33 
 xkb/xkbActions.c                                                     |   13 
 xkb/xkbEvents.c                                                      |    9 
 xkb/xkbLEDs.c                                                        |   13 
 xkb/xkmread.c                                                        |    9 
 465 files changed, 19773 insertions(+), 20310 deletions(-)

New commits:
commit 4bcfce45ae13f2823d062d5402d8fce2bd31c32b
Author: Julien Cristau <jcristau@debian.org>
Date:   Tue Feb 15 17:02:20 2011 +0100

    Relax randrproto build-dep to 1.3.99
    
    1.4 is not released yet.

diff --git a/debian/changelog b/debian/changelog
index 0a6cbd3..e153825 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,7 @@ xorg-server (2:1.9.99.901-1) UNRELEASED; urgency=low
   * Drop 16-xaa-fbcomposite-fix-negative-size.diff, the mod macro that this
     patch fixes is no longer used.
   * debian/control:
-    - Bump x11proto-xrandr-dev and x11proto-xext-dev build-deps to 1.4 and 
+    - Bump x11proto-xrandr-dev and x11proto-xext-dev build-deps to 1.3.99 and 
       7.1.99 for new XRandR and XSync extension protocols.
 
   [ Julien Cristau ]
diff --git a/debian/control b/debian/control
index aeb5f12..d8c3d19 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,7 @@ Build-Depends:
  x11proto-fixes-dev (>= 1:4.1),
  x11proto-kb-dev (>= 1.0.3),
  x11proto-xinerama-dev,
- x11proto-randr-dev (>= 1.4),
+ x11proto-randr-dev (>= 1.3.99),
  x11proto-record-dev (>= 1.13.99.1),
  x11proto-render-dev (>= 2:0.11),
  x11proto-resource-dev,

commit b29b4d0cf341e1621b3d6b92deb4c428d8c6fe2e
Author: Julien Cristau <jcristau@debian.org>
Date:   Tue Feb 15 16:08:03 2011 +0100

    Bump serverminver and ABI versions.

diff --git a/debian/changelog b/debian/changelog
index 561d047..0a6cbd3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 xorg-server (2:1.9.99.901-1) UNRELEASED; urgency=low
   
+  [ Christopher James Halse Rogers ]
   * New upstream release (1.10 rc1)
   * Drop 16-xaa-fbcomposite-fix-negative-size.diff, the mod macro that this
     patch fixes is no longer used.
@@ -7,6 +8,9 @@ xorg-server (2:1.9.99.901-1) UNRELEASED; urgency=low
     - Bump x11proto-xrandr-dev and x11proto-xext-dev build-deps to 1.4 and 
       7.1.99 for new XRandR and XSync extension protocols.
 
+  [ Julien Cristau ]
+  * Bump serverminver and ABI versions.
+
  -- Christopher James Halse Rogers <raof@ubuntu.com>  Wed, 19 Jan 2011 10:28:16 +1100
 
 xorg-server (2:1.9.4-2) UNRELEASED; urgency=low
diff --git a/debian/serverminver b/debian/serverminver
index cb66b15..8092908 100644
--- a/debian/serverminver
+++ b/debian/serverminver
@@ -1,3 +1,3 @@
-2:1.8.99.904
-ABI_VIDEODRV_VERSION:8.0
-ABI_XINPUT_VERSION:11.0
+2:1.9.99.901
+ABI_VIDEODRV_VERSION:9.0
+ABI_XINPUT_VERSION:12.0

commit d832281d7b335c9b9b7b75f872a0f251ab2c7bf2
Author: Julien Cristau <jcristau@debian.org>
Date:   Tue Feb 15 16:07:23 2011 +0100

    Update changelog

diff --git a/ChangeLog b/ChangeLog
index 2231f67..8750ded 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,276 +1,377 @@
-commit ce83d1bd5a7dee70cc1616b583fbd3ce2392f0a0
-Author: Jeremy Huddleston <jeremyhu@apple.com>
-Date:   Fri Feb 4 11:35:58 2011 -0800
+commit 14983286c489ea1ec6ba4fadbeaec5c2d2ee34e1
+Author: Keith Packard <keithp@keithp.com>
+Date:   Mon Dec 6 20:45:35 2010 -0800
 
-    xorg-server 1.9.4
+    Version bumped to 1.9.99.901 (1.10 RC1)
     
-    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+    Signed-off-by: Keith Packard <keithp@keithp.com>
 
-commit df12f4a4d9afe819fd3ae1ec8aaa5a7ec9d6567f
-Author: Jeremy Huddleston <jeremyhu@apple.com>
-Date:   Sun Jan 30 17:07:25 2011 -0800
+commit d96d5f5443358e33e47d1a61f9bd2afd8064a8dd
+Author: James Jones <jajones@nvidia.com>
+Date:   Sun Dec 5 19:42:41 2010 -0800
 
-    xorg-server 1.9.3.902
+    Bump extension ABI to 5
     
-    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+    Commit 606e079cc4d9a9db3197652ca51683c36f74efb8 moved the visual
+    field in WindowOptRec, breaking the extension module ABI.
+    
+    Signed-off-by: James Jones <jajones@nvidia.com>
+    Reviewed-by: Keith Packard <keithp@keithp.com>
+    Signed-off-by: Keith Packard <keithp@keithp.com>
 
-commit 79a367d6e3075f31c89ce9fe4189ffe1ca649e37
-Author: Jeremy Huddleston <jeremyhu@apple.com>
-Date:   Fri Jan 28 21:13:38 2011 -0800
+commit 435361bd73b9fc733f093d81af6b839953e35176
+Author: Keith Packard <keithp@keithp.com>
+Date:   Mon Dec 6 20:38:14 2010 -0800
 
-    XQuartz: Localization Updates
+    sync: syncObject may be None in SyncInitTrigger
     
-    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
-    (cherry picked from commit 8c1f75a1d4cb5a34b4d10f3f5068bccc4356f31a)
+    And often is, especially when called from ProcSyncCreateAlarm.
+    Crashing in this case seems unwise.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
 
-commit 3396d237a5e7d7f32c7c555597d4f17f49d3b937
-Author: Jeremy Huddleston <jeremyhu@apple.com>
-Date:   Sun Jan 23 22:35:34 2011 -0800
+commit 0d01b66df9081ef48843b3bad81c56bb2cd1ae69
+Author: Keith Packard <keithp@keithp.com>
+Date:   Sun Dec 5 23:35:28 2010 -0800
 
-    XQuartz: Use the default signal handler
+    randr: handle RRSetCrtcConfigs request with zero configs
     
-    This allows better interaction with CrashTracer
+    Need to actually return a reply in this case.
     
-    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
-    (cherry picked from commit effaf9459c450f13e35bf263835d3e37d48ff29d)
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+    Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
 
-commit e7871a95125d85bef37fee51e8f8691a058a984d
-Author: Jeremy Huddleston <jeremyhu@apple.com>
-Date:   Thu Jan 13 17:12:17 2011 -0800
+commit b0f4bd61f0caf80f3be9a176f1f7a707bc6628d8
+Author: Keith Packard <keithp@keithp.com>
+Date:   Sun Dec 5 21:53:25 2010 -0800
 
-    XQuartz: Call RRScreenSizeNotify after handling externally-generated XP_EVENT_DISPLAY_CHANGED
-    
-    We get an XP_EVENT_DISPLAY_CHANGED event when our display configuration is
-    changed.  If this change was caused by hotplugging a monitor or Mac Display
-    Preferences changes by the user, we need to call RRScreenSizeNotify in order
-    to ensure new connections get the correct screen size.
+    ProcRRSetCrtcConfigs uses 'configs' without being initialized
     
-    http://xquartz.macosforge.org/trac/ticket/460
+    If the client sends invalid data for this request, the server
+    will jump to 'sendReply' and call RRFreeCrtcConfigs, passing it the
+    uninitialized 'configs' and 'num_configs' values.
     
-    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
-    (cherry picked from commit 418bb57a3923311338baa8a85c0794a72e15ceeb)
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+    Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
 
-commit 824ebda72ab61f0640a14d79ef893a1d78644db8
-Author: Jeremy Huddleston <jeremyhu@apple.com>
-Date:   Thu Jan 13 16:08:46 2011 -0800
+commit 752c368421c1c824752cf467fba9318d75d2ca2c
+Author: Keith Packard <keithp@keithp.com>
+Date:   Sun Dec 5 20:57:47 2010 -0800
 
-    XQuartz: Bump version string to 2.6.1
+    Separate out screen size and screen pixmap sizes in RRScreenSizeSet
     
-    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
-    (cherry picked from commit 6f52b10b9e8068e3deafb2bbb64b62175a208c49)
+    This provides for separate sizes for the screen scanout and rendering
+    buffer and the application-visible screen size.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+    Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
 
-commit 188148e1cc1cdecc7731a4251a9ecb9dd73e6241
-Author: Oliver McFadden <oliver.mcfadden@nokia.com>
-Date:   Mon Jan 24 22:03:30 2011 +0200
-
-    dix: GetPointerEvents: added valuator range checking
-    
-    Button events may be sent with no valuators (e.g. to simply indicate
-    ButtonPress or ButtonRelease without any coordinates); when this happens
-    the server would read uninitialized memory.
-    
-    ==9999== Conditional jump or move depends on uninitialised value(s)
-    ==9999==    at 0x48E87E8: pixman_f_transform_point (in /usr/lib/libpixman-1.so.0.18.2)
-    ==9999==  Uninitialised value was created by a stack allocation
-    ==9999==    at 0x37524: GetPointerEvents (getevents.c:1074)
-    ==9999==
-    ==9999== Conditional jump or move depends on uninitialised value(s)
-    ==9999==    at 0x496D074: lround (s_lround.c:40)
-    ==9999==    by 0x3773B: GetPointerEvents (getevents.c:1048)
-    ==9999==    by 0x683BB: xf86PostButtonEventP (xf86Xinput.c:1162)
-    ==9999==    by 0x6853B: xf86PostButtonEvent (xf86Xinput.c:1126)
-    ==9999==    by 0x5779037: process_state (multitouch.c:321)      (xf86-input-mtev)
-    ==9999==    by 0x577908F: read_input (multitouch.c:331))        (xf86-input-mtev)
-    ==9999==    by 0x66B4F: xf86SigioReadInput (xf86Events.c:298)
-    ==9999==    by 0x112697: xf86SIGIO (sigio.c:118)
-    ==9999==    by 0x4A12B2F: ??? (sigrestorer.S:51)
-    ==9999==  Uninitialised value was created by a stack allocation
-    ==9999==    at 0x37524: GetPointerEvents (getevents.c:1074)
+commit a88d70fb20a2bc3152b84adff4380857e6cfadf5
+Author: Keith Packard <keithp@keithp.com>
+Date:   Sun Dec 5 20:55:46 2010 -0800
+
+    Set sprite transforms from RRSetCrtcConfigs
     
-    Signed-off-by: Oliver McFadden <oliver.mcfadden@nokia.com>
-    Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+    These were getting ignored.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+    Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
 
-commit 089a510dc9511721817df63bf9a968a10b842198
-Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
-Date:   Thu Dec 30 19:19:38 2010 +0200
+commit 96b4d4787bf82edd9d06eb9a6e94bc45412c7df2
+Author: Keith Packard <keithp@keithp.com>
+Date:   Sun Dec 5 20:49:19 2010 -0800
 
-    mi: Fix the debug message
+    DIX is responsible for ref counting scanout pixmaps.
     
-    Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
-    Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
-    Reviewed-by: Daniel Stone <daniel@fooishbar.org>
-    (cherry picked from commit bf48082f30818b96bc623834be3022600371d4fc)
+    Remove some extra ref counting inside hw/xfree86/modes
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+    Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
 
-commit b22415b0d567fae358b9b7a7067a70c80dd0dd1d
-Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
-Date:   Thu Dec 30 19:19:41 2010 +0200
+commit afb6ebf1d5829346c40fe1053c9f50afe926e6c6
+Author: Keith Packard <keithp@keithp.com>
+Date:   Fri Dec 3 13:04:37 2010 -0800
 
-    udev: Fix removing of the wake up handler
+    randr: Hook up the new RandR 1.4 functionality
     
-    RemoveBlockAndWakeupHandlers requires caller to pass same block data
-    parameter as for RegisterBlockAndWakeupHandlers.
+    This bumps the supported RandR protocol version and adds the dispatch
+    hooks needed to call the new functions
     
-    Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
-    Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
-    Reviewed-by: Daniel Stone <daniel@fooishbar.org>
-    (cherry picked from commit 3e1455505addc7e52178fa04399aef2a8522c921)
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+    Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
 
-commit 6451a3ff949ff55c9dff7399d0babb6b98201e99
-Author: Jeremy Huddleston <jeremyhu@apple.com>
-Date:   Fri Jan 7 15:40:25 2011 -0800
+commit 82612045e11f2b882ae132e184a9629f43f1c424
+Author: Keith Packard <keithp@keithp.com>
+Date:   Fri Dec 3 13:00:46 2010 -0800
 
-    xorg-server 1.9.3.901 (1.9.4 RC1)
+    randr: Add per-crtc pixmaps
     
-    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+    This adds new driver hooks to allocate scanout pixmaps and
+    changes the mode setting APIs to pass the new scanout pixmaps
+    along from DIX. DIX is responsible for reference counting the pixmaps
+    by tracking them through RRCrtcNotify.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+    Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
 
-commit c11f9bfc081423a7f15d72c36f2f0d6518083591
-Author: Jeremy Huddleston <jeremyhu@apple.com>
-Date:   Fri Jan 7 15:39:14 2011 -0800
+commit 86c489c319c705f710bee3897fe27600ce15008e
+Author: Keith Packard <keithp@keithp.com>
+Date:   Sat Dec 4 20:12:26 2010 -0800
 
-    XQuartz: Update copyright dates in bundle's plist
+    hw/xfree86/modes: Add optional driver API for RRSetCrtcConfigs
     
-    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+    This provides a driver hook which can either completely replace, or
+    just validate the parameters for, the RRSetCrtcConfigs request.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+    Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
 
-commit 3d12e6d25a79c1d78964df723731d2510bb932f8
-Author: Zhao Yakui <yakui.zhao@intel.com>
-Date:   Tue Jan 4 14:08:16 2011 -0500
+commit d94a035ea9eb3167fc4f35b2d9f0d53f8807014c
+Author: Keith Packard <keithp@keithp.com>
+Date:   Sat Dec 4 19:22:11 2010 -0800
 
-    edid: Fix incorrect timings for VIC61
+    randr: Implement RRSetCrtcConfigs
     
-    Reviewed-by: Adam Jackson <ajax@redhat.com>
-    Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
-    Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
-    (cherry picked from commit 86ca434a1ab766c1519ee7146b48dbfead843524)
+    This provides a driver-independent implementation of the
+    RRSetCrtcConfigs API by simply using the existing interfaces.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+    Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
 
-commit 9213c2525a2be6f8bf1412f1c6001a7bc6ce4538
-Author: Adam Jackson <ajax@redhat.com>
-Date:   Fri Dec 10 14:24:02 2010 -0500
+commit 66294afcab7b7a82f7dd897767e46c48a94b8ee8
+Author: Keith Packard <keithp@keithp.com>
+Date:   Fri Dec 3 22:08:06 2010 -0800
 
-    x86emu: Fix more mis-decoding of the data prefix
+    randr: Add sprite position transforms
+    
+    This implements sprite position transformations. Sprite image
+    transforms are passed all the way to the DDX layer, but the images are
+    not yet manipulated before being passed to the drivers.
     
-    cc2c73ddcb4370a7c3ad439cda4da825156c26c9's three-cent titanium tax
-    doesn't go too far enough.  Fix the rest of the call and jmp
-    instructions to handle the data prefix correctly.
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+    Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
+
+commit c8bc25fd7629df10f2825b7cc713b031ae78f223
+Author: Keith Packard <keithp@keithp.com>
+Date:   Mon Dec 6 19:40:30 2010 -0800
+
+    Require RandR protocol version 1.4 or newer
     
-    Reference: Intel 64 and IA-32 Architectures Software Developer's Manual
-    Volume 2A: Instruction Set Reference, A-M
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 8b35118c03590a7ad3786d3284bafb3f40fcb8cc
+Author: Keith Packard <keithp@keithp.com>
+Date:   Sun Jun 6 15:23:37 2010 -0700
+
+    Replace huge argument list in xf86CrtcSetModeTransform with struct
     
-    http://www.intel.com/Assets/PDF/manual/253666.pdf
+    xf86CrtcSetModeTransform was starting to get ridiculous with 6
+    arguments, this change has it take a single structure that contains
+    all of those values along with a set of flags that says which have
+    changed.
     
-    Reviewed-by: Julien Cristau <jcristau@debian.org>
-    Signed-off-by: Adam Jackson <ajax@redhat.com>
-    (cherry picked from commit bb18f277156c08be028a6e12d8987fb1593e9168)
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+    Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
 
-commit dc24f90ddc9c116a31347ba961f19feaf63fa843
-Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
-Date:   Thu Dec 30 19:19:42 2010 +0200
+commit f5b8bd620f91214c0b87e9b04d57015655792352
+Merge: 01e9fa7 8127c83
+Author: Keith Packard <keithp@keithp.com>
+Date:   Mon Dec 6 19:51:06 2010 -0800
+
+    Merge remote branch 'jajones/for-keith'
+
+commit 01e9fa7da389fc7ab834b4234b8484514144b7f4
+Merge: 79870db 68a1b0d
+Author: Keith Packard <keithp@keithp.com>
+Date:   Mon Dec 6 19:45:11 2010 -0800
 
-    os: Fix a memory leak
+    Merge remote branch 'whot/for-keith'
+
+commit 79870dbf72d463cf9efea1b3e61d1d5759df27b5
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Sat Dec 4 16:13:29 2010 -0500
+
+    config: build Xserver man pages using XORG_MANPAGE_SECTIONS
+    
+    Nothing requires the use of a C preprocessor
+    Using standard file exentions (.man) means no need for .gitignore
+    Use standard directory and makefile
+    Fix man page whitespace issues
     
-    Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
     Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-    Reviewed-by: Daniel Stone <daniel@fooishbar.org>
-    (cherry picked from commit 617b7d22115ccaaaa7ec69c99885054d33a3bc37)
+    Reviewed-by: Matt Dew <matt@osource.org>
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+    Signed-off-by: Keith Packard <keithp@keithp.com>
 
-commit a87a5b7e83349d3871fcde71fec08f85fa16dc0b
-Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
-Date:   Thu Dec 30 19:19:32 2010 +0200
+commit c4a7a5917ab828d4a0bd825a98e4d641bcb378f1
+Merge: 5de312a 714b68d
+Author: Keith Packard <keithp@keithp.com>
+Date:   Mon Dec 6 19:28:07 2010 -0800
+
+    Merge remote branch 'jeremyhu/master'
 
-    render: Don't filter 0 return from GetTimeInMillis
+commit 5de312a60d8227ed670849ecf888ea878aa81430
+Merge: 311cad3 8f42b2b
+Author: Keith Packard <keithp@keithp.com>
+Date:   Mon Dec 6 19:22:52 2010 -0800
+
+    Merge remote branch 'alanc/master'
+
+commit 8127c83c81bf64369a8ba2999088226d14e0b128
+Author: James Jones <jajones@nvidia.com>
+Date:   Mon Dec 6 12:14:01 2010 -0800
+
+    Expose Sync Fence Object protocol
     
-    In animate cursor block handler code assumes GetTimeInMillis returns
-    always nonzero value. This isn't true when time wraps around.
+    Add the new protocol handlers for XSync 3.1 to the
+    dispatch tables and report support for Sync protocol
+    version 3.1.
     
-    To prevent any problems in case GetTimeInMillis would return zero use
-    activeDevice variable to track if we have received time.
+    Signed-off-by: James Jones <jajones@nvidia.com>
+    Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit 9c0c7cc9a7adf230b5eee0b4166f9e17e07a088b
+Author: James Jones <jajones@nvidia.com>
+Date:   Mon Dec 6 13:10:42 2010 -0800
+
+    Add XSyncAwaitFence() handler
     
-    Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
-    Reviewed-by: Daniel Stone <daniel@fooishbar.org>
-    (cherry picked from commit aa8cea953dc66bcf4cb4d08f2681f9e6cb1bc8c5)
+    -Add the actual ProcSyncAwaitFence() dispatch func
+    
+    -Add support for fence sync triggers.
+    
+    Signed-off-by: James Jones <jajones@nvidia.com>
+    Reviewed-by: Keith Packard <keithp@keithp.com>
 
-commit aec278eb65fe1ca98ab551a8c3873a7195bad540
-Author: Ville Syrjälä <ville.syrjala@nokia.com>
-Date:   Thu Dec 16 18:22:13 2010 +0200
+commit 397dfd9f87e1cdf105d10a789a97230f4f0d204e
+Author: James Jones <jajones@nvidia.com>
+Date:   Fri Jun 25 17:59:14 2010 -0700
+
+    Create/Destroy/Trigger/Reset/Query Fence Sync objs
+    
+    Initial server side implementation of fence sync
+    objects.  Allows creation, management, and state
+    queries of binary state objects.  Currently they
+    are not very useful as there is no way to wait for
+    them efficiently.
+    
+    The basic trigger operation added here triggers
+    relative to a given X screen's rendering operations.
+    To perform this operation, fence sync objects must
+    be tied to a screen.  As Aaron Plattner pointed out,
+    screens are identified but a drawable in X protocol,
+    so a drawable argument is included in
+    XSyncCreateFence().  The screen also could have been
+    specified as part of the trigger operation.  However,
+    it is also desireable to associate a screen with
+    fence sync objects at creation time so that the
+    associated screen's driver can allocate any HW-
+    specific resources needed by the fence object up
+    front.
+    
+    Signed-off-by: James Jones <jajones@nvidia.com>
+    Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit 53ea965d64bd9563e6bfcc81d04f283d2b85f09d
+Author: James Jones <jajones@nvidia.com>
+Date:   Mon Nov 29 10:09:36 2010 -0800
 
-    xfree86/modes: Take rotation into account when checking mode size
+    Require xextproto 7.1.99
     
-    Assume that a mode can be used in either landscape or portrait
-    orientation. I suppose the correct thing to do would be to
-    collect all the supported rotations from the CRTCs that can be used
-    with a specific output, but that information doesn't seem to be
-    readily available when these checks are done. So just assume that
-    either orientation is fine.
+    Subsequent changes rely on fence sync protocol
+    in the sync extension.  This protocol is only
+    complete in xextproto version 7.1.99 and
+    above.
     
-    Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
-    Reviewed-by: Adam Jackson <ajax@redhat.com>
-    (cherry picked from commit 2e781457d43ec4bf0d633257ac6852cde3b00541)
+    Signed-off-by: James Jones <jajones@nvidia.com>
+    Reviewed-by: Keith Packard <keithp@keithp.com>
 
-commit 005b465048178d2ab0abecf26ccf6c79c6d5e2cc
-Author: Ville Syrjälä <ville.syrjala@nokia.com>
-Date:   Fri Dec 3 17:42:16 2010 +0200
+commit 1c4a0db2c6bf0320cb630b84ab87bcfd3801a53d
+Author: James Jones <jajones@nvidia.com>
+Date:   Mon Jun 28 16:10:13 2010 -0700
 
-    dri2: Don't page flip when the window size doesn't match the pixmap size
+    Add fence sync driver interface


Reply to: