ChangeLog | 4458 +++++++++++++- Xext/bigreq.c | 7 Xext/dpms.c | 60 Xext/geext.c | 16 Xext/panoramiX.c | 74 Xext/panoramiXSwap.c | 26 Xext/panoramiXsrv.h | 2 Xext/saver.c | 68 Xext/security.c | 37 Xext/shape.c | 110 Xext/shm.c | 114 Xext/sync.c | 186 Xext/xcmisc.c | 41 Xext/xf86bigfont.c | 62 Xext/xres.c | 64 Xext/xselinux_ext.c | 67 Xext/xtest.c | 30 Xext/xvdisp.c | 407 - Xi/allowev.c | 6 Xi/chgdctl.c | 15 Xi/chgfctl.c | 52 Xi/chgkbd.c | 4 Xi/chgkmap.c | 3 Xi/chgprop.c | 8 Xi/chgptr.c | 4 Xi/closedev.c | 4 Xi/devbell.c | 4 Xi/exevents.c | 96 Xi/extinit.c | 238 Xi/getbmap.c | 10 Xi/getdctl.c | 33 Xi/getfctl.c | 64 Xi/getfocus.c | 14 Xi/getkmap.c | 10 Xi/getmmap.c | 10 Xi/getprop.c | 14 Xi/getselev.c | 16 Xi/getvers.c | 16 Xi/grabdev.c | 16 Xi/grabdevb.c | 10 Xi/grabdevk.c | 10 Xi/gtmotion.c | 20 Xi/listdev.c | 28 Xi/opendev.c | 10 Xi/queryst.c | 13 Xi/selectev.c | 8 Xi/sendexev.c | 7 Xi/setbmap.c | 10 Xi/setdval.c | 10 Xi/setfocus.c | 8 Xi/setmmap.c | 10 Xi/setmode.c | 10 Xi/ungrdev.c | 6 Xi/ungrdevb.c | 8 Xi/ungrdevk.c | 8 Xi/xiallowev.c | 8 Xi/xichangecursor.c | 10 Xi/xichangehierarchy.c | 11 Xi/xigetclientpointer.c | 12 Xi/xigrabdev.c | 28 Xi/xipassivegrab.c | 60 Xi/xiproperty.c | 107 Xi/xiquerydevice.c | 142 Xi/xiquerydevice.h | 1 Xi/xiquerypointer.c | 30 Xi/xiqueryversion.c | 17 Xi/xiselectev.c | 30 Xi/xisetclientpointer.c | 8 Xi/xisetdevfocus.c | 23 Xi/xiwarppointer.c | 24 composite/compalloc.c | 11 composite/compext.c | 74 config/Makefile.am | 6 config/config-backends.h | 7 config/config.c | 20 config/dbus.c | 60 config/hal.c | 44 config/udev.c | 63 config/wscons.c | 268 configure.ac | 167 damageext/damageext.c | 44 dbe/dbe.c | 68 debian/changelog | 77 debian/control | 9 debian/patches/07-xfree86-fix-build-with-xv-disabled.diff | 50 debian/patches/15-nouveau.diff | 68 debian/patches/series | 2 debian/rules | 19 debian/serverminver | 6 debian/xserver-xorg-core.install | 1 debian/xserver-xorg-core.lintian-overrides | 3 devbook.am | 45 dix/.gitignore | 1 dix/colormap.c | 7 dix/cursor.c | 2 dix/devices.c | 61 dix/dispatch.c | 33 dix/dixfonts.c | 30 dix/enterleave.c | 10 dix/eventconvert.c | 70 dix/events.c | 313 dix/getevents.c | 831 +- dix/grabs.c | 2 dix/inpututils.c | 320 - dix/ptrveloc.c | 263 dix/swaprep.c | 401 - dix/swapreq.c | 728 +- doc/Xinput.xml | 26 doc/Xserver-spec.xml | 33 doc/dtrace/Xserver-DTrace.xml | 22 docbook.am | 114 fb/fbpict.c | 4 fb/wfbrename.h | 2 glx/glxserver.h | 6 hw/dmx/config/xdmxconfig.c | 23 hw/dmx/dmx.c | 241 hw/dmx/dmxclient.h | 1 hw/dmx/dmxcursor.h | 4 hw/dmx/dmxextension.c | 2 hw/dmx/dmxinit.c | 11 hw/dmx/dmxprop.c | 9 hw/dmx/doc/dmx.xml | 11 hw/dmx/examples/dmxwininfo.c | 3 hw/dmx/glxProxy/glxcmds.c | 41 hw/dmx/glxProxy/glxscreens.c | 39 hw/dmx/glxProxy/glxserver.h | 6 hw/dmx/glxProxy/render2swap.c | 2 hw/dmx/input/dmxinputinit.c | 6 hw/dmx/input/lnx-keyboard.c | 6 hw/dmx/input/usb-common.c | 4 hw/kdrive/ephyr/ephyrdriext.c | 24 hw/kdrive/ephyr/ephyrhostproxy.c | 2 hw/kdrive/ephyr/hostx.c | 11 hw/kdrive/ephyr/man/Xephyr.man | 32 hw/kdrive/src/kinfo.c | 12 hw/kdrive/src/kinput.c | 139 hw/vfb/InitOutput.c | 5 hw/xfree86/Makefile.am | 2 hw/xfree86/common/Makefile.am | 11 hw/xfree86/common/xf86.h | 19 hw/xfree86/common/xf86AutoConfig.c | 4 hw/xfree86/common/xf86Bus.c | 19 hw/xfree86/common/xf86Bus.h | 1 hw/xfree86/common/xf86Config.c | 222 hw/xfree86/common/xf86Configure.c | 6 hw/xfree86/common/xf86Cursor.c | 2 hw/xfree86/common/xf86DGA.c | 2 hw/xfree86/common/xf86DPMS.c | 3 hw/xfree86/common/xf86Events.c | 9 hw/xfree86/common/xf86Globals.c | 9 hw/xfree86/common/xf86Helper.c | 157 hw/xfree86/common/xf86Init.c | 76 hw/xfree86/common/xf86Module.h | 6 hw/xfree86/common/xf86Opt.h | 67 hw/xfree86/common/xf86Option.c | 114 hw/xfree86/common/xf86Optionstr.h | 44 hw/xfree86/common/xf86PciInfo.h | 2 hw/xfree86/common/xf86Privstr.h | 8 hw/xfree86/common/xf86RandR.c | 3 hw/xfree86/common/xf86VGAarbiter.c | 15 hw/xfree86/common/xf86VidMode.c | 3 hw/xfree86/common/xf86Xinput.c | 99 hw/xfree86/common/xf86Xinput.h | 7 hw/xfree86/common/xf86fbBus.c | 2 hw/xfree86/common/xf86pciBus.c | 30 hw/xfree86/common/xf86str.h | 8 hw/xfree86/dixmods/Makefile.am | 12 hw/xfree86/dixmods/extmod/Makefile.am | 2 hw/xfree86/dixmods/extmod/xf86vmode.c | 444 - hw/xfree86/doc/ddxDesign.xml | 35 hw/xfree86/dri/xf86dri.c | 24 hw/xfree86/dri2/dri2.c | 58 hw/xfree86/dri2/dri2.h | 31 hw/xfree86/dri2/dri2ext.c | 19 hw/xfree86/exa/Makefile.am | 2 hw/xfree86/fbdevhw/Makefile.am | 2 hw/xfree86/fbdevhw/fbdevhw.c | 1 hw/xfree86/fbdevhw/fbdevhw.h | 2 hw/xfree86/i2c/fi1236.c | 1002 +-- hw/xfree86/int10/generic.c | 86 hw/xfree86/int10/helper_exec.c | 86 hw/xfree86/int10/helper_mem.c | 3 hw/xfree86/int10/xf86int10.c | 61 hw/xfree86/int10/xf86int10.h | 2 hw/xfree86/loader/loadmod.c | 41 hw/xfree86/man/Xorg.man | 7 hw/xfree86/man/xorg.conf.man | 73 hw/xfree86/modes/xf86Crtc.c | 72 hw/xfree86/modes/xf86Crtc.h | 26 hw/xfree86/modes/xf86Cursors.c | 93 hw/xfree86/modes/xf86EdidModes.c | 5 hw/xfree86/modes/xf86Modes.c | 55 hw/xfree86/modes/xf86RandR12.c | 2 hw/xfree86/modes/xf86Rotate.c | 135 hw/xfree86/os-support/Makefile.am | 5 hw/xfree86/os-support/bsd/alpha_video.c | 71 hw/xfree86/os-support/bsd/arm_video.c | 13 hw/xfree86/os-support/bsd/bsd_bell.c | 4 hw/xfree86/os-support/bsd/bsd_init.c | 69 hw/xfree86/os-support/bsd/i386_video.c | 9 hw/xfree86/os-support/bsd/ppc_video.c | 13 hw/xfree86/os-support/bsd/sparc64_video.c | 6 hw/xfree86/os-support/bus/Makefile.am | 9 hw/xfree86/os-support/bus/Pci.c | 8 hw/xfree86/os-support/bus/Pci.h | 17 hw/xfree86/os-support/bus/bsd_pci.c | 16 hw/xfree86/os-support/bus/linuxPci.c | 450 - hw/xfree86/os-support/bus/nobus.c | 1 hw/xfree86/os-support/bus/xf86Pci.h | 10 hw/xfree86/os-support/linux/Makefile.am | 4 hw/xfree86/os-support/linux/int10/linux.c | 3 hw/xfree86/os-support/linux/lnx_init.c | 39 hw/xfree86/os-support/linux/lnx_video.c | 12 hw/xfree86/os-support/shared/bios_devmem.c | 75 hw/xfree86/os-support/shared/bios_mmap.c | 4 hw/xfree86/os-support/shared/ia64Pci.c | 188 hw/xfree86/os-support/shared/posix_tty.c | 4 hw/xfree86/os-support/shared/vidmem.c | 6 hw/xfree86/os-support/solaris/sun_init.c | 42 hw/xfree86/os-support/stub/Makefile.am | 19 hw/xfree86/os-support/stub/stub_bell.c | 10 hw/xfree86/os-support/stub/stub_bios.c | 12 hw/xfree86/os-support/stub/stub_init.c | 26 hw/xfree86/os-support/stub/stub_video.c | 13 hw/xfree86/os-support/xf86_OSlib.h | 65 hw/xfree86/os-support/xf86_OSproc.h | 15 hw/xfree86/parser/Flags.c | 5 hw/xfree86/parser/Layout.c | 2 hw/xfree86/parser/Makefile.am | 2 hw/xfree86/parser/scan.c | 17 hw/xfree86/parser/xf86Optrec.h | 25 hw/xfree86/parser/xf86tokens.h | 2 hw/xfree86/ramdac/xf86Cursor.c | 6 hw/xfree86/ramdac/xf86HWCurs.c | 4 hw/xfree86/sdksyms.sh | 11 hw/xfree86/shadowfb/Makefile.am | 2 hw/xfree86/utils/cvt/cvt.c | 7 hw/xfree86/utils/man/cvt.man | 3 hw/xfree86/utils/man/gtf.man | 3 hw/xfree86/vbe/Makefile.am | 2 hw/xfree86/vbe/vbe.c | 5 hw/xfree86/vgahw/vgaHW.c | 184 hw/xfree86/vgahw/vgaHW.h | 24 hw/xfree86/x86emu/sys.c | 2 hw/xfree86/xaa/Makefile.am | 2 hw/xnest/Display.c | 15 hw/xnest/GC.c | 3 hw/xnest/Keyboard.c | 25 hw/xnest/XNCursor.h | 4 hw/xnest/XNGC.h | 1 hw/xquartz/X11Application.m | 2 hw/xquartz/applewm.c | 12 hw/xquartz/darwin.c | 2 hw/xquartz/pbproxy/Makefile.am | 1 hw/xquartz/pseudoramiX.c | 65 hw/xquartz/xpr/appledri.c | 149 hw/xquartz/xpr/appledristr.h | 298 hw/xwin/InitOutput.c | 66 hw/xwin/XWin.exe.manifest | 5 hw/xwin/ddraw.h | 2 hw/xwin/man/XWinrc.man | 10 hw/xwin/win.h | 3 hw/xwin/winclipboardwndproc.c | 48 hw/xwin/winglobals.c | 7 hw/xwin/winmonitors.c | 28 hw/xwin/winmultiwindowwndproc.c | 4 hw/xwin/winprocarg.c | 32 hw/xwin/winwin32rootlesswndproc.c | 4 hw/xwin/winwindowswm.c | 10 hw/xwin/winwndproc.c | 4 include/Makefile.am | 1 include/colormapst.h | 17 include/cursor.h | 4 include/dix-config.h.in | 15 include/dix.h | 4 include/dixstruct.h | 9 include/eventstr.h | 12 include/exevents.h | 28 include/globals.h | 2 include/input.h | 37 include/inputstr.h | 33 include/inpututils.h | 9 include/list.h | 172 include/misc.h | 102 include/optionstr.h | 14 include/os.h | 17 include/protocol-versions.h | 2 include/ptrveloc.h | 32 include/scrnintstr.h | 4 include/xorg-config.h.in | 18 include/xserver-properties.h | 5 man/Xserver.man | 20 mi/mi.h | 2 mi/miarc.c | 2 mi/mieq.c | 207 mi/mifpoly.h | 6 mi/mipointer.c | 71 mi/mipointer.h | 8 mi/misprite.c | 5 mi/mivaltree.c | 2 mi/miwideline.c | 2 miext/rootless/rootlessScreen.c | 4 os/.gitignore | 1 os/backtrace.c | 5 os/connection.c | 6 os/io.c | 7 os/log.c | 175 os/utils.c | 14 os/xprintf.c | 5 randr/rrcrtc.c | 129 randr/rrdispatch.c | 9 randr/rrmode.c | 7 randr/rroutput.c | 33 randr/rrproperty.c | 67 randr/rrscreen.c | 106 randr/rrsdispatch.c | 262 randr/rrxinerama.c | 88 record/record.c | 151 render/mipict.c | 67 render/mipict.h | 20 render/picture.c | 44 render/picturestr.h | 21 render/render.c | 446 - test/Makefile.am | 3 test/input.c | 460 + test/list.c | 164 test/misc.c | 104 test/xfree86.c | 107 test/xi2/protocol-common.c | 64 test/xi2/protocol-eventconvert.c | 169 test/xi2/protocol-xigetclientpointer.c | 12 test/xi2/protocol-xigetselectedevents.c | 17 test/xi2/protocol-xipassivegrabdevice.c | 29 test/xi2/protocol-xiquerydevice.c | 98 test/xi2/protocol-xiquerypointer.c | 24 test/xi2/protocol-xiqueryversion.c | 16 test/xi2/protocol-xiselectevents.c | 11 test/xi2/protocol-xisetclientpointer.c | 7 test/xi2/protocol-xiwarppointer.c | 19 xfixes/cursor.c | 122 xfixes/region.c | 156 xfixes/saveset.c | 5 xfixes/select.c | 9 xfixes/xfixes.c | 16 xkb/ddxList.c | 13 xkb/ddxLoad.c | 3 xkb/xkb.c | 413 - xkb/xkbAccessX.c | 9 xkb/xkbActions.c | 9 xkb/xkbEvents.c | 105 xkb/xkbSwap.c | 338 - xorg-server.pc.in | 1 352 files changed, 14136 insertions(+), 8751 deletions(-)
New commits: commit 503a9f9ff06438d36a14fe674b5bb009ad045435 Author: Cyril Brulebois <[email protected]> Date: Thu Dec 15 18:49:20 2011 +0100 Upload to experimental. diff --git a/debian/changelog b/debian/changelog index 94e51d9..4685d0d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xorg-server (2:1.11.99.1-1) UNRELEASED; urgency=low +xorg-server (2:1.11.99.1-1) experimental; urgency=low * New upstream release snapshot (on the way to 1.12). * Bump libpciaccess-dev, x11proto-input-dev build-deps. @@ -10,7 +10,7 @@ xorg-server (2:1.11.99.1-1) UNRELEASED; urgency=low - 07-xfree86-fix-build-with-xv-disabled.diff - 15-nouveau.diff - -- Cyril Brulebois <[email protected]> Thu, 15 Dec 2011 17:39:25 +0100 + -- Cyril Brulebois <[email protected]> Thu, 15 Dec 2011 18:49:10 +0100 xorg-server (2:1.11.2.901-1) unstable; urgency=low commit 36fb8bc77fb87651911de5c4bcbf96e0c2273775 Author: Cyril Brulebois <[email protected]> Date: Thu Dec 15 17:56:02 2011 +0100 Drop patch (merged upstream): 15-nouveau.diff diff --git a/debian/changelog b/debian/changelog index ff31167..94e51d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,8 +6,9 @@ xorg-server (2:1.11.99.1-1) UNRELEASED; urgency=low - Add libpixman-1-dev. - Bump x11proto-input-dev. * Update serverminver with new server and ABI versions. - * Drop patch (merged upstream): + * Drop patches (merged upstream): - 07-xfree86-fix-build-with-xv-disabled.diff + - 15-nouveau.diff -- Cyril Brulebois <[email protected]> Thu, 15 Dec 2011 17:39:25 +0100 diff --git a/debian/patches/15-nouveau.diff b/debian/patches/15-nouveau.diff deleted file mode 100644 index 98fec87..0000000 --- a/debian/patches/15-nouveau.diff +++ /dev/null @@ -1,68 +0,0 @@ -From a685b5cf34532cef96fc9b05f735088ac0c0c7ad Mon Sep 17 00:00:00 2001 -From: Fedora X Ninjas <[email protected]> -Date: Tue, 16 Feb 2010 11:38:17 +1000 -Subject: [PATCH 08/17] autoconfig: select nouveau by default for NVIDIA GPUs - -Also, don't treat DRI setup failure as an error for nouveau. ---- - glx/glxdri.c | 7 +++++-- - glx/glxdri2.c | 7 +++++-- - hw/xfree86/common/xf86AutoConfig.c | 19 ++++++++++++++++++- - 3 files changed, 28 insertions(+), 5 deletions(-) ---- -v2: Adapt the (II) part for nouveau after the move from glx/glxdri*.c to - glx/glxdricommon.c; the callers will still report (EE) after that - when mentioning the fallback to software rendering (since the error - case can be triggered in many various ways). - -Signed-off-by: Cyril Brulebois <[email protected]> - ---- a/hw/xfree86/common/xf86pciBus.c -+++ b/hw/xfree86/common/xf86pciBus.c -@@ -1123,7 +1123,24 @@ videoPtrToDriverList(struct pci_device * - break; - case 0x102b: driverList[0] = "mga"; break; - case 0x10c8: driverList[0] = "neomagic"; break; -- case 0x10de: case 0x12d2: driverList[0] = "nv"; break; -+ case 0x10de: case 0x12d2: -+ switch (dev->device_id) { -+ /* NV1 */ -+ case 0x0008: -+ case 0x0009: -+ driverList[0] = "vesa"; -+ break; -+ /* NV3 */ -+ case 0x0018: -+ case 0x0019: -+ driverList[0] = "nv"; -+ break; -+ default: -+ driverList[0] = "nouveau"; -+ driverList[1] = "nv"; -+ break; -+ } -+ break; - case 0x1106: driverList[0] = "openchrome"; break; - case 0x1b36: driverList[0] = "qxl"; break; - case 0x1163: driverList[0] = "rendition"; break; ---- a/glx/glxdricommon.c -+++ b/glx/glxdricommon.c -@@ -217,6 +217,7 @@ glxProbeDriver(const char *driverName, - void *driver; - char filename[PATH_MAX]; - const __DRIextension **extensions; -+ int from = X_ERROR; - - snprintf(filename, sizeof filename, "%s/%s_dri.so", - dri_driver_path, driverName); -@@ -248,7 +249,9 @@ glxProbeDriver(const char *driverName, - } - - if (*coreExt == NULL || *renderExt == NULL) { -- LogMessage(X_ERROR, -+ if (!strcmp(driverName, "nouveau")) -+ from = X_INFO; -+ LogMessage(from, - "AIGLX error: %s does not export required DRI extension\n", - driverName); - goto cleanup_failure; diff --git a/debian/patches/series b/debian/patches/series index de38a87..aaaaaed 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,4 +3,3 @@ 001_fedora_extramodes.patch 02_Add-libnettle-as-option-for-sha1.diff #13_debian_add_xkbpath_env_variable.diff -15-nouveau.diff commit 8fe094e0b36ba5fd9880a2bfc9b1e1d8d7fe5df6 Author: Cyril Brulebois <[email protected]> Date: Thu Dec 15 17:54:28 2011 +0100 Drop patch (merged upstream): 07-xfree86-fix-build-with-xv-disabled.diff diff --git a/debian/changelog b/debian/changelog index 6420d4a..ff31167 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ xorg-server (2:1.11.99.1-1) UNRELEASED; urgency=low - Add libpixman-1-dev. - Bump x11proto-input-dev. * Update serverminver with new server and ABI versions. + * Drop patch (merged upstream): + - 07-xfree86-fix-build-with-xv-disabled.diff -- Cyril Brulebois <[email protected]> Thu, 15 Dec 2011 17:39:25 +0100 diff --git a/debian/patches/07-xfree86-fix-build-with-xv-disabled.diff b/debian/patches/07-xfree86-fix-build-with-xv-disabled.diff deleted file mode 100644 index 1bd6b70..0000000 --- a/debian/patches/07-xfree86-fix-build-with-xv-disabled.diff +++ /dev/null @@ -1,50 +0,0 @@ -From fe7575e929d65e8c798104ec2f72b879051694d3 Mon Sep 17 00:00:00 2001 -From: Julien Cristau <[email protected]> -Date: Mon, 8 Feb 2010 02:04:33 +0100 -Subject: [PATCH] xfree86: fix build with xv disabled - ---- - hw/xfree86/modes/xf86Crtc.c | 2 ++ - hw/xfree86/modes/xf86Crtc.h | 2 ++ - 2 files changed, 4 insertions(+), 0 deletions(-) - -Index: xorg-server/hw/xfree86/modes/xf86Crtc.c -=================================================================== ---- xorg-server.orig/hw/xfree86/modes/xf86Crtc.c -+++ xorg-server/hw/xfree86/modes/xf86Crtc.c -@@ -3089,6 +3089,7 @@ xf86_crtc_box_area(BoxPtr box) - return (int) (box->x2 - box->x1) * (int) (box->y2 - box->y1); - } - -+#ifdef XV - /* - * Return the crtc covering 'box'. If two crtcs cover a portion of - * 'box', then prefer 'desired'. If 'desired' is NULL, then prefer the crtc -@@ -3177,6 +3178,7 @@ xf86_crtc_clip_video_helper(ScrnInfoPtr - - return ret; - } -+#endif - - xf86_crtc_notify_proc_ptr - 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 -@@ -934,6 +934,7 @@ xf86_hide_cursors (ScrnInfoPtr scrn); - extern _X_EXPORT void - xf86_cursors_fini (ScreenPtr screen); - -+#ifdef XV - /* - * For overlay video, compute the relevant CRTC and - * clip video to that. -@@ -952,6 +953,7 @@ xf86_crtc_clip_video_helper(ScrnInfoPtr - RegionPtr reg, - INT32 width, - INT32 height); -+#endif - - extern _X_EXPORT xf86_crtc_notify_proc_ptr - xf86_wrap_crtc_notify (ScreenPtr pScreen, xf86_crtc_notify_proc_ptr new); diff --git a/debian/patches/series b/debian/patches/series index 2e0f947..de38a87 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,6 +2,5 @@ ## Ubuntu patches start with 100. 001_fedora_extramodes.patch 02_Add-libnettle-as-option-for-sha1.diff -07-xfree86-fix-build-with-xv-disabled.diff #13_debian_add_xkbpath_env_variable.diff 15-nouveau.diff commit 1812d523ea5a0bdb065eccef385e9866091dce9e Author: Cyril Brulebois <[email protected]> Date: Thu Dec 15 17:50:12 2011 +0100 Update serverminver with new server and ABI versions. diff --git a/debian/changelog b/debian/changelog index f9f4f1d..6420d4a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ xorg-server (2:1.11.99.1-1) UNRELEASED; urgency=low * Update xserver-xorg-dev's dependencies: - Add libpixman-1-dev. - Bump x11proto-input-dev. + * Update serverminver with new server and ABI versions. -- Cyril Brulebois <[email protected]> Thu, 15 Dec 2011 17:39:25 +0100 diff --git a/debian/serverminver b/debian/serverminver index 5580dc9..c2492bd 100644 --- a/debian/serverminver +++ b/debian/serverminver @@ -1,3 +1,3 @@ -2:1.10.99.901 -ABI_VIDEODRV_VERSION:11.0 -ABI_XINPUT_VERSION:13.0 +2:1.11.99.1 +ABI_VIDEODRV_VERSION:12.0 +ABI_XINPUT_VERSION:14.0 commit 2e1e7fe422da98d218a57c6ec557a4bf916cc1a4 Author: Cyril Brulebois <[email protected]> Date: Thu Dec 15 17:45:59 2011 +0100 Update xserver-xorg-dev's dependencies. diff --git a/debian/changelog b/debian/changelog index c094297..f9f4f1d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,9 @@ xorg-server (2:1.11.99.1-1) UNRELEASED; urgency=low * New upstream release snapshot (on the way to 1.12). * Bump libpciaccess-dev, x11proto-input-dev build-deps. + * Update xserver-xorg-dev's dependencies: + - Add libpixman-1-dev. + - Bump x11proto-input-dev. -- Cyril Brulebois <[email protected]> Thu, 15 Dec 2011 17:39:25 +0100 diff --git a/debian/control b/debian/control index 6b57881..3ab7965 100644 --- a/debian/control +++ b/debian/control @@ -158,7 +158,7 @@ Architecture: any Depends: libpixman-1-dev (>= 0.21.8), x11proto-core-dev (>= 7.0.22), - x11proto-input-dev (>= 1.9.99.902), + x11proto-input-dev (>= 2.0.99.1), x11proto-xext-dev (>= 7.1.99), x11proto-video-dev, x11proto-randr-dev (>= 1.2.99.3), @@ -169,6 +169,7 @@ Depends: x11proto-kb-dev, libxkbfile-dev, libpciaccess-dev, + libpixman-1-dev (>= 0.21.8), ${misc:Depends}, Description: Xorg X server - development files This package provides development files for the X.Org ('Xorg') X server. commit 388580b8c1dbf8120c7069d1060af1d62f83c82e Author: Cyril Brulebois <[email protected]> Date: Thu Dec 15 17:44:37 2011 +0100 Bump libpciaccess-dev, x11proto-input-dev build-deps. diff --git a/debian/changelog b/debian/changelog index 7fbecf7..c094297 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ xorg-server (2:1.11.99.1-1) UNRELEASED; urgency=low * New upstream release snapshot (on the way to 1.12). + * Bump libpciaccess-dev, x11proto-input-dev build-deps. -- Cyril Brulebois <[email protected]> Thu, 15 Dec 2011 17:39:25 +0100 diff --git a/debian/control b/debian/control index f822fc9..6b57881 100644 --- a/debian/control +++ b/debian/control @@ -39,13 +39,13 @@ Build-Depends: x11proto-xf86vidmode-dev (>= 2.2.99.1), xtrans-dev (>= 1.2.2), libxau-dev (>= 1:1.0.5-2), - x11proto-input-dev (>= 1.9.99.902), + x11proto-input-dev (>= 2.0.99.1), x11proto-dri2-dev (>= 2.6), libxdmcp-dev (>= 1:0.99.1), libxfont-dev (>= 1:1.4.2), libxkbfile-dev (>= 1:0.99.1), libpixman-1-dev (>= 0.21.8), - libpciaccess-dev (>= 0.11.0-2), + libpciaccess-dev (>= 0.12.901), libgcrypt-dev, nettle-dev, libdbus-1-dev [kfreebsd-any], commit 15dbc497b433184e1d503569745791446a11260e Author: Cyril Brulebois <[email protected]> Date: Thu Dec 15 17:41:27 2011 +0100 Bump changelogs. diff --git a/ChangeLog b/ChangeLog index bf744e1..d8eb167 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,54 +1,22 @@ -commit 4689c84a07f87d35492feeae2bc59642c31b6eb3 -Author: Jeremy Huddleston <[email protected]> -Date: Mon Nov 28 00:07:29 2011 -0800 +commit 5952efa903d57ac69070f1477ce46223a2a7893c +Author: Keith Packard <[email protected]> +Date: Sun Nov 20 13:07:33 2011 -0800 - configure.ac: 1.11.2.901 (1.11.3 RC1) + Bump version to 1.11.99.1 (1.12 development release 1) - Signed-off-by: Jeremy Huddleston <[email protected]> + Signed-off-by: Keith Packard <[email protected]> -commit e2661ddbc5d1b2edb1ab514a761f8c0b66e69736 -Author: Derek Buitenhuis <[email protected]> -Date: Sun Nov 6 12:20:51 2011 -0500 +commit 795fbe3e6e440f023e52c452106f4c266c13d36c +Author: Keith Packard <[email protected]> +Date: Sun Nov 20 13:33:12 2011 -0800 - Fix vesa's VBE PanelID interpretation - - xserver's VESA driver's VBE (Vesa BIOS Extensions) code - includes a PanelID probe, which can get a monitor's native - resolution. From this, using CVT formulas, it derives - horizontal sync rate and a vertical refresh rate ranges. - - It however, only derives the upper bounds of the ranges, and - the lower bounds cannot de derived. By default, they are set - to hardcoded constants which represent the lowest supported - resolution: 640x480. The constants in vbe.c however, were - not actually derived from forulas, but carried over from - other code from the bad old days, and are not relevant - to flat panel displays. This caused, for example, EEEPC701's - panel, with a native resolution of 800x480, to end up with - a upper bound of the horizontal sync rate that was lower - than the hardcoded lower bound, which of course broke things. + Add 'optionstr.h' to include/Makefile.am - These numbers have been rederived using both my own CVT tool - based on xf86CVTMode(), and using the provided 'cvt' tool - that comes with xserver. + This makes sure it gets distributed - Signed-off-by: Derek Buitenhuis <[email protected]> - Reviewed-by: Adam Jackson <[email protected]> Signed-off-by: Keith Packard <[email protected]> - (cherry picked from commit f0d50cc6651dce3a8a3cd3fb84210aa92b139763) - -commit 2e3406fc6737539210e29ac0b2821848e6d1f069 -Author: Jeremy Huddleston <[email protected]> -Date: Mon Nov 7 22:14:30 2011 +0000 - - dmx: Build fix for -Werror=implicit-function-declaration - - Signed-off-by: Jeremy Huddleston <[email protected]> - Reviewed-by: Alan Coopersmith <[email protected]> - Signed-off-by: Alan Coopersmith <[email protected]> - (cherry picked from commit f405dfffe7d5db81d398615a80acbeba7e014ada) -commit b440fc9c1bb10f8c227120e6d9e58101108d71bb +commit 328074890eeb111950e984c6f618311983600b20 Author: dtakahashi42 <[email protected]> Date: Fri Nov 18 11:30:22 2011 -0800 @@ -58,9 +26,8 @@ Date: Fri Nov 18 11:30:22 2011 -0800 Signed-off-by: Jeremy Huddleston <[email protected]> Reviewed-by: Jeremy Huddleston <[email protected]> - (cherry picked from commit 328074890eeb111950e984c6f618311983600b20) -commit 40c1287f36517f0afd62306e306f6a68120d9a59 +commit 58864146fbdf1820d04825838691e84784ef91bc Author: Ross Burton <[email protected]> Date: Wed Sep 28 11:46:02 2011 +0100 @@ -74,9 +41,8 @@ Date: Wed Sep 28 11:46:02 2011 +0100 Signed-off-by: Ross Burton <[email protected]> Reviewed-by: Daniel Stone <[email protected]> Reviewed-by: Jeremy Huddleston <[email protected]> - (cherry picked from commit 58864146fbdf1820d04825838691e84784ef91bc) -commit 7972e2dade58158bb98f5b7dc5f873b9fb3446de +commit 34b0e4eee911f8b09a3682a7f1b4c8598ef48b8d Author: Chris Wilson <[email protected]> Date: Thu Aug 25 16:04:04 2011 +0100 @@ -92,9 +58,8 @@ Date: Thu Aug 25 16:04:04 2011 +0100 Signed-off-by: Chris Wilson <[email protected]> Reviewed-by: Jeremy Huddleston <[email protected]> Tested-by: Paulo Zanoni <[email protected]> - (cherry picked from commit 34b0e4eee911f8b09a3682a7f1b4c8598ef48b8d) -commit 73beaf9033d9a44e7a7c654f296624c7265eeb6d +commit bfa1a0dd190ed88020d60eba3bb04681c8e83a68 Author: Chris Wilson <[email protected]> Date: Mon Jan 24 11:17:03 2011 +0000 @@ -104,9 +69,8 @@ Date: Mon Jan 24 11:17:03 2011 +0000 Signed-off-by: Chris Wilson <[email protected]> Reviewed-by: Jeremy Huddleston <[email protected]> - (cherry picked from commit bfa1a0dd190ed88020d60eba3bb04681c8e83a68) -commit 6105fcaa3592cb6d0d5f22d9b850986d0bc4d241 +commit eeb21a133b982f71de739baf62e53c8a68f5d495 Author: Chris Wilson <[email protected]> Date: Mon Jan 24 11:17:03 2011 +0000 @@ -116,9 +80,8 @@ Date: Mon Jan 24 11:17:03 2011 +0000 Signed-off-by: Chris Wilson <[email protected]> Reviewed-by: Jeremy Huddleston <[email protected]> - (cherry picked from commit eeb21a133b982f71de739baf62e53c8a68f5d495) -commit d113b2911573f3685dc644c6fdd1979aa880b99f +commit c1bb8f43b9290c2b18a9f0ac59773ff8f1eb974f Author: Rami Ylimäki <[email protected]> Date: Tue Oct 4 12:25:26 2011 +0300 @@ -130,9 +93,17 @@ Date: Tue Oct 4 12:25:26 2011 +0300 Signed-off-by: Rami Ylimäki <[email protected]> Reviewed-by: Erkki Seppälä <[email protected]> - (cherry picked from commit c1bb8f43b9290c2b18a9f0ac59773ff8f1eb974f) -commit 4dc5b6ea9f4932070c37b7c5393d468d00803712 +commit 1f5baa924a5907978f564372265d9830ac72a077 +Author: Jeremy Huddleston <[email protected]> +Date: Sun Oct 30 20:26:42 2011 -0700 + + xfree86: Deprecate the use of xf86PciInfo.h + + Signed-off-by: Jeremy Huddleston <[email protected]> + Reviewed-by: Tormod Volden <[email protected]> + +commit eb3377ffb8a7baa26c9831e56ed782d48b28fa71 Author: Jeremy Huddleston <[email protected]> Date: Tue Nov 1 14:59:15 2011 -0700 @@ -147,9 +118,75 @@ Date: Tue Nov 1 14:59:15 2011 -0700 Signed-off-by: Jeremy Huddleston <[email protected]> Reviewed-by: Mark Kettenis <[email protected]> - (cherry picked from commit eb3377ffb8a7baa26c9831e56ed782d48b28fa71) -commit a1925f08790083a5c00f9f4ba766cbb8749240f3 +commit a551f126cc4af7a476d9c8fd0cb309d5aa600d54 +Author: Pierre-Loup A. Griffais <[email protected]> +Date: Fri Nov 4 23:26:25 2011 -0700 + + xfree86: Fix RandR rotation across server generations + + 245cb8e94fd1599 fixed xf86RotateDestroy() to actually run its teardown + code, causing the Damage object to properly be re-allocated after a + server regeneration. However the block that does that still thinks the + Rotate layer BlockHandler is wrapped from the last generation, meaning + the shadow pixmap is never re-allocated and the Damage object is never + re-registered, causing a blank screen, and potentially a driver crash + on the next teardown after the server asks it to free a 0x0 Pixmap. + + Signed-off-by: Pierre-Loup A. Griffais <[email protected]> + Reviewed-by: Aaron Plattner <[email protected]> + Signed-off-by: Keith Packard <[email protected]> + +commit bfa2a1857a1efda7f171f10e855d200ca0dbcc1a +Merge: f0d50cc e7cb8f8 +Author: Keith Packard <[email protected]> +Date: Mon Nov 14 09:07:06 2011 -0800 + + Merge remote-tracking branch 'whot/for-keith' + +commit e7cb8f802adf6fc22e7a930c0dfc5c1076781c96 +Author: Peter Hutterer <[email protected]> +Date: Wed Nov 9 15:31:57 2011 +1000 + + Xext: remove unused variable 'n' + + xselinux_ext.c: In function 'SELinuxSendItemsToClient': + xselinux_ext.c:340:16: warning: unused variable 'n' [-Wunused-variable] + + Signed-off-by: Peter Hutterer <[email protected]> + Reviewed-by: Julien Cristau <[email protected]> + +commit bb4aa1f263ad38c175bfda3b7e6c325260ce3f28 +Author: Peter Hutterer <[email protected]> +Date: Wed Nov 9 15:31:10 2011 +1000 + + Xext: don't swap CARD8 in SProcSELinuxQueryVersion + + xselinux_ext.c: In function 'SELinuxSendItemsToClient': + xselinux_ext.c:340:16: warning: unused variable 'n' [-Wunused-variable] + xselinux_ext.c: In function 'SProcSELinuxQueryVersion': + xselinux_ext.c:532:62: error: call to 'wrong_size' declared with attribute + error: wrong sized variable passed to swap + xselinux_ext.c:533:62: error: call to 'wrong_size' declared with attribute + error: wrong sized variable passed to swap + + Signed-off-by: Peter Hutterer <[email protected]> + Reviewed-by: Julien Cristau <[email protected]> + +commit 35ec24cf245e5ef676e98a0bf7c77296a3f1ff63 +Author: Peter Hutterer <[email protected]> +Date: Mon Aug 1 14:14:02 2011 +1000 + + input: replace remaining GetPairedDevice() with GetMaster() + + Wherever it's obvious which device we need (keyboard or pointer), use + GetMaster() instead of GetPairedDevice(). It is more reliable in actually + getting the device type we want. + + Signed-off-by: Peter Hutterer <[email protected]> + Reviewed-by: Daniel Stone <[email protected]> + +commit fc16917ad6f0d2722bfb5c5eeca955dd3bc4125a Author: Peter Hutterer <[email protected]> Date: Fri Apr 15 13:32:10 2011 +1000 @@ -160,9 +197,8 @@ Date: Fri Apr 15 13:32:10 2011 +1000 Signed-off-by: Peter Hutterer <[email protected]> Reviewed-by: Jeremy Huddleston <[email protected]> - (cherry picked from commit fc16917ad6f0d2722bfb5c5eeca955dd3bc4125a) -commit a6a21f84bbdd4e3c6218f7b4c04a2d947a784f9f +commit 11840595a1be9f2df7390bcc708cc176e60d3ef2 Author: Peter Hutterer <[email protected]> Date: Thu Nov 3 08:58:58 2011 +1000 @@ -170,9 +206,8 @@ Date: Thu Nov 3 08:58:58 2011 +1000 Signed-off-by: Peter Hutterer <[email protected]> Reviewed-by: Jeremy Huddleston <[email protected]> - (cherry picked from commit 11840595a1be9f2df7390bcc708cc176e60d3ef2) -commit 2f2d871ccdfb256831ae487c5916054a3d29d126 +commit 22715e465b415b3351b83b8279a4f44157f63199 Author: Peter Hutterer <[email protected]> Date: Thu Oct 27 11:03:39 2011 +1000 @@ -184,299 +219,3765 @@ Date: Thu Oct 27 11:03:39 2011 +1000 Signed-off-by: Peter Hutterer <[email protected]> Tested-by: Bastien Nocera <[email protected]> Reviewed-by: Daniel Stone <[email protected]> - (cherry picked from commit 22715e465b415b3351b83b8279a4f44157f63199) -commit 34bb83b9df20ff63dbb147ed661f39efb8bae8e4 -Author: Peter Hutterer <[email protected]> -Date: Mon Oct 24 12:00:32 2011 +1000 +commit f0d50cc6651dce3a8a3cd3fb84210aa92b139763 +Author: Derek Buitenhuis <[email protected]> +Date: Sun Nov 6 12:20:51 2011 -0500 - dix: block signals when closing all devices + Fix vesa's VBE PanelID interpretation - When closing down all devices, we manually unset master for all attached - devices, but the device's sprite info still points to the master's sprite - info. This leaves us a window where the master is freed already but the - device isn't yet. A signal during that window causes dereference of the - already freed spriteInfo in mieqEnqueue's EnqueueScreen macro. + xserver's VESA driver's VBE (Vesa BIOS Extensions) code + includes a PanelID probe, which can get a monitor's native + resolution. From this, using CVT formulas, it derives + horizontal sync rate and a vertical refresh rate ranges. - Simply block signals when removing all devices. It's not like we're really - worrying about high-responsive input at this stage. + It however, only derives the upper bounds of the ranges, and + the lower bounds cannot de derived. By default, they are set + to hardcoded constants which represent the lowest supported + resolution: 640x480. The constants in vbe.c however, were + not actually derived from forulas, but carried over from + other code from the bad old days, and are not relevant + to flat panel displays. This caused, for example, EEEPC701's + panel, with a native resolution of 800x480, to end up with + a upper bound of the horizontal sync rate that was lower + than the hardcoded lower bound, which of course broke things. - https://bugzilla.redhat.com/show_bug.cgi?id=737031 + These numbers have been rederived using both my own CVT tool + based on xf86CVTMode(), and using the provided 'cvt' tool + that comes with xserver. - Signed-off-by: Peter Hutterer <[email protected]> - Reviewed-by: Julien Cristau <[email protected]> - (cherry picked from commit d7c44a7c9760449bef263413ad3b20f19b1dc95a) + Signed-off-by: Derek Buitenhuis <[email protected]> + Reviewed-by: Adam Jackson <[email protected]> + Signed-off-by: Keith Packard <[email protected]> -commit 97f2ae60fc0cc755abd8b88df826fcb1a20464fe -Author: Christopher Yeleighton <[email protected]> -Date: Mon Oct 24 18:47:06 2011 -0700 +commit c643c2b7bf480f5c27ff8606bda087f8bff3b154 +Author: Peter Hutterer <[email protected]> +Date: Tue Nov 1 12:17:50 2011 +1000 - Bug 38420: Xvfb crashes in miInitVisuals() when started with depth=2 + xfree86: duplicate name and driver from pInfo for NewInputDeviceRequest - https://bugs.freedesktop.org/show_bug.cgi?id=38420 + xorg.conf devices had the name and driver set in the DDX's InputInfoPtr list + but not in the option list for those devices. That information was lost when + passing the options into NewInputDeviceRequest. NIDR then refused to start -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
