Hello community,
here is the log from the commit of package wayland for openSUSE:Factory checked
in at 2013-09-27 19:24:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/wayland (Old)
and /work/SRC/openSUSE:Factory/.wayland.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wayland"
Changes:
--------
--- /work/SRC/openSUSE:Factory/wayland/wayland.changes 2013-07-22
14:57:52.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.wayland.new/wayland.changes 2013-09-27
19:24:11.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Sep 19 21:58:52 UTC 2013 - hrvoje.sen...@gmail.com
+
+- Update to new upstream release 1.2.1
+* Bug fixes and documentation tweaks
+* Touch support for toytoolkit and other clients.
+
+-------------------------------------------------------------------
Old:
----
wayland-1.2.0.tar.xz
New:
----
wayland-1.2.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ wayland.spec ++++++
--- /var/tmp/diff_new_pack.DjVzc6/_old 2013-09-27 19:24:12.000000000 +0200
+++ /var/tmp/diff_new_pack.DjVzc6/_new 2013-09-27 19:24:12.000000000 +0200
@@ -18,7 +18,7 @@
Name: wayland
%define lname libwayland0
-Version: 1.2.0
+Version: 1.2.1
Release: 0
Summary: Wayland Compositor Infrastructure
License: HPND
++++++ wayland-1.2.0.tar.xz -> wayland-1.2.1.tar.xz ++++++
++++ 2381 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/wayland-1.2.0/configure.ac new/wayland-1.2.1/configure.ac
--- old/wayland-1.2.0/configure.ac 2013-07-13 07:29:35.000000000 +0200
+++ new/wayland-1.2.1/configure.ac 2013-08-22 19:39:38.000000000 +0200
@@ -2,7 +2,7 @@
m4_define([wayland_major_version], [1])
m4_define([wayland_minor_version], [2])
-m4_define([wayland_micro_version], [0])
+m4_define([wayland_micro_version], [1])
m4_define([wayland_version],
[wayland_major_version.wayland_minor_version.wayland_micro_version])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/wayland-1.2.0/doc/doxygen/man/man3/wl_buffer.3
new/wayland-1.2.1/doc/doxygen/man/man3/wl_buffer.3
--- old/wayland-1.2.0/doc/doxygen/man/man3/wl_buffer.3 2013-07-13
07:49:07.000000000 +0200
+++ new/wayland-1.2.1/doc/doxygen/man/man3/wl_buffer.3 2013-08-22
19:47:11.000000000 +0200
@@ -1,4 +1,4 @@
-.TH "wl_buffer" 3 "Sat Jul 13 2013" "Version 1.2.0" "Wayland" \" -*- nroff -*-
+.TH "wl_buffer" 3 "Thu Aug 22 2013" "Version 1.2.1" "Wayland" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/wayland-1.2.0/doc/doxygen/man/man3/wl_client.3
new/wayland-1.2.1/doc/doxygen/man/man3/wl_client.3
--- old/wayland-1.2.0/doc/doxygen/man/man3/wl_client.3 2013-07-13
07:49:07.000000000 +0200
+++ new/wayland-1.2.1/doc/doxygen/man/man3/wl_client.3 2013-08-22
19:47:11.000000000 +0200
@@ -1,4 +1,4 @@
-.TH "wl_client" 3 "Sat Jul 13 2013" "Version 1.2.0" "Wayland" \" -*- nroff -*-
+.TH "wl_client" 3 "Thu Aug 22 2013" "Version 1.2.1" "Wayland" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/wayland-1.2.0/doc/doxygen/man/man3/wl_display.3
new/wayland-1.2.1/doc/doxygen/man/man3/wl_display.3
--- old/wayland-1.2.0/doc/doxygen/man/man3/wl_display.3 2013-07-13
07:49:07.000000000 +0200
+++ new/wayland-1.2.1/doc/doxygen/man/man3/wl_display.3 2013-08-22
19:47:11.000000000 +0200
@@ -1,4 +1,4 @@
-.TH "wl_display" 3 "Sat Jul 13 2013" "Version 1.2.0" "Wayland" \" -*- nroff -*-
+.TH "wl_display" 3 "Thu Aug 22 2013" "Version 1.2.1" "Wayland" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -136,7 +136,7 @@
A \fBwl_display\fP object or \fCNULL\fP on failure
.RE
.PP
-Connect to the Wayland display named \fCname\fP\&. If \fCname\fP is
\fCNULL\fP, its value will bee replaced with the WAYLAND_DISPLAY environment
variable if it is set, otherwise display 'wayland-0' will be used\&.
+Connect to the Wayland display named \fCname\fP\&. If \fCname\fP is
\fCNULL\fP, its value will be replaced with the WAYLAND_DISPLAY environment
variable if it is set, otherwise display 'wayland-0' will be used\&.
.SS "struct \fBwl_display\fP * wl_display_connect_to_fd (intfd)\fC [read]\fP"
Connect to Wayland display on an already open fd
.PP
@@ -269,7 +269,7 @@
The number of dispatched events on success or -1 on failure
.RE
.PP
-Dispatch all incoming events for objects assigned to the given event queue\&.
On failure -1 is returned and errno set appropriately\&. If there are no events
queued, this functions return immediately\&.
+Dispatch all incoming events for objects assigned to the given event queue\&.
On failure -1 is returned and errno set appropriately\&. If there are no events
queued, this function returns immediately\&.
.PP
\fBSince:\fP
.RS 4
@@ -287,14 +287,14 @@
.PP
\fBReturns:\fP
.RS 4
-The number of bytes send on success or -1 on failure
+The number of bytes sent on success or -1 on failure
.RE
.PP
Send all buffered data on the client side to the server\&. Clients should call
this function before blocking\&. On success, the number of bytes sent to the
server is returned\&. On failure, this function returns -1 and errno is set
appropriately\&.
.PP
\fBwl_display_flush()\fP never blocks\&. It will write as much data as
possible, but if all data could not be written, errno will be set to EAGAIN and
-1 returned\&. In that case, use poll on the display file descriptor to wait
for it to become writable again\&.
.SS "int wl_display_get_error (struct \fBwl_display\fP *display)"
-Retrieve the last error occurred on a display
+Retrieve the last error that occurred on a display
.PP
\fBParameters:\fP
.RS 4
@@ -303,10 +303,10 @@
.PP
\fBReturns:\fP
.RS 4
-The last error occurred on \fCdisplay\fP or 0 if no error occurred
+The last error that occurred on \fCdisplay\fP or 0 if no error occurred
.RE
.PP
-Return the last error occurred on the display\&. This may be an error sent by
the server or caused by the local client\&.
+Return the last error that occurred on the display\&. This may be an error
sent by the server or caused by the local client\&.
.PP
\fBNote:\fP
.RS 4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/wayland-1.2.0/doc/doxygen/man/man3/wl_event_queue.3
new/wayland-1.2.1/doc/doxygen/man/man3/wl_event_queue.3
--- old/wayland-1.2.0/doc/doxygen/man/man3/wl_event_queue.3 2013-07-13
07:49:07.000000000 +0200
+++ new/wayland-1.2.1/doc/doxygen/man/man3/wl_event_queue.3 2013-08-22
19:47:11.000000000 +0200
@@ -1,4 +1,4 @@
-.TH "wl_event_queue" 3 "Sat Jul 13 2013" "Version 1.2.0" "Wayland" \" -*-
nroff -*-
+.TH "wl_event_queue" 3 "Thu Aug 22 2013" "Version 1.2.1" "Wayland" \" -*-
nroff -*-
.ad l
.nh
.SH NAME
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/wayland-1.2.0/doc/doxygen/man/man3/wl_global.3
new/wayland-1.2.1/doc/doxygen/man/man3/wl_global.3
--- old/wayland-1.2.0/doc/doxygen/man/man3/wl_global.3 2013-07-13
07:49:07.000000000 +0200
+++ new/wayland-1.2.1/doc/doxygen/man/man3/wl_global.3 2013-08-22
19:47:11.000000000 +0200
@@ -1,4 +1,4 @@
-.TH "wl_global" 3 "Sat Jul 13 2013" "Version 1.2.0" "Wayland" \" -*- nroff -*-
+.TH "wl_global" 3 "Thu Aug 22 2013" "Version 1.2.1" "Wayland" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/wayland-1.2.0/doc/doxygen/man/man3/wl_listener.3
new/wayland-1.2.1/doc/doxygen/man/man3/wl_listener.3
--- old/wayland-1.2.0/doc/doxygen/man/man3/wl_listener.3 2013-07-13
07:49:07.000000000 +0200
+++ new/wayland-1.2.1/doc/doxygen/man/man3/wl_listener.3 2013-08-22
19:47:11.000000000 +0200
@@ -1,4 +1,4 @@
-.TH "wl_listener" 3 "Sat Jul 13 2013" "Version 1.2.0" "Wayland" \" -*- nroff
-*-
+.TH "wl_listener" 3 "Thu Aug 22 2013" "Version 1.2.1" "Wayland" \" -*- nroff
-*-
.ad l
.nh
.SH NAME
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/wayland-1.2.0/doc/doxygen/man/man3/wl_object.3
new/wayland-1.2.1/doc/doxygen/man/man3/wl_object.3
--- old/wayland-1.2.0/doc/doxygen/man/man3/wl_object.3 2013-07-13
07:49:07.000000000 +0200
+++ new/wayland-1.2.1/doc/doxygen/man/man3/wl_object.3 2013-08-22
19:47:11.000000000 +0200
@@ -1,4 +1,4 @@
-.TH "wl_object" 3 "Sat Jul 13 2013" "Version 1.2.0" "Wayland" \" -*- nroff -*-
+.TH "wl_object" 3 "Thu Aug 22 2013" "Version 1.2.1" "Wayland" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/wayland-1.2.0/doc/doxygen/man/man3/wl_proxy.3
new/wayland-1.2.1/doc/doxygen/man/man3/wl_proxy.3
--- old/wayland-1.2.0/doc/doxygen/man/man3/wl_proxy.3 2013-07-13
07:49:07.000000000 +0200
+++ new/wayland-1.2.1/doc/doxygen/man/man3/wl_proxy.3 2013-08-22
19:47:11.000000000 +0200
@@ -1,4 +1,4 @@
-.TH "wl_proxy" 3 "Sat Jul 13 2013" "Version 1.2.0" "Wayland" \" -*- nroff -*-
+.TH "wl_proxy" 3 "Thu Aug 22 2013" "Version 1.2.1" "Wayland" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/wayland-1.2.0/doc/doxygen/man/man3/wl_resource.3
new/wayland-1.2.1/doc/doxygen/man/man3/wl_resource.3
--- old/wayland-1.2.0/doc/doxygen/man/man3/wl_resource.3 2013-07-13
07:49:07.000000000 +0200
+++ new/wayland-1.2.1/doc/doxygen/man/man3/wl_resource.3 2013-08-22
19:47:11.000000000 +0200
@@ -1,4 +1,4 @@
-.TH "wl_resource" 3 "Sat Jul 13 2013" "Version 1.2.0" "Wayland" \" -*- nroff
-*-
+.TH "wl_resource" 3 "Thu Aug 22 2013" "Version 1.2.1" "Wayland" \" -*- nroff
-*-
.ad l
.nh
.SH NAME
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/wayland-1.2.0/doc/doxygen/man/man3/wl_signal.3
new/wayland-1.2.1/doc/doxygen/man/man3/wl_signal.3
--- old/wayland-1.2.0/doc/doxygen/man/man3/wl_signal.3 2013-07-13
07:49:07.000000000 +0200
+++ new/wayland-1.2.1/doc/doxygen/man/man3/wl_signal.3 2013-08-22
19:47:11.000000000 +0200
@@ -1,4 +1,4 @@
-.TH "wl_signal" 3 "Sat Jul 13 2013" "Version 1.2.0" "Wayland" \" -*- nroff -*-
+.TH "wl_signal" 3 "Thu Aug 22 2013" "Version 1.2.1" "Wayland" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/wayland-1.2.0/doc/doxygen/man/man3/wl_socket.3
new/wayland-1.2.1/doc/doxygen/man/man3/wl_socket.3
--- old/wayland-1.2.0/doc/doxygen/man/man3/wl_socket.3 2013-07-13
07:49:07.000000000 +0200
+++ new/wayland-1.2.1/doc/doxygen/man/man3/wl_socket.3 2013-08-22
19:47:11.000000000 +0200
@@ -1,4 +1,4 @@
-.TH "wl_socket" 3 "Sat Jul 13 2013" "Version 1.2.0" "Wayland" \" -*- nroff -*-
+.TH "wl_socket" 3 "Thu Aug 22 2013" "Version 1.2.1" "Wayland" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/wayland-1.2.0/doc/man/wl_display_connect.3
new/wayland-1.2.1/doc/man/wl_display_connect.3
--- old/wayland-1.2.0/doc/man/wl_display_connect.3 2013-07-13
07:32:24.000000000 +0200
+++ new/wayland-1.2.1/doc/man/wl_display_connect.3 2013-08-21
01:25:08.000000000 +0200
@@ -1,7 +1,7 @@
'\" t
.\" Title: wl_display_connect
.\" Author: David Herrmann <dh.herrm...@googlemail.com>
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
.\" Date: September 2012
.\" Manual: wl_display_connect
.\" Source: wayland-client
@@ -71,7 +71,6 @@
is set correspondingly\&.
.SH "SEE ALSO"
.PP
-
\fBwayland-client\fR(7),
\fBwl_display_disconnect\fR(3),
\fBwl_display_iterate\fR(3)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/wayland-1.2.0/doc/publican/publican.cfg
new/wayland-1.2.1/doc/publican/publican.cfg
--- old/wayland-1.2.0/doc/publican/publican.cfg 2013-04-10 22:01:15.000000000
+0200
+++ new/wayland-1.2.1/doc/publican/publican.cfg 2013-08-21 01:23:48.000000000
+0200
@@ -6,3 +6,4 @@
brand: common
tmp_dir: Wayland
toc_section_depth: 1
+chunk_section_depth: 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/wayland-1.2.0/doc/publican/sources/Foreword.xml
new/wayland-1.2.1/doc/publican/sources/Foreword.xml
--- old/wayland-1.2.0/doc/publican/sources/Foreword.xml 2013-04-10
22:01:15.000000000 +0200
+++ new/wayland-1.2.1/doc/publican/sources/Foreword.xml 2013-08-21
01:23:11.000000000 +0200
@@ -9,15 +9,14 @@
<title>Preface</title>
<para>
- This document concerns the (i) Wayland architecture, (ii) Wayland model of
- operation and (iii) its library API. Wayland protocol specification is shown
- also in the Appendix. The document here is aimed at Wayland developers and
- who is looking for information how to program with it, but it is not meant
- primarily for applications developers.
+ This document describes the (i) Wayland architecture, (ii) Wayland model of
+ operation and (iii) its library API. Also, the Wayland protocol
specification is shown
+ in the Appendix. This document is aimed primarily at Wayland developers and
+ those looking to program with it; it does not cover application development.
</para>
<para>
- There have been many contributors to this document and, while this is the
- first edition only, many errors are expected to be found. We appreciate
+ There have been many contributors to this document and since this is only the
+ first edition many errors are expected to be found. We appreciate
corrections.
</para>
<literallayout>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/wayland-1.2.0/doc/publican/sources/Introduction.xml
new/wayland-1.2.1/doc/publican/sources/Introduction.xml
--- old/wayland-1.2.0/doc/publican/sources/Introduction.xml 2013-04-10
22:01:15.000000000 +0200
+++ new/wayland-1.2.1/doc/publican/sources/Introduction.xml 2013-08-21
01:23:14.000000000 +0200
@@ -8,7 +8,7 @@
<section id="sect-Motivation">
<title>Motivation</title>
<para>
- Most of Linux and Unix-based systems rely on the X Window System (or
+ Most Linux and Unix-based systems rely on the X Window System (or
simply <emphasis>X</emphasis>) as the low-level protocol for building
bitmap graphics interfaces. On these systems, the X stack has grown to
encompass functionality arguably belonging in client libraries,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/wayland-1.2.0/doc/publican/sources/Protocol.xml
new/wayland-1.2.1/doc/publican/sources/Protocol.xml
--- old/wayland-1.2.0/doc/publican/sources/Protocol.xml 2013-05-22
21:49:13.000000000 +0200
+++ new/wayland-1.2.1/doc/publican/sources/Protocol.xml 2013-08-21
01:23:54.000000000 +0200
@@ -164,6 +164,67 @@
</para>
</section>
<xi:include href="ProtocolInterfaces.xml"
xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <section id="sect-Protocol-Versioning">
+ <title>Versioning</title>
+ <para>
+ Every interface is versioned and every protocol object implements a
+ particular version of its interface. For global objects, the maximum
+ version supported by the server is advertised with the global and the
+ actual verion of the created protocol object is determined by the
+ version argument passed to wl_registry.bind(). For objects that are
+ not globals, their version is inferred from the object that created
+ them.
+ </para>
+ <para>
+ In order to keep things sane, this has a few implications for
+ interface versions:
+ <itemizedlist>
+ <listitem>
+ <para>
+ The object creation hierarchy must be a tree. Otherwise,
+ infering object versions from the parent object becomes a much
+ more difficult to properly track.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ When the version of an interface increases, so does the version
+ of its parent (recursively until you get to a global interface)
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ A global interface's version number acts like a counter for all
+ of its child interfaces. Whenever a child interface gets
+ modified, the global parent's interface version number also
+ increases (see above). The child interface then takes on the
+ same version number as the new version of its parent global
+ interface.
+ </para>
+ </listitem>
+ </itemizedlist>
+ </para>
+ <para>
+ To illustrate the above, consider the wl_compositor interface. It
+ has two children, wl_surface and wl_region. As of wayland version
+ 1.2, wl_surface and wl_compositor are both at version 3. If
+ something is added to the wl_region interface, both wl_region and
+ wl_compositor will get bumpped to version 4. If, afterwards,
+ wl_surface is changed, both wl_compositor and wl_surface will be at
+ version 5. In this way the global interface version is used as a
+ sort of "counter" for all of its child interfaces. This makes it
+ very simple to know the version of the child given the version of its
+ parent. The child is at the highest possible interface version that
+ is less than or equal to its parent's version.
+ </para>
+ <para>
+ It is worth noting a particular exception to the above versioning
+ scheme. The wl_display (and, by extension, wl_registry) interface
+ cannot change because it is the core protocol object and its version
+ is never advertised nor is there a mechanism to request a different
+ version.
+ </para>
+ </section>
<section id="sect-Protocol-Connect-Time">
<title>Connect Time</title>
<para>
@@ -196,10 +257,16 @@
<section id="sect-Protocol-Creating-Objects">
<title>Creating Objects</title>
<para>
- Each object has a unique ID. The IDs are allocated by the
- client, from a range of IDs. The server tracks how many
- IDs are left in the current range and sends a new range
- when the client is about to run out.
+ Each object has a unique ID. The IDs are allocated by the entity
+ creating the object (either client or server). IDs allocated by the
+ client are in the range [1, 0xfeffffff] while IDs allocated by the
+ server are in the range [0xff000000, 0xffffffff]. The 0 ID is
+ reserved to represent a null or non-existant object.
+
+ For efficiency purposes, the IDs are densely packed in the sense that
+ the ID N will not be used until N-1 has been used. Any ID allocation
+ algorithm that does not maintain this property is incompatible with
+ the implementation in libwayland.
</para>
</section>
<section id="sect-Protocol-Compositor">
@@ -285,11 +352,11 @@
A surface can change the pointer image when the surface is the pointer
focus of the input device. Wayland doesn't automatically change the
pointer image when a pointer enters a surface, but expects the
- application to set the cursor it wants in response the pointer
+ application to set the cursor it wants in response to the pointer
focus and motion events. The rationale is that a client has to manage
changing pointer images for UI elements within the surface in response
to motion events anyway, so we'll make that the only mechanism for
- setting changing the pointer image. If the server receives a request
+ setting or changing the pointer image. If the server receives a request
to set the pointer image after the surface loses pointer focus, the
request is ignored. To the client this will look like it successfully
set the pointer image.
@@ -312,8 +379,8 @@
<section id="sect-Protocol-Output">
<title>Output</title>
<para>
- A output is a global object, advertised at connect time or as they
- come and go.
+ An output is a global object, advertised at connect time or as it
+ comes and goes.
</para>
<para>
See <xref linkend="protocol-spec-interface-wl_output"/> for the protocol
@@ -452,7 +519,7 @@
</para>
<para>
When the drag ends, the receiving client receives a
- <function>wl_data_device.drop</function> event at which it is expect
+ <function>wl_data_device.drop</function> event at which it is expected
to transfer the data using the
<function>wl_data_offer.receive</function> request.
</para>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/wayland-1.2.0/protocol/wayland.xml new/wayland-1.2.1/protocol/wayland.xml
--- old/wayland-1.2.0/protocol/wayland.xml 2013-06-29 01:51:12.000000000
+0200
+++ new/wayland-1.2.1/protocol/wayland.xml 2013-08-21 01:23:46.000000000
+0200
@@ -521,7 +521,7 @@
<description summary="initiate drag-and-drop session">
This event is sent when an active drag-and-drop pointer enters
a surface owned by the client. The position of the pointer at
- enter time is provided by the x an y arguments, in surface
+ enter time is provided by the x and y arguments, in surface
local coordinates.
</description>
@@ -544,7 +544,7 @@
<description summary="drag-and-drop session motion">
This event is sent when the drag-and-drop pointer moves within
the currently focused surface. The new position of the pointer
- is provided by the x an y arguments, in surface local
+ is provided by the x and y arguments, in surface local
coordinates.
</description>
<arg name="time" type="uint" summary="timestamp with millisecond
granularity"/>
@@ -577,7 +577,7 @@
<interface name="wl_data_device_manager" version="1">
<description summary="data transfer interface">
- The wl_data_device_manager is a a singleton global object that
+ The wl_data_device_manager is a singleton global object that
provides access to inter-client data transfer mechanisms such as
copy-and-paste and drag-and-drop. These mechanisms are tied to
a wl_seat and this interface lets a client get a wl_data_device
@@ -846,9 +846,9 @@
Set a class for the surface.
The surface class identifies the general class of applications
- to which the surface belongs. A common convention is to use
- the file name (full path if non-standard location) of the
- applications .desktop file as the class.
+ to which the surface belongs. A common convention is to use the
+ file name (or the full path if it is a non-standard location) of
+ the application's .desktop file as the class.
</description>
<arg name="class_" type="string"/>
</request>
@@ -890,7 +890,7 @@
<event name="popup_done">
<description summary="popup interaction is done">
The popup_done event is sent out when a popup grab is broken,
- that is, when the users clicks a surface that doesn't belong
+ that is, when the user clicks a surface that doesn't belong
to the client owning the popup surface.
</description>
</event>
@@ -952,10 +952,10 @@
Destroying the wl_buffer after wl_buffer.release does not change
the surface contents. However, if the client destroys the
- wl_buffer before receiving wl_buffer.release, the surface
+ wl_buffer before receiving the wl_buffer.release event, the surface
contents become undefined immediately.
- Only if wl_surface.attach is sent with a NULL wl_buffer, the
+ If wl_surface.attach is sent with a NULL wl_buffer, the
following wl_surface.commit will remove the surface content.
</description>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/wayland-1.2.0/src/scanner.c new/wayland-1.2.1/src/scanner.c
--- old/wayland-1.2.0/src/scanner.c 2013-07-13 06:33:27.000000000 +0200
+++ new/wayland-1.2.1/src/scanner.c 2013-08-21 01:22:40.000000000 +0200
@@ -34,6 +34,10 @@
usage(int ret)
{
fprintf(stderr, "usage: ./scanner
[client-header|server-header|code]\n");
+ fprintf(stderr, "\n");
+ fprintf(stderr, "Converts XML protocol descriptions supplied on "
+ "stdin to client headers,\n"
+ "server headers, or protocol marshalling code.\n");
exit(ret);
}
@@ -1158,9 +1162,22 @@
struct protocol protocol;
int len;
void *buf;
+ enum {
+ CLIENT_HEADER,
+ SERVER_HEADER,
+ CODE,
+ } mode;
if (argc != 2)
usage(EXIT_FAILURE);
+ else if (strcmp(argv[1], "help") == 0 || strcmp(argv[1], "--help") == 0)
+ usage(EXIT_SUCCESS);
+ else if (strcmp(argv[1], "client-header") == 0)
+ mode = CLIENT_HEADER;
+ else if (strcmp(argv[1], "server-header") == 0)
+ mode = SERVER_HEADER;
+ else if (strcmp(argv[1], "code") == 0)
+ mode = CODE;
wl_list_init(&protocol.interface_list);
protocol.type_index = 0;
@@ -1193,12 +1210,16 @@
XML_ParserFree(ctx.parser);
- if (strcmp(argv[1], "client-header") == 0) {
- emit_header(&protocol, 0);
- } else if (strcmp(argv[1], "server-header") == 0) {
- emit_header(&protocol, 1);
- } else if (strcmp(argv[1], "code") == 0) {
- emit_code(&protocol);
+ switch(mode) {
+ case CLIENT_HEADER:
+ emit_header(&protocol, 0);
+ break;
+ case SERVER_HEADER:
+ emit_header(&protocol, 1);
+ break;
+ case CODE:
+ emit_code(&protocol);
+ break;
}
return 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/wayland-1.2.0/src/wayland-client-protocol.h
new/wayland-1.2.1/src/wayland-client-protocol.h
--- old/wayland-1.2.0/src/wayland-client-protocol.h 2013-07-13
07:49:04.000000000 +0200
+++ new/wayland-1.2.1/src/wayland-client-protocol.h 2013-08-22
19:40:18.000000000 +0200
@@ -808,8 +808,8 @@
*
* This event is sent when an active drag-and-drop pointer enters
* a surface owned by the client. The position of the pointer at
- * enter time is provided by the x an y arguments, in surface local
- * coordinates.
+ * enter time is provided by the x and y arguments, in surface
+ * local coordinates.
*/
void (*enter)(void *data,
struct wl_data_device *wl_data_device,
@@ -835,7 +835,7 @@
*
* This event is sent when the drag-and-drop pointer moves within
* the currently focused surface. The new position of the pointer
- * is provided by the x an y arguments, in surface local
+ * is provided by the x and y arguments, in surface local
* coordinates.
*/
void (*motion)(void *data,
@@ -1136,7 +1136,7 @@
* popup_done - popup interaction is done
*
* The popup_done event is sent out when a popup grab is broken,
- * that is, when the users clicks a surface that doesn't belong to
+ * that is, when the user clicks a surface that doesn't belong to
* the client owning the popup surface.
*/
void (*popup_done)(void *data,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/wayland-1.2.0/src/wayland-client.c new/wayland-1.2.1/src/wayland-client.c
--- old/wayland-1.2.0/src/wayland-client.c 2013-07-13 06:40:31.000000000
+0200
+++ new/wayland-1.2.1/src/wayland-client.c 2013-08-21 01:23:18.000000000
+0200
@@ -563,7 +563,7 @@
* \return A \ref wl_display object or \c NULL on failure
*
* Connect to the Wayland display named \c name. If \c name is \c NULL,
- * its value will bee replaced with the WAYLAND_DISPLAY environment
+ * its value will be replaced with the WAYLAND_DISPLAY environment
* variable if it is set, otherwise display "wayland-0" will be used.
*
* \memberof wl_display
@@ -1148,7 +1148,7 @@
*
* Dispatch all incoming events for objects assigned to the given
* event queue. On failure -1 is returned and errno set appropriately.
- * If there are no events queued, this functions return immediately.
+ * If there are no events queued, this function returns immediately.
*
* \memberof wl_display
* \since 1.0.2
@@ -1157,18 +1157,15 @@
wl_display_dispatch_queue_pending(struct wl_display *display,
struct wl_event_queue *queue)
{
+ int ret;
+
pthread_mutex_lock(&display->mutex);
- if (dispatch_queue(display, queue) == -1)
- goto err_unlock;
+ ret = dispatch_queue(display, queue);
pthread_mutex_unlock(&display->mutex);
- return 0;
-
- err_unlock:
- pthread_mutex_unlock(&display->mutex);
- return -1;
+ return ret;
}
/** Process incoming events
@@ -1244,12 +1241,12 @@
return wl_display_dispatch_queue_pending(display, &display->queue);
}
-/** Retrieve the last error occurred on a display
+/** Retrieve the last error that occurred on a display
*
* \param display The display context object
- * \return The last error occurred on \c display or 0 if no error occurred
+ * \return The last error that occurred on \c display or 0 if no error occurred
*
- * Return the last error occurred on the display. This may be an error sent
+ * Return the last error that occurred on the display. This may be an error
sent
* by the server or caused by the local client.
*
* \note Errors are \b fatal. If this function returns non-zero the display
@@ -1274,7 +1271,7 @@
/** Send all buffered requests on the display to the server
*
* \param display The display context object
- * \return The number of bytes send on success or -1 on failure
+ * \return The number of bytes sent on success or -1 on failure
*
* Send all buffered data on the client side to the server. Clients
* should call this function before blocking. On success, the number
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/wayland-1.2.0/src/wayland-server-protocol.h
new/wayland-1.2.1/src/wayland-server-protocol.h
--- old/wayland-1.2.0/src/wayland-server-protocol.h 2013-07-13
07:49:04.000000000 +0200
+++ new/wayland-1.2.1/src/wayland-server-protocol.h 2013-08-22
19:40:18.000000000 +0200
@@ -634,11 +634,10 @@
* @create_data_source: create a new data source
* @get_data_device: create a new data device
*
- * The wl_data_device_manager is a a singleton global object that
- * provides access to inter-client data transfer mechanisms such as
- * copy-and-paste and drag-and-drop. These mechanisms are tied to a wl_seat
- * and this interface lets a client get a wl_data_device corresponding to a
- * wl_seat.
+ * The wl_data_device_manager is a singleton global object that provides
+ * access to inter-client data transfer mechanisms such as copy-and-paste
+ * and drag-and-drop. These mechanisms are tied to a wl_seat and this
+ * interface lets a client get a wl_data_device corresponding to a wl_seat.
*/
struct wl_data_device_manager_interface {
/**
@@ -990,8 +989,8 @@
*
* The surface class identifies the general class of applications
* to which the surface belongs. A common convention is to use the
- * file name (full path if non-standard location) of the
- * applications .desktop file as the class.
+ * file name (or the full path if it is a non-standard location) of
+ * the application's .desktop file as the class.
*/
void (*set_class)(struct wl_client *client,
struct wl_resource *resource,
@@ -1092,10 +1091,10 @@
*
* Destroying the wl_buffer after wl_buffer.release does not change
* the surface contents. However, if the client destroys the
- * wl_buffer before receiving wl_buffer.release, the surface
- * contents become undefined immediately.
+ * wl_buffer before receiving the wl_buffer.release event, the
+ * surface contents become undefined immediately.
*
- * Only if wl_surface.attach is sent with a NULL wl_buffer, the
+ * If wl_surface.attach is sent with a NULL wl_buffer, the
* following wl_surface.commit will remove the surface content.
*/
void (*attach)(struct wl_client *client,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/wayland-1.2.0/src/wayland-server.c new/wayland-1.2.1/src/wayland-server.c
--- old/wayland-1.2.0/src/wayland-server.c 2013-07-09 22:56:13.000000000
+0200
+++ new/wayland-1.2.1/src/wayland-server.c 2013-08-21 01:22:28.000000000
+0200
@@ -116,14 +116,6 @@
static int wl_debug = 0;
-static void
-destroy_client(void *data)
-{
- struct wl_client *client = data;
-
- wl_client_destroy(client);
-}
-
WL_EXPORT void
wl_resource_post_event(struct wl_resource *resource, uint32_t opcode, ...)
{
@@ -136,12 +128,13 @@
&object->interface->events[opcode]);
va_end(ap);
- if (closure == NULL)
+ if (closure == NULL) {
+ resource->client->error = 1;
return;
+ }
if (wl_closure_send(closure, resource->client->connection))
- wl_event_loop_add_idle(resource->client->display->loop,
- destroy_client, resource->client);
+ resource->client->error = 1;
if (wl_debug)
wl_closure_print(closure, object, true);
@@ -162,12 +155,13 @@
&object->interface->events[opcode]);
va_end(ap);
- if (closure == NULL)
+ if (closure == NULL) {
+ resource->client->error = 1;
return;
+ }
if (wl_closure_queue(closure, resource->client->connection))
- wl_event_loop_add_idle(resource->client->display->loop,
- destroy_client, resource->client);
+ resource->client->error = 1;
if (wl_debug)
wl_closure_print(closure, object, true);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/wayland-1.2.0/src/wayland-version.h new/wayland-1.2.1/src/wayland-version.h
--- old/wayland-1.2.0/src/wayland-version.h 2013-07-13 07:49:59.000000000
+0200
+++ new/wayland-1.2.1/src/wayland-version.h 2013-08-22 19:40:16.000000000
+0200
@@ -25,7 +25,7 @@
#define WAYLAND_VERSION_MAJOR 1
#define WAYLAND_VERSION_MINOR 2
-#define WAYLAND_VERSION_MICRO 0
-#define WAYLAND_VERSION "1.2.0"
+#define WAYLAND_VERSION_MICRO 1
+#define WAYLAND_VERSION "1.2.1"
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/wayland-1.2.0/wayland-scanner.m4 new/wayland-1.2.1/wayland-scanner.m4
--- old/wayland-1.2.0/wayland-scanner.m4 2013-07-03 22:38:12.000000000
+0200
+++ new/wayland-1.2.1/wayland-scanner.m4 2013-08-21 01:22:44.000000000
+0200
@@ -1,6 +1,8 @@
AC_DEFUN([WAYLAND_SCANNER_RULES], [
PKG_PROG_PKG_CONFIG
+ PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner])
+
wayland_scanner=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`
AC_SUBST([wayland_scanner])
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
