xorg-server: Changes to 'debian-experimental'
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 | 137
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 | 50
dbe/midbe.h | 11
debian/gbp.conf | 8
debian/patches/02_Add-libnettle-as-option-for-sha1.diff | 16
debian/patches/07-xfree86-fix-build-with-xv-disabled.diff | 12
debian/patches/15-nouveau.diff | 30
debian/patches/16-xaa-fbcomposite-fix-negative-size.diff | 6
dix/Makefile.am | 1
dix/atom.c | 54
dix/colormap.c | 320
dix/cursor.c | 75
dix/devices.c | 211
dix/dispatch.c | 674 -
dix/dixfonts.c | 192
dix/dixutils.c | 66
dix/enterleave.c | 12
dix/eventconvert.c | 8
dix/events.c | 422
dix/extension.c | 49
dix/gc.c | 436
dix/getevents.c | 42
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 | 62
exa/exa_accel.c | 98
exa/exa_classic.c | 11
exa/exa_driver.c | 3
exa/exa_glyphs.c | 16
exa/exa_migration_classic.c | 60
exa/exa_mixed.c | 10
exa/exa_offscreen.c | 8
exa/exa_priv.h | 27
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 | 57
glx/glxdri2.c | 58
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/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 | 139
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 | 4
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 | 29
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 | 114
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 | 332
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 | 261
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 | 18
hw/xfree86/ramdac/xf86CursorPriv.h | 3
hw/xfree86/ramdac/xf86HWCurs.c | 32
hw/xfree86/ramdac/xf86RamDac.c | 16
hw/xfree86/shadowfb/shadow.c | 83
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 | 55
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 | 6
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/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 | 23
hw/xquartz/quartzCommon.h | 3
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 | 20
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/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 | 4
include/inputstr.h | 18
include/list.h | 6
include/os.h | 96
include/pixmap.h | 3
include/privates.h | 252
include/ptrveloc.h | 5
include/regionstr.h | 429
include/resource.h | 17
include/scrnintstr.h | 42
include/windowstr.h | 13
include/xkbsrv.h | 22
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 | 40
mi/mipointer.h | 6
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 | 17
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 | 20
xkb/xkbActions.c | 123
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
658 files changed, 37410 insertions(+), 35594 deletions(-)
New commits:
commit 96c0c6b467e2e8d0209a25d4a479f606883c4162
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Mon Jul 5 17:26:23 2010 +1000
Refresh patches for new upstream
diff --git a/debian/patches/02_Add-libnettle-as-option-for-sha1.diff b/debian/patches/02_Add-libnettle-as-option-for-sha1.diff
index afc7183..263c9ed 100644
--- a/debian/patches/02_Add-libnettle-as-option-for-sha1.diff
+++ b/debian/patches/02_Add-libnettle-as-option-for-sha1.diff
@@ -10,9 +10,9 @@ Signed-off-by: Julien Cristau <jcristau@debian.org>
---
Index: xorg-server/configure.ac
===================================================================
---- xorg-server.orig/configure.ac
-+++ xorg-server/configure.ac
-@@ -1351,7 +1351,7 @@
+--- xorg-server.orig/configure.ac 2010-07-05 16:58:09.868394001 +1000
++++ xorg-server/configure.ac 2010-07-05 16:59:02.628394001 +1000
+@@ -1358,7 +1358,7 @@
# SHA1 hashing
AC_ARG_WITH([sha1],
@@ -21,7 +21,7 @@ Index: xorg-server/configure.ac
[choose SHA1 implementation])])
AC_CHECK_FUNC([SHA1Init], [HAVE_SHA1_IN_LIBC=yes])
if test "x$with_sha1" = x && test "x$HAVE_SHA1_IN_LIBC" = xyes; then
-@@ -1434,6 +1434,16 @@
+@@ -1441,6 +1441,16 @@
SHA1_CFLAGS="$OPENSSL_CFLAGS"
fi
fi
@@ -40,8 +40,8 @@ Index: xorg-server/configure.ac
AC_MSG_ERROR([No suitable SHA1 implementation found])
Index: xorg-server/include/dix-config.h.in
===================================================================
---- xorg-server.orig/include/dix-config.h.in
-+++ xorg-server/include/dix-config.h.in
+--- xorg-server.orig/include/dix-config.h.in 2010-07-05 16:58:09.888394001 +1000
++++ xorg-server/include/dix-config.h.in 2010-07-05 16:59:02.628394001 +1000
@@ -175,6 +175,9 @@
/* Define to use libsha1 for SHA1 */
#undef HAVE_SHA1_IN_LIBSHA1
@@ -54,8 +54,8 @@ Index: xorg-server/include/dix-config.h.in
Index: xorg-server/os/xsha1.c
===================================================================
---- xorg-server.orig/os/xsha1.c
-+++ xorg-server/os/xsha1.c
+--- xorg-server.orig/os/xsha1.c 2010-07-05 16:58:09.898394001 +1000
++++ xorg-server/os/xsha1.c 2010-07-05 16:59:02.628394001 +1000
@@ -127,6 +127,31 @@
return 1;
}
diff --git a/debian/patches/07-xfree86-fix-build-with-xv-disabled.diff b/debian/patches/07-xfree86-fix-build-with-xv-disabled.diff
index befce3d..d240b66 100644
--- a/debian/patches/07-xfree86-fix-build-with-xv-disabled.diff
+++ b/debian/patches/07-xfree86-fix-build-with-xv-disabled.diff
@@ -10,9 +10,9 @@ Subject: [PATCH] xfree86: fix build with xv disabled
Index: xorg-server/hw/xfree86/modes/xf86Crtc.c
===================================================================
---- xorg-server.orig/hw/xfree86/modes/xf86Crtc.c
-+++ xorg-server/hw/xfree86/modes/xf86Crtc.c
-@@ -3057,6 +3057,7 @@
+--- xorg-server.orig/hw/xfree86/modes/xf86Crtc.c 2010-07-05 16:58:09.758394001 +1000
++++ xorg-server/hw/xfree86/modes/xf86Crtc.c 2010-07-05 16:59:15.268394002 +1000
+@@ -3084,6 +3084,7 @@
return (int) (box->x2 - box->x1) * (int) (box->y2 - box->y1);
}
@@ -20,7 +20,7 @@ Index: xorg-server/hw/xfree86/modes/xf86Crtc.c
/*
* Return the crtc covering 'box'. If two crtcs cover a portion of
* 'box', then prefer 'desired'. If 'desired' is NULL, then prefer the crtc
-@@ -3145,6 +3146,7 @@
+@@ -3172,6 +3173,7 @@
return ret;
}
@@ -30,8 +30,8 @@ Index: xorg-server/hw/xfree86/modes/xf86Crtc.c
xf86_wrap_crtc_notify (ScreenPtr screen, xf86_crtc_notify_proc_ptr new)
Index: xorg-server/hw/xfree86/modes/xf86Crtc.h
===================================================================
---- xorg-server.orig/hw/xfree86/modes/xf86Crtc.h
-+++ xorg-server/hw/xfree86/modes/xf86Crtc.h
+--- xorg-server.orig/hw/xfree86/modes/xf86Crtc.h 2010-07-05 16:58:09.778394001 +1000
++++ xorg-server/hw/xfree86/modes/xf86Crtc.h 2010-07-05 16:59:15.268394002 +1000
@@ -934,6 +934,7 @@
extern _X_EXPORT void
xf86_cursors_fini (ScreenPtr screen);
diff --git a/debian/patches/15-nouveau.diff b/debian/patches/15-nouveau.diff
index 453f0dc..b5a18e7 100644
--- a/debian/patches/15-nouveau.diff
+++ b/debian/patches/15-nouveau.diff
@@ -12,8 +12,8 @@ Also, don't treat DRI setup failure as an error for nouveau.
Index: xorg-server/glx/glxdri.c
===================================================================
---- xorg-server.orig/glx/glxdri.c
-+++ xorg-server/glx/glxdri.c
+--- xorg-server.orig/glx/glxdri.c 2010-07-05 16:12:34.000000000 +1000
++++ xorg-server/glx/glxdri.c 2010-07-05 17:17:49.378394001 +1000
@@ -968,6 +968,7 @@
const __DRIconfig **driConfigs;
const __DRIextension **extensions;
@@ -33,9 +33,9 @@ Index: xorg-server/glx/glxdri.c
filename, dlerror());
goto handle_error;
}
-@@ -1184,7 +1187,7 @@
+@@ -1185,7 +1188,7 @@
- xfree(screen);
+ free(screen);
- LogMessage(X_ERROR, "AIGLX: reverting to software rendering\n");
+ LogMessage(from, "AIGLX: reverting to software rendering\n");
@@ -44,17 +44,17 @@ Index: xorg-server/glx/glxdri.c
}
Index: xorg-server/glx/glxdri2.c
===================================================================
---- xorg-server.orig/glx/glxdri2.c
-+++ xorg-server/glx/glxdri2.c
-@@ -678,6 +678,7 @@
+--- xorg-server.orig/glx/glxdri2.c 2010-07-05 16:12:34.000000000 +1000
++++ xorg-server/glx/glxdri2.c 2010-07-05 17:17:49.378394001 +1000
+@@ -696,6 +696,7 @@
const __DRIextension **extensions;
const __DRIconfig **driConfigs;
int i;
+ int from = X_ERROR;
- screen = xcalloc(1, sizeof *screen);
+ screen = calloc(1, sizeof *screen);
if (screen == NULL)
-@@ -704,7 +705,9 @@
+@@ -722,7 +723,9 @@
screen->driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL);
if (screen->driver == NULL) {
@@ -65,20 +65,20 @@ Index: xorg-server/glx/glxdri2.c
filename, dlerror());
goto handle_error;
}
-@@ -795,7 +798,7 @@
+@@ -816,7 +819,7 @@
- xfree(screen);
+ free(screen);
- LogMessage(X_ERROR, "AIGLX: reverting to software rendering\n");
+ LogMessage(from, "AIGLX: reverting to software rendering\n");
return NULL;
}
-Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c
+Index: xorg-server/hw/xfree86/common/xf86pciBus.c
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86AutoConfig.c
-+++ xorg-server/hw/xfree86/common/xf86AutoConfig.c
-@@ -192,7 +192,24 @@
+--- xorg-server.orig/hw/xfree86/common/xf86pciBus.c 2010-07-05 17:20:04.268394001 +1000
++++ xorg-server/hw/xfree86/common/xf86pciBus.c 2010-07-05 17:20:27.318394001 +1000
+@@ -1118,7 +1118,24 @@
break;
case 0x102b: driverList[0] = "mga"; break;
case 0x10c8: driverList[0] = "neomagic"; break;
diff --git a/debian/patches/16-xaa-fbcomposite-fix-negative-size.diff b/debian/patches/16-xaa-fbcomposite-fix-negative-size.diff
index 0cd0431..b8d2716 100644
--- a/debian/patches/16-xaa-fbcomposite-fix-negative-size.diff
+++ b/debian/patches/16-xaa-fbcomposite-fix-negative-size.diff
@@ -1,8 +1,8 @@
Index: xorg-server/fb/fbpict.c
===================================================================
---- xorg-server.orig/fb/fbpict.c 2010-06-04 13:54:10.000000000 +1000
-+++ xorg-server/fb/fbpict.c 2010-06-04 13:57:34.657009716 +1000
-@@ -37,7 +37,7 @@
+--- xorg-server.orig/fb/fbpict.c 2010-07-05 16:12:34.118394001 +1000
++++ xorg-server/fb/fbpict.c 2010-07-05 17:20:51.548394001 +1000
+@@ -35,7 +35,7 @@
#include "mipict.h"
#include "fbpict.h"
commit c2438b791cfd80b13c4f300c77c6796f914e282d
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Mon Jul 5 16:58:51 2010 +1000
Add gbp.conf to make use of the pristine-tar branch we've got
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..ec89742
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,8 @@
+[DEFAULT]
+# the default branch for upstream sources:
+upstream-branch = upstream-experimental
+# the default branch for the debian patch:
+debian-branch = debian-experimental
+# use pristine-tar:
+pristine-tar = True
+
commit a71dbc03e65cf7b0654a6eca93ce0bf6a1711ffa
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jul 1 08:27:05 2010 -0400
Bump to version 1.8.99.904 (1.9 RC4)
Signed-off-by: Keith Packard <keithp@keithp.com>
diff --git a/configure.ac b/configure.ac
index 5c18a12..b3b752c 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.903, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2010-06-22"
+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_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit 5ea497fc32202ff19c2b7d8ef4eba08889108a87
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Tue Jun 29 16:08:02 2010 +0300
xfree86: configure: remove vendor and card name matching rules
Although vendor and board naming are used to create the configure file, the
server doesn't actually use it when fetching such file and probing devices.
Reported-by: Richard Barnette <jrbarnette@chromium.org>
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
Tested-by: Richard Barnette <jrbarnette@chromium.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c
index 822d767..da654f0 100644
--- a/hw/xfree86/common/xf86Configure.c
+++ b/hw/xfree86/common/xf86Configure.c
@@ -107,8 +107,6 @@ bus_sbus_configure(void *busData)
static void
bus_pci_newdev_configure(void *busData, int i, int *chipset)
{
- const char *VendorName;
- const char *CardName;
char busnum[8];
struct pci_device * pVideo = NULL;
@@ -116,26 +114,6 @@ bus_pci_newdev_configure(void *busData, int i, int *chipset)
DevToConfig[i].pVideo = pVideo;
- VendorName = pci_device_get_vendor_name( pVideo );
- CardName = pci_device_get_device_name( pVideo );
-
- if (!VendorName) {
- VendorName = xnfalloc(15);
- sprintf((char*)VendorName, "Unknown Vendor");
- }
-
- if (!CardName) {
- CardName = xnfalloc(14);
- sprintf((char*)CardName, "Unknown Board");
- }
-
- DevToConfig[i].GDev.identifier =
- xnfalloc(strlen(VendorName) + strlen(CardName) + 2);
- sprintf(DevToConfig[i].GDev.identifier, "%s %s", VendorName, CardName);
-
- DevToConfig[i].GDev.vendor = (char *)VendorName;
- DevToConfig[i].GDev.board = (char *)CardName;
-
DevToConfig[i].GDev.busID = xnfalloc(16);
xf86FormatPciBusNumber(pVideo->bus, busnum);
sprintf(DevToConfig[i].GDev.busID, "PCI:%s:%d:%d",
@@ -357,9 +335,6 @@ configureDeviceSection (int screennum)
/* Move device info to parser structure */
sprintf(identifier, "Card%d", screennum);
ptr->dev_identifier = strdup(identifier);
-/* ptr->dev_identifier = DevToConfig[screennum].GDev.identifier;*/
- ptr->dev_vendor = DevToConfig[screennum].GDev.vendor;
- ptr->dev_board = DevToConfig[screennum].GDev.board;
ptr->dev_chipset = DevToConfig[screennum].GDev.chipset;
ptr->dev_busid = DevToConfig[screennum].GDev.busID;
ptr->dev_driver = DevToConfig[screennum].GDev.driver;
commit 90fd9e40b59e69333d250a795998f44dc3a5dc0c
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Tue Jun 29 16:08:01 2010 +0300
xfree86: pci: remove superfluous vendor and card name logging
X server suffers in startup time when relying on the pciaccess's linear search
to fetch vendor and video device name from PCI ID file (when existent). Such
names are only used to write the log, which may be superfluous. This
information often is provided by the drivers or likewise users can get the it
using external tools like lspci or scanpci.
This patch remove the references of those functions from X start up.
Reported-by: Richard Barnette <jrbarnette@chromium.org>
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Tested-by: Richard Barnette <jrbarnette@chromium.org>
Reviewed-by: James Cloos <cloos@jhcloos.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
index 1517951..74016af 100644
--- a/hw/xfree86/common/xf86pciBus.c
+++ b/hw/xfree86/common/xf86pciBus.c
@@ -151,18 +151,13 @@ xf86PciProbe(void)
/* Print a summary of the video devices found */
for (k = 0; k < num; k++) {
- const char *vendorname = NULL, *chipname = NULL;
const char *prim = " ";
Bool memdone = FALSE, iodone = FALSE;
info = xf86PciVideoInfo[k];
- vendorname = pci_device_get_vendor_name( info );
- chipname = pci_device_get_device_name( info );
-
- if ((!vendorname || !chipname) &&
- !PCIALWAYSPRINTCLASSES(info->device_class))
Reply to: