xorg-server: Changes to 'debian-experimental'
ChangeLog | 6474 ++++++++++++++++++++++-
Xext/geext.c | 10
Xext/geint.h | 5
Xext/hashtable.c | 4
Xext/panoramiX.c | 10
Xext/panoramiXprocs.c | 21
Xext/saver.c | 2
Xext/security.c | 24
Xext/shape.c | 2
Xext/sync.c | 4
Xext/xace.c | 28
Xext/xace.h | 3
Xext/xcmisc.c | 2
Xext/xf86bigfont.c | 4
Xext/xres.c | 10
Xext/xselinux_hooks.c | 9
Xext/xselinux_label.c | 2
Xext/xtest.c | 2
Xext/xvmain.c | 84
Xi/exevents.c | 21
Xi/getprop.c | 2
Xi/xichangehierarchy.c | 6
Xi/xiproperty.c | 8
Xi/xiquerypointer.c | 4
autogen.sh | 8
composite/compinit.c | 35
composite/compwindow.c | 2
config/10-evdev.conf | 40
config/Makefile.am | 4
config/config.c | 3
configure.ac | 135
dbe/dbe.c | 14
dbe/midbe.c | 2
debian/changelog | 38
debian/control | 14
debian/patches/02_kbsd-input-devd.diff | 14
debian/patches/03_static-nettle.diff | 2
debian/patches/05_Revert-Unload-submodules.diff | 2
debian/patches/series | 2
debian/patches/xext-fix-udeb-build.diff | 37
debian/patches/xorg-wrapper-envp.diff | 24
debian/rules | 3
debian/serverminver | 6
debian/xserver-xorg-core.NEWS | 17
dev/null |binary
dix/Xserver.d | 5
dix/atom.c | 10
dix/colormap.c | 434 -
dix/cursor.c | 8
dix/devices.c | 10
dix/dispatch.c | 20
dix/dixfonts.c | 51
dix/enterleave.c | 4
dix/enterleave.h | 2
dix/events.c | 12
dix/extension.c | 6
dix/getevents.c | 78
dix/glyphcurs.c | 4
dix/grabs.c | 8
dix/inpututils.c | 78
dix/main.c | 5
dix/pixmap.c | 180
dix/privates.c | 9
dix/property.c | 10
dix/protocol.txt | 302 -
dix/region.c | 2
dix/resource.c | 44
dix/touch.c | 10
dix/window.c | 18
doc/Xinput.xml | 24
doc/Xserver-spec.xml | 9
doc/c-extensions | 2
doc/smartsched | 6
dri3/dri3.c | 3
dri3/dri3_event.c | 163
dri3/dri3_priv.h | 2
exa/exa_accel.c | 8
exa/exa_glyphs.c | 4
exa/exa_migration_mixed.c | 4
exa/exa_render.c | 2
fb/fb.h | 5
fb/fbcopy.c | 2
fb/fbpict.c | 15
glamor/Makefile.am | 2
glamor/glamor.c | 462 -
glamor/glamor.h | 214
glamor/glamor_addtraps.c | 29
glamor/glamor_composite_glyphs.c | 562 +
glamor/glamor_compositerects.c | 6
glamor/glamor_copy.c | 90
glamor/glamor_core.c | 44
glamor/glamor_dash.c | 17
glamor/glamor_egl.c | 201
glamor/glamor_egl_stubs.c | 2
glamor/glamor_fbo.c | 224
glamor/glamor_font.c | 37
glamor/glamor_glyphblt.c | 54
glamor/glamor_glyphs.c | 1783 ------
glamor/glamor_gradient.c | 41
glamor/glamor_image.c | 35
glamor/glamor_largepixmap.c | 215
glamor/glamor_lines.c | 23
glamor/glamor_picture.c | 893 ++-
glamor/glamor_pixmap.c | 1036 ---
glamor/glamor_points.c | 27
glamor/glamor_prepare.c | 64
glamor/glamor_priv.h | 556 -
glamor/glamor_program.c | 299 -
glamor/glamor_program.h | 65
glamor/glamor_rects.c | 28
glamor/glamor_render.c | 531 -
glamor/glamor_segs.c | 20
glamor/glamor_spans.c | 61
glamor/glamor_text.c | 51
glamor/glamor_transfer.c | 2
glamor/glamor_transform.c | 48
glamor/glamor_transform.h | 6
glamor/glamor_trapezoid.c | 16
glamor/glamor_triangles.c | 42
glamor/glamor_utils.c | 2
glamor/glamor_utils.h | 300 -
glamor/glamor_vbo.c | 1
glamor/glamor_window.c | 32
glamor/glamor_xv.c | 53
glx/createcontext.c | 15
glx/extension_string.c | 1
glx/extension_string.h | 3
glx/glxcmds.c | 22
glx/glxcontext.h | 5
glx/glxdri2.c | 7
glx/glxdriswrast.c | 44
glx/rensize.c | 1
glx/single2.c | 9
glx/single2swap.c | 9
hw/dmx/config/dmxconfig.c | 10
hw/dmx/config/dmxparse.h | 3
hw/dmx/config/dmxprint.c | 20
hw/dmx/dmx.c | 11
hw/dmx/dmxcb.c | 3
hw/dmx/dmxcmap.c | 2
hw/dmx/dmxcursor.c | 2
hw/dmx/dmxextension.c | 4
hw/dmx/dmxfont.c | 6
hw/dmx/dmxfont.h | 2
hw/dmx/dmxgc.c | 6
hw/dmx/dmxgc.h | 4
hw/dmx/dmxinit.c | 46
hw/dmx/dmxpict.c | 11
hw/dmx/dmxprop.c | 8
hw/dmx/dmxscrinit.c | 1
hw/dmx/dmxwindow.c | 8
hw/dmx/doc/dmx.xml | 2
hw/dmx/glxProxy/compsize.h | 7
hw/dmx/glxProxy/g_disptab.h | 21
hw/dmx/glxProxy/glxcmds.c | 41
hw/dmx/glxProxy/glxcmds.h | 6
hw/dmx/glxProxy/glxcmdsswap.c | 4
hw/dmx/glxProxy/glxext.c | 2
hw/dmx/glxProxy/glxext.h | 1
hw/dmx/glxProxy/glxscreens.c | 15
hw/dmx/glxProxy/glxscreens.h | 2
hw/dmx/glxProxy/glxserver.h | 8
hw/dmx/glxProxy/glxsingle.c | 6
hw/dmx/glxProxy/glxsingle.h | 4
hw/dmx/glxProxy/glxswap.c | 4
hw/dmx/glxProxy/glxvendor.c | 6
hw/dmx/input/dmxarg.c | 2
hw/dmx/input/dmxevents.c | 7
hw/dmx/input/dmxinputinit.c | 14
hw/dmx/input/dmxmotion.c | 5
hw/kdrive/ephyr/ephyr.c | 17
hw/kdrive/ephyr/ephyr_glamor_glx.c | 2
hw/kdrive/ephyr/ephyrcursor.c | 4
hw/kdrive/ephyr/ephyrdriext.c | 8
hw/kdrive/ephyr/ephyrglxext.c | 2
hw/kdrive/ephyr/ephyrinit.c | 2
hw/kdrive/ephyr/hostx.c | 44
hw/kdrive/ephyr/hostx.h | 2
hw/kdrive/fake/fake.c | 8
hw/kdrive/fbdev/fbdev.c | 8
hw/kdrive/src/kinput.c | 37
hw/kdrive/src/kshadow.c | 2
hw/kdrive/src/kxv.c | 4
hw/vfb/InitOutput.c | 8
hw/vfb/Makefile.am | 1
hw/xfree86/Makefile.am | 2
hw/xfree86/common/Makefile.am | 1
hw/xfree86/common/compiler.h | 64
hw/xfree86/common/dgaproc.h | 62
hw/xfree86/common/vidmodeproc.h | 77
hw/xfree86/common/xf86.h | 11
hw/xfree86/common/xf86AutoConfig.c | 2
hw/xfree86/common/xf86Bus.c | 23
hw/xfree86/common/xf86Config.c | 109
hw/xfree86/common/xf86Configure.c | 6
hw/xfree86/common/xf86DGA.c | 38
hw/xfree86/common/xf86Events.c | 4
hw/xfree86/common/xf86Helper.c | 47
hw/xfree86/common/xf86Mode.c | 11
hw/xfree86/common/xf86Module.h | 4
hw/xfree86/common/xf86VidMode.c | 2
hw/xfree86/common/xf86Xinput.c | 50
hw/xfree86/common/xf86Xinput.h | 13
hw/xfree86/common/xf86cmap.c | 6
hw/xfree86/common/xf86fbman.c | 11
hw/xfree86/common/xf86pciBus.c | 10
hw/xfree86/common/xf86platformBus.c | 9
hw/xfree86/common/xf86sbusBus.c | 10
hw/xfree86/common/xf86str.h | 10
hw/xfree86/common/xf86vmode.c | 8
hw/xfree86/common/xf86xv.c | 10
hw/xfree86/common/xf86xvmc.c | 2
hw/xfree86/ddc/ddc.c | 2
hw/xfree86/doc/ddxDesign.xml | 75
hw/xfree86/dri/dri.c | 2
hw/xfree86/dri/xf86dri.c | 2
hw/xfree86/dri2/dri2.c | 4
hw/xfree86/dri2/dri2ext.c | 14
hw/xfree86/drivers/modesetting/dri2.c | 4
hw/xfree86/drivers/modesetting/driver.c | 282 -
hw/xfree86/drivers/modesetting/driver.h | 44
hw/xfree86/drivers/modesetting/drmmode_display.c | 500 +
hw/xfree86/drivers/modesetting/drmmode_display.h | 19
hw/xfree86/drivers/modesetting/modesetting.man | 18
hw/xfree86/drivers/modesetting/present.c | 450 +
hw/xfree86/drivers/modesetting/vblank.c | 46
hw/xfree86/fbdevhw/fbdevhw.c | 53
hw/xfree86/i2c/xf86i2c.c | 2
hw/xfree86/loader/loadmod.c | 10
hw/xfree86/man/Xorg.man | 8
hw/xfree86/man/Xorg.wrap.man | 2
hw/xfree86/man/xorg.conf.man | 17
hw/xfree86/modes/xf86Crtc.c | 211
hw/xfree86/modes/xf86Crtc.h | 26
hw/xfree86/modes/xf86Cursors.c | 8
hw/xfree86/modes/xf86DiDGA.c | 2
hw/xfree86/modes/xf86EdidModes.c | 2
hw/xfree86/modes/xf86RandR12.c | 99
hw/xfree86/modes/xf86Rotate.c | 8
hw/xfree86/os-support/bus/Sbus.c | 2
hw/xfree86/os-support/linux/Makefile.am | 2
hw/xfree86/os-support/linux/linux.h | 32
hw/xfree86/os-support/linux/lnx_init.c | 169
hw/xfree86/os-support/linux/systemd-logind.c | 26
hw/xfree86/os-support/shared/sigio.c | 2
hw/xfree86/os-support/solaris/Makefile.am | 3
hw/xfree86/os-support/solaris/apSolaris.shar | 806 --
hw/xfree86/os-support/xf86_OSlib.h | 13
hw/xfree86/parser/Configint.h | 2
hw/xfree86/parser/InputClass.c | 152
hw/xfree86/parser/Makefile.am | 16
hw/xfree86/parser/OutputClass.c | 52
hw/xfree86/parser/Screen.c | 96
hw/xfree86/parser/Vendor.c | 32
hw/xfree86/parser/configProcs.h | 9
hw/xfree86/parser/xf86Parser.h | 5
hw/xfree86/parser/xf86tokens.h | 1
hw/xfree86/ramdac/TI.c | 2
hw/xfree86/ramdac/xf86Cursor.c | 2
hw/xfree86/ramdac/xf86Cursor.h | 4
hw/xfree86/ramdac/xf86HWCurs.c | 6
hw/xfree86/sdksyms.sh | 12
hw/xfree86/utils/cvt/cvt.c | 4
hw/xfree86/vbe/vbe.c | 4
hw/xfree86/x86emu/debug.c | 6
hw/xfree86/xorg-wrapper.c | 14
hw/xnest/Color.c | 17
hw/xnest/Display.c | 4
hw/xnest/Events.c | 2
hw/xnest/GC.c | 5
hw/xnest/Keyboard.c | 2
hw/xnest/Screen.c | 4
hw/xquartz/GL/indirect.c | 37
hw/xquartz/X11Application.m | 27
hw/xquartz/X11Controller.m | 13
hw/xquartz/bundle/Info.plist.cpp | 13
hw/xquartz/bundle/Makefile.am | 30
hw/xquartz/bundle/mk_bundke.sh | 2
hw/xquartz/darwinEvents.c | 17
hw/xquartz/quartz.c | 5
hw/xquartz/quartzKeyboard.c | 2
hw/xquartz/xpr/xprCursor.c | 2
hw/xquartz/xpr/xprScreen.c | 2
hw/xwayland/xwayland-cursor.c | 1
hw/xwayland/xwayland-glamor.c | 8
hw/xwayland/xwayland-input.c | 328 -
hw/xwayland/xwayland-output.c | 113
hw/xwayland/xwayland-shm.c | 2
hw/xwayland/xwayland.c | 17
hw/xwayland/xwayland.h | 15
hw/xwin/InitOutput.c | 61
hw/xwin/Makefile.am | 2
hw/xwin/XWin.exe.manifest | 16
hw/xwin/glx/indirect.c | 12
hw/xwin/glx/winpriv.c | 2
hw/xwin/man/XWin.man | 11
hw/xwin/win.h | 35
hw/xwin/winallpriv.c | 4
hw/xwin/winclipboard/internal.h | 4
hw/xwin/winclipboard/wndproc.c | 12
hw/xwin/winclipboard/xevents.c | 16
hw/xwin/wincmap.c | 10
hw/xwin/winconfig.c | 2
hw/xwin/wincreatewnd.c | 9
hw/xwin/windialogs.c | 8
hw/xwin/winengine.c | 26
hw/xwin/winglobals.c | 2
hw/xwin/winkeybd.c | 6
hw/xwin/winkeyhook.c | 2
hw/xwin/winmsg.c | 8
hw/xwin/winmultiwindowicons.c | 9
hw/xwin/winmultiwindowwindow.c | 50
hw/xwin/winmultiwindowwm.c | 4
hw/xwin/winmultiwindowwndproc.c | 39
hw/xwin/winos.c | 72
hw/xwin/winprocarg.c | 6
hw/xwin/winrandr.c | 7
hw/xwin/winscrinit.c | 27
hw/xwin/winshaddd.c | 1221 ----
hw/xwin/winshadddnl.c | 15
hw/xwin/winshadgdi.c | 10
hw/xwin/winwin32rootlesswndproc.c | 18
hw/xwin/winwndproc.c | 8
include/Makefile.am | 6
include/colormap.h | 12
include/cursorstr.h | 2
include/dix-config.h.in | 15
include/dixfont.h | 36
include/dixstruct.h | 23
include/extinit.h | 5
include/input.h | 20
include/inpututils.h | 2
include/kdrive-config.h.in | 3
include/misc.h | 3
include/nonsdk_extinit.h | 35
include/opaque.h | 1
include/os.h | 38
include/pixmap.h | 14
include/pixmapstr.h | 5
include/probes.h | 41
include/protocol-versions.h | 2
include/resource.h | 15
include/scrnintstr.h | 10
include/swaprep.h | 320 -
include/swapreq.h | 6
include/windowstr.h | 4
include/xorg-server.h.in | 6
m4/xorg-tls.m4 | 55
man/Xserver.man | 16
mi/miarc.c | 27
mi/mibitblt.c | 16
mi/micmap.c | 8
mi/micopy.c | 4
mi/midispcur.c | 20
mi/mieq.c | 16
mi/miexpose.c | 50
mi/mifillrct.c | 4
mi/miglblt.c | 3
mi/miinitext.c | 7
mi/mioverlay.c | 13
mi/mipoly.c | 4
mi/mipolypnt.c | 2
mi/mipolyrect.c | 2
mi/miscrinit.c | 1
mi/miwideline.c | 44
mi/miwindow.c | 17
mi/mizerarc.c | 4
mi/mizerline.c | 4
miext/Makefile.am | 9
miext/damage/damage.c | 3
miext/rootless/rootlessCommon.h | 23
miext/rootless/rootlessConfig.h | 19
miext/rootless/rootlessGC.c | 2
miext/rootless/rootlessScreen.c | 3
miext/rootless/rootlessValTree.c | 2
miext/rootless/rootlessWindow.c | 35
miext/rootless/rootlessWindow.h | 1
miext/shadow/shalloc.c | 2
os/access.c | 15
os/connection.c | 31
os/osdep.h | 8
os/osinit.c | 5
os/reallocarray.c | 43
os/utils.c | 91
os/xdmauth.c | 4
os/xdmcp.c | 33
present/present.c | 16
present/present_event.c | 2
present/present_priv.h | 2
present/present_request.c | 4
pseudoramiX/pseudoramiX.c | 12
pseudoramiX/pseudoramiX.h | 2
randr/Makefile.am | 1
randr/randr.c | 4
randr/randrstr.h | 63
randr/rrcrtc.c | 161
randr/rrdispatch.c | 7
randr/rrinfo.c | 10
randr/rrmode.c | 4
randr/rrmonitor.c | 749 ++
randr/rroutput.c | 36
randr/rrproperty.c | 12
randr/rrproviderproperty.c | 6
randr/rrscreen.c | 5
randr/rrsdispatch.c | 38
randr/rrtransform.c | 12
randr/rrxinerama.c | 123
record/record.c | 35
record/set.c | 4
render/filter.c | 12
render/glyph.c | 10
render/glyphstr.h | 36
render/miindex.c | 2
render/mipict.c | 20
render/mipict.h | 36
render/picture.c | 39
render/picture.h | 6
render/picturestr.h | 50
render/render.c | 21
test/Makefile.am | 2
test/README | 17
test/input.c | 63
test/xi1/.gitignore | 1
xfixes/Makefile.am | 4
xfixes/cursor.c | 2
xfixes/region.c | 2
xfixes/xfixes.h | 6
xkb/XKBAlloc.c | 14
xkb/XKBGAlloc.c | 2
xkb/XKBMAlloc.c | 47
xkb/maprules.c | 12
xkb/xkb.c | 32
xkb/xkbActions.c | 13
xkb/xkbUtils.c | 76
xkb/xkmread.c | 2
435 files changed, 15851 insertions(+), 11087 deletions(-)
New commits:
commit 7e373c6366bf1651f4f6392cc9475ece8bc4902a
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Oct 29 09:37:54 2015 +0000
Bump serverminver (video ABI 20.0, input ABI 22.1).
diff --git a/debian/changelog b/debian/changelog
index 9eeb7f7..7d53038 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xorg-server (2:1.17.99.902-1) UNRELEASED; urgency=medium
* New upstream release candidate.
* Bump x11proto-core and x11proto-randr dependencies per configure.ac.
* Stop passing deleted options to configure.
+ * Bump serverminver (video ABI 20.0, input ABI 22.1).
-- Julien Cristau <jcristau@debian.org> Wed, 28 Oct 2015 19:02:38 +0000
diff --git a/debian/serverminver b/debian/serverminver
index f8cfe44..3c1d506 100644
--- a/debian/serverminver
+++ b/debian/serverminver
@@ -1,3 +1,3 @@
-2:1.16.99.901
-ABI_VIDEODRV_VERSION:19.0
-ABI_XINPUT_VERSION:21.0
+2:1.17.99.902
+ABI_VIDEODRV_VERSION:20.0
+ABI_XINPUT_VERSION:22.1
commit 7b74dcc1a2ed2e15229e831cedffd26ee0cc7520
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Oct 28 19:07:33 2015 +0000
Stop passing deleted options to configure.
diff --git a/debian/changelog b/debian/changelog
index f1ad52b..9eeb7f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xorg-server (2:1.17.99.902-1) UNRELEASED; urgency=medium
* New upstream release candidate.
* Bump x11proto-core and x11proto-randr dependencies per configure.ac.
+ * Stop passing deleted options to configure.
-- Julien Cristau <jcristau@debian.org> Wed, 28 Oct 2015 19:02:38 +0000
diff --git a/debian/rules b/debian/rules
index 76870f2..fe1469a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -125,7 +125,6 @@ confflags += \
--with-xkb-path=/usr/share/X11/xkb \
--with-xkb-output=/var/lib/xkb \
--with-shared-memory-dir=/dev/shm \
- --disable-install-libxf86config \
--enable-mitshm \
--enable-xres \
--disable-xcsecurity \
@@ -147,7 +146,6 @@ confflags += \
confflags_main = \
--with-default-font-path="/usr/share/fonts/X11/misc,/usr/share/fonts/X11/cyrillic,/usr/share/fonts/X11/100dpi/:unscaled,/usr/share/fonts/X11/75dpi/:unscaled,/usr/share/fonts/X11/Type1,/usr/share/fonts/X11/100dpi,/usr/share/fonts/X11/75dpi,built-ins" \
--enable-aiglx \
- --enable-glx-tls \
--enable-composite \
--enable-record \
--enable-xv \
@@ -181,7 +179,6 @@ confflags_main = \
confflags_udeb = \
--with-default-font-path="built-ins" \
--disable-aiglx \
- --disable-glx-tls \
--disable-composite \
--disable-record \
--disable-xv \
commit 2a8998fe24081c03d45e3c026504cfc781eedca6
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Oct 28 19:07:28 2015 +0000
Bump x11proto-core and x11proto-randr dependencies per configure.ac.
diff --git a/debian/changelog b/debian/changelog
index c9492e6..f1ad52b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xorg-server (2:1.17.99.902-1) UNRELEASED; urgency=medium
* New upstream release candidate.
+ * Bump x11proto-core and x11proto-randr dependencies per configure.ac.
-- Julien Cristau <jcristau@debian.org> Wed, 28 Oct 2015 19:02:38 +0000
diff --git a/debian/control b/debian/control
index a77b425..1faa02a 100644
--- a/debian/control
+++ b/debian/control
@@ -17,13 +17,13 @@ Build-Depends:
xfonts-utils (>= 1:7.5+1),
x11proto-bigreqs-dev (>= 1:1.1.0),
x11proto-composite-dev (>= 1:0.4),
- x11proto-core-dev (>= 7.0.26),
+ x11proto-core-dev (>= 7.0.28),
x11proto-damage-dev (>= 1.1),
x11proto-fixes-dev (>= 1:5.0),
x11proto-fonts-dev (>= 2.1.3),
x11proto-kb-dev (>= 1.0.3),
x11proto-xinerama-dev,
- x11proto-randr-dev (>= 1.4.0),
+ x11proto-randr-dev (>= 1.5.0),
x11proto-record-dev (>= 1.13.99.1),
x11proto-render-dev (>= 2:0.11),
x11proto-resource-dev (>= 1.2.0),
@@ -194,11 +194,11 @@ Package: xserver-xorg-dev
Architecture: any
Depends:
libpixman-1-dev (>= 0.27.2),
- x11proto-core-dev (>= 7.0.26),
+ x11proto-core-dev (>= 7.0.28),
x11proto-input-dev (>= 2.3),
x11proto-xext-dev (>= 7.2.99.901),
x11proto-video-dev,
- x11proto-randr-dev (>= 1.4.0),
+ x11proto-randr-dev (>= 1.5.0),
x11proto-render-dev (>= 2:0.11),
x11proto-dri2-dev (>= 2.8),
x11proto-gl-dev (>= 1.4.17),
commit d3e0a2e1f4f77d15b25fe721f31b100cd20423a3
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Oct 28 19:03:19 2015 +0000
Bump changelogs and refresh patches
diff --git a/ChangeLog b/ChangeLog
index 1343abd..25db34c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,52 @@
-commit 780022a8a5d6f8abd02f8b568f522ce5aed99839
+commit d8b7a900cf912cadb5915b3924dd6ce5a74505e7
Author: Adam Jackson <ajax@redhat.com>
-Date: Mon Oct 26 13:03:59 2015 -0400
+Date: Mon Oct 26 13:47:04 2015 -0400
- xserver 1.17.3
+ xserver 1.17.99.902 (1.18 RC2)
Signed-off-by: Adam Jackson <ajax@redhat.com>
-commit d9344ef3ea4f3009d61240e0fefcfca40eaa7dca
+commit 47b00fa4bf3b67736957296492310f7fdd6c0a25
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Oct 21 12:15:34 2015 -0400
+
+ xfree86: Use same inb/outb asm code for i386 amd64 and ia64
+
+ This matches the GCCUSESGAS path from the old monolith build (where that
+ macro was actually set), and fixes the build on modern OSX.
+
+ Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit c99fb550e06207e83ec89463fe32bd6bceca45f8
+Author: Dave Airlie <airlied@gmail.com>
+Date: Sun Sep 13 07:45:15 2015 +1000
+
+ xf86: don't add gpus from udev if autoAddGPU is set
+
+ At startup the server wasn't adding devices, but nothing
+ was blocking hotplug devices by the look of it.
+
+ bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91388
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+ Reviewed-by: Hans de Goede <hdegoede@redhat.com>
+
+commit 912f1fe2bb1b640d55fc44fcf636b6ca40d7f40b
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sun Apr 5 10:32:03 2015 +0100
+
+ Xv: Only stop the adaptors when the Pixmap is finally destroyed
+
+ Pixmaps are reference counted and DestroyPixmap is called for the
+ removal of every reference. However, we only want to stop the adaptors
+ writing into the Pixmap just before the Pixmap is finally destroyed,
+ similar to how Windows are handled.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+ Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
+ Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
+
+commit 413cb2ff1d754b5f19d77ff19cddf40793989c03
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon Feb 16 09:49:18 2015 +0000
@@ -18,9 +58,27 @@ Date: Mon Feb 16 09:49:18 2015 +0000
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Mario Kleiner <mario.kleiner.de@gmail.com>
- (cherry picked from commit 413cb2ff1d754b5f19d77ff19cddf40793989c03)
-commit 88f22fc5dac502c7d57d0b53defda75b44dab985
+commit 702c0a247f5523b43652befaf6be548ddbbe9dee
+Author: Alberto Milone <alberto.milone@canonical.com>
+Date: Thu Dec 12 10:00:09 2013 +0100
+
+ randr: make RROutputChanged change the main protocol screen not the gpu screen
+
+ We only set changes on the main protocol screen as, for example
+ in RRSetChanged() and RRTellChanged(), therefore we should follow
+ the same logic when reporting that an output changed in
+ RROutputChanged().
+
+ This means that RRTellChanged() will then update the relevant
+ timestamps also when events come from gpu screens.
+
+ [ajax: Fix mixed code and decls]
+
+ Reviewed-by: Dave Airlie <airlied@redhat.com>
+ Signed-off-by: Alberto Milone <alberto.milone@canonical.com>
+
+commit 2092f12a243b9f7682f542b593b77c96d455ec89
Author: Hans de Goede <hdegoede@redhat.com>
Date: Wed Oct 21 11:36:06 2015 +0200
@@ -42,9 +100,39 @@ Date: Wed Oct 21 11:36:06 2015 +0200
BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1269210
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
- (cherry picked from commit 2092f12a243b9f7682f542b593b77c96d455ec89)
-commit 0ca79007c940b09bd81823fc2e2276f08057247c
+commit ee06f674bbcd796324d6daf69bfb5d8856e94008
+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Thu Oct 15 22:28:49 2015 -0700
+
+ Xi: Silence some tautological warnings
+
+ xichangehierarchy.c:424:23: warning: comparison of constant 536870911 with expression of type 'uint16_t'
+ (aka 'unsigned short') is always false [-Wtautological-constant-out-of-range-compare,Semantic Issue]
+ if (stuff->length > (INT_MAX >> 2))
+ ~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~
+ xichangehierarchy.c:438:26: warning: comparison of constant 536870911 with expression of type 'uint16_t'
+ (aka 'unsigned short') is always false [-Wtautological-constant-out-of-range-compare,Semantic Issue]
+ if ((any->length > (INT_MAX >> 2)) || (len < (any->length << 2)))
+ ~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~
+
+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 113c0bb4fd764da8c08d8f30abe350c7650c9fc2
+Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date: Mon Oct 19 23:15:36 2015 +0200
+
+ hurd: fix xorg-wrapper build
+
+ hurd does not have any PATH_MAX limitation. misc.h provides a default value
+ which is fine here.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
+
+commit f9a04d19aef77bf787b8d322305a6971d24a6ba1
Author: Keith Packard <keithp@keithp.com>
Date: Mon Sep 21 07:16:12 2015 +0100
@@ -74,9 +162,161 @@ Date: Mon Sep 21 07:16:12 2015 +0100
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
- (cherry picked from commit f9a04d19aef77bf787b8d322305a6971d24a6ba1)
-commit 82000d6d0376bdd5c6bb4e0daefcb85879f7c5c7
+commit 5b582a4a0350c253d729efb31b710851ae9a958e
+Merge: 1d4aa67 27ad212
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Oct 19 12:23:22 2015 -0400
+
+ Merge remote-tracking branch 'jeremyhu/master'
+
+commit 1d4aa672424d8b1629fda11400b88607b5066965
+Author: Julien Cristau <jcristau@debian.org>
+Date: Mon Oct 19 15:42:30 2015 +0200
+
+ xorg-wrapper: when starting the server as root, reset its environment
+
+ When the server is privileged, we shouldn't be passing the user's
+ environment directly.
+
+ Clearing the environment is recommended by the libdbus maintainers, see
+ https://bugs.freedesktop.org/show_bug.cgi?id=52202
+
+ v2: rename envp to empty_envp (Jeremy)
+ Reviewed-by: Hans de Goede <hdegoede@redhat.com>
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=83849
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+
+commit 08c4912406b965bbac0a3a52413c374a073c051b
+Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date: Mon Oct 19 14:47:43 2015 +0200
+
+ xorg-wrapper: fix build without libdrm
+
+ Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
+ Reviewed-by: Hans de Goede <hdegoede@redhat.com>
+
+commit a4cd8ee5f8e8de776c7f764656770311cdbde0d2
+Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date: Mon Oct 19 14:47:42 2015 +0200
+
+ hurd: disable detecting drm
+
+ Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
+ Reviewed-by: Hans de Goede <hdegoede@redhat.com>
+
+commit 27ad21254f257bac6c647315d749ee69f20c24e0
+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Sun Oct 18 23:01:53 2015 -0700
+
+ XQuartz: Cleanup formatting of DarwinEQInit that was butchered by automation a few years ago
+
+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+
+commit 3db7e332d374bf8cee581c31b7d50d7ac0509187
+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Sun Oct 18 23:03:23 2015 -0700
+
+ XQuartz: Make sure that darwin_all_modifier_mask_additions is 0-terminated
+
+ Found by ASan
+
+ X.Org X Server 1.17.99.901 Build Date: 20151018
+ ================================================================
+ ==40471==ERROR: AddressSanitizer: global-buffer-overflow on address 0x000101fed7a4 at pc 0x000101584030 bp 0x70000029f920 sp 0x70000029f918
+ READ of size 4 at 0x000101fed7a4 thread T7
+ #0 0x10158402f in DarwinEQInit darwinEvents.c:377
+ #1 0x10157f3bc in InitInput darwin.c:566
+ #2 0x101be87ad in dix_main main.c:268
+ #3 0x10159131b in server_thread quartzStartup.c:66
+ #4 0x7fff8a535c12 in _pthread_body (/usr/lib/system/libsystem_pthread.dylib+0x3c12)
+ #5 0x7fff8a535b8f in _pthread_start (/usr/lib/system/libsystem_pthread.dylib+0x3b8f)
+ #6 0x7fff8a533374 in thread_start (/usr/lib/system/libsystem_pthread.dylib+0x1374)
+
+ 0x000101fed7a4 is located 0 bytes to the right of global variable 'darwin_all_modifier_mask_additions' defined in 'darwinEvents.c:181:12'
+ (0x101fed7a0) of size 4
+ SUMMARY: AddressSanitizer: global-buffer-overflow darwinEvents.c:377 DarwinEQInit
+ Shadow bytes around the buggy address:
+ 0x1000203fdaa0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+ 0x1000203fdab0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+ 0x1000203fdac0: f9 f9 f9 f9 00 00 00 00 00 00 f9 f9 f9 f9 f9 f9
+ 0x1000203fdad0: 00 00 00 00 00 00 00 00 f9 f9 f9 f9 00 00 00 00
+ 0x1000203fdae0: 00 00 f9 f9 f9 f9 f9 f9 00 00 00 00 00 f9 f9 f9
+ =>0x1000203fdaf0: f9 f9 f9 f9[04]f9 f9 f9 f9 f9 f9 f9 00 00 00 00
+ 0x1000203fdb00: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+ 0x1000203fdb10: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+ 0x1000203fdb20: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+ 0x1000203fdb30: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+ 0x1000203fdb40: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+ Shadow byte legend (one shadow byte represents 8 application bytes):
+ Addressable: 00
+ Partially addressable: 01 02 03 04 05 06 07
+ Heap left redzone: fa
+ Heap right redzone: fb
+ Freed heap region: fd
+ Stack left redzone: f1
+ Stack mid redzone: f2
+ Stack right redzone: f3
+ Stack partial redzone: f4
+ Stack after return: f5
+ Stack use after scope: f8
+ Global redzone: f9
+ Global init order: f6
+ Poisoned by user: f7
+ Container overflow: fc
+ Array cookie: ac
+ Intra object redzone: bb
+ ASan internal: fe
+ Left alloca redzone: ca
+ Right alloca redzone: cb
+ Thread T7 created by T0 here:
+ #0 0x10242ee99 in wrap_pthread_create
+ (/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/7.0.0/lib/darwin/libclang_rt.asan_osx_dynamic.dylib+0x37e99)
+ #1 0x101591089 in create_thread quartzStartup.c:78
+ #2 0x101590ed9 in QuartzInitServer quartzStartup.c:95
+ #3 0x1015697eb in X11ApplicationMain X11Application.m:1277
+ #4 0x101575dc0 in X11ControllerMain X11Controller.m:984
+ #5 0x10159171a in server_main quartzStartup.c:127
+ #6 0x101540fc0 in do_start_x11_server bundle-main.c:436
+ #7 0x101544869 in _Xstart_x11_server mach_startupServer.c:189
+ #8 0x101545c96 in mach_startup_server mach_startupServer.c:398
+ #9 0x7fff8d1b70f3 in mach_msg_server (/usr/lib/system/libsystem_kernel.dylib+0x110f3)
+ #10 0x1015416e7 in main bundle-main.c:774
+ #11 0x7fff8bd975ac in start (/usr/lib/system/libdyld.dylib+0x35ac)
+ #12 0x0 (<unknown module>)
+
+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+
+commit ec6294116cc41ff1c3be081b626952fb7e614244
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Sun Oct 18 23:12:52 2015 -0700
+
+ osinit: Silence -Wunused-variable warnings
+
+ osinit.c:161:24: warning: unused variable 'devnull' [-Wunused-variable,Unused Entity Issue]
+ static const char *devnull = "/dev/null";
+ ^
+ osinit.c:162:10: warning: unused variable 'fname' [-Wunused-variable,Unused Entity Issue]
+ char fname[PATH_MAX];
+ ^
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+
+commit 0a5d54f721de7e3ab3b6f4b080190a92bbe3429b
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Sun Oct 18 23:12:51 2015 -0700
+
+ dix: Silence -Wunused-variable warning by moving window.c off of legacy region defines
+
+ window.c:223:15: warning: unused variable 'pScreen' [-Wunused-variable,Unused Entity Issue]
+ ScreenPtr pScreen = pWin->drawable.pScreen;
+ ^
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+
+commit e09875701b980b8c4578fb310a922c9934c34eef
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sun Oct 18 23:12:50 2015 -0700
@@ -88,9 +328,27 @@ Date: Sun Oct 18 23:12:50 2015 -0700
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
- (cherry picked from commit e09875701b980b8c4578fb310a922c9934c34eef)
-commit 2ae94d6e8978faff330e9433eddf1697ba4693f6
+commit 5dc415048e4091b18cd7d123ebeae8f95ed5a4f5
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Sun Oct 18 23:12:49 2015 -0700
+
+ randr: Silence -Wshift-negative-value warnings
+
+ rrtransform.c:199:23: warning: shifting a negative signed value is undefined [-Wshift-negative-value,Semantic Issue]
+ rot_cos = F(-1);
+ ^~~~~
+ rrtransform.c:114:14: note: expanded from macro 'F'
+ ^~~~~~~~~~~~~~
+ ../render/picture.h:200:24: note: expanded from macro 'IntToxFixed'
+ ^~~~~~~~~~~~~~~~~~~~~~
+ /opt/X11/include/pixman-1/pixman.h:130:56: note: expanded from macro 'pixman_int_to_fixed'
+ ~~~ ^
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+
+commit 9a2a05a9a7ba02921fa29844c4cad41243c41326
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Oct 14 15:13:42 2015 -0700
@@ -101,9 +359,86 @@ Date: Wed Oct 14 15:13:42 2015 -0700
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
- (cherry picked from commit 9a2a05a9a7ba02921fa29844c4cad41243c41326)
-commit a88460ca82c7aed00177a5bb733b98a7f9b45968
+commit a7a00e4bd8153e0386c7e58d6b30a7a96f15fdb0
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Wed Oct 14 15:13:39 2015 -0700
+
+ security: Silence some benign -Wformat warnings
+
+ XID may be either 'unsigned long' or 'unsigned int' depending on:
+
+ typedef unsigned long CARD64;
+ typedef unsigned int CARD32;
+ typedef unsigned long long CARD64;
+ typedef unsigned long CARD32;
+
+ typedef unsigned long XID;
+ typedef CARD32 XID;
+
+ so when building with -Wformat, we get some warnings that are benign. This silences them.
+
+ security.c:215:52: warning: format specifies type 'int' but the argument has type 'XID' (aka 'unsigned long')
+ [-Wformat,Format String Issue]
+ SecurityAudit("revoked authorization ID %d\n", pAuth->id);
+ ~~ ^~~~~~~~~
+ %lu
+ CC dpmsstubs.lo
+ security.c:553:25: warning: format specifies type 'int' but the argument has type 'XID' (aka 'unsigned long')
+ [-Wformat,Format String Issue]
+ client->index, pAuth->id, pAuth->trustLevel, pAuth->timeout,
+ ^~~~~~~~~
+ security.c:553:55: warning: format specifies type 'int' but the argument has type 'CARD32' (aka 'unsigned long')
+ [-Wformat,Format String Issue]
+ client->index, pAuth->id, pAuth->trustLevel, pAuth->timeout,
+ ^~~~~~~~~~~~~~
+ security.c:554:10: warning: format specifies type 'int' but the argument has type 'XID' (aka 'unsigned long')
+ [-Wformat,Format String Issue]
+ pAuth->group, eventMask);
+ ^~~~~~~~~~~~
+ security.c:554:24: warning: format specifies type 'int' but the argument has type 'Mask' (aka 'unsigned long')
+ [-Wformat,Format String Issue]
+ pAuth->group, eventMask);
+ ^~~~~~~~~
+ security.c:781:19: warning: format specifies type 'unsigned int' but the argument has type 'Mask' (aka 'unsigned
+ long')
+ [-Wformat,Format String Issue]
+ requested, rec->id, cid,
+ ^~~~~~~~~
+ security.c:781:30: warning: format specifies type 'unsigned int' but the argument has type 'XID' (aka 'unsigned long')
+ [-Wformat,Format String Issue]
+ requested, rec->id, cid,
+ ^~~~~~~
+ security.c:863:23: warning: format specifies type 'unsigned int' but the argument has type 'XID' (aka 'unsigned long')
+ [-Wformat,Format String Issue]
+ rec->pWin->drawable.id, wClient(rec->pWin)->index,
+ ^~~~~~~~~~~~~~~~~~~~~~
+ security.c:893:31: warning: format specifies type 'unsigned int' but the argument has type 'XID' (aka 'unsigned long')
+ [-Wformat,Format String Issue]
+ rec->pWin->drawable.id,
+ ^~~~~~~~~~~~~~~~~~~~~~
+ security.c:915:39: warning: format specifies type 'unsigned int' but the argument has type 'XID' (aka 'unsigned long')
+ [-Wformat,Format String Issue]
+ rec->client->index, rec->pWin->drawable.id,
+ ^~~~~~~~~~~~~~~~~~~~~~
+
+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit aa73d587fece225753d8e6b8773a9c8b85823bd9
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Wed Oct 14 15:13:38 2015 -0700
+
+ xres: Silence -Wunused-function warnings when building !COMPOSITE or !RENDER
+
+ xres.c:422:1: warning: unused function 'ResFindCompositeClientWindowPixmaps' [-Wunused-function,Unused Entity Issue]
+ ResFindCompositeClientWindowPixmaps (void *value, XID id, void *cdata)
+ ^
+
+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 85eb90ea45e89033b97bf71a13c5c70fec8f6871
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Oct 14 15:13:36 2015 -0700
@@ -131,9 +466,8 @@ Date: Wed Oct 14 15:13:36 2015 -0700
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
- (cherry picked from commit 85eb90ea45e89033b97bf71a13c5c70fec8f6871)
-commit 0f051cb4c3af6c3b906c2f210e3b6858dd7a5f53
+commit 9f0fcd14b52f8481cbb3b3b9c6e06f64ff003cc8
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Oct 14 15:13:35 2015 -0700
Reply to: