ChangeLog | 6692 +++++++ 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/shm.c | 10 Xext/sync.c | 4 Xext/xace.c | 28 Xext/xace.h | 5 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 | 141 dbe/dbe.c | 14 dbe/midbe.c | 2 debian/changelog | 287 debian/compat | 2 debian/control | 98 debian/copyright | 27 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/105_nvidia_fglrx_autodetect.patch | 27 debian/patches/111_armel-drv-fallbacks.patch | 13 debian/patches/122_xext_fix_card32_overflow_in_xauth.patch | 17 debian/patches/168_glibc_trace_to_stderr.patch | 14 debian/patches/188_default_primary_to_first_busid.patch | 4 debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch | 44 debian/patches/191-Xorg-add-an-extra-module-path.patch | 28 debian/patches/208_switch_on_release.diff | 16 debian/patches/226_fall_back_to_autoconfiguration.patch | 33 debian/patches/227_null_ptr_midispcur.patch | 9 debian/patches/228_autobind_gpu.patch | 10 debian/patches/232-xf86compatoutput-valgrind.patch | 17 debian/patches/config-add-no-removal.patch | 20 debian/patches/disable-rotation-transform-gpuscreens.patch | 41 debian/patches/drm_device_keep_trying.patch | 12 debian/patches/fix-detach-gpu.patch | 20 debian/patches/fix-ftbfs-ppc64el.patch | 3 debian/patches/mi-dont-process-disabled.patch | 62 debian/patches/no-nv.patch | 4 debian/patches/pixman-validate.patch | 27 debian/patches/series | 4 debian/patches/xf86-ignore-conflicting-rr-caps.patch | 6 debian/patches/xf86-inactive-gpuscreen.patch | 15 debian/patches/xfree86-no-xv-for-gpuscreens.patch | 14 debian/patches/xi2-resize-touch.patch | 15 debian/patches/xmir-desktop-file-hint-flag.patch | 22 debian/patches/xmir.patch | 8779 ++++++++-- debian/patches/xrandr-rroutputchanged-main.patch | 63 debian/po/POTFILES.in | 1 debian/po/ar.po | 62 debian/po/ast.po | 64 debian/po/be.po | 58 debian/po/bg.po | 80 debian/po/bn.po | 60 debian/po/bs.po | 70 debian/po/ca.po | 79 debian/po/cs.po | 79 debian/po/da.po | 98 debian/po/de.po | 78 debian/po/dz.po | 73 debian/po/el.po | 84 debian/po/eo.po | 61 debian/po/es.po | 88 debian/po/eu.po | 82 debian/po/fi.po | 62 debian/po/fr.po | 87 debian/po/gl.po | 68 debian/po/gu.po | 59 debian/po/he.po | 61 debian/po/hr.po | 56 debian/po/hu.po | 56 debian/po/id.po | 74 debian/po/it.po | 85 debian/po/ja.po | 81 debian/po/kk.po | 55 debian/po/km.po | 70 debian/po/ko.po | 58 debian/po/ku.po | 56 debian/po/lt.po | 71 debian/po/ml.po | 70 debian/po/mr.po | 60 debian/po/nb.po | 63 debian/po/ne.po | 63 debian/po/nl.po | 82 debian/po/nn.po | 70 debian/po/pl.po | 66 debian/po/pothead.in | 30 debian/po/pt.po | 67 debian/po/pt_BR.po | 85 debian/po/ro.po | 84 debian/po/ru.po | 87 debian/po/sk.po | 65 debian/po/sq.po | 66 debian/po/sr.po | 60 debian/po/[email protected] | 61 debian/po/sv.po | 88 debian/po/ta.po | 70 debian/po/templates.pot | 53 debian/po/th.po | 59 debian/po/tr.po | 83 debian/po/vi.po | 62 debian/po/wo.po | 61 debian/po/zh_CN.po | 81 debian/po/zh_TW.po | 74 debian/rules | 51 debian/serverminver | 6 debian/upstream/signing-key.asc | 41 debian/xmir.install | 1 debian/xserver-xorg-core.NEWS | 17 debian/xserver-xorg-core.install | 9 debian/xserver-xorg-legacy.config | 87 debian/xserver-xorg-legacy.install | 3 debian/xserver-xorg-legacy.postinst | 77 debian/xserver-xorg-legacy.postrm | 36 debian/xserver-xorg-legacy.templates | 22 debian/xserver-xorg-xmir.install | 1 dev/null |binary dix/Xserver.d | 5 dix/atom.c | 10 dix/colormap.c | 434 dix/cursor.c | 8 dix/devices.c | 9 dix/dispatch.c | 20 dix/dixfonts.c | 51 dix/enterleave.c | 4 dix/enterleave.h | 2 dix/events.c | 13 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/Makefile.am | 4 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 | 498 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 | 46 glamor/glamor_dash.c | 17 glamor/glamor_egl.c | 207 glamor/glamor_egl_stubs.c | 2 glamor/glamor_fbo.c | 225 glamor/glamor_font.c | 38 glamor/glamor_glyphblt.c | 54 glamor/glamor_glyphs.c | 1783 -- glamor/glamor_gradient.c | 41 glamor/glamor_image.c | 35 glamor/glamor_largepixmap.c | 220 glamor/glamor_lines.c | 23 glamor/glamor_picture.c | 893 - glamor/glamor_pixmap.c | 1037 - glamor/glamor_points.c | 27 glamor/glamor_prepare.c | 64 glamor/glamor_priv.h | 558 glamor/glamor_program.c | 302 glamor/glamor_program.h | 65 glamor/glamor_rects.c | 28 glamor/glamor_render.c | 535 glamor/glamor_segs.c | 20 glamor/glamor_spans.c | 63 glamor/glamor_sync.c | 2 glamor/glamor_text.c | 51 glamor/glamor_transfer.c | 59 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 | 13 hw/kdrive/ephyr/hostx.c | 57 hw/kdrive/ephyr/hostx.h | 2 hw/kdrive/fake/Makefile.am | 1 hw/kdrive/fake/fake.c | 8 hw/kdrive/fbdev/Makefile.am | 1 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 | 4 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 | 11 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 | 29 hw/xfree86/common/xf86sbusBus.c | 10 hw/xfree86/common/xf86str.h | 10 hw/xfree86/common/xf86vmode.c | 230 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/dri2/pci_ids/radeonsi_pci_ids.h | 28 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 | 526 hw/xfree86/drivers/modesetting/drmmode_display.h | 19 hw/xfree86/drivers/modesetting/dumb_bo.c | 4 hw/xfree86/drivers/modesetting/modesetting.man | 18 hw/xfree86/drivers/modesetting/present.c | 450 hw/xfree86/drivers/modesetting/vblank.c | 46 hw/xfree86/exa/Makefile.am | 3 hw/xfree86/fbdevhw/fbdevhw.c | 53 hw/xfree86/i2c/xf86i2c.c | 2 hw/xfree86/int10/generic.c | 2 hw/xfree86/loader/Makefile.am | 2 hw/xfree86/loader/loadmod.c | 10 hw/xfree86/man/Xorg.man | 68 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 | 28 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/int10/linux.c | 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 | 43 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 | 26 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 | 6 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/Makefile.am | 1 hw/xwayland/xwayland-cursor.c | 27 hw/xwayland/xwayland-glamor.c | 12 hw/xwayland/xwayland-input.c | 385 hw/xwayland/xwayland-output.c | 115 hw/xwayland/xwayland-shm.c | 2 hw/xwayland/xwayland.c | 21 hw/xwayland/xwayland.h | 21 hw/xwin/InitOutput.c | 61 hw/xwin/Makefile.am | 2 hw/xwin/XWin.exe.manifest | 16 hw/xwin/glx/gen_gl_wrappers.py | 96 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/Makefile.am | 2 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 | 20 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 | 21 include/dixfont.h | 36 include/dixstruct.h | 23 include/extinit.h | 5 include/input.h | 22 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 | 55 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/servermd.h | 2 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 | 29 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/mifillarc.c | 5 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/WaitFor.c | 1 os/access.c | 126 os/auth.c | 8 os/backtrace.c | 4 os/connection.c | 40 os/log.c | 28 os/osdep.h | 8 os/osinit.c | 5 os/reallocarray.c | 43 os/utils.c | 93 os/xdmauth.c | 4 os/xdmcp.c | 54 present/present.c | 51 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 | 167 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 | 7 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 | 4 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 547 files changed, 28586 insertions(+), 13430 deletions(-)
New commits: commit e6e1c37545a7253ab0271f15294a99657de4e213 Author: Timo Aaltonen <[email protected]> Date: Tue Dec 8 19:48:33 2015 +0200 patches: Refreshed, dropped what's upstream. diff --git a/debian/changelog b/debian/changelog index c5d8b5b..33aa763 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xorg-server (2:1.18.0-1ubuntu1) UNRELEASED; urgency=medium + + * Merge from Debian experimental + * patches: Refreshed, dropped what's upstream. + + -- Timo Aaltonen <[email protected]> Tue, 08 Dec 2015 19:47:06 +0200 + xorg-server (2:1.18.0-1) experimental; urgency=medium * New upstream release. diff --git a/debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch b/debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch index 7544e3d..be34def 100644 --- a/debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch +++ b/debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch @@ -6,7 +6,7 @@ Last-Update: 2013-09-19 --- a/configure.ac +++ b/configure.ac -@@ -501,9 +501,9 @@ AC_MSG_RESULT([$FONTPATH]) +@@ -519,9 +519,9 @@ AC_MSG_RESULT([$FONTPATH]) AC_ARG_WITH(xkb-path, AS_HELP_STRING([--with-xkb-path=PATH], [Path to XKB base dir (default: ${datadir}/X11/xkb)]), [ XKBPATH="$withval" ], [ XKBPATH="${datadir}/X11/xkb" ]) @@ -18,7 +18,7 @@ Last-Update: 2013-09-19 AC_ARG_WITH(default-xkb-rules, AS_HELP_STRING([--with-default-xkb-rules=RULES], [Keyboard ruleset (default: base/evdev)]), [ XKB_DFLT_RULES="$withval" ], -@@ -1452,7 +1452,7 @@ AC_DEFINE_DIR(XKB_BIN_DIRECTORY, XKB_BIN +@@ -1450,7 +1450,7 @@ AC_DEFINE_DIR(XKB_BIN_DIRECTORY, XKB_BIN dnl Make sure XKM_OUTPUT_DIR is an absolute path XKBOUTPUT_FIRSTCHAR=`echo $XKBOUTPUT | cut -b 1` if [[ x$XKBOUTPUT_FIRSTCHAR != x/ -a x$XKBOUTPUT_FIRSTCHAR != 'x$' ]] ; then diff --git a/debian/patches/191-Xorg-add-an-extra-module-path.patch b/debian/patches/191-Xorg-add-an-extra-module-path.patch index f42972b..764d8ad 100644 --- a/debian/patches/191-Xorg-add-an-extra-module-path.patch +++ b/debian/patches/191-Xorg-add-an-extra-module-path.patch @@ -2,7 +2,7 @@ Description: Patch from Mandriva to allow the use of an extra-modules-dir so tha --- a/configure.ac +++ b/configure.ac -@@ -446,6 +446,10 @@ AC_ARG_WITH(module-dir, AS_HELP_STR +@@ -464,6 +464,10 @@ AC_ARG_WITH(module-dir, AS_HELP_STR [Directory where modules are installed (default: $libdir/xorg/modules)]), [ moduledir="$withval" ], [ moduledir="${libdir}/xorg/modules" ]) @@ -13,7 +13,7 @@ Description: Patch from Mandriva to allow the use of an extra-modules-dir so tha AC_ARG_WITH(log-dir, AS_HELP_STRING([--with-log-dir=DIR], [Directory where log files are kept (default: $localstatedir/log)]), [ logdir="$withval" ], -@@ -2086,6 +2090,7 @@ if test "x$XORG" = xyes; then +@@ -2077,6 +2081,7 @@ if test "x$XORG" = xyes; then AC_DEFINE_DIR(XF86CONFIGFILE, XF86CONFIGFILE, [Name of configuration file]) AC_DEFINE_DIR(__XCONFIGDIR__, XF86CONFIGDIR, [Name of configuration directory]) AC_DEFINE_DIR(DEFAULT_MODULE_PATH, moduledir, [Default module search path]) @@ -23,7 +23,7 @@ Description: Patch from Mandriva to allow the use of an extra-modules-dir so tha AC_DEFINE_DIR(DEFAULT_LOGPREFIX, LOGPREFIX, [Default logfile prefix]) --- a/hw/xfree86/common/xf86Config.c +++ b/hw/xfree86/common/xf86Config.c -@@ -635,11 +635,22 @@ configFiles(XF86ConfFilesPtr fileconf) +@@ -641,11 +641,22 @@ configFiles(XF86ConfFilesPtr fileconf) /* ModulePath */ diff --git a/debian/patches/208_switch_on_release.diff b/debian/patches/208_switch_on_release.diff index e77d26d..4d2098a 100644 --- a/debian/patches/208_switch_on_release.diff +++ b/debian/patches/208_switch_on_release.diff @@ -3,12 +3,11 @@ Description: Perform keyboard layout switches on key-release rather than key-pre Author: Bryce Harrington <[email protected]> Bug-Ubuntu: https://launchpad.net/bugs/36812 Bug-Ubuntu: https://launchpad.net/bugs/711842 +Bug: https://bugs.freedesktop.org/show_bug.cgi?id=865 -Index: xorg-server-1.17.2/xkb/xkbActions.c -=================================================================== ---- xorg-server-1.17.2.orig/xkb/xkbActions.c -+++ xorg-server-1.17.2/xkb/xkbActions.c -@@ -351,22 +351,83 @@ _XkbFilterLatchState(XkbSrvInfoPtr xkbi, +--- a/xkb/xkbActions.c ++++ b/xkb/xkbActions.c +@@ -352,25 +352,86 @@ _XkbFilterLatchState(XkbSrvInfoPtr xkbi, } static int @@ -36,6 +35,9 @@ Index: xorg-server-1.17.2/xkb/xkbActions.c +_XkbFilterLockGroup(XkbSrvInfoPtr xkbi, XkbFilterPtr filter, unsigned keycode, XkbAction *pAction) { + if (filter->keycode == 0) /* initial press */ + AccessXCancelRepeatKey(xkbi, keycode); + - if (pAction && (pAction->type == XkbSA_LockGroup)) { - if (pAction->group.flags & XkbSA_GroupAbsolute) - xkbi->state.locked_group = XkbSAGroup(&pAction->group); @@ -100,7 +102,7 @@ Index: xorg-server-1.17.2/xkb/xkbActions.c filter->upAction = *pAction; if (!(filter->upAction.mods.flags & XkbSA_LockNoLock)) xkbi->state.locked_mods |= pAction->mods.mask; -@@ -1243,9 +1304,12 @@ XkbHandleActions(DeviceIntPtr dev, Devic +@@ -1250,9 +1311,12 @@ XkbHandleActions(DeviceIntPtr dev, Devic sendEvent = _XkbFilterLatchState(xkbi, filter, key, &act); break; case XkbSA_LockMods: diff --git a/debian/patches/227_null_ptr_midispcur.patch b/debian/patches/227_null_ptr_midispcur.patch index 1dc67d9..621bdaa 100644 --- a/debian/patches/227_null_ptr_midispcur.patch +++ b/debian/patches/227_null_ptr_midispcur.patch @@ -3,11 +3,9 @@ Description: Check for NULL pointer before dereferencing pointer from miGetDCDev Author: Bryce Harrington <[email protected]> Bug-Ubuntu: https://launchpad.net/bugs/930936 -Index: xorg-server-1.17.2/mi/midispcur.c -=================================================================== ---- xorg-server-1.17.2.orig/mi/midispcur.c -+++ xorg-server-1.17.2/mi/midispcur.c -@@ -435,6 +435,10 @@ miDCRestoreUnderCursor(DeviceIntPtr pDev +--- a/mi/midispcur.c ++++ b/mi/midispcur.c +@@ -421,6 +421,10 @@ miDCRestoreUnderCursor(DeviceIntPtr pDev GCPtr pGC; pBuffer = miGetDCDevice(pDev, pScreen); diff --git a/debian/patches/228_autobind_gpu.patch b/debian/patches/228_autobind_gpu.patch index f714ea4..736a44f 100644 --- a/debian/patches/228_autobind_gpu.patch +++ b/debian/patches/228_autobind_gpu.patch @@ -58,7 +58,7 @@ DO NOT UPSTREAM. int xf86platformAddDevice(int index) { -@@ -537,6 +540,7 @@ xf86platformAddDevice(int index) +@@ -540,6 +543,7 @@ xf86platformAddDevice(int index) } /* attach unbound to 0 protocol screen */ AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen); @@ -68,7 +68,7 @@ DO NOT UPSTREAM. RRTellChanged(xf86Screens[0]->pScreen); --- a/hw/xfree86/modes/xf86Crtc.c +++ b/hw/xfree86/modes/xf86Crtc.c -@@ -3387,3 +3387,35 @@ xf86DetachAllCrtc(ScrnInfoPtr scrn) +@@ -3562,3 +3562,35 @@ xf86DetachAllCrtc(ScrnInfoPtr scrn) crtc->x = crtc->y = 0; } } diff --git a/debian/patches/fix-detach-gpu.patch b/debian/patches/fix-detach-gpu.patch index 7e1149b..cd90052 100644 --- a/debian/patches/fix-detach-gpu.patch +++ b/debian/patches/fix-detach-gpu.patch @@ -4,7 +4,7 @@ Bug-Ubuntu: https://launchpad.net/bugs/1280743 --- a/hw/xfree86/modes/xf86RandR12.c +++ b/hw/xfree86/modes/xf86RandR12.c -@@ -1781,7 +1781,8 @@ xf86RandR14ProviderSetOutputSource(Scree +@@ -1845,7 +1845,8 @@ xf86RandR14ProviderSetOutputSource(Scree ScreenPtr cmScreen = pScreen->current_master; xf86DetachOutputGPU(pScreen); @@ -14,7 +14,7 @@ Bug-Ubuntu: https://launchpad.net/bugs/1280743 } provider->output_source = NULL; return TRUE; -@@ -1792,7 +1793,8 @@ xf86RandR14ProviderSetOutputSource(Scree +@@ -1856,7 +1857,8 @@ xf86RandR14ProviderSetOutputSource(Scree SetRootClip(source_provider->pScreen, FALSE); @@ -24,7 +24,7 @@ Bug-Ubuntu: https://launchpad.net/bugs/1280743 AttachOutputGPU(source_provider->pScreen, pScreen); provider->output_source = source_provider; -@@ -1809,7 +1811,8 @@ xf86RandR14ProviderSetOffloadSink(Screen +@@ -1873,7 +1875,8 @@ xf86RandR14ProviderSetOffloadSink(Screen if (provider->offload_sink) { ScreenPtr cmScreen = pScreen->current_master; xf86DetachOutputGPU(pScreen); @@ -34,7 +34,7 @@ Bug-Ubuntu: https://launchpad.net/bugs/1280743 } provider->offload_sink = NULL; -@@ -1819,7 +1822,8 @@ xf86RandR14ProviderSetOffloadSink(Screen +@@ -1883,7 +1886,8 @@ xf86RandR14ProviderSetOffloadSink(Screen if (provider->offload_sink == sink_provider) return TRUE; @@ -44,7 +44,7 @@ Bug-Ubuntu: https://launchpad.net/bugs/1280743 AttachOffloadGPU(sink_provider->pScreen, pScreen); provider->offload_sink = sink_provider; -@@ -1898,12 +1902,14 @@ xf86RandR14ProviderDestroy(ScreenPtr scr +@@ -1962,12 +1966,14 @@ xf86RandR14ProviderDestroy(ScreenPtr scr config->randr_provider->offload_sink = NULL; RRSetChanged(screen); } @@ -63,7 +63,7 @@ Bug-Ubuntu: https://launchpad.net/bugs/1280743 config->randr_provider = NULL; --- a/dix/dispatch.c +++ b/dix/dispatch.c -@@ -3951,6 +3951,8 @@ AttachUnboundGPU(ScreenPtr pScreen, Scre +@@ -3952,6 +3952,8 @@ AttachUnboundGPU(ScreenPtr pScreen, Scre assert(new->isGPU); assert(!new->current_master); xorg_list_add(&new->unattached_head, &pScreen->unattached_list); @@ -72,7 +72,7 @@ Bug-Ubuntu: https://launchpad.net/bugs/1280743 new->current_master = pScreen; } -@@ -3975,7 +3977,8 @@ DetachOutputGPU(ScreenPtr slave) +@@ -3976,7 +3978,8 @@ DetachOutputGPU(ScreenPtr slave) { assert(slave->isGPU); xorg_list_del(&slave->output_head); @@ -82,7 +82,7 @@ Bug-Ubuntu: https://launchpad.net/bugs/1280743 } void -@@ -3991,6 +3994,7 @@ DetachOffloadGPU(ScreenPtr slave) +@@ -3992,6 +3995,7 @@ DetachOffloadGPU(ScreenPtr slave) { assert(slave->isGPU); xorg_list_del(&slave->offload_head); diff --git a/debian/patches/os-make-sure-the-clientswritable-fd-set-is-initialized.diff b/debian/patches/os-make-sure-the-clientswritable-fd-set-is-initialized.diff deleted file mode 100644 index b3a7d2e..0000000 --- a/debian/patches/os-make-sure-the-clientswritable-fd-set-is-initialized.diff +++ /dev/null @@ -1,63 +0,0 @@ -From 7cc7ffd25d5e50b54cb942d07d4cb160f20ff9c5 Mon Sep 17 00:00:00 2001 -From: Martin Peres <[email protected]> -Date: Fri, 17 Jul 2015 17:21:26 +0300 -Subject: [PATCH] os: make sure the clientsWritable fd_set is initialized - before use - -In WaitForSomething(), the fd_set clientsWritable may be used unitialized when -the boolean AnyClientsWriteBlocked is set in the WakeupHandler(). This leads to -a crash in FlushAllOutput() after x11proto's commit -2c94cdb453bc641246cc8b9a876da9799bee1ce7. - -The problem did not manifest before because both the XFD_SIZE and the maximum -number of clients were set to 256. As the connectionTranslation table was -initalized for the 256 clients to 0, the test on the index not being 0 was -aborting before dereferencing the client #0. - -As of commit 2c94cdb453bc641246cc8b9a876da9799bee1ce7 in x11proto, the XFD_SIZE -got bumped to 512. This lead the OutputPending fd_set to have any fd above 256 -to be uninitialized which in turns lead to reading an index after the end of -the ConnectionTranslation table. This index would then be used to find the -client corresponding to the fd marked as pending writes and would also result -to an out-of-bound access which would usually be the fatal one. - -Fix this by zeroing the clientsWritable fd_set at the beginning of -WaitForSomething(). In this case, the bottom part of the loop, which would -indirectly call FlushAllOutput, will not do any work but the next call to -select will result in the execution of the right codepath. This is exactly what -we want because we need to know the writable clients before handling them. In -the end, it also makes sure that the fds above MaxClient are initialized, -preventing the crash in FlushAllOutput(). - -Thanks to everyone involved in tracking this one down! - -Reported-by: Karol Herbst <[email protected]> -Reported-by: Tobias Klausmann <[email protected]> -Signed-off-by: Martin Peres <[email protected]> -Tested-by: Martin Peres <[email protected]> -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91316 -Cc: Ilia Mirkin <[email protected]> -Cc: Martin Peres <[email protected]> -Cc: Olivier Fourdan <[email protected] -Cc: Adam Jackson <[email protected]> -Cc: Alan Coopersmith <[email protected] -Cc: Chris Wilson <[email protected]> ---- - os/WaitFor.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/os/WaitFor.c b/os/WaitFor.c -index 431f1a6..993c14e 100644 ---- a/os/WaitFor.c -+++ b/os/WaitFor.c -@@ -158,6 +158,7 @@ WaitForSomething(int *pClientsReady) - Bool someReady = FALSE; - - FD_ZERO(&clientsReadable); -+ FD_ZERO(&clientsWritable); - - if (nready) - SmartScheduleStopTimer(); --- -2.4.5 - diff --git a/debian/patches/series b/debian/patches/series index a2f61f6..1216060 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -39,7 +39,6 @@ no-nv.patch # hybrid graphics fixes 228_autobind_gpu.patch xf86-inactive-gpuscreen.patch -xrandr-rroutputchanged-main.patch config-add-no-removal.patch xf86-ignore-conflicting-rr-caps.patch fix-detach-gpu.patch @@ -50,4 +49,3 @@ xmir.patch xmir-desktop-file-hint-flag.patch drm_device_keep_trying.patch xi2-resize-touch.patch -os-make-sure-the-clientswritable-fd-set-is-initialized.diff diff --git a/debian/patches/xf86-ignore-conflicting-rr-caps.patch b/debian/patches/xf86-ignore-conflicting-rr-caps.patch index d9bd163..c2e05a6 100644 --- a/debian/patches/xf86-ignore-conflicting-rr-caps.patch +++ b/debian/patches/xf86-ignore-conflicting-rr-caps.patch @@ -4,7 +4,7 @@ Bug-Ubuntu: https://launchpad.net/bugs/1277014 --- a/hw/xfree86/modes/xf86RandR12.c +++ b/hw/xfree86/modes/xf86RandR12.c -@@ -1550,10 +1550,16 @@ xf86RandR12CreateObjects12(ScreenPtr pSc +@@ -1548,10 +1548,16 @@ xf86RandR12CreateObjects12(ScreenPtr pSc } if (config->name) { diff --git a/debian/patches/xfree86-no-xv-for-gpuscreens.patch b/debian/patches/xfree86-no-xv-for-gpuscreens.patch index b64d5b1..38a5639 100644 --- a/debian/patches/xfree86-no-xv-for-gpuscreens.patch +++ b/debian/patches/xfree86-no-xv-for-gpuscreens.patch @@ -2,10 +2,8 @@ Description: Do not bother registering xv/xvmc on gpu screens. Author: Maarten Lankhorst <[email protected]> Bug-Ubuntu: https://launchpad.net/bugs/1079096 -Index: xorg-server-1.17.2/hw/xfree86/common/xf86xv.c -=================================================================== ---- xorg-server-1.17.2.orig/hw/xfree86/common/xf86xv.c -+++ xorg-server-1.17.2/hw/xfree86/common/xf86xv.c +--- a/hw/xfree86/common/xf86xv.c ++++ b/hw/xfree86/common/xf86xv.c @@ -230,7 +230,7 @@ xf86XVScreenInit(ScreenPtr pScreen, XF86 ScrnInfoPtr pScrn; XF86XVScreenPtr ScreenPriv; @@ -15,10 +13,8 @@ Index: xorg-server-1.17.2/hw/xfree86/common/xf86xv.c return FALSE; if (Success != XvScreenInit(pScreen)) -Index: xorg-server-1.17.2/hw/xfree86/common/xf86xvmc.c -=================================================================== ---- xorg-server-1.17.2.orig/hw/xfree86/common/xf86xvmc.c -+++ xorg-server-1.17.2/hw/xfree86/common/xf86xvmc.c +--- a/hw/xfree86/common/xf86xvmc.c ++++ b/hw/xfree86/common/xf86xvmc.c @@ -148,11 +148,15 @@ xf86XvMCScreenInit(ScreenPtr pScreen, { XvMCAdaptorPtr pAdapt; @@ -37,4 +33,4 @@ Index: xorg-server-1.17.2/hw/xfree86/common/xf86xvmc.c + if (!pxvs) return FALSE; - if (!(pAdapt = malloc(sizeof(XvMCAdaptorRec) * num_adaptors))) + if (!(pAdapt = xallocarray(num_adaptors, sizeof(XvMCAdaptorRec)))) diff --git a/debian/patches/xi2-resize-touch.patch b/debian/patches/xi2-resize-touch.patch index 17c2911..7c13184 100644 --- a/debian/patches/xi2-resize-touch.patch +++ b/debian/patches/xi2-resize-touch.patch @@ -1,11 +1,9 @@ Description: Resize touch event history if the array is filled up. Author: Maarten Lankhorst <[email protected]> -diff --git a/dix/touch.c b/dix/touch.c -index a7ea213..1478e38 100644 --- a/dix/touch.c +++ b/dix/touch.c -@@ -460,12 +460,26 @@ TouchEventHistoryPush(TouchPointInfoPtr ti, const DeviceEvent *ev) +@@ -460,11 +460,25 @@ TouchEventHistoryPush(TouchPointInfoPtr if (ev->flags & (TOUCH_CLIENT_ID | TOUCH_REPLAYING)) return; @@ -28,10 +26,8 @@ index a7ea213..1478e38 100644 - /* FIXME: proper overflow fixes */ if (ti->history_elements > ti->history_size - 1) { ti->history_elements = ti->history_size - 1; -- DebugF("source device %d: history size %d overflowing for touch %u\n", -- ti->sourceid, ti->history_size, ti->client_id); -+ ErrorF("source device %d: history size %d overflowing for touch %u\n", -+ ti->sourceid, ti->history_size, ti->client_id); +- DebugF("source device %d: history size %zu overflowing for touch %u\n", ++ ErrorF("source device %d: history size %zu overflowing for touch %u\n", + ti->sourceid, ti->history_size, ti->client_id); } } - diff --git a/debian/patches/xmir-desktop-file-hint-flag.patch b/debian/patches/xmir-desktop-file-hint-flag.patch index 7dbc73a..16e3152 100644 --- a/debian/patches/xmir-desktop-file-hint-flag.patch +++ b/debian/patches/xmir-desktop-file-hint-flag.patch @@ -8,11 +8,9 @@ Subject: [PATCH 3/4] xmir: Ignore --desktop_file_hint flag required by Unity8 hw/xmir/xmir.c | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/hw/xmir/xmir.c b/hw/xmir/xmir.c -index ef78cca..b9b7f2d 100644 --- a/hw/xmir/xmir.c +++ b/hw/xmir/xmir.c -@@ -123,6 +123,9 @@ ddxProcessArgument(int argc, char *argv[], int i) +@@ -168,6 +168,9 @@ ddxProcessArgument(int argc, char *argv[ } else if (!strcmp(argv[i], "-novtswitch") || !strncmp(argv[i], "vt", 2)) { return 1; @@ -22,6 +20,3 @@ index ef78cca..b9b7f2d 100644 } else if (!strcmp(argv[i], "-fd")) { if (!seen_shared) NoListenAll = 1; --- -2.4.6 - diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch index 79b7d1c..63da73c 100644 --- a/debian/patches/xmir.patch +++ b/debian/patches/xmir.patch @@ -46,11 +46,9 @@ Contributions from: create mode 100644 hw/xmir/xmir.c create mode 100644 hw/xmir/xmir.h -diff --git a/configure.ac b/configure.ac -index d8f0e74..56355fd 100644 --- a/configure.ac +++ b/configure.ac -@@ -624,6 +624,7 @@ AC_ARG_ENABLE(xvfb, AS_HELP_STRING([--enable-xvfb], [Build Xvfb server +@@ -632,6 +632,7 @@ AC_ARG_ENABLE(xvfb, AS_HELP_ST AC_ARG_ENABLE(xnest, AS_HELP_STRING([--enable-xnest], [Build Xnest server (default: auto)]), [XNEST=$enableval], [XNEST=auto]) AC_ARG_ENABLE(xquartz, AS_HELP_STRING([--enable-xquartz], [Build Xquartz server for OS-X (default: auto)]), [XQUARTZ=$enableval], [XQUARTZ=auto]) AC_ARG_ENABLE(xwayland, AS_HELP_STRING([--enable-xwayland], [Build Xwayland server (default: auto)]), [XWAYLAND=$enableval], [XWAYLAND=auto]) @@ -58,7 +56,7 @@ index d8f0e74..56355fd 100644 AC_ARG_ENABLE(standalone-xpbproxy, AS_HELP_STRING([--enable-standalone-xpbproxy], [Build a standalone xpbproxy (in addition to the one integrated into Xquartz as a separate thread) (default: no)]), [STANDALONE_XPBPROXY=$enableval], [STANDALONE_XPBPROXY=no]) AC_ARG_ENABLE(xwin, AS_HELP_STRING([--enable-xwin], [Build XWin server (default: auto)]), [XWIN=$enableval], [XWIN=auto]) AC_ARG_ENABLE(glamor, AS_HELP_STRING([--enable-glamor], [Build glamor dix module (default: no)]), [GLAMOR=$enableval], [GLAMOR=no]) -@@ -745,6 +746,7 @@ case $host_os in +@@ -750,6 +751,7 @@ case $host_os in XVFB=no XNEST=no XWAYLAND=no @@ -66,7 +64,7 @@ index d8f0e74..56355fd 100644 COMPOSITE=no
