COPYING | 2
ChangeLog | 1200
++++++++++
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 | 929
+++++--
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 | 27
Xi/extinit.c | 7
Xi/listdev.c | 14
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 | 44
composite/compext.c | 362 ++-
composite/compint.h | 3
composite/compoverlay.c | 17
composite/compwindow.c | 56
config/Makefile.am | 2
config/hal.c | 6
config/udev.c | 7
config/x11-input.fdi | 5
configure.ac | 52
damageext/damageext.c | 4
debian/changelog | 46
debian/patches/06_dont_trap_access_to_timer_and_keyboard.diff | 22
debian/patches/121_only_switch_vt_when_active.diff | 54
debian/patches/16-xaa-fbcomposite-fix-negative-size.diff | 13
debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch | 60
debian/patches/197_xvfb-randr.patch | 20
debian/patches/209_add_legacy_bgnone_option.patch | 21
debian/patches/series | 8
dix/Makefile.am | 1
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 | 17
dix/events.c | 76
dix/extension.c | 6
dix/gc.c | 6
dix/getevents.c | 359 +-
dix/globals.c | 4
dix/grabs.c | 7
dix/inpututils.c | 154 +
dix/main.c | 4
dix/privates.c | 34
dix/ptrveloc.c | 8
dix/tables.c | 508 ++++
dix/window.c | 236 -
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 | 12
doc/xml/xmlrules-inst.in | 23
doc/xml/xmlrules-noinst.in | 22
doc/xml/xmlrules.in | 53
exa/exa.c | 3
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 | 9
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 | 61
hw/dmx/glxProxy/glxcmdsswap.c | 6
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 | 137 -
hw/kdrive/fake/fake.c | 7
hw/kdrive/linux/tslib.c | 15
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/xf86DGA.c | 4
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 | 91
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 | 593 ++--
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/ddc/ddc.c | 4
hw/xfree86/dixmods/extmod/Makefile.am | 2
hw/xfree86/dixmods/extmod/xf86dga2.c | 132 -
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 | 74
hw/xfree86/modes/xf86EdidModes.c | 8
hw/xfree86/modes/xf86Modes.c | 14
hw/xfree86/modes/xf86RandR12.c | 440 ++-
hw/xfree86/modes/xf86Rotate.c | 46
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/hurd/hurd_mmap.c | 12
hw/xfree86/os-support/hurd/hurd_video.c | 27
hw/xfree86/os-support/linux/lnx_init.c | 112
hw/xfree86/os-support/linux/lnx_video.c | 7
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 | 20
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/indirect.c | 2
hw/xquartz/X11Application.m | 46
hw/xquartz/applewm.c | 56
hw/xquartz/bundle/Makefile.am | 4
hw/xquartz/bundle/Resources/Spanish.lproj/locversion.plist | 4
hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/designable.nib | 52
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 | 44
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 | 21
hw/xquartz/bundle/Resources/da.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 | 23
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 | 97
hw/xquartz/bundle/Resources/pt.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 | 42
hw/xquartz/bundle/Resources/sv.lproj/main.nib/keyedobjects.nib |binary
hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/designable.nib | 2
hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/keyedobjects.nib |binary
hw/xquartz/bundle/mk_bundke.sh | 3
hw/xquartz/darwin.c | 45
hw/xquartz/darwinEvents.c | 10
hw/xquartz/darwinXinput.c | 91
hw/xquartz/mach-startup/bundle-main.c | 5
hw/xquartz/quartz.c | 37
hw/xquartz/quartzRandR.c | 23
hw/xquartz/xpr/appledri.c | 43
hw/xquartz/xpr/dri.c | 112
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/eventstr.h | 2
include/exevents.h | 7
include/gc.h | 4
include/gcstruct.h | 4
include/input.h | 34
include/inputstr.h | 7
include/inpututils.h | 48
include/opaque.h | 5
include/os.h | 25
include/pixmap.h | 6
include/privates.h | 52
include/protocol-versions.h | 6
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/mieq.c | 8
mi/miglblt.c | 2
mi/mipointer.c | 6
mi/miscrinit.c | 20
mi/mispans.c | 2
mi/mivalidate.h | 3
mi/miwideline.c | 2
mi/miwindow.c | 5
miext/Makefile.am | 4
miext/cw/cw.c | 1
miext/damage/damage.c | 24
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/shadow/shpacked.c | 4
miext/sync/Makefile.am | 14
miext/sync/misync.c | 201 +
miext/sync/misync.h | 77
miext/sync/misyncstr.h | 86
os/access.c | 137 -
os/connection.c | 15
os/io.c | 19
os/log.c | 37
os/osinit.c | 10
os/strlcat.c | 4
os/strlcpy.c | 4
os/utils.c | 79
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 | 32
randr/rrsdispatch.c | 132 +
randr/rrsprite.c | 104
randr/rrtransform.c | 64
randr/rrtransform.h | 15
render/Makefile.am | 5
render/glyphstr.h | 3
render/miindex.c | 14
render/picture.c | 13
render/picturestr.h | 15
render/render.c | 4
render/renderedge.c | 91
render/renderedge.h | 105
test/input.c | 204 +
test/xi2/protocol-common.c | 1
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 | 37
xkb/xkbActions.c | 13
xkb/xkbEvents.c | 9
xkb/xkbLEDs.c | 13
xkb/xkmread.c | 9
427 files changed, 10349 insertions(+), 12044 deletions(-)
New commits:
commit ef7a6acd40d7e53a14e69834e82f7e5c5e597ed8
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Mon Jan 10 17:22:23 2011 -0600
Set UNRELEASED; this isn't yet releaseable
diff --git a/debian/changelog b/debian/changelog
index ffa5437..afbb6a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.9.99.901-1ubuntu1) natty; urgency=low
+xorg-server (2:1.9.99.901-1ubuntu1) UNRELEASED; urgency=low
* Merge from (unreleased) debian-experimental. Remaining Ubuntu changes:
- …
commit 870eef900a2d82d6484dde3e3da8ca0aff1f41a7
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Mon Jan 10 17:21:06 2011 -0600
Re-add “-nr” option as a synonym for “-background none”.
This is useful so that we can keep gdm passing -nr for a while so that we
can
mix and match old and new X servers.
Eventually all the ?DMs will be transitioned to “-background none”, and
this patch
can be dropped
diff --git a/debian/changelog b/debian/changelog
index e19d99b..ffa5437 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,10 @@ xorg-server (2:1.9.99.901-1ubuntu1) natty; urgency=low
* Refresh 197_xvfb-randr.patch for new upstream.
* Drop 207_dga_master_device.patch; upstream.
* Drop 208_switch_on_release.diff; upstream.
+ * debian/patches/209_add_legacy_bgnone_option.patch:
+ + Add "-nr" as a synonym for "-background none" to ease the transition from
+ the old 189_xserver_1.5.0_bg_none_root.patch patch. Can be dropped once
+ all the ?DM have been updated to use the new option.
-- Christopher James Halse Rogers <r...@ubuntu.com> Mon, 10 Jan 2011
15:53:23 -0600
diff --git a/debian/patches/209_add_legacy_bgnone_option.patch
b/debian/patches/209_add_legacy_bgnone_option.patch
new file mode 100644
index 0000000..2dd2d09
--- /dev/null
+++ b/debian/patches/209_add_legacy_bgnone_option.patch
@@ -0,0 +1,21 @@
+Index: xorg-server/os/utils.c
+===================================================================
+--- xorg-server.orig/os/utils.c 2011-01-10 17:10:56.190132573 -0600
++++ xorg-server/os/utils.c 2011-01-10 17:14:10.000000000 -0600
+@@ -499,6 +499,7 @@
+ ErrorF("-nolisten string don't listen on protocol\n");
+ ErrorF("-noreset don't reset after last client exists\n");
+ ErrorF("-background [none] create root window with no background\n");
++ ErrorF("-nr (Ubuntu-specific) Synonym for -background
none\n");
+ ErrorF("-reset reset after last client exists\n");
+ ErrorF("-p # screen-saver pattern duration
(minutes)\n");
+ ErrorF("-pn accept failure to listen on all ports\n");
+@@ -837,6 +838,8 @@
+ UseMsg();
+ }
+ }
++ else if ( strcmp( argv[i], "-nr") == 0)
++ bgNoneRoot = TRUE;
+ else if ( strcmp( argv[i], "-maxbigreqsize") == 0) {
+ if(++i < argc) {
+ long reqSizeArg = atol(argv[i]);
diff --git a/debian/patches/series b/debian/patches/series
index 2e4fee5..823a3b8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -20,7 +20,6 @@
172_cwgetbackingpicture_nullptr_check.patch
187_edid_quirk_hp_nc8430.patch
188_default_primary_to_first_busid.patch
-189_xserver_1.5.0_bg_none_root.patch
190_cache-xkbcomp_output_for_fast_start_up.patch
191-Xorg-add-an-extra-module-path.patch
197_xvfb-randr.patch
@@ -31,3 +30,4 @@
#203_gestures-extension.patch
204_fix-neg-sync-transition.patch
206_intel_8xx_default_to_fbdev.patch
+209_add_legacy_bgnone_option.patch
commit f3c874501313b03169ab30a390fdac97a0ac330b
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Mon Jan 10 17:08:37 2011 -0600
Drop patches merged upstream
diff --git a/debian/changelog b/debian/changelog
index 3e8535f..e19d99b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ xorg-server (2:1.9.99.901-1ubuntu1) natty; urgency=low
* Drop 189_xserver_1.5.0_bg_none_root.patch; functionality now upstream.
* Refresh 190_cache-xkbcomp_output_for_fast_start_up.patch for new upstream.
* Refresh 197_xvfb-randr.patch for new upstream.
+ * Drop 207_dga_master_device.patch; upstream.
+ * Drop 208_switch_on_release.diff; upstream.
-- Christopher James Halse Rogers <r...@ubuntu.com> Mon, 10 Jan 2011
15:53:23 -0600
diff --git a/debian/patches/series b/debian/patches/series
index 6b758c5..2e4fee5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -28,8 +28,6 @@
200_randr-null.patch
#201_report-real-dpi.patch
202_xf86CoordinationsToWindows.patch
-203_gestures-extension.patch
+#203_gestures-extension.patch
204_fix-neg-sync-transition.patch
206_intel_8xx_default_to_fbdev.patch
-207_dga_master_device.patch
-208_switch_on_release.diff
commit ac7fcadc794f29305e839baa757690c0195625e0
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Mon Jan 10 17:06:00 2011 -0600
Refresh 197_xvfb-randr.patch for new upstream
diff --git a/debian/changelog b/debian/changelog
index 6e5d1ba..3e8535f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ xorg-server (2:1.9.99.901-1ubuntu1) natty; urgency=low
* Refresh 121_only_switch_vt_when_active.diff for new upstream.
* Drop 189_xserver_1.5.0_bg_none_root.patch; functionality now upstream.
* Refresh 190_cache-xkbcomp_output_for_fast_start_up.patch for new upstream.
+ * Refresh 197_xvfb-randr.patch for new upstream.
-- Christopher James Halse Rogers <r...@ubuntu.com> Mon, 10 Jan 2011
15:53:23 -0600
diff --git a/debian/patches/197_xvfb-randr.patch
b/debian/patches/197_xvfb-randr.patch
index d29bbf1..5564099 100644
--- a/debian/patches/197_xvfb-randr.patch
+++ b/debian/patches/197_xvfb-randr.patch
@@ -1,8 +1,8 @@
=== modified file 'hw/vfb/InitOutput.c'
Index: xorg-server/hw/vfb/InitOutput.c
===================================================================
---- xorg-server.orig/hw/vfb/InitOutput.c 2010-07-14 15:06:03.511453001
+1000
-+++ xorg-server/hw/vfb/InitOutput.c 2010-07-14 15:07:00.101453002 +1000
+--- xorg-server.orig/hw/vfb/InitOutput.c 2011-01-10 16:10:26.000000000
-0600
++++ xorg-server/hw/vfb/InitOutput.c 2011-01-10 17:02:37.000000000 -0600
@@ -66,6 +66,7 @@
#endif /* HAS_SHM */
#include "dix.h"
@@ -15,12 +15,12 @@ Index: xorg-server/hw/vfb/InitOutput.c
if (!ret) return FALSE;
-+ if (!miRandRInit(pScreen))
-+ /* Not sure how to emit warnings in xorg. Should warn here though:
-+ * ("Could not initialise RANDR\n");
-+ */
-+ return FALSE;
++ if (!miRandRInit(pScreen)) {
++ xf86DrvMsg(pScreen->index, X_WARNING,
++ "Could not initialise RANDR\n");
++ return FALSE;
++ }
+
- miInitializeBackingStore(pScreen);
-
- /*
+ pScreen->InstallColormap = vfbInstallColormap;
+ pScreen->UninstallColormap = vfbUninstallColormap;
+ pScreen->ListInstalledColormaps = vfbListInstalledColormaps;
commit 8c338b8f5547c6aab80fc29f4e30e0a1f3f29a3a
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Mon Jan 10 16:57:16 2011 -0600
Refresh 190_cache-xkbcomp_output_for_fast_start_up.patch for new upstream
diff --git a/debian/changelog b/debian/changelog
index fca0dfd..6e5d1ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ xorg-server (2:1.9.99.901-1ubuntu1) natty; urgency=low
* Merge from (unreleased) debian-experimental. Remaining Ubuntu changes:
- …
* Refresh 121_only_switch_vt_when_active.diff for new upstream.
+ * Drop 189_xserver_1.5.0_bg_none_root.patch; functionality now upstream.
+ * Refresh 190_cache-xkbcomp_output_for_fast_start_up.patch for new upstream.
-- Christopher James Halse Rogers <r...@ubuntu.com> Mon, 10 Jan 2011
15:53:23 -0600
diff --git a/debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch
b/debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch
index e2d6cc3..e64554f 100644
--- a/debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch
+++ b/debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch
@@ -5,9 +5,9 @@ Signed-off-by: Bryce Harrington <br...@canonical.com>
Index: xorg-server/configure.ac
===================================================================
---- xorg-server.orig/configure.ac 2010-07-14 14:02:00.000000000 +1000
-+++ xorg-server/configure.ac 2010-07-14 14:18:57.201453001 +1000
-@@ -540,9 +540,9 @@
+--- xorg-server.orig/configure.ac 2011-01-10 16:10:25.000000000 -0600
++++ xorg-server/configure.ac 2011-01-10 16:13:48.893598689 -0600
+@@ -537,9 +537,9 @@
AC_ARG_WITH(xkb-path, AS_HELP_STRING([--with-xkb-path=PATH], [Path to
XKB base dir (default: ${datadir}/X11/xkb)]),
[ XKBPATH="$withval" ],
[ XKBPATH="${datadir}/X11/xkb" ])
@@ -19,7 +19,7 @@ Index: xorg-server/configure.ac
AC_ARG_WITH(default-xkb-rules,
AS_HELP_STRING([--with-default-xkb-rules=RULES],
[Keyboard ruleset (default: base/evdev)]),
[ XKB_DFLT_RULES="$withval" ],
-@@ -1175,7 +1175,7 @@
+@@ -1170,7 +1170,7 @@
dnl Make sure XKM_OUTPUT_DIR is an absolute path
XKBOUTPUT_FIRSTCHAR=`echo $XKBOUTPUT | cut -b 1`
if [[ x$XKBOUTPUT_FIRSTCHAR != x/ -a x$XKBOUTPUT_FIRSTCHAR != 'x$' ]] ; then
@@ -30,8 +30,8 @@ Index: xorg-server/configure.ac
dnl XKM_OUTPUT_DIR (used in code) must end in / or file names get hosed
Index: xorg-server/xkb/README.compiled
===================================================================
---- xorg-server.orig/xkb/README.compiled 2010-06-18 12:58:19.000000000
+1000
-+++ xorg-server/xkb/README.compiled 2010-07-14 14:18:57.201453001 +1000
+--- xorg-server.orig/xkb/README.compiled 2010-10-28 13:52:22.000000000
-0500
++++ xorg-server/xkb/README.compiled 2011-01-10 16:13:48.893598689 -0600
@@ -4,10 +4,10 @@
or some other tool might destroy or replace the files in this directory,
so it is not a safe place to store compiled keymaps for long periods of
@@ -49,8 +49,8 @@ Index: xorg-server/xkb/README.compiled
different hosts could cause problems.
Index: xorg-server/xkb/ddxLoad.c
===================================================================
---- xorg-server.orig/xkb/ddxLoad.c 2010-07-14 13:21:02.000000000 +1000
-+++ xorg-server/xkb/ddxLoad.c 2010-07-14 14:51:09.761453001 +1000
+--- xorg-server.orig/xkb/ddxLoad.c 2011-01-10 15:38:10.000000000 -0600
++++ xorg-server/xkb/ddxLoad.c 2011-01-10 16:22:55.000000000 -0600
@@ -30,6 +30,12 @@
#include <xkb-config.h>
@@ -160,8 +160,9 @@ Index: xorg-server/xkb/ddxLoad.c
#else
- const char *xkmfile = "-";
+ const char *xkbfile = "-";
-+#endif
-+
+ #endif
+
+- snprintf(keymap, sizeof(keymap), "server-%s", display);
+ /* Write keymap source (xkbfile) to memory buffer `xkbKeyMapBuf',
+ of which SHA1 is generated and used as result xkm file name */
+ memset(xkbKeyMapBuf, 0, sizeof(xkbKeyMapBuf));
@@ -181,13 +182,12 @@ Index: xorg-server/xkb/ddxLoad.c
+ ErrorF("[xkb] XkbDDXCompileKeymapByNames compiling keymap:\n");
+ fputs(xkbKeyMapBuf, stderr);
+ }
- #endif
++#endif
+ if (!ret) {
+ ErrorF("[xkb] Generating XKB Keymap failed, giving up compiling
keymap\n");
+ return FALSE;
+ }
-
-- snprintf(keymap, sizeof(keymap), "server-%s", display);
++
+ DebugF("[xkb] computing SHA1 of keymap\n");
+ if (Success == Sha1Asc(sha1Asc, xkbKeyMapBuf)) {
+ snprintf(xkmfile, sizeof(xkmfile), "server-%s", sha1Asc);
@@ -258,7 +258,7 @@ Index: xorg-server/xkb/ddxLoad.c
#ifndef WIN32
out= Popen(buf,"w");
#else
-@@ -248,31 +352,42 @@
+@@ -248,30 +352,42 @@
#endif
if (out!=NULL) {
@@ -284,28 +284,29 @@ Index: xorg-server/xkb/ddxLoad.c
{
+ /* xkbcomp success */
if (xkbDebugFlags)
- DebugF("[xkb] xkb executes: %s\n",buf);
+- DebugF("[xkb] xkb executes: %s\n",buf);
- if (nameRtrn) {
- strncpy(nameRtrn,keymap,nameRtrnLen);
- nameRtrn[nameRtrnLen-1]= '\0';
+- }
+- free(buf);
+- return TRUE;
++ DebugF("[xkb] xkb executes: %s\n",buf);
+
+ /* if canonicalXkmFileName already exists now, we simply
+ overwrite it, this is OK */
+ ret = rename(tmpXkmFile, canonicalXkmFileName);
+ if (0 != ret) {
+ ErrorF("[xkb] Can't rename %s to %s, error: %s\n",
-+ tmpXkmFile, canonicalXkmFileName,
-+ strerror(errno));
++ tmpXkmFile, canonicalXkmFileName,
++ strerror(errno));
+
-+ /* in case of error, don't unlink tmpXkmFile, leave it
-+ for debugging */
++ /* in case of error, don't unlink tmpXkmFile, leave i
++ for debugging */
+
-+ result = FALSE;
-+ goto _ret;
- }
-- if (buf != NULL)
-- free(buf);
-- return TRUE;
++ result = FALSE;
++ goto _ret;
++ }
+ result = TRUE;
+ goto _ret;
}
@@ -315,12 +316,11 @@ Index: xorg-server/xkb/ddxLoad.c
#ifdef WIN32
/* remove the temporary file */
unlink(tmpname);
-@@ -287,9 +402,17 @@
+@@ -286,8 +402,17 @@
}
if (nameRtrn)
nameRtrn[0]= '\0';
-- if (buf != NULL)
-- free(buf);
+- free(buf);
- return FALSE;
+ result = FALSE;
+
@@ -332,11 +332,11 @@ Index: xorg-server/xkb/ddxLoad.c
+ if (buf)
+ free(buf);
+
-+ return result;
++ return result;
}
static FILE *
-@@ -373,7 +496,6 @@
+@@ -371,7 +496,6 @@
DebugF("Loaded XKB keymap %s,
defined=0x%x\n",fileName,(*xkbRtrn)->defined);
}
fclose(file);
commit 2dcd41fcfea67295a24c8e3ea6bb52a8e16e89fe
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Mon Jan 10 16:08:23 2011 -0600
Refresh 121_only_switch_vt_when_active.diff for new upstream
diff --git a/debian/changelog b/debian/changelog
index 54b5e55..fca0dfd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xorg-server (2:1.9.99.901-1ubuntu1) natty; urgency=low
* Merge from (unreleased) debian-experimental. Remaining Ubuntu changes:
- …
+ * Refresh 121_only_switch_vt_when_active.diff for new upstream.
-- Christopher James Halse Rogers <r...@ubuntu.com> Mon, 10 Jan 2011
15:53:23 -0600
diff --git a/debian/patches/121_only_switch_vt_when_active.diff
b/debian/patches/121_only_switch_vt_when_active.diff
index e35467b..499e169 100644
--- a/debian/patches/121_only_switch_vt_when_active.diff
+++ b/debian/patches/121_only_switch_vt_when_active.diff
@@ -1,30 +1,36 @@
---- a/hw/xfree86/os-support/linux/lnx_init.c
-+++ b/hw/xfree86/os-support/linux/lnx_init.c
-@@ -336,10 +336,25 @@ xf86CloseConsole(void)
+Index: xorg-server/hw/xfree86/os-support/linux/lnx_init.c
+===================================================================
+--- xorg-server.orig/hw/xfree86/os-support/linux/lnx_init.c 2011-01-10
15:38:09.000000000 -0600
++++ xorg-server/hw/xfree86/os-support/linux/lnx_init.c 2011-01-10
16:06:26.000000000 -0600
+@@ -273,11 +273,26 @@
if (VTSwitch)
{
-+ struct vt_stat vts;
-+
- /*
+- /*
- * Perform a switch back to the active VT when we were started
-+ * Perform a switch back to the active VT when we were started.
-+ * We cannot rely on vtSema to determine if the server was the
-+ * active VT at the time of shutdown since it has already been
-+ * released. Instead, we manually check the current VT and
-+ * compare it with the VT we were running on.
- */
+- */
- if (activeVT >= 0) {
-+ if (ioctl(xf86Info.consoleFd, VT_GETSTATE, &vts) < 0)
-+ {
-+ /* If this failed, fall back to old behaviour
-+ * of always switching. */
-+ xf86Msg(X_WARNING,"xf86OpenConsole: VT_GETSTATE failed: %s\n",
-+ strerror(errno));
-+ vts.v_active = xf86Info.vtno;
-+ }
+- switch_to(activeVT, "xf86CloseConsole");
++ struct vt_stat vts;
++
++ /*
++ * Perform a switch back to the active VT when we were started.
++ * We cannot rely on vtSema to determine if the server was the
++ * active VT at the time of shutdown since it has already been
++ * released. Instead, we manually check the current VT and
++ * compare it with the VT we were running on.
++ */
++ if (ioctl(xf86Info.consoleFd, VT_GETSTATE, &vts) < 0)
++ {
++ /* If this failed, fall back to old behaviour
++ * of always switching. */
++ xf86Msg(X_WARNING,"xf86OpenConsole: VT_GETSTATE failed: %s\n",
++ strerror(errno));
++ vts.v_active = xf86Info.vtno;
++ }
+
-+ if (activeVT >= 0 && vts.v_active == xf86Info.vtno) {
- if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, activeVT) < 0)
- xf86Msg(X_WARNING, "xf86CloseConsole: VT_ACTIVATE failed: %s\n",
- strerror(errno));
++ if (activeVT >= 0 && vts.v_active == xf86Info.vtno) {
++ switch_to(activeVT, "xf86CloseConsole");
+ activeVT = -1;
+ }
+ }
commit 9fc8ada10de545423e3fa04b40fc4169e148a3fc
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Mon Jan 10 15:30:10 2011 -0600
Update to 1.10 RC1
diff --git a/debian/changelog b/debian/changelog
index dbfe3de..f501da8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.9.99.901-1) experimental; urgency=low
+
+ * 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.
+
+ -- Christopher James Halse Rogers <r...@ubuntu.com> Mon, 10 Jan 2011
12:12:01 -0600
+
xorg-server (2:1.9.3.901-1) experimental; urgency=low
* New upstream release (1.9.4 rc1).
diff --git a/debian/patches/16-xaa-fbcomposite-fix-negative-size.diff
b/debian/patches/16-xaa-fbcomposite-fix-negative-size.diff
deleted file mode 100644
index b8d2716..0000000
--- a/debian/patches/16-xaa-fbcomposite-fix-negative-size.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: xorg-server/fb/fbpict.c
-===================================================================
---- 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"
-
--#define mod(a,b) ((b) == 1 ? 0 : (a) >= 0 ? (a) % (b) : (b) - (-a) % (b))
-+#define mod(a,b) ((b) == 1 ? 0 : (a) >= 0 ? (a) % (b) : (b) - (-(a)) % (b))
-
- void
- fbWalkCompositeRegion (CARD8 op,
diff --git a/debian/patches/series b/debian/patches/series
index f850345..2e0f947 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,3 @@
07-xfree86-fix-build-with-xv-disabled.diff
#13_debian_add_xkbpath_env_variable.diff
15-nouveau.diff
-16-xaa-fbcomposite-fix-negative-size.diff
commit b6b7c8e382f71a9941ef2efe8c8951d571f01f63
Author: Cyril Brulebois <k...@debian.org>
Date: Sun Jan 9 03:10:18 2011 +0100
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index 465c0e2..dbfe3de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xorg-server (2:1.9.3.901-1) UNRELEASED; urgency=low
+xorg-server (2:1.9.3.901-1) experimental; urgency=low
* New upstream release (1.9.4 rc1).
- -- Cyril Brulebois <k...@debian.org> Sun, 09 Jan 2011 03:06:41 +0100
+ -- Cyril Brulebois <k...@debian.org> Sun, 09 Jan 2011 03:10:13 +0100
xorg-server (2:1.9.2.902-1) experimental; urgency=low
commit 1f1da5e62c634fd6a4b169fc9c3e330b6e6b10a7
Author: Cyril Brulebois <k...@debian.org>
Date: Sun Jan 9 03:07:14 2011 +0100
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index c07bc14..25696b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,337 @@
+commit 6451a3ff949ff55c9dff7399d0babb6b98201e99
+Author: Jeremy Huddleston <jerem...@apple.com>
+Date: Fri Jan 7 15:40:25 2011 -0800
+
+ xorg-server 1.9.3.901 (1.9.4 RC1)
+
+ Signed-off-by: Jeremy Huddleston <jerem...@apple.com>
+
+commit c11f9bfc081423a7f15d72c36f2f0d6518083591
+Author: Jeremy Huddleston <jerem...@apple.com>
+Date: Fri Jan 7 15:39:14 2011 -0800
+
+ XQuartz: Update copyright dates in bundle's plist
+
+ Signed-off-by: Jeremy Huddleston <jerem...@apple.com>
+
+commit 3d12e6d25a79c1d78964df723731d2510bb932f8
+Author: Zhao Yakui <yakui.z...@intel.com>
+Date: Tue Jan 4 14:08:16 2011 -0500
+
+ edid: Fix incorrect timings for VIC61
+
+ Reviewed-by: Adam Jackson <a...@redhat.com>
+ Signed-off-by: Anssi Hannula <anssi.hann...@iki.fi>
+ Signed-off-by: Zhao Yakui <yakui.z...@intel.com>
+ (cherry picked from commit 86ca434a1ab766c1519ee7146b48dbfead843524)
+
+commit 9213c2525a2be6f8bf1412f1c6001a7bc6ce4538
+Author: Adam Jackson <a...@redhat.com>
+Date: Fri Dec 10 14:24:02 2010 -0500
+
+ x86emu: Fix more mis-decoding of the data prefix
+
+ 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.
+
+ Reference: Intel 64 and IA-32 Architectures Software Developer's Manual
+ Volume 2A: Instruction Set Reference, A-M
+
+ http://www.intel.com/Assets/PDF/manual/253666.pdf
+
+ Reviewed-by: Julien Cristau <jcris...@debian.org>
+ Signed-off-by: Adam Jackson <a...@redhat.com>
+ (cherry picked from commit bb18f277156c08be028a6e12d8987fb1593e9168)
+
+commit dc24f90ddc9c116a31347ba961f19feaf63fa843
+Author: Pauli Nieminen <ext-pauli.niemi...@nokia.com>
+Date: Thu Dec 30 19:19:42 2010 +0200
+
+ os: Fix a memory leak
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pcr4i-0007jg...@alioth.debian.org
