xorg-server: Changes to 'ubuntu'
ChangeLog | 7920 +++++++---
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 | 13
Xext/xace.h | 2
Xext/xcmisc.c | 2
Xext/xf86bigfont.c | 4
Xext/xres.c | 10
Xext/xselinux_hooks.c | 1
Xext/xselinux_label.c | 2
Xext/xtest.c | 2
Xext/xvmain.c | 84
Xi/exevents.c | 9
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 | 150
dbe/dbe.c | 14
dbe/midbe.c | 2
debian/changelog | 70
debian/control | 13
debian/patches/02_kbsd-input-devd.diff | 8
debian/patches/03_static-nettle.diff | 2
debian/patches/05_Revert-Unload-submodules.diff | 2
debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch | 4
debian/patches/191-Xorg-add-an-extra-module-path.patch | 6
debian/patches/208_switch_on_release.diff | 14
debian/patches/227_null_ptr_midispcur.patch | 8
debian/patches/228_autobind_gpu.patch | 4
debian/patches/fix-detach-gpu.patch | 16
debian/patches/fix-ftbfs-ppc64el.patch | 16
debian/patches/fix-xineramaqueryscreens-for-reverse-prime.diff | 70
debian/patches/os-make-sure-the-clientswritable-fd-set-is-initialized.diff | 63
debian/patches/series | 7
debian/patches/xext-fix-udeb-build.diff | 37
debian/patches/xf86-ignore-conflicting-rr-caps.patch | 2
debian/patches/xfree86-no-xv-for-gpuscreens.patch | 14
debian/patches/xi2-resize-touch.patch | 12
debian/patches/xmir-desktop-file-hint-flag.patch | 7
debian/patches/xmir-fixes.diff | 117
debian/patches/xrandr-rroutputchanged-main.patch | 63
debian/rules | 19
debian/serverminver | 6
dix/atom.c | 10
dix/colormap.c | 434
dix/cursor.c | 8
dix/devices.c | 10
dix/dispatch.c | 15
dix/dixfonts.c | 30
dix/enterleave.c | 4
dix/enterleave.h | 2
dix/events.c | 4
dix/extension.c | 6
dix/getevents.c | 71
dix/glyphcurs.c | 4
dix/grabs.c | 8
dix/inpututils.c | 78
dix/main.c | 4
dix/pixmap.c | 201
dix/property.c | 10
dix/protocol.txt | 3
dix/region.c | 2
dix/resource.c | 39
dix/touch.c | 10
dix/window.c | 144
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
fb/fbcopy.c | 2
fb/fbpict.c | 2
glamor/Makefile.am | 2
glamor/glamor.c | 445
glamor/glamor.h | 214
glamor/glamor_addtraps.c | 29
glamor/glamor_composite_glyphs.c | 569
glamor/glamor_compositerects.c | 6
glamor/glamor_copy.c | 93
glamor/glamor_core.c | 44
glamor/glamor_dash.c | 17
glamor/glamor_egl.c | 205
glamor/glamor_egl_stubs.c | 2
glamor/glamor_fbo.c | 242
glamor/glamor_font.c | 35
glamor/glamor_font.h | 2
glamor/glamor_glyphblt.c | 54
glamor/glamor_glyphs.c | 1783 --
glamor/glamor_gradient.c | 41
glamor/glamor_image.c | 31
glamor/glamor_largepixmap.c | 215
glamor/glamor_lines.c | 23
glamor/glamor_picture.c | 916 +
glamor/glamor_pixmap.c | 1036 -
glamor/glamor_points.c | 27
glamor/glamor_prepare.c | 62
glamor/glamor_priv.h | 560
glamor/glamor_program.c | 299
glamor/glamor_program.h | 65
glamor/glamor_rects.c | 28
glamor/glamor_render.c | 555
glamor/glamor_segs.c | 20
glamor/glamor_spans.c | 61
glamor/glamor_text.c | 61
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 | 17
glamor/glamor_window.c | 32
glamor/glamor_xv.c | 53
glx/createcontext.c | 31
glx/extension_string.c | 1
glx/extension_string.h | 1
glx/glxdri2.c | 4
glx/glxdriswrast.c | 2
glx/rensize.c | 1
glx/single2.c | 9
glx/single2swap.c | 9
hw/dmx/config/dmxcompat.c | 2
hw/dmx/config/dmxconfig.c | 12
hw/dmx/config/dmxparse.h | 2
hw/dmx/config/dmxtodmx.c | 1
hw/dmx/config/parser.y | 1
hw/dmx/config/scanner.l | 6
hw/dmx/config/xdmxconfig.c | 1
hw/dmx/dmx.c | 10
hw/dmx/dmxcmap.c | 2
hw/dmx/dmxcursor.c | 2
hw/dmx/dmxextension.c | 4
hw/dmx/dmxfont.c | 6
hw/dmx/dmxgc.c | 2
hw/dmx/dmxinit.c | 4
hw/dmx/dmxpict.c | 10
hw/dmx/dmxprop.c | 2
hw/dmx/dmxwindow.c | 4
hw/dmx/doc/dmx.xml | 2
hw/dmx/doxygen/doxygen.conf.in | 2429 ++-
hw/dmx/glxProxy/glxcmds.c | 34
hw/dmx/glxProxy/glxext.c | 2
hw/dmx/glxProxy/glxscreens.c | 9
hw/dmx/glxProxy/glxsingle.c | 5
hw/dmx/glxProxy/render2swap.c | 34
hw/dmx/glxProxy/renderpixswap.c | 3
hw/dmx/input/dmxarg.c | 2
hw/dmx/input/dmxevents.c | 7
hw/dmx/input/dmxinputinit.c | 4
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 | 34
hw/kdrive/ephyr/hostx.h | 2
hw/kdrive/fake/fake.c | 8
hw/kdrive/fbdev/fbdev.c | 8
hw/kdrive/src/kinput.c | 39
hw/kdrive/src/kshadow.c | 2
hw/kdrive/src/kxv.c | 4
hw/vfb/InitOutput.c | 131
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 | 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 | 55
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 | 230
hw/xfree86/common/xf86xv.c | 10
hw/xfree86/common/xf86xvmc.c | 2
hw/xfree86/ddc/ddc.c | 2
hw/xfree86/dixmods/xkbPrivate.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/pci_ids/i915_pci_ids.h | 4
hw/xfree86/dri2/pci_ids/i965_pci_ids.h | 56
hw/xfree86/dri2/pci_ids/radeonsi_pci_ids.h | 28
hw/xfree86/drivers/modesetting/dri2.c | 4
hw/xfree86/drivers/modesetting/driver.c | 291
hw/xfree86/drivers/modesetting/driver.h | 41
hw/xfree86/drivers/modesetting/drmmode_display.c | 522
hw/xfree86/drivers/modesetting/drmmode_display.h | 19
hw/xfree86/drivers/modesetting/modesetting.man | 18
hw/xfree86/drivers/modesetting/present.c | 456
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/loader/Makefile.am | 2
hw/xfree86/loader/loadmod.c | 10
hw/xfree86/man/Xorg.man | 66
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/xf86RandR12.c | 86
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 | 147
hw/xfree86/os-support/linux/systemd-logind.c | 27
hw/xfree86/os-support/solaris/Makefile.am | 3
hw/xfree86/os-support/solaris/apSolaris.shar | 806 -
hw/xfree86/os-support/xf86_OSlib.h | 9
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/ops.c | 192
hw/xfree86/xorg-wrapper.c | 1
hw/xnest/Color.c | 17
hw/xnest/Display.c | 4
hw/xnest/Events.c | 2
hw/xnest/GC.c | 5
hw/xnest/Keyboard.c | 7
hw/xnest/Screen.c | 4
hw/xquartz/darwinEvents.c | 6
hw/xquartz/quartz.c | 5
hw/xquartz/xpr/xprCursor.c | 2
hw/xquartz/xpr/xprScreen.c | 2
hw/xwayland/xwayland-cursor.c | 1
hw/xwayland/xwayland-glamor.c | 12
hw/xwayland/xwayland-input.c | 346
hw/xwayland/xwayland-output.c | 158
hw/xwayland/xwayland-shm.c | 6
hw/xwayland/xwayland.c | 52
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 | 5
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/list.h | 8
include/misc.h | 3
include/nonsdk_extinit.h | 35
include/opaque.h | 1
include/os.h | 40
include/pixmap.h | 14
include/pixmapstr.h | 5
include/protocol-versions.h | 2
include/resource.h | 15
include/scrnintstr.h | 10
include/swaprep.h | 320
include/swapreq.h | 6
include/window.h | 1
include/windowstr.h | 4
include/xorg-server.h.in | 6
m4/xorg-tls.m4 | 55
man/Xserver.man | 18
mi/miarc.c | 25
mi/mibitblt.c | 16
mi/micmap.c | 8
mi/micopy.c | 4
mi/midispcur.c | 20
mi/mieq.c | 14
mi/miexpose.c | 37
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 | 42
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 | 1
miext/rootless/rootlessConfig.h | 19
miext/rootless/rootlessScreen.c | 3
miext/rootless/rootlessWindow.c | 35
miext/rootless/rootlessWindow.h | 1
miext/shadow/shalloc.c | 2
os/WaitFor.c | 1
os/access.c | 15
os/connection.c | 20
os/log.c | 126
os/osdep.h | 8
os/osinit.c | 5
os/reallocarray.c | 43
os/utils.c | 41
present/present.c | 102
present/present_event.c | 2
present/present_priv.h | 4
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 | 94
randr/rrdispatch.c | 3
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 | 10
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 | 26
render/picture.h | 6
render/picturestr.h | 50
render/render.c | 6
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
431 files changed, 17565 insertions(+), 13889 deletions(-)
New commits:
commit 61e8748c7bc97a7fdc350ea8787e0205995e2f21
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Thu Feb 25 11:50:31 2016 +0200
upload to staging ppa
diff --git a/debian/changelog b/debian/changelog
index d6c20e7..18cd204 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xorg-server (2:1.18.1-1ubuntu3) UNRELEASED; urgency=medium
+xorg-server (2:1.18.1-1ubuntu3) xenial; urgency=medium
* Merge xmir changes from 2:1.17.3-2ubuntu4.
* fix-xineramaqueryscreens-for-reverse-prime.diff: Fix unity-greeter
crash with nvidia prime.
- -- Timo Aaltonen <tjaalton@debian.org> Fri, 19 Feb 2016 12:02:30 +0200
+ -- Timo Aaltonen <tjaalton@debian.org> Thu, 25 Feb 2016 11:49:23 +0200
xorg-server (2:1.18.1-1ubuntu2) xenial; urgency=medium
commit d99c495632d9bf762fa88ae04f241e42f0b96c0a
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Thu Feb 25 11:49:13 2016 +0200
fix-xineramaqueryscreens-for-reverse-prime.diff: Fix unity-greeter crash with nvidia prime.
diff --git a/debian/changelog b/debian/changelog
index 7fc8d2b..d6c20e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
xorg-server (2:1.18.1-1ubuntu3) UNRELEASED; urgency=medium
* Merge xmir changes from 2:1.17.3-2ubuntu4.
+ * fix-xineramaqueryscreens-for-reverse-prime.diff: Fix unity-greeter
+ crash with nvidia prime.
-- Timo Aaltonen <tjaalton@debian.org> Fri, 19 Feb 2016 12:02:30 +0200
diff --git a/debian/patches/fix-xineramaqueryscreens-for-reverse-prime.diff b/debian/patches/fix-xineramaqueryscreens-for-reverse-prime.diff
new file mode 100644
index 0000000..cf253d0
--- /dev/null
+++ b/debian/patches/fix-xineramaqueryscreens-for-reverse-prime.diff
@@ -0,0 +1,70 @@
+commit 7bb64d8c1de9659f11da7917772919b071e9db82
+Author: Jan Burgmeier <jan.burgmeier@unicon-software.com>
+Date: Thu Feb 4 14:06:43 2016 +0100
+
+ Fix XineramaQueryScreens for reverse prime
+
+ Make sure we account for slave CRTCs when building the monitor list,
+ since that's what rrxinerama uses to fake Xinerama geometry.
+
+ [ajax: Slightly more informative commit message.]
+
+ Bugzilla: https://bugs.freedesktop.org/92313
+ Reviewed-by: Dave Airlie <airlied@redhat.com>
+
+diff --git a/randr/rrmonitor.c b/randr/rrmonitor.c
+index c37dcf8..58041bb 100644
+--- a/randr/rrmonitor.c
++++ b/randr/rrmonitor.c
+@@ -326,7 +326,7 @@ RRMonitorMakeList(ScreenPtr screen, Bool get_active, RRMonitorPtr *monitors_ret,
+ RRMonitorSetFromClient(pScrPriv->monitors[list.client_primary], mon);
+ mon++;
+ } else if (list.server_primary >= 0) {
+- RRMonitorSetFromServer(pScrPriv->crtcs[list.server_primary], mon);
++ RRMonitorSetFromServer(list.server_crtc[list.server_primary], mon);
+ mon++;
+ }
+
+@@ -354,8 +354,8 @@ RRMonitorMakeList(ScreenPtr screen, Bool get_active, RRMonitorPtr *monitors_ret,
+
+ /* And finish with the list of crtc-inspired monitors
+ */
+- for (c = 0; c < pScrPriv->numCrtcs; c++) {
+- RRCrtcPtr crtc = pScrPriv->crtcs[c];
++ for (c = 0; c < list.num_crtcs; c++) {
++ RRCrtcPtr crtc = list.server_crtc[c];
+ if (c == list.server_primary && list.client_primary < 0)
+ continue;
+
+diff --git a/randr/rroutput.c b/randr/rroutput.c
+index d12b9ba..686ae49 100644
+--- a/randr/rroutput.c
++++ b/randr/rroutput.c
+@@ -543,6 +543,7 @@ ProcRRSetOutputPrimary(ClientPtr client)
+ WindowPtr pWin;
+ rrScrPrivPtr pScrPriv;
+ int ret;
++ ScreenPtr slave;
+
+ REQUEST_SIZE_MATCH(xRRSetOutputPrimaryReq);
+
+@@ -565,8 +566,19 @@ ProcRRSetOutputPrimary(ClientPtr client)
+
+ pScrPriv = rrGetScrPriv(pWin->drawable.pScreen);
+ if (pScrPriv)
++ {
+ RRSetPrimaryOutput(pWin->drawable.pScreen, pScrPriv, output);
+
++ xorg_list_for_each_entry(slave,
++ &pWin->drawable.pScreen->output_slave_list,
++ output_head) {
++ rrScrPrivPtr pSlavePriv;
++ pSlavePriv = rrGetScrPriv(slave);
++
++ RRSetPrimaryOutput(slave, pSlavePriv, output);
++ }
++ }
++
+ return Success;
+ }
+
diff --git a/debian/patches/series b/debian/patches/series
index d3b62d0..6ee13f3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -50,3 +50,4 @@ xmir-desktop-file-hint-flag.patch
drm_device_keep_trying.patch
xi2-resize-touch.patch
xmir-fixes.diff
+fix-xineramaqueryscreens-for-reverse-prime.diff
commit 15cc6a09a9b794bb85ad46c654c2c7e179df34ba
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Fri Feb 19 12:04:16 2016 +0200
update the changelog
diff --git a/debian/changelog b/debian/changelog
index c90c5f3..7fc8d2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.18.1-1ubuntu3) UNRELEASED; urgency=medium
+
+ * Merge xmir changes from 2:1.17.3-2ubuntu4.
+
+ -- Timo Aaltonen <tjaalton@debian.org> Fri, 19 Feb 2016 12:02:30 +0200
+
xorg-server (2:1.18.1-1ubuntu2) xenial; urgency=medium
* Merge xmir changes from 2:1.17.3-2ubuntu3.
commit 41bb5bf140d81edc4ae7db2e84d70eae392c7fc0
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Tue Feb 16 10:02:48 2016 +0200
Merge xmir changes from 2:1.17.3-2ubuntu3.
diff --git a/debian/changelog b/debian/changelog
index 9440892..f91dad1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.18.1-1ubuntu2) xenial; urgency=medium
+
+ * Merge xmir changes from 2:1.17.3-2ubuntu3.
+
+ -- Timo Aaltonen <tjaalton@debian.org> Tue, 16 Feb 2016 10:02:03 +0200
+
xorg-server (2:1.18.1-1ubuntu1) xenial; urgency=medium
* Merge from Debian experimental
commit 11602a83f60d8adcc53551832c2aeddc46e6a0aa
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Tue Feb 16 08:15:43 2016 +0200
refresh xmir-fixes.diff
diff --git a/debian/patches/xmir-fixes.diff b/debian/patches/xmir-fixes.diff
index ea5b035..6b547e6 100644
--- a/debian/patches/xmir-fixes.diff
+++ b/debian/patches/xmir-fixes.diff
@@ -17,7 +17,7 @@ Description: port xmir to 1.18
} else {
--- a/hw/xmir/xmir.c
+++ b/hw/xmir/xmir.c
-@@ -1211,7 +1211,7 @@ xmir_create_screen_resources(ScreenPtr s
+@@ -1256,7 +1256,7 @@ xmir_create_screen_resources(ScreenPtr s
if (xmir_screen->glamor && !xmir_screen->rootless) {
glamor_pixmap_private *pixmap_priv = glamor_get_pixmap_private(screen->devPrivate);
commit 91e73c64a139a423e1ab07ebb2fb6ef8a3c3e90d
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Tue Feb 9 10:54:40 2016 +0200
release to ppa
diff --git a/debian/changelog b/debian/changelog
index 7a9cd96..cc537ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.18.1-1ubuntu1) UNRELEASED; urgency=medium
+xorg-server (2:1.18.1-1ubuntu1) xenial; urgency=medium
* Merge from Debian experimental
* patches: Refreshed, dropped what's upstream.
commit 80bbd5bc8f276cd24561308d02bfb5e2d6b7d2e5
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Tue Feb 9 10:54:02 2016 +0200
update the changelog
diff --git a/debian/changelog b/debian/changelog
index 0ccbcfa..7a9cd96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg-server (2:1.18.1-1ubuntu1) UNRELEASED; urgency=medium
+
+ * Merge from Debian experimental
+ * patches: Refreshed, dropped what's upstream.
+ * xmir-fixes.diff: Port xmir to 1.18.
+ * fix-ftbfs-ppc64el.patch: Dropped, not needed anymore.
+
+ -- Timo Aaltonen <tjaalton@debian.org> Tue, 08 Dec 2015 19:47:06 +0200
+
xorg-server (2:1.18.1-1) unstable; urgency=medium
* New upstream release.
@@ -8,15 +17,6 @@ xorg-server (2:1.18.1-1) unstable; urgency=medium
-- Timo Aaltonen <tjaalton@debian.org> Tue, 09 Feb 2016 10:27:18 +0200
-xorg-server (2:1.18.0-3ubuntu1) UNRELEASED; urgency=medium
-
- * Merge from Debian experimental
- * patches: Refreshed, dropped what's upstream.
- * xmir-fixes.diff: Port xmir to 1.18.
- * fix-ftbfs-ppc64el.patch: Dropped, not needed anymore.
-
- -- Timo Aaltonen <tjaalton@debian.org> Tue, 08 Dec 2015 19:47:06 +0200
-
xorg-server (2:1.18.0-3) unstable; urgency=medium
* update-intel-pciids.diff: Sync dri2 mapping ids for intel.
commit 8321c9b0eaf138064f11d51978801044c948e333
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Tue Feb 9 10:27:37 2016 +0200
release to unstable
diff --git a/debian/changelog b/debian/changelog
index 126c8e4..ebe35b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.18.1-1) UNRELEASED; urgency=medium
+xorg-server (2:1.18.1-1) unstable; urgency=medium
* New upstream release.
* add_support_new_libsystemd.patch,
@@ -6,7 +6,7 @@ xorg-server (2:1.18.1-1) UNRELEASED; urgency=medium
update-intel-pciids.diff:
- dropped, upstream
- -- Timo Aaltonen <tjaalton@debian.org> Tue, 09 Feb 2016 09:59:37 +0200
+ -- Timo Aaltonen <tjaalton@debian.org> Tue, 09 Feb 2016 10:27:18 +0200
xorg-server (2:1.18.0-3) unstable; urgency=medium
commit 5986392afbe4a54335ac6c85a2fde36ea39097e3
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Tue Feb 9 10:26:22 2016 +0200
update changelog, drop upstream patches
diff --git a/debian/changelog b/debian/changelog
index be300ae..126c8e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xorg-server (2:1.18.1-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+ * add_support_new_libsystemd.patch,
+ glamor-disable-debugging-msgs.diff,
+ update-intel-pciids.diff:
+ - dropped, upstream
+
+ -- Timo Aaltonen <tjaalton@debian.org> Tue, 09 Feb 2016 09:59:37 +0200
+
xorg-server (2:1.18.0-3) unstable; urgency=medium
* update-intel-pciids.diff: Sync dri2 mapping ids for intel.
diff --git a/debian/patches/add_support_new_libsystemd.patch b/debian/patches/add_support_new_libsystemd.patch
deleted file mode 100644
index d642b60..0000000
--- a/debian/patches/add_support_new_libsystemd.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -849,7 +849,7 @@ if test "x$WITH_SYSTEMD_DAEMON" = xyes;
- AC_MSG_ERROR([systemd support requested but no library has been found])
- fi
- AC_DEFINE(HAVE_SYSTEMD_DAEMON, 1, [Define to 1 if libsystemd-daemon is available])
-- REQUIRED_LIBS="$REQUIRED_LIBS libsystemd-daemon"
-+ REQUIRED_LIBS="$REQUIRED_LIBS libsystemd"
- fi
- AM_CONDITIONAL([HAVE_SYSTEMD_DAEMON], [test "x$HAVE_SYSTEMD_DAEMON" = "xyes"])
-
diff --git a/debian/patches/glamor-disable-debugging-msgs.diff b/debian/patches/glamor-disable-debugging-msgs.diff
deleted file mode 100644
index 6556848..0000000
--- a/debian/patches/glamor-disable-debugging-msgs.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-commit 1db6de7b6a6ee240eb50a13fe1fa1e135d7cb93b
-Author: Michel Dänzer <michel.daenzer@amd.com>
-Date: Tue Jan 12 15:42:47 2016 +0900
-
- glamor: Disable debugging messages other than GL API errors
-
- According to Nicolai Hähnle, the relevant specification says "All
- messages are initially enabled unless their assigned severity is
- DEBUG_SEVERITY_LOW", so we need to explicitly disable the messages we
- don't want to get. Failing that, we were accidentally logging e.g.
- shader stats intended for shader-db.
-
- Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93659
- Tested-by: Laurent Carlier <lordheavym@gmail.com>
- Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
- Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
- Reviewed-by: Eric Anholt <eric@anholt.net>
-
-diff --git a/glamor/glamor.c b/glamor/glamor.c
-index 116d10c..81aba2d 100644
---- a/glamor/glamor.c
-+++ b/glamor/glamor.c
-@@ -393,6 +393,9 @@ glamor_setup_debug_output(ScreenPtr screen)
- return;
-
- glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS);
-+ /* Disable debugging messages other than GL API errors */
-+ glDebugMessageControl(GL_DONT_CARE, GL_DONT_CARE, GL_DONT_CARE, 0, NULL,
-+ GL_FALSE);
- glDebugMessageControl(GL_DEBUG_SOURCE_API,
- GL_DEBUG_TYPE_ERROR,
- GL_DONT_CARE,
diff --git a/debian/patches/series b/debian/patches/series
index 4055e15..2c8af94 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,6 +5,3 @@
03_static-nettle.diff
05_Revert-Unload-submodules.diff
#08_xfree86_fix_ia64_inx_outx.diff
-add_support_new_libsystemd.patch
-update-intel-pciids.diff
-glamor-disable-debugging-msgs.diff
diff --git a/debian/patches/update-intel-pciids.diff b/debian/patches/update-intel-pciids.diff
deleted file mode 100644
index e67819b..0000000
--- a/debian/patches/update-intel-pciids.diff
+++ /dev/null
@@ -1,87 +0,0 @@
-commit 51cf2ea3f846fd7785754f7a31d35514daa8a672
-Author: Timo Aaltonen <tjaalton@debian.org>
-Date: Wed Jan 27 13:56:29 2016 +0200
-
- dri2: Sync i915_pci_ids.h and i965_pci_ids.h from mesa
-
- Adds Skylake, Kabylake and Broxton allowing them to use
- modesetting + glamor with dri2.
-
- Signed-off-by: Timo Aaltonen <timo.aaltonen@canonical.com>
-
-diff --git a/hw/xfree86/dri2/pci_ids/i915_pci_ids.h b/hw/xfree86/dri2/pci_ids/i915_pci_ids.h
-index 7d51975..1c43c8e 100644
---- a/hw/xfree86/dri2/pci_ids/i915_pci_ids.h
-+++ b/hw/xfree86/dri2/pci_ids/i915_pci_ids.h
-@@ -11,5 +11,5 @@ CHIPSET(0x27AE, I945_GME, "Intel(R) 945GME")
- CHIPSET(0x29B2, Q35_G, "Intel(R) Q35")
- CHIPSET(0x29C2, G33_G, "Intel(R) G33")
- CHIPSET(0x29D2, Q33_G, "Intel(R) Q33")
--CHIPSET(0xA011, IGD_GM, "Intel(R) IGD")
--CHIPSET(0xA001, IGD_G, "Intel(R) IGD")
-+CHIPSET(0xA011, PNV_GM, "Intel(R) Pineview M")
-+CHIPSET(0xA001, PNV_G, "Intel(R) Pineview")
-diff --git a/hw/xfree86/dri2/pci_ids/i965_pci_ids.h b/hw/xfree86/dri2/pci_ids/i965_pci_ids.h
-index 2e04301..5139e27 100644
---- a/hw/xfree86/dri2/pci_ids/i965_pci_ids.h
-+++ b/hw/xfree86/dri2/pci_ids/i965_pci_ids.h
-@@ -109,7 +109,55 @@ CHIPSET(0x162A, bdw_gt3, "Intel(R) Iris Pro P6300 (Broadwell GT3e)")
- CHIPSET(0x162B, bdw_gt3, "Intel(R) Iris 6100 (Broadwell GT3)")
- CHIPSET(0x162D, bdw_gt3, "Intel(R) Broadwell GT3")
- CHIPSET(0x162E, bdw_gt3, "Intel(R) Broadwell GT3")
--CHIPSET(0x22B0, chv, "Intel(R) Cherryview")
--CHIPSET(0x22B1, chv, "Intel(R) Cherryview")
--CHIPSET(0x22B2, chv, "Intel(R) Cherryview")
--CHIPSET(0x22B3, chv, "Intel(R) Cherryview")
-+CHIPSET(0x1902, skl_gt1, "Intel(R) HD Graphics 510 (Skylake GT1)")
-+CHIPSET(0x1906, skl_gt1, "Intel(R) HD Graphics 510 (Skylake GT1)")
-+CHIPSET(0x190A, skl_gt1, "Intel(R) Skylake GT1")
-+CHIPSET(0x190E, skl_gt1, "Intel(R) Skylake GT1")
-+CHIPSET(0x1912, skl_gt2, "Intel(R) HD Graphics 530 (Skylake GT2)")
-+CHIPSET(0x1913, skl_gt2, "Intel(R) Skylake GT2f")
-+CHIPSET(0x1915, skl_gt2, "Intel(R) Skylake GT2f")
-+CHIPSET(0x1916, skl_gt2, "Intel(R) HD Graphics 520 (Skylake GT2)")
-+CHIPSET(0x1917, skl_gt2, "Intel(R) Skylake GT2f")
-+CHIPSET(0x191A, skl_gt2, "Intel(R) Skylake GT2")
-+CHIPSET(0x191B, skl_gt2, "Intel(R) HD Graphics 530 (Skylake GT2)")
-+CHIPSET(0x191D, skl_gt2, "Intel(R) HD Graphics P530 (Skylake GT2)")
-+CHIPSET(0x191E, skl_gt2, "Intel(R) HD Graphics 515 (Skylake GT2)")
-+CHIPSET(0x1921, skl_gt2, "Intel(R) Skylake GT2")
-+CHIPSET(0x1923, skl_gt3, "Intel(R) Iris Graphics 540 (Skylake GT3e)")
-+CHIPSET(0x1926, skl_gt3, "Intel(R) HD Graphics 535 (Skylake GT3)")
-+CHIPSET(0x1927, skl_gt3, "Intel(R) Iris Graphics 550 (Skylake GT3e)")
-+CHIPSET(0x192A, skl_gt4, "Intel(R) Skylake GT4")
-+CHIPSET(0x192B, skl_gt3, "Intel(R) Iris Graphics (Skylake GT3fe)")
-+CHIPSET(0x1932, skl_gt4, "Intel(R) Skylake GT4")
-+CHIPSET(0x193A, skl_gt4, "Intel(R) Skylake GT4")
-+CHIPSET(0x193B, skl_gt4, "Intel(R) Skylake GT4")
-+CHIPSET(0x193D, skl_gt4, "Intel(R) Skylake GT4")
-+CHIPSET(0x5902, kbl_gt1, "Intel(R) Kabylake GT1")
-+CHIPSET(0x5906, kbl_gt1, "Intel(R) Kabylake GT1")
-+CHIPSET(0x590A, kbl_gt1, "Intel(R) Kabylake GT1")
-+CHIPSET(0x590B, kbl_gt1, "Intel(R) Kabylake GT1")
-+CHIPSET(0x590E, kbl_gt1, "Intel(R) Kabylake GT1")
-+CHIPSET(0x5913, kbl_gt1_5, "Intel(R) Kabylake GT1.5")
-+CHIPSET(0x5915, kbl_gt1_5, "Intel(R) Kabylake GT1.5")
-+CHIPSET(0x5917, kbl_gt1_5, "Intel(R) Kabylake GT1.5")
-+CHIPSET(0x5912, kbl_gt2, "Intel(R) Kabylake GT2")
-+CHIPSET(0x5916, kbl_gt2, "Intel(R) Kabylake GT2")
-+CHIPSET(0x591A, kbl_gt2, "Intel(R) Kabylake GT2")
-+CHIPSET(0x591B, kbl_gt2, "Intel(R) Kabylake GT2")
-+CHIPSET(0x591D, kbl_gt2, "Intel(R) Kabylake GT2")
-+CHIPSET(0x591E, kbl_gt2, "Intel(R) Kabylake GT2")
-+CHIPSET(0x5921, kbl_gt2, "Intel(R) Kabylake GT2F")
-+CHIPSET(0x5926, kbl_gt3, "Intel(R) Kabylake GT3")
-+CHIPSET(0x592A, kbl_gt3, "Intel(R) Kabylake GT3")
-+CHIPSET(0x592B, kbl_gt3, "Intel(R) Kabylake GT3")
-+CHIPSET(0x5932, kbl_gt4, "Intel(R) Kabylake GT4")
-+CHIPSET(0x593A, kbl_gt4, "Intel(R) Kabylake GT4")
-+CHIPSET(0x593B, kbl_gt4, "Intel(R) Kabylake GT4")
-+CHIPSET(0x593D, kbl_gt4, "Intel(R) Kabylake GT4")
-+CHIPSET(0x22B0, chv, "Intel(R) HD Graphics (Cherryview)")
-+CHIPSET(0x22B1, chv, "Intel(R) HD Graphics (Cherryview)")
-+CHIPSET(0x22B2, chv, "Intel(R) HD Graphics (Cherryview)")
-+CHIPSET(0x22B3, chv, "Intel(R) HD Graphics (Cherryview)")
-+CHIPSET(0x0A84, bxt, "Intel(R) HD Graphics (Broxton)")
-+CHIPSET(0x1A84, bxt, "Intel(R) HD Graphics (Broxton)")
-+CHIPSET(0x5A84, bxt, "Intel(R) HD Graphics (Broxton)")
commit 23e60f917a5af652cd83b8a3a9951c79838721b3
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Feb 8 18:32:57 2016 -0500
xserver 1.18.1
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/configure.ac b/configure.ac
index a9b6954..4808ef4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,9 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.18.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2015-11-09"
-RELEASE_NAME="Moussaka"
+AC_INIT([xorg-server], 1.18.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2016-02-08"
+RELEASE_NAME="Spanakopita"
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
commit a92eb5f6454085c39d751da0a77677d2b1123fe2
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Thu Jan 28 14:53:59 2016 +0200
drop fix-ftbfs-ppc64el.patch, update changelog
diff --git a/debian/changelog b/debian/changelog
index 8c36692..77650de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg-server (2:1.18.0-3ubuntu1) UNRELEASED; urgency=medium
+
+ * Merge from Debian experimental
+ * patches: Refreshed, dropped what's upstream.
+ * xmir-fixes.diff: Port xmir to 1.18.
+ * fix-ftbfs-ppc64el.patch: Dropped, not needed anymore.
+
+ -- Timo Aaltonen <tjaalton@debian.org> Tue, 08 Dec 2015 19:47:06 +0200
+
xorg-server (2:1.18.0-3) unstable; urgency=medium
* update-intel-pciids.diff: Sync dri2 mapping ids for intel.
@@ -6,14 +15,6 @@ xorg-server (2:1.18.0-3) unstable; urgency=medium
-- Timo Aaltonen <tjaalton@debian.org> Wed, 27 Jan 2016 16:41:59 +0200
-xorg-server (2:1.18.0-1ubuntu1) UNRELEASED; urgency=medium
-
- * Merge from Debian experimental
- * patches: Refreshed, dropped what's upstream.
- * xmir-fixes.diff: Port xmir to 1.18.
-
- -- Timo Aaltonen <tjaalton@debian.org> Tue, 08 Dec 2015 19:47:06 +0200
-
xorg-server (2:1.18.0-2) unstable; urgency=medium
[ Laurent Bigonville ]
diff --git a/debian/patches/fix-ftbfs-ppc64el.patch b/debian/patches/fix-ftbfs-ppc64el.patch
deleted file mode 100644
index fa452c1..0000000
--- a/debian/patches/fix-ftbfs-ppc64el.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix ftbfs on ppc64el
-Author: Maarten Lankhorst <maarten.lankhorst@ubuntu.com>
-
-diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
-index a9a9fa5..f88cdc0 100644
---- a/hw/kdrive/src/kinput.c
-+++ b/hw/kdrive/src/kinput.c
-@@ -221,7 +221,7 @@ KdUnregisterFd(void *closure, int fd, Bool do_close)
- if (do_close)
- close(kdInputFds[i].fd);
- kdNumInputFds--;
-- for (j = i; j < (kdNumInputFds - 1); j++)
-+ for (j = i; j < (kdNumInputFds - 1) && j < (KD_MAX_INPUT_FDS - 1); j++)
- kdInputFds[j] = kdInputFds[j + 1];
- break;
- }
diff --git a/debian/patches/series b/debian/patches/series
index 4426023..7cf15e7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -48,7 +48,6 @@ xf86-ignore-conflicting-rr-caps.patch
fix-detach-gpu.patch
disable-rotation-transform-gpuscreens.patch
-fix-ftbfs-ppc64el.patch
xmir.patch
xmir-desktop-file-hint-flag.patch
drm_device_keep_trying.patch
commit a0d49b1c660f2453d07ce23bf86b0ef717f3d2c8
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Wed Jan 27 14:18:50 2016 +0200
dri2: Sync i915_pci_ids.h and i965_pci_ids.h from mesa
Adds Skylake, Kabylake and Broxton allowing them to use
modesetting + glamor with dri2.
Reply to: