.gitignore | 1
ChangeLog | 5654 ++++++++++++++++---
Makefile.am | 2
Xext/Makefile.am | 7
Xext/geext.c | 9
Xext/panoramiX.c | 26
Xext/panoramiX.h | 4
Xext/panoramiXprocs.c | 50
Xext/panoramiXsrv.h | 23
Xext/shm.c | 6
Xext/xcalibrate.c | 297 -
Xext/xselinux_hooks.c | 32
Xext/xtest.c | 7
Xext/xvdisp.c | 4
Xext/xvdix.h | 12
Xext/xvmain.c | 21
Xext/xvmc.c | 6
Xi/chgdctl.c | 72
Xi/exevents.c | 246
Xi/exglobals.h | 2
Xi/extinit.c | 4
Xi/getdctl.c | 75
Xi/stubs.c | 12
Xi/xichangehierarchy.c | 8
Xi/xipassivegrab.c | 10
Xi/xiquerydevice.c | 4
Xi/xiquerypointer.c | 2
Xi/xiqueryversion.c | 7
Xi/xiwarppointer.c | 2
composite/compalloc.c | 173
composite/compext.c | 5
composite/compint.h | 5
composite/compwindow.c | 19
configure.ac | 175
damageext/damageext.c | 2
dbe/dbe.c | 25
debian/changelog | 25
debian/control | 7
debian/patches/15-nouveau.diff | 88
debian/patches/20-workaround-36986.diff | 13
debian/patches/series | 1
debian/rules | 6
debian/serverminver | 6
devbook.am | 62
dix/Makefile.am | 1
dix/cursor.c | 5
dix/deprecated.c | 165
dix/devices.c | 165
dix/dispatch.c | 22
dix/eventconvert.c | 42
dix/events.c | 842 +-
dix/getevents.c | 265
dix/inpututils.c | 36
dix/main.c | 28
dix/ptrveloc.c | 523 +
dix/region.c | 234
dix/resource.c | 36
dix/window.c | 107
doc/.gitignore | 4
doc/Makefile.am | 16
doc/Xinput.xml | 1209 ++++
doc/Xserver-spec.xml | 5102 +++++++++++++++++
doc/dtrace/.gitignore | 5
doc/dtrace/Makefile.am | 17
doc/dtrace/Xserver-DTrace.xml | 578 +
doc/man/Makefile.am | 6
doc/man/Xserver.man | 584 -
doc/xml/.gitignore | 5
doc/xml/Makefile.am | 30
doc/xml/Xserver-spec.xml | 5102 -----------------
doc/xml/dtrace/.gitignore | 3
doc/xml/dtrace/Makefile.am | 36
doc/xml/dtrace/Xserver-DTrace.xml | 579 -
doc/xml/xmlrules-inst.in | 23
doc/xml/xmlrules-noinst.in | 22
doc/xml/xmlrules.in | 47
doc/xml/xserver.ent.in | 3
docbook.am | 96
exa/exa_priv.h | 7
exa/exa_unaccel.c | 7
fb/fb.h | 34
fb/fballpriv.c | 4
fb/fbarc.c | 4
fb/fbbits.c | 2
fb/fbblt.c | 8
fb/fbbltone.c | 31
fb/fbcopy.c | 2
fb/fbgc.c | 2
fb/fbgetsp.c | 2
fb/fbglyph.c | 18
fb/fbimage.c | 4
fb/fbline.c | 8
fb/fboverlay.c | 8
fb/fbpict.c | 8
fb/fbpict.h | 20
fb/fbpixmap.c | 2
fb/fbpoint.c | 6
fb/fbscreen.c | 6
fb/fbseg.c | 14
fb/fbsetsp.c | 2
fb/fbsolid.c | 4
fb/fbstipple.c | 4
fb/fbtrap.c | 222
fb/fbwindow.c | 61
glx/Makefile.am | 3
glx/glapi.c | 87
glx/glapi.h | 3
glx/glthread.c | 162
glx/glthread.h | 72
glx/glxcmds.c | 14
glx/glxcontext.h | 2
glx/glxdri.c | 75
glx/glxdri2.c | 53
glx/glxdricommon.c | 57
glx/glxdricommon.h | 5
glx/glxdriswrast.c | 56
glx/glxext.c | 17
glx/glxserver.h | 10
glx/single2.c | 8
glx/single2swap.c | 8
glx/singlepix.c | 2
glx/singlepixswap.c | 2
hw/dmx/Makefile.am | 2
hw/dmx/dmx.h | 2
hw/dmx/dmxcb.c | 7
hw/dmx/dmxextension.c | 4
hw/dmx/dmxgcops.c | 2
hw/dmx/dmxpict.c | 87
hw/dmx/dmxpict.h | 10
hw/dmx/dmxwindow.c | 4
hw/dmx/doc/.gitignore | 17
hw/dmx/doc/Makefile.am | 383 -
hw/dmx/doc/doxygen.conf.in | 1053 ---
hw/dmx/doc/doxygen.css | 49
hw/dmx/doc/doxygen.foot | 12
hw/dmx/doc/doxygen.head | 8
hw/dmx/doxygen/.gitignore | 2
hw/dmx/doxygen/Makefile.am | 36
hw/dmx/doxygen/doxygen.conf.in | 1559 +++++
hw/dmx/doxygen/footer.html | 4
hw/dmx/glxProxy/glxserver.h | 8
hw/dmx/input/dmxevents.c | 66
hw/kdrive/ephyr/ephyr.c | 25
hw/kdrive/ephyr/ephyrinit.c | 7
hw/kdrive/src/kdrive.c | 93
hw/kdrive/src/kdrive.h | 3
hw/kdrive/src/kinput.c | 26
hw/xfree86/Makefile.am | 8
hw/xfree86/common/xf86Configure.c | 18
hw/xfree86/common/xf86Events.c | 6
hw/xfree86/common/xf86Helper.c | 104
hw/xfree86/common/xf86Init.c | 2
hw/xfree86/common/xf86Module.h | 4
hw/xfree86/common/xf86Priv.h | 3
hw/xfree86/common/xf86RandR.c | 37
hw/xfree86/common/xf86Xinput.c | 77
hw/xfree86/common/xf86xv.c | 9
hw/xfree86/ddc/ddcProperty.c | 1
hw/xfree86/dixmods/Makefile.am | 2
hw/xfree86/doc/.gitignore | 4
hw/xfree86/doc/Makefile.am | 18
hw/xfree86/doc/README.DRIcomp | 554 +
hw/xfree86/doc/Registry | 409 +
hw/xfree86/doc/ddxDesign.xml | 9394 ++++++++++++++++++++++++++++++++
hw/xfree86/doc/devel/Makefile.am | 7
hw/xfree86/doc/devel/README.DRIcomp | 556 -
hw/xfree86/doc/devel/Registry | 409 -
hw/xfree86/doc/devel/exa-driver.txt | 94
hw/xfree86/doc/exa-driver.txt | 94
hw/xfree86/doc/man/Makefile.am | 3
hw/xfree86/doc/man/Xorg.man | 689 --
hw/xfree86/doc/man/xorg.conf.d.man | 1
hw/xfree86/doc/man/xorg.conf.man | 2485 --------
hw/xfree86/doc/sgml/.gitignore | 6
hw/xfree86/doc/sgml/DESIGN.xml | 9394 --------------------------------
hw/xfree86/doc/sgml/Makefile.am | 27
hw/xfree86/dri/dri.c | 6
hw/xfree86/dri/xf86dri.c | 1
hw/xfree86/dri2/dri2.c | 29
hw/xfree86/fbdevhw/fbdevhw.c | 1
hw/xfree86/loader/loadmod.c | 32
hw/xfree86/loader/sdksyms.sh | 1
hw/xfree86/man/Makefile.am | 3
hw/xfree86/man/Xorg.man | 689 ++
hw/xfree86/man/xorg.conf.d.man | 1
hw/xfree86/man/xorg.conf.man | 2495 ++++++++
hw/xfree86/modes/xf86RandR12.c | 39
hw/xfree86/os-support/linux/lnx_init.c | 83
hw/xfree86/os-support/xf86_OSlib.h | 11
hw/xfree86/parser/InputClass.c | 21
hw/xfree86/parser/Pointer.c | 2
hw/xfree86/parser/scan.c | 11
hw/xfree86/parser/xf86Parser.h | 1
hw/xfree86/parser/xf86tokens.h | 1
hw/xfree86/ramdac/xf86Cursor.c | 6
hw/xnest/Events.c | 36
hw/xnest/Init.c | 4
hw/xnest/Pixmap.c | 1
hw/xquartz/GL/capabilities.c | 6
hw/xquartz/GL/indirect.c | 16
hw/xquartz/GL/visualConfigs.c | 1
hw/xquartz/Makefile.am | 4
hw/xquartz/X11Application.h | 3
hw/xquartz/X11Application.m | 96
hw/xquartz/applewm.c | 2
hw/xquartz/bundle/Info.plist.cpp | 8
hw/xquartz/bundle/Makefile.am | 2
hw/xquartz/console_redirect.c | 418 +
hw/xquartz/console_redirect.h | 44
hw/xquartz/darwin.c | 175
hw/xquartz/darwin.h | 20
hw/xquartz/darwinEvents.c | 47
hw/xquartz/darwinEvents.h | 3
hw/xquartz/darwinXinput.c | 12
hw/xquartz/mach-startup/Makefile.am | 1
hw/xquartz/mach-startup/bundle-main.c | 178
hw/xquartz/mach-startup/launchd_fd.c | 20
hw/xquartz/mach-startup/stub.c | 92
hw/xquartz/man/Xquartz.man | 67
hw/xquartz/pbproxy/Makefile.am | 2
hw/xquartz/pbproxy/app-main.m | 24
hw/xquartz/pbproxy/main.m | 36
hw/xquartz/pbproxy/pbproxy.h | 10
hw/xquartz/pbproxy/x-input.m | 2
hw/xquartz/pbproxy/x-selection.m | 144
hw/xquartz/quartz.c | 27
hw/xquartz/quartz.h | 2
hw/xquartz/quartzKeyboard.c | 33
hw/xquartz/quartzKeyboard.h | 2
hw/xquartz/quartzRandR.c | 219
hw/xquartz/quartzStartup.c | 6
hw/xquartz/sanitizedCocoa.h | 39
hw/xquartz/threadSafety.c | 78
hw/xquartz/threadSafety.h | 56
hw/xquartz/xpr/dri.c | 5
hw/xquartz/xpr/xpr.h | 2
hw/xquartz/xpr/xprEvent.c | 2
hw/xquartz/xpr/xprFrame.c | 179
hw/xquartz/xpr/xprScreen.c | 5
hw/xwin/InitOutput.c | 2
hw/xwin/glx/.gitignore | 7
hw/xwin/glx/Makefile.am | 34
hw/xwin/glx/indirect.c | 10
hw/xwin/glx/wgl_ext_api.c | 2
hw/xwin/glx/wgl_ext_api.h | 2
hw/xwin/man/XWin.man | 3
hw/xwin/win.h | 1
hw/xwin/winclipboardxevents.c | 5
hw/xwin/winkeybd.c | 13
hw/xwin/winmonitors.c | 2
hw/xwin/winmouse.c | 25
hw/xwin/winmultiwindowicons.c | 5
hw/xwin/winmultiwindowwindow.c | 30
hw/xwin/winmultiwindowwm.c | 46
hw/xwin/winpfbdd.c | 3
hw/xwin/winprefs.c | 26
hw/xwin/winprefs.h | 2
hw/xwin/winrandr.c | 104
hw/xwin/winscrinit.c | 4
hw/xwin/winshaddd.c | 3
hw/xwin/winshadddnl.c | 3
hw/xwin/winshadgdi.c | 3
hw/xwin/winvideo.c | 2
hw/xwin/winwin32rootless.c | 20
include/Makefile.am | 1
include/client.h | 59
include/dix-config.h.in | 15
include/dix.h | 36
include/dixstruct.h | 2
include/eventconvert.h | 2
include/eventstr.h | 4
include/input.h | 79
include/inputstr.h | 41
include/inpututils.h | 2
include/list.h | 182
include/misc.h | 34
include/os.h | 8
include/propertyst.h | 4
include/protocol-versions.h | 4
include/ptrveloc.h | 38
include/regionstr.h | 15
include/resource.h | 31
include/window.h | 1
include/xkbsrv.h | 4
include/xserver-properties.h | 8
m4/ax_tls.m4 | 74
m4/xorg-tls.m4 | 57
man/Makefile.am | 6
man/Xserver.man | 584 +
manpages.am | 2
mi/midispcur.c | 2
mi/mieq.c | 92
mi/mipointer.c | 213
mi/mipointer.h | 1
mi/mipointrst.h | 1
mi/misprite.c | 57
miext/cw/cw.h | 2
miext/cw/cw_render.c | 64
miext/damage/damage.c | 101
miext/damage/damage.h | 4
miext/rootless/rootlessScreen.c | 1
miext/rootless/rootlessValTree.c | 2
os/Makefile.am | 18
os/access.c | 21
os/client.c | 309 +
os/connection.c | 7
os/log.c | 11
os/osinit.c | 9
os/utils.c | 11
os/xdmcp.c | 2
os/xstrans.c | 5
randr/randr.c | 2
randr/randrstr.h | 4
randr/rrcrtc.c | 155
randr/rrdispatch.c | 40
randr/rrscreen.c | 12
record/record.c | 10
render/mipict.c | 68
render/mipict.h | 54
render/mitrap.c | 110
render/mitri.c | 123
render/picture.c | 102
render/picturestr.h | 50
render/render.c | 39
test/.gitignore | 2
test/Makefile.am | 14
test/input.c | 529 -
test/list.c | 173
test/misc.c | 62
test/xi2/Makefile.am | 16
test/xi2/protocol-common.c | 5
test/xi2/protocol-common.h | 12
test/xi2/protocol-eventconvert.c | 172
test/xi2/protocol-xigetclientpointer.c | 31
test/xi2/protocol-xigetselectedevents.c | 28
test/xi2/protocol-xipassivegrabdevice.c | 234
test/xi2/protocol-xiquerydevice.c | 98
test/xi2/protocol-xiquerypointer.c | 40
test/xi2/protocol-xiqueryversion.c | 28
test/xi2/protocol-xiselectevents.c | 24
test/xi2/protocol-xisetclientpointer.c | 32
test/xi2/protocol-xiwarppointer.c | 26
test/xkb.c | 76
test/xtest.c | 39
xfixes/xfixes.c | 12
xkb/XKBGAlloc.c | 77
xkb/ddxLoad.c | 21
xkb/maprules.c | 33
xkb/xkb.c | 72
xkb/xkbAccessX.c | 2
xkb/xkbActions.c | 12
xkb/xkbEvents.c | 44
xkb/xkbInit.c | 20
xkb/xkbUtils.c | 129
xkb/xkbfmisc.c | 10
xkb/xkbgeom.h | 20
xkb/xkmread.c | 21
xserver.ent.in | 3
358 files changed, 34153 insertions(+), 29043 deletions(-)
New commits:
commit 1b1d2774c0a99009cbf68e2b6180721941b1d7fa
Author: Cyril Brulebois <k...@debian.org>
Date: Tue May 31 15:47:39 2011 +0200
Drop libglib2.0-dev build-dep, no longer needed for unit tests.
diff --git a/debian/changelog b/debian/changelog
index 5b706cf..5ab7974 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ xorg-server (2:1.10.99.1-1) UNRELEASED; urgency=low
* Refresh 20-workaround-36986.diff.
* Bump pixman build-dep/dep to 0.21.8.
* Bump xutils-dev build-dep for new macros.
+ * Drop libglib2.0-dev build-dep, no longer needed for unit tests.
-- Cyril Brulebois <k...@debian.org> Tue, 31 May 2011 13:52:04 +0200
diff --git a/debian/control b/debian/control
index 5da96e1..678362f 100644
--- a/debian/control
+++ b/debian/control
@@ -75,7 +75,6 @@ Build-Depends:
libxv-dev,
libxinerama-dev,
# unit tests
- libglib2.0-dev,
xkb-data,
x11-xkb-utils,
Standards-Version: 3.9.1
commit fe03a8810362a9012dd1bdad9c96554d780de606
Author: Cyril Brulebois <k...@debian.org>
Date: Tue May 31 15:46:40 2011 +0200
Bump xutils-dev build-dep for new macros.
diff --git a/debian/changelog b/debian/changelog
index 3bdfb25..5b706cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ xorg-server (2:1.10.99.1-1) UNRELEASED; urgency=low
the fallback to software rendering.
* Refresh 20-workaround-36986.diff.
* Bump pixman build-dep/dep to 0.21.8.
+ * Bump xutils-dev build-dep for new macros.
-- Cyril Brulebois <k...@debian.org> Tue, 31 May 2011 13:52:04 +0200
diff --git a/debian/control b/debian/control
index d3db657..5da96e1 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
flex,
automake,
libtool,
- xutils-dev (>= 1:7.5+4),
+ xutils-dev (>= 1:7.6+3),
xfonts-utils (>= 1:7.5+1),
x11proto-bigreqs-dev (>= 1:1.1.0),
x11proto-composite-dev (>= 1:0.4),
commit 6378c38eef83b2921acc42da6ac1e82c3a72a98f
Author: Cyril Brulebois <k...@debian.org>
Date: Tue May 31 15:40:45 2011 +0200
Bump pixman build-dep/dep to 0.21.8.
diff --git a/debian/changelog b/debian/changelog
index d32dcdb..3bdfb25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ xorg-server (2:1.10.99.1-1) UNRELEASED; urgency=low
GLX probing. Nouveau users might still see an error (EE) mentioning
the fallback to software rendering.
* Refresh 20-workaround-36986.diff.
+ * Bump pixman build-dep/dep to 0.21.8.
-- Cyril Brulebois <k...@debian.org> Tue, 31 May 2011 13:52:04 +0200
diff --git a/debian/control b/debian/control
index ad69157..d3db657 100644
--- a/debian/control
+++ b/debian/control
@@ -44,7 +44,7 @@ Build-Depends:
libxdmcp-dev (>= 1:0.99.1),
libxfont-dev (>= 1:1.4.2),
libxkbfile-dev (>= 1:0.99.1),
- libpixman-1-dev (>= 0.15.20),
+ libpixman-1-dev (>= 0.21.8),
libpciaccess-dev (>= 0.11.0-2),
libgcrypt-dev,
nettle-dev,
@@ -148,7 +148,7 @@ Description: Xorg X server - core server
Package: xserver-xorg-dev
Architecture: any
Depends:
- libpixman-1-dev (>= 0.15.20),
+ libpixman-1-dev (>= 0.21.8),
x11proto-core-dev (>= 7.0.17),
x11proto-input-dev (>= 1.9.99.902),
x11proto-xext-dev (>= 7.1.99),
commit fc070d9f9f7991c4fbd65d6a66ad31ccdcc7d52b
Author: Cyril Brulebois <k...@debian.org>
Date: Tue May 31 14:57:52 2011 +0200
Refresh 20-workaround-36986.diff.
diff --git a/debian/changelog b/debian/changelog
index 62924d1..d32dcdb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ xorg-server (2:1.10.99.1-1) UNRELEASED; urgency=low
* Adapt 15-nouveau.diff to cope with the glxdricommon-ification of
GLX probing. Nouveau users might still see an error (EE) mentioning
the fallback to software rendering.
+ * Refresh 20-workaround-36986.diff.
-- Cyril Brulebois <k...@debian.org> Tue, 31 May 2011 13:52:04 +0200
diff --git a/debian/patches/20-workaround-36986.diff
b/debian/patches/20-workaround-36986.diff
index 24b3cb9..d9026cd 100644
--- a/debian/patches/20-workaround-36986.diff
+++ b/debian/patches/20-workaround-36986.diff
@@ -1,14 +1,13 @@
Workaround fdo#36986 <http://bugs.freedesktop.org/show_bug.cgi?id=36986>
--- a/test/input.c
+++ b/test/input.c
-@@ -1213,8 +1213,10 @@
+@@ -1223,8 +1223,10 @@ static void dix_valuator_alloc(void)
- g_assert(v);
- g_assert(v->numAxes == num_axes);
+ assert(v);
+ assert(v->numAxes == num_axes);
+#if 0
- g_assert(((void*)v->axisVal - (void*)v) % sizeof(double) == 0);
- g_assert(((void*)v->axes - (void*)v) % sizeof(double) == 0);
+ assert(((void*)v->axisVal - (void*)v) % sizeof(double) == 0);
+ assert(((void*)v->axes - (void*)v) % sizeof(double) == 0);
+#endif
num_axes ++;
}
-
commit b30d80a2c927031e3bf8d6ada52f0c1bbd4d9dd9
Author: Cyril Brulebois <k...@debian.org>
Date: Tue May 31 14:42:44 2011 +0200
Refresh 15-nouveau.diff
diff --git a/debian/changelog b/debian/changelog
index cc1d875..62924d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ xorg-server (2:1.10.99.1-1) UNRELEASED; urgency=low
should sort nicely before 1.10.99.901, which should be the first
release candidate for 1.11.
* Bump serverminver, as well as input and video ABI.
+ * Adapt 15-nouveau.diff to cope with the glxdricommon-ification of
+ GLX probing. Nouveau users might still see an error (EE) mentioning
+ the fallback to software rendering.
-- Cyril Brulebois <k...@debian.org> Tue, 31 May 2011 13:52:04 +0200
diff --git a/debian/patches/15-nouveau.diff b/debian/patches/15-nouveau.diff
index 712c7ec..98fec87 100644
--- a/debian/patches/15-nouveau.diff
+++ b/debian/patches/15-nouveau.diff
@@ -9,67 +9,14 @@ Also, don't treat DRI setup failure as an error for nouveau.
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 <k...@debian.org>
---- a/glx/glxdri.c
-+++ b/glx/glxdri.c
-@@ -978,6 +978,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
- const __DRIconfig **driConfigs;
- const __DRIextension **extensions;
- int i;
-+ int from = X_ERROR;
-
- if (!xf86LoaderCheckSymbol("DRIQueryDirectRenderingCapable") ||
- !DRIQueryDirectRenderingCapable(pScreen, &isCapable) ||
-@@ -1057,7 +1058,9 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
-
- screen->driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL);
- if (screen->driver == NULL) {
-- LogMessage(X_ERROR, "AIGLX error: dlopen of %s failed (%s)\n",
-+ if (!strcmp(driverName, "nouveau"))
-+ from = X_INFO;
-+ LogMessage(from, "AIGLX error: dlopen of %s failed (%s)\n",
- filename, dlerror());
- goto handle_error;
- }
-@@ -1193,7 +1196,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
-
- free(screen);
-
-- LogMessage(X_ERROR, "AIGLX: reverting to software rendering\n");
-+ LogMessage(from, "AIGLX: reverting to software rendering\n");
-
- return NULL;
- }
---- a/glx/glxdri2.c
-+++ b/glx/glxdri2.c
-@@ -708,6 +708,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
- const __DRIextension **extensions;
- const __DRIconfig **driConfigs;
- int i;
-+ int from = X_ERROR;
-
- screen = calloc(1, sizeof *screen);
- if (screen == NULL)
-@@ -734,7 +735,9 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
-
- screen->driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL);
- if (screen->driver == NULL) {
-- LogMessage(X_ERROR, "AIGLX error: dlopen of %s failed (%s)\n",
-+ if (!strcmp(driverName, "nouveau"))
-+ from = X_INFO;
-+ LogMessage(from, "AIGLX error: dlopen of %s failed (%s)\n",
- filename, dlerror());
- goto handle_error;
- }
-@@ -826,7 +829,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
-
- free(screen);
-
-- LogMessage(X_ERROR, "AIGLX: reverting to software rendering\n");
-+ LogMessage(from, "AIGLX: reverting to software rendering\n");
-
- return NULL;
- }
--- a/hw/xfree86/common/xf86pciBus.c
+++ b/hw/xfree86/common/xf86pciBus.c
@@ -1123,7 +1123,24 @@ videoPtrToDriverList(struct pci_device *
@@ -98,3 +45,24 @@ Also, don't treat DRI setup failure as an error for nouveau.
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;
commit 580d2600ef7dfedcadc8c3f3c87ecd41ce627cb3
Author: Cyril Brulebois <k...@debian.org>
Date: Tue May 31 13:55:06 2011 +0200
Bump serverminver, as well as input and video ABI.
diff --git a/debian/changelog b/debian/changelog
index 9a9ea67..cc1d875 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xorg-server (2:1.10.99.1-1) UNRELEASED; urgency=low
* New upstream snapshot. The version string is Debian-specific, and
should sort nicely before 1.10.99.901, which should be the first
release candidate for 1.11.
+ * Bump serverminver, as well as input and video ABI.
-- Cyril Brulebois <k...@debian.org> Tue, 31 May 2011 13:52:04 +0200
diff --git a/debian/serverminver b/debian/serverminver
index ccdf7f1..01f0694 100644
--- a/debian/serverminver
+++ b/debian/serverminver
@@ -1,3 +1,3 @@
-2:1.9.99.903
-ABI_VIDEODRV_VERSION:10.0
-ABI_XINPUT_VERSION:12.2
+2:1.10.99.1
+ABI_VIDEODRV_VERSION:11.0
+ABI_XINPUT_VERSION:13.0
commit 472e3d56a648851ea95d7afdd4bd98a3d86057e2
Author: Cyril Brulebois <k...@debian.org>
Date: Tue May 31 13:53:26 2011 +0200
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index a914e76..3a4c7bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,264 @@
-commit d784fd09dc277610d5f4e98d577c4fdcd9215f9c
+commit 4621bb270a36d35d4ab67f1d7fb47674683dfc5b
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Wed May 18 15:00:54 2011 +1000
+
+ Add a property for device/product ID.
+
+ In some cases, knowing about the device model number and the device's
vendor
+ is important to activate product-specific settings. Since this is
+ nonetheless driver-specific, only provide the property but don't do
anything
+ with it.
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+ Reviewed-by: Daniel Stone <dan...@fooishbar.org>
+
+commit f26a5b9a994a980ab309bc7f3b4295a4992d81c2
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Mon Jan 31 14:43:01 2011 +1000
+
+ Xi: add device node property to known properties.
+
+ Since the server has little choice (or even knowledge) of the actual device
+ node used by the driver, this property is merely provided for
+ standardisation. It is up to the driver to set it to the appropriate value,
+ usually a device node in the form of /dev/input/event0 or similar.
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+ Acked-by: Dan Nicholson <dbn.li...@gmail.com>
+
+commit b6c7b9b2f39e970cedb6bc1e073f901e28cb0fa3
+Author: Aaron Plattner <aplatt...@nvidia.com>
+Date: Tue May 24 16:02:42 2011 -0700
+
+ randr: check rotated virtual size limits correctly
+
+ Commit d1107918d4626268803b54033a07405122278e7f introduced checks to
+ the RandR path that cause RRSetScreenConfig requests to fail if the
+ size is too large. Unfortunately, when RandR 1.1 rotation is enabled
+ it compares the rotated screen dimensions to the unrotated limits,
+ which causes 90- and 270-degree rotation to fail unless your screen
+ happens to be square:
+
+ X Error of failed request: BadValue (integer parameter out of range for
operation)
+ Major opcode of failed request: 153 (RANDR)
+ Minor opcode of failed request: 2 (RRSetScreenConfig)
+ Value in failed request: 0x780
+ Serial number of failed request: 14
+ Current serial number in output stream: 14
+
+ Fix this by moving the check above the code that swaps the dimensions
+ based on the rotation.
+
+ Signed-off-by: Aaron Plattner <aplatt...@nvidia.com>
+ Reviewed-by: Jeremy Huddleston <jerem...@apple.com>
+ Tested-by: Robert Hooker <robert.hoo...@canonical.com>
+ Tested-by: Kent Baxley <kent.bax...@canonical.com>
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+
+commit 4725d6b0dbb6371af4a1b2fbef851dcfe155514a
+Merge: 1b2d177 b5d8287
+Author: Keith Packard <kei...@keithp.com>
+Date: Wed May 25 09:40:51 2011 -0600
+
+ Merge remote-tracking branch 'whot/for-keith'
+
+commit 1b2d17748f0154da142e9b421d4f6a46e4e5a18c
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Sun May 22 13:50:14 2011 -0700
+
+ fbbltone.c: Mark bitmasks as unsigned ints
+
+ Clears many Sun compiler warnings:
+ "fbbltone.c", line 491: warning: integer overflow detected: op "<<"
+ "fbbltone.c", line 491: warning: integer overflow detected: op "<<"
+ "fbbltone.c", line 491: warning: integer overflow detected: op "<<"
+ "fbbltone.c", line 491: warning: initializer will be sign-extended:
-16777216
+ "fbbltone.c", line 491: warning: integer overflow detected: op "<<"
+ "fbbltone.c", line 491: warning: initializer will be sign-extended: -1
+ "fbbltone.c", line 495: warning: integer overflow detected: op "<<"
+ "fbbltone.c", line 495: warning: integer overflow detected: op "<<"
+ "fbbltone.c", line 495: warning: integer overflow detected: op "<<"
+ "fbbltone.c", line 495: warning: initializer will be sign-extended: -256
+ "fbbltone.c", line 495: warning: integer overflow detected: op "<<"
+ "fbbltone.c", line 495: warning: initializer will be sign-extended: -1
+ "fbbltone.c", line 499: warning: integer overflow detected: op "<<"
+ "fbbltone.c", line 499: warning: integer overflow detected: op "<<"
+ "fbbltone.c", line 499: warning: integer overflow detected: op "<<"
+ "fbbltone.c", line 499: warning: initializer will be sign-extended: -65536
+ "fbbltone.c", line 499: warning: integer overflow detected: op "<<"
+ "fbbltone.c", line 499: warning: initializer will be sign-extended: -1
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+ Reviewed-by: Jamey Sharp <ja...@minilop.net>
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+
+commit b5d828789c092c994722a896c252212e2b3614ab
+Author: Simon Thum <simon.t...@gmx.de>
+Date: Thu Mar 10 21:03:40 2011 +0100
+
+ xserver: remove AbsoluteClass, breaking the A(P|B)I
+
+ This struct was unused and has been effectively removed in
+ commit 633b81e8ba09cc6a1ea8b43f323874fda2cf0bde
+ Refs: xorg-server-1.10.0-133-g633b81e
+
+ Remove the remainder, with an ABI bump to 13.0.
+
+ Signed-off-by: Simon Thum <simon.t...@gmx.de>
+ Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit c05c8640f13708384e77579e7714ca846fa93f5c
+Author: Oleh Nykyforchyn <oleh....@gmail.com>
+Date: Thu May 19 09:39:52 2011 +0300
+
+ xfree86: Allow "MatchLayout" statements in config files
+
+ Usage example (tested on a dual-seat PC):
+ Section "InputClass"
+ Identifier "keyboard-all"
+ MatchIsKeyboard "on"
+ MatchDevicePath "/dev/input/event*"
+ MatchLayout "!GeForce|!Matrox"
+ Driver "evdev"
+ Option "XkbLayout" "us"
+ Option "XkbOptions" "terminate:ctrl_alt_bksp"
+ EndSection
+
+ It disables auto keyboard configuration for layouts "GeForce" and "Matrox".
+ Note that "" in patterns means "no Layout sections found", e.g.
+ MatchLayout "GeForce|"
+ is "in layout GeForce or without explicit layout at all".
+
+ Signed-off-by: Oleh Nykyforchyn <oleh....@gmail.com>
+ Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net>
+ Acked-by: Dan Nicholson <dbn.li...@gmail.com>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 83c059f03463f2d7f41e172afe510d1ca9bba8b0
+Author: Tomas Frydrych <to...@sleepfive.com>
+Date: Wed May 18 20:49:52 2011 +0100
+
+ Xephyr: fix pointer coordinate translation when screen is rotated
+
+ In the Xephyr case the position of the pointer relative toward the
+ Xephyr window is controlled by the host server without taking into
+ account rotation of the Xephyr screen. Consequently the pointer coords
+ must always be translated when the fb is rotated.
+
+ Signed-off-by: Tomas Frydrych <to...@sleepfive.com>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit b387069fafbe549f2091f364e2aa92af6cc21261
+Author: Tomas Frydrych <to...@sleepfive.com>
+Date: Wed May 18 20:47:52 2011 +0100
+
+ Xephyr: added dummy ephyrDeviceCursorCleanup() to avoid crashing
+
+ The DeviceCursorCleanup in miPointerSpriteFuncRec can no longer be
+ NULL it seems.
+
+ Signed-off-by: Tomas Frydrych <to...@sleepfive.com>
+ Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 53ccc54ac71c2655276678e13f0b3d879d691489
+Author: Colin Harrison <colin.harri...@virgin.net>
+Date: Mon May 16 19:31:57 2011 +0100
+
+ Fix XWin compilation after updates for input API changes
+
+ Fix XWin compilation after updates for input API changes in commits
+ e7150db5 8670c46b and 20fb07f4
+
+ Also remove a no longer needed InternalEvent* variable
+
+ Signed-off-by: Jon TURNEY <jon.tur...@dronecode.org.uk>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 4c4df3ac0d8162c874b85fede12ffbe42f0062c3
+Author: Jeremy Huddleston <jerem...@apple.com>
+Date: Sat May 14 16:23:59 2011 -0700
+
+ input: Don't implicitly define verify_internal_event
+
+ Fixes regression introduced by 56901998020b6f443cbaa5eb303100d979e81b22
+
+ mieq.c:159:5: error: implicit declaration of function
'verify_internal_event' is invalid in C99
[-Wimplicit-function-declaration,Semantic Issue]
+ verify_internal_event(e);
+ ^
+ 1 error generated.
+
+ Also includes some other warning cleanups in events.c we're there.
+
+ events.c:2198:24: warning: equality comparison with extraneous parentheses
[-Wparentheses,Semantic Issue]
+ else if ((type == MotionNotify))
+ ~~~~~^~~~~~~~~~~~~~~
+ events.c:2198:24: note: remove extraneous parentheses around the
comparison to silence this warning [Semantic Issue]
+ else if ((type == MotionNotify))
+ ~ ^ ~
+ events.c:2198:24: note: use '=' to turn this equality comparison into an
assignment [Semantic Issue]
+ else if ((type == MotionNotify))
+ ^~
+ =
+ events.c:2487:5: error: implicit declaration of function
'verify_internal_event' is invalid in C99
[-Wimplicit-function-declaration,Semantic Issue]
+ verify_internal_event(event);
+ ^
+ events.c:5909:22: warning: declaration shadows a local variable
[-Wshadow,Semantic Issue]
+ DeviceIntPtr it = inputInfo.devices;
+ ^
+ events.c:5893:18: note: previous declaration is here
+ DeviceIntPtr it = inputInfo.devices;
+ ^
+ 3 warnings and 1 error generated.
+
+ events.c:2836:27: warning: incompatible pointer types passing 'DeviceEvent
*' (aka 'struct _DeviceEvent *') to parameter of type
+ 'const InternalEvent *' (aka 'const union _InternalEvent *')
+ verify_internal_event(ev);
+ ^~
+ ../include/inpututils.h:40:56: note: passing argument to parameter 'ev'
here
+ extern void verify_internal_event(const InternalEvent *ev);
+ ^
+ 1 warning generated.
+
+ Found-by: yuffie tinderbox (-Werror=implicit)
+ Signed-off-by: Jeremy Huddleston <jerem...@apple.com>
+ Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit ba7d1020ac0135ebc8acda4cd57ed48b331e0133
Author: Jeremy Huddleston <jerem...@apple.com>
-Date: Sat May 28 16:59:05 2011 -0700
+Date: Sat May 14 16:31:10 2011 -0700
- configure.ac: Bump version to 1.10.2
+ input: Fix format string for verify_internal_event
+
+ inpututils.c:577:25: warning: conversion specifies type 'unsigned short'
but the argument has type 'unsigned char' [-Wformat,Format String Issue]
+ ErrorF("%02hx ", *data);
+ ~~~~^ ~~~~~
+ %02hhx
+ 1 warning generated.
Signed-off-by: Jeremy Huddleston <jerem...@apple.com>
+ Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 0de7cec90738a7a5020150309866bb0e23b6f479
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Thu May 19 15:36:29 2011 +1000
-commit 398114c1489fbfc9fe487de38ff4a4176755eee6
+ xfree86: bump to video ABI 11
+
+ We've broken the ABI with some commit and drivers built against ABI 10
+ happily segfault now.
+
+ (The relevant patch is 51f353d0a0d116af16d7d9590cadef6c56328746 which
+ changed the ATOM typedef from unsigned long to uint32_t, thanks to
+ Cyril Brulebois <k...@debian.org> for figuring this out)
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+
+commit 1fb501ad1521cfedaa5cf3052d45a924ef1866cf
Author: Jeremy Huddleston <jerem...@apple.com>
Date: Sun May 22 10:18:36 2011 -0700
@@ -16,9 +268,8 @@ Date: Sun May 22 10:18:36 2011 -0700
sized for the old resolution.
Signed-off-by: Jeremy Huddleston <jerem...@apple.com>
- (cherry picked from commit 1fb501ad1521cfedaa5cf3052d45a924ef1866cf)
-commit dc6efd99887c90bb14e066e46b69ca5ba19b6a09
+commit 60af79e35ee8546a99d15a1358aac3deabfa22be
Author: Jeremy Huddleston <jerem...@apple.com>
Date: Sun May 22 09:32:57 2011 -0700
@@ -28,34 +279,56 @@ Date: Sun May 22 09:32:57 2011 -0700
provide a fake 800x600 display until we are notified about displays being
attached.
Signed-off-by: Jeremy Huddleston <jerem...@apple.com>
- (cherry picked from commit 60af79e35ee8546a99d15a1358aac3deabfa22be)
-commit 1a665a8abd0ce1dbc50a1d889f11d5b74c78539e
+commit f25ca898c54cb88c7886005fc75a53762c42710b
Author: Jeremy Huddleston <jerem...@apple.com>
-Date: Fri May 20 22:59:27 2011 -0700
+Date: Thu May 19 14:39:22 2011 -0700
+
+ XQuartz: Mark functions _X_NORETURN
+
+ Signed-off-by: Jeremy Huddleston <jerem...@apple.com>
- configure.ac: Bump version to 1.10.1.902 (1.10.2 RC2)
+commit 7413886d650aef492ecbfdc4298c2d92d9af5f87
+Author: Jeremy Huddleston <jerem...@apple.com>
+Date: Thu May 19 14:35:56 2011 -0700
+
+ XQuartz: Silence clang warnings about shadow declarations
+
+ X11Application.m:1272:26: warning: declaration shadows a local variable
[-Wshadow,Semantic Issue]
+ xp_error e;
+ ^
+ X11Application.m:1098:36: note: previous declaration is here
+ - (void) sendX11NSEvent:(NSEvent *)e {
+ ^
+ 1 warning generated.
+
+ bundle-main.c:648:36: warning: declaration shadows a local variable
[-Wshadow,Semantic Issue]
+ int max_files, i;
+ ^
+ bundle-main.c:594:9: note: previous declaration is here
+ int i;
+ ^
+ 1 warning generated.
Signed-off-by: Jeremy Huddleston <jerem...@apple.com>
-commit 52e27b446a69b4b196d7e59d4e92aaa073c83dae
+commit 96ac4e61f4618332d95d1fd0e4799dd82844f90f
Author: Jeremy Huddleston <jerem...@apple.com>
-Date: Mon May 16 21:07:13 2011 -0700
+Date: Thu May 19 14:34:39 2011 -0700
--
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/e1qrpdr-0003s1...@vasks.debian.org
