Makefile.am | 8 configure.ac | 4 cursor/cursor-data.h | 2 cursor/wayland-cursor.c | 1 debian/changelog | 23 + debian/compat | 2 debian/control | 11 debian/copyright | 2 debian/libwayland-server0.symbols | 9 debian/rules | 4 debian/upstream/signing-key.asc | 44 +++ debian/watch | 5 doc/publican/doxygen-to-publican.xsl | 2 doc/publican/sources/Book_Info.xml | 2 protocol/wayland.xml | 401 ++++++++++++++++++---------------- src/event-loop.c | 12 - src/scanner.c | 36 ++- src/wayland-client-core.h | 3 src/wayland-private.h | 4 src/wayland-server-core.h | 115 +++++++-- src/wayland-server.c | 281 +++++++++++++++++++++++ src/wayland-server.h | 3 src/wayland-shm.c | 2 src/wayland-util.c | 53 ++-- src/wayland-util.h | 11 tests/compositor-introspection-test.c | 172 ++++++++++++++ tests/connection-test.c | 1 tests/display-test.c | 2 tests/event-loop-test.c | 1 tests/exec-fd-leak-checker.c | 2 tests/list-test.c | 13 + tests/map-test.c | 1 tests/os-wrappers-test.c | 1 tests/protocol-logger-test.c | 148 ++++++++++++ tests/queue-test.c | 1 tests/resources-test.c | 1 tests/test-compositor.c | 1 tests/test-compositor.h | 1 38 files changed, 1104 insertions(+), 281 deletions(-)
New commits: commit 73d18803b682ba0c9675ab57ab343296b5465dab Author: Emilio Pozuelo Monfort <po...@debian.org> Date: Wed Dec 7 18:55:12 2016 +0100 Release to unstable diff --git a/debian/changelog b/debian/changelog index 0337676..2f84b50 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -wayland (1.12.0-1) UNRELEASED; urgency=medium +wayland (1.12.0-1) unstable; urgency=medium * New upstream release. Closes: #840752. * Update various links to https. @@ -6,7 +6,7 @@ wayland (1.12.0-1) UNRELEASED; urgency=medium * Bump debhelper compat to 10. + debhelper now calls dh-autoreconf by default. - -- Emilio Pozuelo Monfort <po...@debian.org> Wed, 07 Dec 2016 17:34:30 +0100 + -- Emilio Pozuelo Monfort <po...@debian.org> Wed, 07 Dec 2016 18:54:57 +0100 wayland (1.11.94-1) experimental; urgency=medium commit a0a2018f7462ccf4720175f390411499465d9a0a Author: Emilio Pozuelo Monfort <po...@debian.org> Date: Wed Dec 7 18:44:45 2016 +0100 Let debhelper call dh-autoreconf diff --git a/debian/changelog b/debian/changelog index e9d313a..0337676 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ wayland (1.12.0-1) UNRELEASED; urgency=medium * Update various links to https. * Verify upstream tarball signatures. Thanks Hideki Yamane. * Bump debhelper compat to 10. + + debhelper now calls dh-autoreconf by default. -- Emilio Pozuelo Monfort <po...@debian.org> Wed, 07 Dec 2016 17:34:30 +0100 diff --git a/debian/control b/debian/control index 73e32c0..1cd1caa 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,6 @@ Uploaders: Emilio Pozuelo Monfort <po...@debian.org>, Build-Depends: debhelper (>= 10), quilt, - dh-autoreconf, pkg-config, libexpat1-dev, libffi-dev, diff --git a/debian/rules b/debian/rules index ebaa814..6508a4d 100755 --- a/debian/rules +++ b/debian/rules @@ -31,7 +31,7 @@ override_dh_auto_test: dh_auto_test || true %: - dh $@ --with quilt,autoreconf --builddirectory=build/ + dh $@ --with quilt --builddirectory=build/ # For maintainer use only, generate a tarball: gentarball: UV=$(shell dpkg-parsechangelog|awk '/^Version:/ {print $$2}'|sed 's/-.*$$//') commit 69b9630022a8291d43d693a2c9072492dd5eb8d7 Author: Emilio Pozuelo Monfort <po...@debian.org> Date: Wed Dec 7 18:44:08 2016 +0100 Bump debhelper compat to 10 diff --git a/debian/changelog b/debian/changelog index 978ac90..e9d313a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ wayland (1.12.0-1) UNRELEASED; urgency=medium * New upstream release. Closes: #840752. * Update various links to https. * Verify upstream tarball signatures. Thanks Hideki Yamane. + * Bump debhelper compat to 10. -- Emilio Pozuelo Monfort <po...@debian.org> Wed, 07 Dec 2016 17:34:30 +0100 diff --git a/debian/compat b/debian/compat index ec63514..f599e28 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/control b/debian/control index e32d627..73e32c0 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Debian X Strike Force <debian-x@lists.debian.org> Uploaders: Emilio Pozuelo Monfort <po...@debian.org>, Héctor Orón Martínez <zu...@debian.org> Build-Depends: - debhelper (>= 9), + debhelper (>= 10), quilt, dh-autoreconf, pkg-config, commit 93ae9d6822939f6e2de98e79762592a348203669 Author: Emilio Pozuelo Monfort <po...@debian.org> Date: Wed Dec 7 18:38:37 2016 +0100 Remove unused variable diff --git a/debian/rules b/debian/rules index 8ad1821..ebaa814 100755 --- a/debian/rules +++ b/debian/rules @@ -2,8 +2,6 @@ SOURCE=wayland -BUILD_DOC= - # Don't build the documentation when not building arch:all packages override_dh_auto_configure-arch: dh_auto_configure -- --disable-documentation commit bf0d21c611cee2ea4804d3226552daedda96f800 Author: Emilio Pozuelo Monfort <po...@debian.org> Date: Wed Dec 7 18:07:10 2016 +0100 Verify upstream tarball signature diff --git a/debian/changelog b/debian/changelog index 8d533cf..978ac90 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ wayland (1.12.0-1) UNRELEASED; urgency=medium * New upstream release. Closes: #840752. * Update various links to https. + * Verify upstream tarball signatures. Thanks Hideki Yamane. -- Emilio Pozuelo Monfort <po...@debian.org> Wed, 07 Dec 2016 17:34:30 +0100 diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc new file mode 100644 index 0000000..19cd20c --- /dev/null +++ b/debian/upstream/signing-key.asc @@ -0,0 +1,44 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQGiBET+XhERBADlUYa7VXfPl3y9uCBUMniYdE4FKLAobrREyiveLf+2mTf435YL +de0gcx9ZS/EZUq+4rn4uv6AsKmw/f/N/VWGC4KL60uyp7zJjUNed2KKBk3sk57IG +pHwRqzXQwk8wVMOuhyyv207cmUadGVtL4GPKUCOYp+C0hnSs3Jq0fZJ9lwCg5xDx +fg3g++HUm8Gu2D/SYR4pFWED/2J4fkdPRQhxnfmvUxphqKf24aDngDwXYLkKlywY +Gs52J8iOwTQ/DRIruKepqrh66gb06QwnMQe9R5mJqncoi87m2jlKzUdJ5WV4JRmX +c4QVu9vRySK9j6e1O2mJeRrYvkf5rDBCHXvOoXET6VSHZI//1OJJ5OMiIApERFdT ++a5TA/4u82BHdLFerbK23ML0aWOpTc/kMbOwLjF7rFF3iJ4Pbhv0gS2wWx/1oqbF +ZGdTS5XVGiWf/+/rZpN8SeC5Q8cJ1EYqSHyo/eA+mI+C6ylqyyODmZ42OQr142xj +t6MFj5uBMq3QQGYytZ65ustDfnE/qP6hNJGtE9Lw6NVGd6oG37QjQnJ5Y2UgSGFy +cmluZ3RvbiA8YnJ5Y2VAdWJ1bnR1LmNvbT6IYAQTEQIAIAIbAwYLCQgHAwIEFQII +AwQWAgMBAh4BAheABQJUwED9AAoJEBGjAVbg5nYRYHkAoN8LIA4RjqX6TtK87+V+ +5aOSggk1AKC6T20Lo9yte4Q6uXXJWGPNVydG8bQmQnJ5Y2UgSGFycmluZ3RvbiA8 +YnJ5Y2VAY2Fub25pY2FsLmNvbT6IYAQTEQIAIAIbAwYLCQgHAwIEFQIIAwQWAgMB +Ah4BAheABQJUwED9AAoJEBGjAVbg5nYRNDQAoKJ3TMTZS3nK+gtYCosXcO4JFYxR +AKDdOzV2Hn+dwors+2n3X91Ol3BNArQoQnJ5Y2UgSGFycmluZ3RvbiA8YnJ5Y2VA +b3NnLnNhbXN1bmcuY29tPohiBBMRAgAiAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIe +AQIXgAUCVMBA/QAKCRARowFW4OZ2Ed2iAJ4s0EVg9+vuE3wAmeHGZazsvRnakACg +0VP0/JUmDDvgm7vOfg5Ex/v82nC0LEJyeWNlIEhhcnJpbmd0b24gPGJyeWNlQGJy +eWNlaGFycmluZ3Rvbi5vcmc+iGAEExECACACGwMGCwkIBwMCBBUCCAMEFgIDAQIe +AQIXgAUCVMBA/QAKCRARowFW4OZ2EfLRAKC/HqDca42tb3lyPxjEJv17tpFxSQCd +HJeu88EIYaC5HZHUbG9ZaFoUuwi0LkJyeWNlIEhhcnJpbmd0b24gPGJyeWNlLmhh +cnJpbmd0b25AdWJ1bnR1LmNvbT6IYAQTEQIAIAIbAwYLCQgHAwIEFQIIAwQWAgMB +Ah4BAheABQJUwED6AAoJEBGjAVbg5nYRHEcAnRluXGX7z2CeQHVccOjXPEx3Dhbu +AKC3BOql6z4e/oHnuPcrmm+cDVwvn7QxQnJ5Y2UgSGFycmluZ3RvbiA8YnJ5Y2Uu +aGFycmluZ3RvbkBjYW5vbmljYWwuY29tPohgBBMRAgAgAhsDBgsJCAcDAgQVAggD +BBYCAwECHgECF4AFAlTAQP0ACgkQEaMBVuDmdhHg7wCgghXeewn/DeBZh3g0EstN +cdSDDU4Anif0Ud+4cdTFS4jWWPJrs/gaPFbDuQINBET+XiQQCADT0bmOAoaZ/3Y7 +cpvc221+V7Yq1YtUw1QNUgkaku5I+5ee54oIvMrEWbADQRd1TqtKjsTS8v1kYFqH +C965uhHgXAMHCb6hlN+AzVXsgl/iqQI3knqHAtx51Buqd/PF1t6grELRhGH39Elz +kK2D9E1e8Ag6XdWY/jCx/tRypc2HrUJoNsdUFrj8+VDOYa9Xi1XSzQdRPbWbdzXi +IxtA5iY4i8mS3B3wItl1eyzD5UFQzgWK5FLFjfhm6/DEpVqlyu1mp+2I7InKz4HW +64l0Rkzn5EC7UxUn/chGDWQTtfiyjeia4ANcUC8Jx5C4NOKXPzXN8anWV3S0oJZh ++pGRaUKTAAMFB/9YkEg13DveEPPg8+bqUXtN9YU+Ogxcvcyou8I5bzRMxlpJkG3a +EsrpAB7mS9D3kpImUa5QA8Y9QoEl4CLxbGIDJIyKNm93OhZrO+A0h8uCTHK45clm +qg3UdUKqnXr5V48zIvs56lrpTnlJ3PqNSl2ErDYtT7fgODyXAyLPNpCGsz2otYfJ +4ne1aYf7i/7gI+UTXpavDUsM90FrX+sydnjbZIi0t6HNpmO9sb9o82QjF+hMr28Y +ntWS0LUvOdUmWNnUyrDtZ2fnTzxoOYl0/8hxE+vUwcw3vk6+CtNEw4r+VkuKKpZg +rP7BIyD8m2dGJn5cfRe8LCP2TIkYh7WBoKQxiEkEGBECAAkFAkT+XiQCGwwACgkQ +EaMBVuDmdhHXAgCg1DelVwB3NVuI4X3w4QAijqlg3vsAn13J6LbSbWkCE1GwkJfo +F9GzWqNd +=LLvz +-----END PGP PUBLIC KEY BLOCK----- diff --git a/debian/watch b/debian/watch index 49f492e..4f8498b 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,4 @@ #git=git://anongit.freedesktop.org/wayland/wayland -version=3 +version=4 +opts="pgpsigurlmangle=s%$%.sig%" \ https://wayland.freedesktop.org/releases/wayland-([\d].*)\.tar\.xz commit 35088941d1206c8318720402ffb8237f6ff26bb5 Author: Emilio Pozuelo Monfort <po...@debian.org> Date: Wed Dec 7 17:56:16 2016 +0100 Update links to https diff --git a/debian/changelog b/debian/changelog index 628b06b..8d533cf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ wayland (1.12.0-1) UNRELEASED; urgency=medium * New upstream release. Closes: #840752. + * Update various links to https. -- Emilio Pozuelo Monfort <po...@debian.org> Wed, 07 Dec 2016 17:34:30 +0100 diff --git a/debian/control b/debian/control index 89cc1e3..e32d627 100644 --- a/debian/control +++ b/debian/control @@ -19,9 +19,9 @@ Build-Depends-Indep: xsltproc, docbook-xsl, Standards-Version: 3.9.8 -Vcs-Git: git://anonscm.debian.org/pkg-xorg/wayland/wayland -Vcs-Browser: http://anonscm.debian.org/cgit/pkg-xorg/wayland/wayland.git -Homepage: http://wayland.freedesktop.org/ +Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/wayland/wayland +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/wayland/wayland.git +Homepage: https://wayland.freedesktop.org/ Package: libwayland-client0 Section: libs diff --git a/debian/copyright b/debian/copyright index 2e7231f..0af6f4b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,6 +1,6 @@ Upstream-Name: wayland Upstream-Contact: Kristian Høgsberg <k...@bitplanet.net> -Source: http://wayland.freedesktop.org/releases/ +Source: https://wayland.freedesktop.org/releases/ Files: debian/* Copyright: © 2011 Cyril Brulebois <k...@debian.org> diff --git a/debian/watch b/debian/watch index c8aafea..49f492e 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ #git=git://anongit.freedesktop.org/wayland/wayland version=3 -http://wayland.freedesktop.org/releases/wayland-([\d].*)\.tar\.xz +https://wayland.freedesktop.org/releases/wayland-([\d].*)\.tar\.xz commit 866b355e0018fb2f1d8de9d5f5ab6a3ace2121b1 Author: Emilio Pozuelo Monfort <po...@debian.org> Date: Wed Dec 7 17:34:50 2016 +0100 New upstream release diff --git a/debian/changelog b/debian/changelog index 317cba6..628b06b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +wayland (1.12.0-1) UNRELEASED; urgency=medium + + * New upstream release. Closes: #840752. + + -- Emilio Pozuelo Monfort <po...@debian.org> Wed, 07 Dec 2016 17:34:30 +0100 + wayland (1.11.94-1) experimental; urgency=medium * New upstream pre-release. commit a0d76ffda5c3483e5e67fed19b7d8afe8966782c Author: Bryce Harrington <br...@osg.samsung.com> Date: Tue Sep 20 10:45:10 2016 -0700 configure.ac: bump to version 1.12.0 for the official release diff --git a/configure.ac b/configure.ac index 11e42c4..a21109a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,8 @@ AC_PREREQ([2.64]) m4_define([wayland_major_version], [1]) -m4_define([wayland_minor_version], [11]) -m4_define([wayland_micro_version], [94]) +m4_define([wayland_minor_version], [12]) +m4_define([wayland_micro_version], [0]) m4_define([wayland_version], [wayland_major_version.wayland_minor_version.wayland_micro_version]) commit 759927e9a0b81ffa7491bb91543e0762a4110760 Author: Emilio Pozuelo Monfort <po...@debian.org> Date: Wed Sep 14 12:10:24 2016 +0200 Release to experimental diff --git a/debian/changelog b/debian/changelog index dfa817c..317cba6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -wayland (1.11.94-1) UNRELEASED; urgency=medium +wayland (1.11.94-1) experimental; urgency=medium * New upstream pre-release. * Standards-Version is 3.9.8, no changes needed. - -- Emilio Pozuelo Monfort <po...@debian.org> Wed, 14 Sep 2016 12:01:31 +0200 + -- Emilio Pozuelo Monfort <po...@debian.org> Wed, 14 Sep 2016 12:10:19 +0200 wayland (1.11.91-1) experimental; urgency=medium commit 117e1ecf6ca95d269f3e4d4829a323923bff80c7 Author: Emilio Pozuelo Monfort <po...@debian.org> Date: Wed Sep 14 12:09:36 2016 +0200 Bump Standards-Version diff --git a/debian/changelog b/debian/changelog index 2e21149..dfa817c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ wayland (1.11.94-1) UNRELEASED; urgency=medium * New upstream pre-release. + * Standards-Version is 3.9.8, no changes needed. -- Emilio Pozuelo Monfort <po...@debian.org> Wed, 14 Sep 2016 12:01:31 +0200 diff --git a/debian/control b/debian/control index 4209fe7..89cc1e3 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,7 @@ Build-Depends-Indep: xmlto, xsltproc, docbook-xsl, -Standards-Version: 3.9.6 +Standards-Version: 3.9.8 Vcs-Git: git://anonscm.debian.org/pkg-xorg/wayland/wayland Vcs-Browser: http://anonscm.debian.org/cgit/pkg-xorg/wayland/wayland.git Homepage: http://wayland.freedesktop.org/ commit 0d0fde885f46c46d4aedaac50822aff28e82f6fb Author: Emilio Pozuelo Monfort <po...@debian.org> Date: Wed Sep 14 12:01:48 2016 +0200 New upstream release diff --git a/debian/changelog b/debian/changelog index 56e5158..2e21149 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +wayland (1.11.94-1) UNRELEASED; urgency=medium + + * New upstream pre-release. + + -- Emilio Pozuelo Monfort <po...@debian.org> Wed, 14 Sep 2016 12:01:31 +0200 + wayland (1.11.91-1) experimental; urgency=medium * New upstream pre-release commit a4aba37ba178f8400cfdc2b595005bb76d6af2c0 Author: Bryce Harrington <br...@osg.samsung.com> Date: Tue Sep 13 12:13:57 2016 -0700 configure.ac: bump to version 1.11.94 for the RC2 release diff --git a/configure.ac b/configure.ac index 429a590..11e42c4 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ AC_PREREQ([2.64]) m4_define([wayland_major_version], [1]) m4_define([wayland_minor_version], [11]) -m4_define([wayland_micro_version], [93]) +m4_define([wayland_micro_version], [94]) m4_define([wayland_version], [wayland_major_version.wayland_minor_version.wayland_micro_version]) commit 9afa4bfb7b1e8abfb798e25fc28545e60673ed50 Author: Yong Bakos <yba...@humanoriented.com> Date: Wed Aug 17 16:08:17 2016 -0700 server: Document display parameter Signed-off-by: Yong Bakos <yba...@humanoriented.com> Reviewed-by: Bryce Harrington <br...@osg.samsung.com> Reviewed-by: Pekka Paalanen <pekka.paala...@collabora.co.uk> diff --git a/src/wayland-server.c b/src/wayland-server.c index 9ecfd97..9d7d9c1 100644 --- a/src/wayland-server.c +++ b/src/wayland-server.c @@ -1528,6 +1528,7 @@ wl_log_set_handler_server(wl_log_func_t handler) * * \a errno is set on error. * + * \param display The display object * \param func The function to call to log a new protocol message * \param user_data The user data pointer to pass to \a func * commit 2c8fc3eae27c9c0b02694c60d46886ebf47cc83c Author: Yong Bakos <yba...@humanoriented.com> Date: Wed Aug 17 16:03:31 2016 -0700 protocol: Replace '#defines' with 'macros' The use of # within a description causes the documentation generator to mistake C syntax with a documentation link. Remove the # from the documentation, suppressing the warning. Signed-off-by: Yong Bakos <yba...@humanoriented.com> Reviewed-by: Bryce Harrington <br...@osg.samsung.com> Reviewed-by: Pekka Paalanen <pekka.paala...@collabora.co.uk> diff --git a/protocol/wayland.xml b/protocol/wayland.xml index 3f2d967..6c6d078 100644 --- a/protocol/wayland.xml +++ b/protocol/wayland.xml @@ -287,7 +287,7 @@ formats are optional and may not be supported by the particular renderer in use. - The drm format codes match the #defines in drm_fourcc.h. + The drm format codes match the macros defined in drm_fourcc.h. The formats actually supported by the compositor will be reported by the format event. </description> commit da58173cfe047864d073ba078e0b8db982a31b12 Author: Bryce Harrington <br...@osg.samsung.com> Date: Tue Sep 6 14:22:03 2016 -0700 configure.ac: bump to version 1.11.93 for the RC1 release diff --git a/configure.ac b/configure.ac index 5f416a1..429a590 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ AC_PREREQ([2.64]) m4_define([wayland_major_version], [1]) m4_define([wayland_minor_version], [11]) -m4_define([wayland_micro_version], [92]) +m4_define([wayland_micro_version], [93]) m4_define([wayland_version], [wayland_major_version.wayland_minor_version.wayland_micro_version]) commit 2bdbb741e2ac0ec9ecc564463a59b3ef8f499f6a Author: Yong Bakos <yba...@humanoriented.com> Date: Sun Sep 4 13:23:05 2016 -0700 tests: Add test for wl_list_length list-test.c did not cover wl_list_length, so add one test that specifically tests this method. Signed-off-by: Yong Bakos <yba...@humanoriented.com> Reviewed-by: Eric Engestrom <eric.engest...@imgtec.com> Reviewed-by: Pekka Paalanen <pekka.paala...@collabora.co.uk> diff --git a/tests/list-test.c b/tests/list-test.c index 21ca4ec..0752618 100644 --- a/tests/list-test.c +++ b/tests/list-test.c @@ -57,6 +57,19 @@ TEST(list_insert) assert(e.link.prev == &list); } +TEST(list_length) +{ + struct wl_list list; + struct element e; + + wl_list_init(&list); + assert(wl_list_length(&list) == 0); + wl_list_insert(&list, &e.link); + assert(wl_list_length(&list) == 1); + wl_list_remove(&e.link); + assert(wl_list_length(&list) == 0); +} + TEST(list_iterator) { struct wl_list list; commit d9ef882139e6178edf68c3fce147afdb3b57b894 Author: Yong Bakos <yba...@humanoriented.com> Date: Sun Sep 4 10:15:49 2016 -0700 doc: Correct docbook title The docbook title was "The Wayland display server," which is inaccurate. Change the title to "The Wayland Protocol". Signed-off-by: Yong Bakos <yba...@humanoriented.com> Reviewed-by: Pekka Paalanen <pekka.paala...@collabora.co.uk> diff --git a/doc/publican/sources/Book_Info.xml b/doc/publican/sources/Book_Info.xml index e9e5ff0..0b7bf07 100644 --- a/doc/publican/sources/Book_Info.xml +++ b/doc/publican/sources/Book_Info.xml @@ -5,7 +5,7 @@ ]> <bookinfo id="book-Wayland-Wayland"> <title>Wayland</title> - <subtitle>The Wayland display server</subtitle> + <subtitle>The Wayland Protocol</subtitle> <productname>Documentation</productname> <productnumber>0.1</productnumber> <edition>1</edition> commit 2d7b34e2ee7627e125496c8816f656f485fcfc81 Author: Bryce Harrington <br...@osg.samsung.com> Date: Tue Aug 30 11:40:23 2016 -0700 configure.ac: bump to version 1.11.92 for the beta release diff --git a/configure.ac b/configure.ac index 109b758..5f416a1 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ AC_PREREQ([2.64]) m4_define([wayland_major_version], [1]) m4_define([wayland_minor_version], [11]) -m4_define([wayland_micro_version], [91]) +m4_define([wayland_micro_version], [92]) m4_define([wayland_version], [wayland_major_version.wayland_minor_version.wayland_micro_version]) commit 177a4735b11e397bbdd4be93db7430ccc294613e Author: Héctor Orón Martínez <zu...@debian.org> Date: Thu Aug 18 17:32:01 2016 +0200 Release experimental Debian version wayland-1.11.91-1 Signed-off-by: Héctor Orón Martínez <zu...@debian.org> diff --git a/debian/changelog b/debian/changelog index 6d0a5a4..56e5158 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +wayland (1.11.91-1) experimental; urgency=medium + + * New upstream pre-release + + -- Héctor Orón Martínez <zu...@debian.org> Thu, 18 Aug 2016 17:18:52 +0200 + wayland (1.11.0-2) unstable; urgency=medium * d/control: libwayland-dev depends on libwayland-bin commit c515b34c273bec49b200610a5acb35721dfb25aa Author: Héctor Orón Martínez <zu...@debian.org> Date: Thu Aug 18 17:24:41 2016 +0200 d/libwayland-server0.symbols: add new symbols Signed-off-by: Héctor Orón Martínez <zu...@debian.org> diff --git a/debian/libwayland-server0.symbols b/debian/libwayland-server0.symbols index 6c1a71e..7187d58 100644 --- a/debian/libwayland-server0.symbols +++ b/debian/libwayland-server0.symbols @@ -9,13 +9,17 @@ libwayland-server.so.0 libwayland-server0 #MINVER# wl_client_add_destroy_listener@Base 1.0.2 wl_client_add_object@Base 1.0.2 wl_client_add_resource@Base 1.0.2 + wl_client_add_resource_created_listener@Base 1.11.91 wl_client_create@Base 1.0.2 wl_client_destroy@Base 1.0.2 wl_client_flush@Base 1.0.2 + wl_client_for_each_resource@Base 1.11.91 + wl_client_from_link@Base 1.11.91 wl_client_get_credentials@Base 1.0.2 wl_client_get_destroy_listener@Base 1.0.2 wl_client_get_display@Base 1.0.2 wl_client_get_fd@Base 1.9.91 + wl_client_get_link@Base 1.11.91 wl_client_get_object@Base 1.0.2 wl_client_new_object@Base 1.0.2 wl_client_post_no_memory@Base 1.2.0 @@ -24,8 +28,10 @@ libwayland-server.so.0 libwayland-server0 #MINVER# wl_data_device_manager_interface@Base 1.0.2 wl_data_offer_interface@Base 1.0.2 wl_data_source_interface@Base 1.0.2 + wl_display_add_client_created_listener@Base 1.11.91 wl_display_add_destroy_listener@Base 1.0.4 wl_display_add_global@Base 1.0.2 + wl_display_add_protocol_logger@Base 1.11.91 wl_display_add_shm_format@Base 1.3.0 wl_display_add_socket@Base 1.0.2 wl_display_add_socket_auto@Base 1.5.91 @@ -33,6 +39,7 @@ libwayland-server.so.0 libwayland-server0 #MINVER# wl_display_create@Base 1.0.2 wl_display_destroy@Base 1.0.2 wl_display_flush_clients@Base 1.0.2 + wl_display_get_client_list@Base 1.11.91 wl_display_get_destroy_listener@Base 1.0.4 wl_display_get_event_loop@Base 1.0.2 wl_display_get_serial@Base 1.0.2 @@ -78,6 +85,7 @@ libwayland-server.so.0 libwayland-server0 #MINVER# wl_map_reserve_new@Base 1.0.2 wl_output_interface@Base 1.0.2 wl_pointer_interface@Base 1.0.2 + wl_protocol_logger_destroy@Base 1.11.91 wl_region_interface@Base 1.0.2 wl_registry_interface@Base 1.0.2 wl_resource_add_destroy_listener@Base 1.2.0 @@ -85,6 +93,7 @@ libwayland-server.so.0 libwayland-server0 #MINVER# wl_resource_destroy@Base 1.0.2 wl_resource_find_for_client@Base 1.2.0 wl_resource_from_link@Base 1.2.0 + wl_resource_get_class@Base 1.11.91 wl_resource_get_client@Base 1.2.0 wl_resource_get_destroy_listener@Base 1.2.0 wl_resource_get_id@Base 1.2.0 commit 2a6b08896abeb8ce82f381b1abf5daeee53e7d79 Author: Bryce Harrington <br...@osg.samsung.com> Date: Tue Aug 16 11:25:12 2016 -0700 configure.ac: bump to version 1.11.91 for the alpha release diff --git a/configure.ac b/configure.ac index 9af3574..109b758 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ AC_PREREQ([2.64]) m4_define([wayland_major_version], [1]) m4_define([wayland_minor_version], [11]) -m4_define([wayland_micro_version], [90]) +m4_define([wayland_micro_version], [91]) m4_define([wayland_version], [wayland_major_version.wayland_minor_version.wayland_micro_version]) commit a285fa939cb06842ff1e1d5071c9ead8141c1052 Author: Yong Bakos <yba...@humanoriented.com> Date: Thu Aug 11 14:33:05 2016 -0700 protocol: Specify upper left corner of damage rectangle Specify x and y args as the upper left corner of the surface / buffer damage rectangle. Signed-off-by: Yong Bakos <yba...@humanoriented.com> Reviewed-by: Bryce Harrington <br...@osg.samsung.com> diff --git a/protocol/wayland.xml b/protocol/wayland.xml index 553274f..3f2d967 100644 --- a/protocol/wayland.xml +++ b/protocol/wayland.xml @@ -1390,7 +1390,8 @@ Damage is double-buffered state, see wl_surface.commit. - The damage rectangle is specified in surface-local coordinates. + The damage rectangle is specified in surface-local coordinates, + where x and y specify the upper left corner of the damage rectangle. The initial value for pending damage is empty: no damage. wl_surface.damage adds pending damage: the new pending damage @@ -1634,7 +1635,8 @@ Damage is double-buffered state, see wl_surface.commit. - The damage rectangle is specified in buffer coordinates. + The damage rectangle is specified in buffer coordinates, + where x and y specify the upper left corner of the damage rectangle. The initial value for pending damage is empty: no damage. wl_surface.damage_buffer adds pending damage: the new pending commit 8e7e52f3353be3d30dba0c1625c232e6d6e223a3 Author: Yong Bakos <yba...@humanoriented.com> Date: Thu Aug 11 14:33:04 2016 -0700 protocol: Describe serial as serial number Change "serial" to "serial number" in arg summaries, for consistency and clarity. Signed-off-by: Yong Bakos <yba...@humanoriented.com> Reviewed-by: Bryce Harrington <br...@osg.samsung.com> diff --git a/protocol/wayland.xml b/protocol/wayland.xml index ac066f4..553274f 100644 --- a/protocol/wayland.xml +++ b/protocol/wayland.xml @@ -1018,7 +1018,7 @@ A client must respond to a ping event with a pong request or the client may be deemed unresponsive. </description> - <arg name="serial" type="uint" summary="serial of the ping event"/> + <arg name="serial" type="uint" summary="serial number of the ping event"/> </request> <request name="move"> @@ -1030,7 +1030,7 @@ the surface (e.g. fullscreen or maximized). </description> <arg name="seat" type="object" interface="wl_seat" summary="seat whose pointer is used"/> - <arg name="serial" type="uint" summary="serial of the implicit grab on the pointer"/> + <arg name="serial" type="uint" summary="serial number of the implicit grab on the pointer"/> </request> <enum name="resize" bitfield="true"> @@ -1060,7 +1060,7 @@ the surface (e.g. fullscreen or maximized). </description> <arg name="seat" type="object" interface="wl_seat" summary="seat whose pointer is used"/> - <arg name="serial" type="uint" summary="serial of the implicit grab on the pointer"/> + <arg name="serial" type="uint" summary="serial number of the implicit grab on the pointer"/> <arg name="edges" type="uint" enum="resize" summary="which edge or corner is being dragged"/> </request> @@ -1175,7 +1175,7 @@ </description> <arg name="seat" type="object" interface="wl_seat" summary="seat whose pointer is used"/> - <arg name="serial" type="uint" summary="serial of the implicit grab on the pointer"/> + <arg name="serial" type="uint" summary="serial number of the implicit grab on the pointer"/> <arg name="parent" type="object" interface="wl_surface" summary="parent surface"/> <arg name="x" type="int" summary="surface-local x coordinate"/> <arg name="y" type="int" summary="surface-local y coordinate"/> @@ -1827,7 +1827,7 @@ undefined, and the wl_surface is unmapped. </description> - <arg name="serial" type="uint" summary="serial of the enter event"/> + <arg name="serial" type="uint" summary="serial number of the enter event"/> <arg name="surface" type="object" interface="wl_surface" allow-null="true" summary="pointer surface"/> <arg name="hotspot_x" type="int" summary="surface-local x coordinate"/> commit 7aa1f6cb2f506e49c483a2222a8f971fcf30882c Author: Yong Bakos <yba...@humanoriented.com> Date: Thu Aug 11 14:33:03 2016 -0700 protocol: Remove wl_ prefix from summary descriptions Summary attributes sometime describe objects using their wl-prefixed type, but more often don't. Remove the wl_ prefix from summary descriptions, since they tend to describe concepts. Signed-off-by: Yong Bakos <yba...@humanoriented.com> Reviewed-by: Bryce Harrington <br...@osg.samsung.com> diff --git a/protocol/wayland.xml b/protocol/wayland.xml index 55a74a7..ac066f4 100644 --- a/protocol/wayland.xml +++ b/protocol/wayland.xml @@ -175,7 +175,7 @@ <description summary="done event"> Notify the client when the related request is done. </description> - <arg name="callback_data" type="uint" summary="request-specific data for the wl_callback"/> + <arg name="callback_data" type="uint" summary="request-specific data for the callback"/> </event> </interface> @@ -1029,7 +1029,7 @@ The server may ignore move requests depending on the state of the surface (e.g. fullscreen or maximized). </description> - <arg name="seat" type="object" interface="wl_seat" summary="the wl_seat whose pointer is used"/> + <arg name="seat" type="object" interface="wl_seat" summary="seat whose pointer is used"/> <arg name="serial" type="uint" summary="serial of the implicit grab on the pointer"/> </request> @@ -1059,7 +1059,7 @@ The server may ignore resize requests depending on the state of the surface (e.g. fullscreen or maximized). </description> - <arg name="seat" type="object" interface="wl_seat" summary="the wl_seat whose pointer is used"/> + <arg name="seat" type="object" interface="wl_seat" summary="seat whose pointer is used"/> <arg name="serial" type="uint" summary="serial of the implicit grab on the pointer"/> <arg name="edges" type="uint" enum="resize" summary="which edge or corner is being dragged"/> </request> @@ -1174,7 +1174,7 @@ parent surface, in surface-local coordinates. </description> - <arg name="seat" type="object" interface="wl_seat" summary="the wl_seat whose pointer is used"/> + <arg name="seat" type="object" interface="wl_seat" summary="seat whose pointer is used"/> <arg name="serial" type="uint" summary="serial of the implicit grab on the pointer"/> <arg name="parent" type="object" interface="wl_surface" summary="parent surface"/> <arg name="x" type="int" summary="surface-local x coordinate"/> commit 40feca914b94d1d3e2f1f6fc7a22a5ebee014137 Author: Yong Bakos <yba...@humanoriented.com> Date: Thu Aug 11 14:33:02 2016 -0700 protocol: Correct description indentation Signed-off-by: Yong Bakos <yba...@humanoriented.com> Reviewed-by: Bryce Harrington <br...@osg.samsung.com> diff --git a/protocol/wayland.xml b/protocol/wayland.xml index 523bd9d..55a74a7 100644 --- a/protocol/wayland.xml +++ b/protocol/wayland.xml @@ -173,7 +173,7 @@ <event name="done"> <description summary="done event"> - Notify the client when the related request is done. + Notify the client when the related request is done. </description> <arg name="callback_data" type="uint" summary="request-specific data for the wl_callback"/> </event> @@ -281,11 +281,11 @@ <enum name="format"> <description summary="pixel formats"> - This describes the memory layout of an individual pixel. + This describes the memory layout of an individual pixel. - All renderers should support argb8888 and xrgb8888 but any other - formats are optional and may not be supported by the particular - renderer in use. + All renderers should support argb8888 and xrgb8888 but any other + formats are optional and may not be supported by the particular + renderer in use. The drm format codes match the #defines in drm_fourcc.h. The formats actually supported by the compositor will be commit 3f1104d64cd24b0580c0b8c86ca699bf03fe9d1f Author: Yong Bakos <yba...@humanoriented.com> Date: Thu Aug 11 14:33:01 2016 -0700 protocol: Add missing line break Signed-off-by: Yong Bakos <yba...@humanoriented.com> Reviewed-by: Bryce Harrington <br...@osg.samsung.com> diff --git a/protocol/wayland.xml b/protocol/wayland.xml index cc0deac..523bd9d 100644 --- a/protocol/wayland.xml +++ b/protocol/wayland.xml @@ -170,6 +170,7 @@ Clients can handle the 'done' event to get notified when the related request is done. </description> + <event name="done"> <description summary="done event"> Notify the client when the related request is done. commit 83ec381bf8e40273c02170028598212f738b9dfd Author: Yong Bakos <yba...@humanoriented.com> Date: Thu Aug 11 14:33:00 2016 -0700 protocol: Capitalize ID for consistency Signed-off-by: Yong Bakos <yba...@humanoriented.com> Reviewed-by: Bryce Harrington <br...@osg.samsung.com> diff --git a/protocol/wayland.xml b/protocol/wayland.xml index b20d35c..cc0deac 100644 --- a/protocol/wayland.xml +++ b/protocol/wayland.xml @@ -98,7 +98,7 @@ When the client receives this event, it will know that it can safely reuse the object ID. </description> - <arg name="id" type="uint" summary="deleted object id"/> + <arg name="id" type="uint" summary="deleted object ID"/> </event> </interface> commit aaf2c91873d77df2bdc1aa32bd7bf6ced41ac53b Author: Yong Bakos <yba...@humanoriented.com> Date: Thu Aug 11 14:32:59 2016 -0700 protocol: Hyphenate subsurface Signed-off-by: Yong Bakos <yba...@humanoriented.com> Reviewed-by: Bryce Harrington <br...@osg.samsung.com> diff --git a/protocol/wayland.xml b/protocol/wayland.xml index 8793293..b20d35c 100644 --- a/protocol/wayland.xml +++ b/protocol/wayland.xml @@ -2511,7 +2511,7 @@ </description> <arg name="id" type="new_id" interface="wl_subsurface" - summary="the new subsurface object ID"/> + summary="the new sub-surface object ID"/> <arg name="surface" type="object" interface="wl_surface" summary="the surface to be turned into a sub-surface"/> <arg name="parent" type="object" interface="wl_surface" commit d7cb6c357023e2c224c169755cdb80a17c8c79aa Author: Yong Bakos <yba...@humanoriented.com> Date: Thu Aug 11 14:32:58 2016 -0700 protocol: Add summary attributes to request params and enum entries Signed-off-by: Yong Bakos <yba...@humanoriented.com> Reviewed-by: Bryce Harrington <br...@osg.samsung.com> diff --git a/protocol/wayland.xml b/protocol/wayland.xml index 0830afc..8793293 100644 --- a/protocol/wayland.xml +++ b/protocol/wayland.xml @@ -48,7 +48,8 @@ The callback_data passed in the callback is the event serial. </description> - <arg name="callback" type="new_id" interface="wl_callback"/> + <arg name="callback" type="new_id" interface="wl_callback" + summary="callback object for the sync request"/> </request> <request name="get_registry"> @@ -57,7 +58,8 @@ to list and bind the global objects available from the compositor. </description>