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 | 128
dbe/dbe.c | 14
dbe/midbe.c | 2
debian/changelog | 29
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/add_support_new_libsystemd.patch | 11
debian/patches/series | 2
debian/patches/xext-fix-udeb-build.diff | 37
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 | 180
dix/property.c | 10
dix/protocol.txt | 3
dix/region.c | 2
dix/resource.c | 39
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
fb/fbcopy.c | 2
fb/fbpict.c | 2
glamor/Makefile.am | 2
glamor/glamor.c | 435 -
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_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 | 893 ++
glamor/glamor_pixmap.c | 1036 ---
glamor/glamor_points.c | 27
glamor/glamor_prepare.c | 62
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/rensize.c | 1
glx/single2.c | 9
glx/single2swap.c | 9
hw/dmx/config/dmxconfig.c | 10
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/glxProxy/glxcmds.c | 34
hw/dmx/glxProxy/glxext.c | 2
hw/dmx/glxProxy/glxscreens.c | 9
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 | 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 | 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 | 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/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 | 522 +
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/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 | 26
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/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/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 | 8
hw/xwayland/xwayland-input.c | 326
hw/xwayland/xwayland-output.c | 111
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 | 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/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/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 | 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 | 19
os/osdep.h | 8
os/osinit.c | 5
os/reallocarray.c | 43
os/utils.c | 41
present/present.c | 27
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 | 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
392 files changed, 14741 insertions(+), 12684 deletions(-)
New commits:
commit 8c7f308ff346a05acfe3b811f8a414bc8cf72125
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Tue Jan 26 16:31:08 2016 +0200
release to unstable
diff --git a/debian/changelog b/debian/changelog
index df2e086..b8bc1cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.18.0-2) UNRELEASED; urgency=medium
+xorg-server (2:1.18.0-2) unstable; urgency=medium
[ Laurent Bigonville ]
* Enable systemd socket activation support (Closes: #803254)
@@ -7,7 +7,7 @@ xorg-server (2:1.18.0-2) UNRELEASED; urgency=medium
* Let xserver-xorg-dev depend on libxfont-dev, as dixfont.h needs
fontutil.h.
- -- Laurent Bigonville <bi...@debian.org> Sat, 05 Dec 2015 20:26:53 +0100
+ -- Timo Aaltonen <tjaal...@debian.org> Tue, 26 Jan 2016 16:25:33 +0200
xorg-server (2:1.18.0-1) experimental; urgency=medium
commit 03209b64a0bfcd0d76bf7438f9a33502081b8a05
Author: Emilio Pozuelo Monfort <po...@debian.org>
Date: Tue Dec 22 16:44:46 2015 +0100
Let xserver-xorg-dev depend on libxfont-dev
diff --git a/debian/changelog b/debian/changelog
index decde27..df2e086 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
xorg-server (2:1.18.0-2) UNRELEASED; urgency=medium
+ [ Laurent Bigonville ]
* Enable systemd socket activation support (Closes: #803254)
+ [ Emilio Pozuelo Monfort ]
+ * Let xserver-xorg-dev depend on libxfont-dev, as dixfont.h needs
+ fontutil.h.
+
-- Laurent Bigonville <bi...@debian.org> Sat, 05 Dec 2015 20:26:53 +0100
xorg-server (2:1.18.0-1) experimental; urgency=medium
diff --git a/debian/control b/debian/control
index f58a7b3..cce4d7a 100644
--- a/debian/control
+++ b/debian/control
@@ -213,6 +213,7 @@ Depends:
x11proto-xf86bigfont-dev (>= 1.2.0),
x11proto-dri3-dev,
x11proto-present-dev,
+ libxfont-dev,
libxkbfile-dev,
libpciaccess-dev,
mesa-common-dev,
commit 336d09cee7d7e8b1a1e4ea136911fb2ee416e35f
Author: Laurent Bigonville <bi...@bigon.be>
Date: Sat Dec 5 20:27:27 2015 +0100
Enable systemd socket activation support (Closes: #803254)
diff --git a/debian/changelog b/debian/changelog
index 09f1c95..decde27 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.18.0-2) UNRELEASED; urgency=medium
+
+ * Enable systemd socket activation support (Closes: #803254)
+
+ -- Laurent Bigonville <bi...@debian.org> Sat, 05 Dec 2015 20:26:53 +0100
+
xorg-server (2:1.18.0-1) experimental; urgency=medium
* New upstream release.
diff --git a/debian/control b/debian/control
index 16c1496..f58a7b3 100644
--- a/debian/control
+++ b/debian/control
@@ -98,6 +98,8 @@ Build-Depends:
libwayland-dev [linux-any],
#logind
libdbus-1-dev (>= 1.0) [linux-any],
+# systemd-daemon
+ libsystemd-dev [linux-any],
Standards-Version: 3.9.6
Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/xserver/xorg-server.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/xserver/xorg-server.git
diff --git a/debian/patches/add_support_new_libsystemd.patch
b/debian/patches/add_support_new_libsystemd.patch
new file mode 100644
index 0000000..d642b60
--- /dev/null
+++ b/debian/patches/add_support_new_libsystemd.patch
@@ -0,0 +1,11 @@
+--- 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/series b/debian/patches/series
index 2c8af94..d0ff25a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
03_static-nettle.diff
05_Revert-Unload-submodules.diff
#08_xfree86_fix_ia64_inx_outx.diff
+add_support_new_libsystemd.patch
diff --git a/debian/rules b/debian/rules
index fe1469a..9013e08 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,13 +44,15 @@ endif
ifeq ($(DEB_HOST_ARCH_OS), linux)
- selinux = --enable-xselinux
- wayland = --enable-xwayland
- logind = --enable-systemd-logind
+ selinux = --enable-xselinux
+ wayland = --enable-xwayland
+ logind = --enable-systemd-logind
+ systemd-daemon = --with-systemd-daemon
else
- selinux = --disable-xselinux
- wayland = --disable-xwayland
- logind = --disable-systemd-logind
+ selinux = --disable-xselinux
+ wayland = --disable-xwayland
+ logind = --disable-systemd-logind
+ systemd-daemon = --without-systemd-daemon
endif
ifeq ($(DEB_HOST_ARCH_OS), hurd)
@@ -165,6 +167,7 @@ confflags_main = \
--enable-xfree86-utils \
$(wayland) \
$(logind) \
+ $(systemd-daemon) \
--enable-suid-wrapper \
--enable-dmx \
--enable-xvfb \
@@ -198,6 +201,7 @@ confflags_udeb = \
--disable-xfree86-utils \
--disable-xwayland \
--disable-systemd-logind \
+ --without-systemd-daemon \
--disable-suid-wrapper \
--disable-dmx \
--disable-xvfb \
commit 30ad9c3f778833344e49f5a0455514955a10a947
Author: Julien Cristau <jcris...@debian.org>
Date: Tue Nov 10 22:40:56 2015 +0100
Upload to experimental
diff --git a/debian/changelog b/debian/changelog
index 937a1ac..09f1c95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xorg-server (2:1.18.0-1) UNRELEASED; urgency=medium
+xorg-server (2:1.18.0-1) experimental; urgency=medium
* New upstream release.
- drop xext-fix-udeb-build.diff, merged upstream
* Extend libgbm-dev build-dep to kfreebsd-any as well as linux-any.
- -- Julien Cristau <jcris...@debian.org> Mon, 09 Nov 2015 22:21:51 +0100
+ -- Julien Cristau <jcris...@debian.org> Tue, 10 Nov 2015 22:40:43 +0100
xorg-server (2:1.17.99.902-1) experimental; urgency=medium
commit 90a629cf3f1ab5a201fb1ceb46a6c7b7ad91ec26
Author: Julien Cristau <jcris...@debian.org>
Date: Tue Nov 10 22:40:08 2015 +0100
Extend libgbm-dev build-dep to kfreebsd-any as well as linux-any.
diff --git a/debian/changelog b/debian/changelog
index 3117629..937a1ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xorg-server (2:1.18.0-1) UNRELEASED; urgency=medium
* New upstream release.
- drop xext-fix-udeb-build.diff, merged upstream
+ * Extend libgbm-dev build-dep to kfreebsd-any as well as linux-any.
-- Julien Cristau <jcris...@debian.org> Mon, 09 Nov 2015 22:21:51 +0100
diff --git a/debian/control b/debian/control
index 1faa02a..16c1496 100644
--- a/debian/control
+++ b/debian/control
@@ -74,7 +74,7 @@ Build-Depends:
# glamor
libepoxy-dev [linux-any kfreebsd-any],
libegl1-mesa-dev [linux-any kfreebsd-any],
- libgbm-dev [linux-any],
+ libgbm-dev (>= 10.2) [linux-any kfreebsd-any],
# XCB bits for Xephyr
libxcb1-dev,
libxcb-shape0-dev,
commit 8ac961a9ecd80db129d79ce5ee3afee28cb39026
Author: Julien Cristau <jcris...@debian.org>
Date: Mon Nov 9 22:23:20 2015 +0100
One dropped patch
diff --git a/debian/changelog b/debian/changelog
index a20a372..3117629 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xorg-server (2:1.18.0-1) UNRELEASED; urgency=medium
* New upstream release.
+ - drop xext-fix-udeb-build.diff, merged upstream
-- Julien Cristau <jcris...@debian.org> Mon, 09 Nov 2015 22:21:51 +0100
diff --git a/debian/patches/series b/debian/patches/series
index ea13f87..2c8af94 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,3 @@
03_static-nettle.diff
05_Revert-Unload-submodules.diff
#08_xfree86_fix_ia64_inx_outx.diff
-xext-fix-udeb-build.diff
diff --git a/debian/patches/xext-fix-udeb-build.diff
b/debian/patches/xext-fix-udeb-build.diff
deleted file mode 100644
index dd41201..0000000
--- a/debian/patches/xext-fix-udeb-build.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-From aaa1928f80c6b3cae614182248a41f92f7f865af Mon Sep 17 00:00:00 2001
-From: Julien Cristau <jcris...@debian.org>
-Date: Tue, 27 Oct 2015 13:02:18 +0100
-Subject: [PATCH xserver] Xext: fix build with --disable-xace
-
-Regression from 990cf5b2828f73dc7a07f1e38f608af39acfd81d
-
-Signed-off-by: Julien Cristau <jcris...@debian.org>
-Cc: Andrew Eikum <aei...@codeweavers.com>
-Cc: Peter Hutterer <peter.hutte...@who-t.net>
----
- Xext/xace.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/Xext/xace.h b/Xext/xace.h
-index 3303f76..6a8d0c4 100644
---- a/Xext/xace.h
-+++ b/Xext/xace.h
-@@ -112,6 +112,7 @@ extern _X_EXPORT void XaceCensorImage(ClientPtr client,
-
- #ifdef __GNUC__
- #define XaceHook(args...) Success
-+#define XaceHookIsSet(args...) 0
- #define XaceHookDispatch(args...) Success
- #define XaceHookPropertyAccess(args...) Success
- #define XaceHookSelectionAccess(args...) Success
-@@ -119,6 +120,7 @@ extern _X_EXPORT void XaceCensorImage(ClientPtr client,
- #define XaceCensorImage(args...) { ; }
- #else
- #define XaceHook(...) Success
-+#define XaceHookIsSet(...) 0
- #define XaceHookDispatch(...) Success
- #define XaceHookPropertyAccess(...) Success
- #define XaceHookSelectionAccess(...) Success
---
-2.6.1
-
commit 690d52a8996c36f5eaf4122cdffaf8cbbf2984d9
Author: Julien Cristau <jcris...@debian.org>
Date: Mon Nov 9 22:22:42 2015 +0100
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index 25db34c..e37f173 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,221 @@
+commit 43fb888bd01cf9d3d277e77a52a3d0c93ccff8bd
+Author: Adam Jackson <a...@redhat.com>
+Date: Mon Nov 9 16:00:26 2015 -0500
+
+ xserver 1.18.0
+
+ Signed-off-by: Adam Jackson <a...@redhat.com>
+
+commit 2203735887ab548b3ee004400d1b89149aae412c
+Author: Axel Davy <axel.d...@ens.fr>
+Date: Wed Nov 4 18:42:42 2015 +0100
+
+ present: Fix Async swap logic
+
+ According to the spec, PresentOptionAsync should only
+ trigger a different behaviour when the target msc has been reached.
+
+ In this case if the driver is able to do async swaps, we use
+ them to avoid a screen copy.
+
+ When the target msc hasn't been reached yet, we want to use sync swaps.
+
+ v2: Fix indentation and simplify checks for Async flips
+
+ Signed-off-by: Axel Davy <axel.d...@ens.fr>
+ Reviewed-by: Michel Dänzer <michel.daen...@amd.com>
+
+commit 3f35909acba117dc8934920d788c7ce612bce444
+Author: Jammy Zhou <jammy.z...@amd.com>
+Date: Wed Oct 28 18:39:10 2015 +0800
+
+ present: Execute right away if target_msc equals current_msc
+
+ It is according to the protocol:
+
+ "If 'options' contains PresentOptionAsync, and the 'target-msc'
+ is less than or equal to the current msc for 'window', then
+ the operation will be performed as soon as possible, not
+ necessarily waiting for the next vertical blank interval."
+
+ Signed-off-by: Jammy Zhou <jammy.z...@amd.com>
+ Reviewed-by: Michel Dänzer <michel.daen...@amd.com>
+ Reviewed-by: Axel Davy <axel.d...@ens.fr>
+
+commit 7d1e4783853f9830344d101ceab087feb19995be
+Author: Daniel Martin <consume.no...@gmail.com>
+Date: Thu Oct 29 14:58:11 2015 +0100
+
+ modesetting: Remove XF86_CRTC_VERSION checks
+
+ The ifdef checks for XF86_CRTC_VERSION >= 3/5 are remnants from the
+ out-of-tree driver. Within the tree, we can rely on:
+ xf86Crtc.h:#define XF86_CRTC_VERSION 6
+
+ Signed-off-by: Daniel Martin <consume.no...@gmail.com>
+ Reviewed-by: Emil Velikov <emil.l.veli...@gmail.com>
+ Reviewed-by: Alex Deucher <alexander.deuc...@amd.com>
+
+commit 45c83a266d18eb515313aa3f1a4d7ff6af53be5d
+Author: Daniel Martin <consume.no...@gmail.com>
+Date: Thu Oct 29 14:58:10 2015 +0100
+
+ modesetting: Free output_ids in drmmode_set_mode_major()
+
+ We calloc() output_ids. Let's free() it, too.
+
+ Signed-off-by: Daniel Martin <consume.no...@gmail.com>
+ Reviewed-by: Emil Velikov <emil.l.veli...@gmail.com>
+ Reviewed-by: Alex Deucher <alexander.deuc...@amd.com>
+
+commit 2674d424020bd71d4f99b8d8de8b0b21aa490d54
+Author: Daniel Martin <consume.no...@gmail.com>
+Date: Thu Oct 29 14:58:09 2015 +0100
+
+ modesetting: Handle failures in setting a CRTC to a DRM mode properly
+
+ This fixes a bug where running the card out of PPLL's when hotplugging
+ another monitor would result in all of the displays going blank and
+ failing to work properly until X was restarted or the user switched to
+ another VT.
+
+ [Michel Dänzer: Pass errno instead of -ret to strerror()]
+ [Daniel Martin: Add \n to log message]
+
+ Picked from xf86-video-ati
+ 7186a87 Handle failures in setting a CRTC to a DRM mode properly
+
+ Signed-off-by: Daniel Martin <consume.no...@gmail.com>
+ Reviewed-by: Emil Velikov <emil.l.veli...@gmail.com>
+ Reviewed-by: Alex Deucher <alexander.deuc...@amd.com>
+
+commit 250666586e2b6f3ed1371340452dc2be2d094d40
+Author: Adam Jackson <a...@redhat.com>
+Date: Thu Oct 29 10:08:17 2015 -0400
+
+ vidmode: Drop the unused event code
+
+ As the code says, this is "far from complete". So far, in fact, that
+ it's been basically untouched for twenty years (XFree86 3.1!). As far
+ as I can tell it was never enabled in any XFree86 build, and certainly
+ has never been enabled since Xorg 7.0.
+
+ Also, K&R.
+
+ Signed-off-by: Adam Jackson <a...@redhat.com>
+ Reviewed-by: Emil Velikov <emil.l.veli...@gmail.com>
+
+commit 478efe285a440c33b053bdf0bfbfdd482f429f01
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Tue Oct 27 19:44:28 2015 -0700
+
+ Xserver.man: document more transports for -nolisten & -listen options
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+ Reviewed-by: Jeremy Huddleston Sequoia <jerem...@apple.com>
+
+commit 8fc295bde9a736f3c8c047031a6698d140d5266f
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Tue Oct 27 19:44:27 2015 -0700
+
+ Xorg.man: update to reflect -nolisten tcp becoming default
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+ Reviewed-by: Jeremy Huddleston Sequoia <jerem...@apple.com>
+
+commit 75157b7dbf4ed4db0492328a44e4e67dda83f769
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Tue Oct 27 19:44:26 2015 -0700
+
+ Xorg.man: move XLOCAL details to X(7) man page instead
+
+ These settings affect clients, not server, so belong there, next to
+ the information about how to set $DISPLAY.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+ Reviewed-by: Jeremy Huddleston Sequoia <jerem...@apple.com>
+
+commit 50c167164700e8ead9b7ccf9f9eafc7541baac75
+Author: Martin Peres <martin.pe...@linux.intel.com>
+Date: Mon Jul 20 10:37:30 2015 +0300
+
+ 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 <freedesk...@karolherbst.de>
+ Reported-by: Tobias Klausmann <tobias.klausm...@mni.thm.de>
+ Signed-off-by: Martin Peres <martin.pe...@linux.intel.com>
+ Tested-by: Tobias Klausmann <tobias.klausm...@mni.thm.de>
+ Tested-by: Martin Peres <martin.pe...@linux.intel.com>
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91316
+ Cc: Ilia Mirkin <imir...@alum.mit.edu>
+ Cc: Olivier Fourdan <ofour...@redhat.com
+ Cc: Adam Jackson <a...@redhat.com>
+ Cc: Alan Coopersmith <alan.coopersm...@oracle.com
+ Cc: Chris Wilson <ch...@chris-wilson.co.uk>
+ Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit bb78c464f09f515db557182a458b12b63c3b52d7
+Author: Adam Jackson <a...@redhat.com>
+Date: Tue Oct 27 13:28:37 2015 -0400
+
+ build: Remove stale miext/cw include paths
+
+ Signed-off-by: Adam Jackson <a...@redhat.com>
+ Reviewed-by: Emil Velikov <emil.l.veli...@gmail.com>
+
+commit 524844c8c18e226aad30feb371b19ef491d83449
+Author: Julien Cristau <jcris...@debian.org>
+Date: Tue Oct 27 13:23:13 2015 +0100
+
+ Xext: fix build with --disable-xace
+
+ Regression from 990cf5b2828f73dc7a07f1e38f608af39acfd81d
+
+ Signed-off-by: Julien Cristau <jcris...@debian.org>
+ Cc: Andrew Eikum <aei...@codeweavers.com>
+ Cc: Peter Hutterer <peter.hutte...@who-t.net>
+ Signed-off-by: Andrew Eikum <aei...@codeweavers.com>
+
+commit ac2f27f1a9fa8cd88c5dbe7ec0f96238eecf2c3e
+Author: Michel Dänzer <michel.daen...@amd.com>
+Date: Tue Oct 27 11:51:49 2015 +0900
+
+ DRI2: Sync radeonsi_pci_ids.h from Mesa
+
+ Fixes DRI2 client driver name mapping for newer AMD GPUs with the
+ modesetting driver, allowing the DRI2 extension to initialize.
+
+ Signed-off-by: Michel Dänzer <michel.daen...@amd.com>
+ Reviewed-by: Alex Deucher <alexander.deuc...@amd.com>
+
commit d8b7a900cf912cadb5915b3924dd6ce5a74505e7
Author: Adam Jackson <a...@redhat.com>
Date: Mon Oct 26 13:47:04 2015 -0400
diff --git a/debian/changelog b/debian/changelog
index eaf4d2f..a20a372 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.18.0-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+
+ -- Julien Cristau <jcris...@debian.org> Mon, 09 Nov 2015 22:21:51 +0100
+
xorg-server (2:1.17.99.902-1) experimental; urgency=medium
* Team upload.
commit 43fb888bd01cf9d3d277e77a52a3d0c93ccff8bd
Author: Adam Jackson <a...@redhat.com>
Date: Mon Nov 9 16:00:26 2015 -0500
xserver 1.18.0
Signed-off-by: Adam Jackson <a...@redhat.com>
diff --git a/configure.ac b/configure.ac
index 9828cab..96c0242 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.17.99.902,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2015-10-26"
-RELEASE_NAME="Amontillado"
+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_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
commit 2203735887ab548b3ee004400d1b89149aae412c
Author: Axel Davy <axel.d...@ens.fr>
Date: Wed Nov 4 18:42:42 2015 +0100
present: Fix Async swap logic
According to the spec, PresentOptionAsync should only
trigger a different behaviour when the target msc has been reached.
In this case if the driver is able to do async swaps, we use
them to avoid a screen copy.
When the target msc hasn't been reached yet, we want to use sync swaps.
v2: Fix indentation and simplify checks for Async flips
Signed-off-by: Axel Davy <axel.d...@ens.fr>
Reviewed-by: Michel Dänzer <michel.daen...@amd.com>
diff --git a/present/present.c b/present/present.c
index 5900c22..beb01dc 100644
--- a/present/present.c
+++ b/present/present.c
@@ -836,19 +836,20 @@ present_pixmap(WindowPtr window,
vblank->notifies = notifies;
vblank->num_notifies = num_notifies;
- if (!(options & PresentOptionAsync))
- vblank->sync_flip = TRUE;
-
- if (!(options & PresentOptionCopy) &&
- !((options & PresentOptionAsync) &&
- (!screen_priv->info ||
- !(screen_priv->info->capabilities & PresentCapabilityAsync))) &&
- pixmap != NULL &&
- present_check_flip (target_crtc, window, pixmap, vblank->sync_flip,
valid, x_off, y_off))
- {
- vblank->flip = TRUE;
- if (vblank->sync_flip)
+ if (pixmap != NULL &&
+ !(options & PresentOptionCopy) &&
