wayland: Changes to 'upstream-experimental'

2016-12-07 Thread Emilio Pozuelo Monfort 
 configure.ac |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a0d76ffda5c3483e5e67fed19b7d8afe8966782c
Author: Bryce Harrington 
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])

wayland: Changes to 'upstream-experimental'

2016-09-14 Thread Emilio Pozuelo Monfort 
 configure.ac   |2 +-
 doc/publican/sources/Book_Info.xml |2 +-
 protocol/wayland.xml   |2 +-
 src/wayland-server.c   |1 +
 tests/list-test.c  |   13 +
 5 files changed, 17 insertions(+), 3 deletions(-)

New commits:
commit a4aba37ba178f8400cfdc2b595005bb76d6af2c0
Author: Bryce Harrington 
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 
Date:   Wed Aug 17 16:08:17 2016 -0700

server: Document display parameter

Signed-off-by: Yong Bakos 
Reviewed-by: Bryce Harrington 
Reviewed-by: Pekka Paalanen 

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 
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 
Reviewed-by: Bryce Harrington 
Reviewed-by: Pekka Paalanen 

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.
   

commit da58173cfe047864d073ba078e0b8db982a31b12
Author: Bryce Harrington 
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 
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 
Reviewed-by: Eric Engestrom 
Reviewed-by: Pekka Paalanen 

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 == );
 }
 
+TEST(list_length)
+{
+   struct wl_list list;
+   struct element e;
+
+   wl_list_init();
+   assert(wl_list_length() == 0);
+   wl_list_insert(, );
+   assert(wl_list_length() == 1);
+   wl_list_remove();
+   assert(wl_list_length() == 0);
+}
+
 TEST(list_iterator)
 {
struct wl_list list;

commit d9ef882139e6178edf68c3fce147afdb3b57b894
Author: Yong Bakos 
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 
Reviewed-by: Pekka Paalanen 

diff --git a/doc/publican/sources/Book_Info.xml 
b/doc/publican/sources/Book_Info.xml
index e9e5ff0..0b7bf07 100644
---

wayland: Changes to 'upstream-experimental'

2016-08-18 Thread Hector Oron 
 Makefile.am   |   13 
 configure.ac  |   20 
 cursor/cursor-data.h  |2 
 cursor/wayland-cursor.c   |1 
 doc/Contributing  |   19 
 doc/doxygen/.gitignore|1 
 doc/doxygen/Makefile.am   |   28 +
 doc/doxygen/mainpage.dox  |   22 +
 doc/doxygen/wayland.doxygen.in|6 
 doc/publican/doxygen-to-publican.xsl  |2 
 doc/publican/protocol-to-docbook.xsl  |   39 +
 doc/publican/sources/Architecture.xml |4 
 doc/publican/sources/Protocol.xml |4 
 protocol/wayland.xml  |  735 +-
 src/.gitignore|1 
 src/connection.c  |   16 
 src/dtddata.S |8 
 src/event-loop.c  |   12 
 src/scanner.c |  353 +++-
 src/wayland-client-core.h |9 
 src/wayland-client.c  |  172 ++-
 src/wayland-client.h  |7 
 src/wayland-private.h |   16 
 src/wayland-server-core.h |  123 -
 src/wayland-server.c  |  282 -
 src/wayland-server.h  |   12 
 src/wayland-shm.c |  103 +++-
 src/wayland-util.c|   42 +
 src/wayland-util.h|   21 
 tests/compositor-introspection-test.c |  172 +++
 tests/connection-test.c   |1 
 tests/display-test.c  |   56 ++
 tests/event-loop-test.c   |1 
 tests/exec-fd-leak-checker.c  |2 
 tests/headers-protocol-core-test.c|7 
 tests/map-test.c  |1 
 tests/os-wrappers-test.c  |1 
 tests/protocol-logger-test.c  |  148 ++
 tests/queue-test.c|  123 +
 tests/resources-test.c|   11 
 tests/test-compositor.c   |1 
 tests/test-compositor.h   |1 
 tests/test-runner.c   |2 
 43 files changed, 1962 insertions(+), 638 deletions(-)

New commits:
commit 2a6b08896abeb8ce82f381b1abf5daeee53e7d79
Author: Bryce Harrington 
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 
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 
Reviewed-by: Bryce Harrington 

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 
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 
Reviewed-by: Bryce Harrington 

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.
   
-  
+  
 
 
 
@@ -1030,7 +1030,7

wayland: Changes to 'upstream-experimental'

2016-02-04 Thread Hector Oron 
 .gitignore   |   19 
 COPYING  |   39 
 Makefile.am  |  102 +-
 configure.ac |   85 +
 cursor/convert_font.c|   87 -
 cursor/cursor-data.h | 1038 ++---
 cursor/os-compatibility.c|   35 
 cursor/os-compatibility.h|   35 
 cursor/wayland-cursor.c  |   81 +
 cursor/wayland-cursor.h  |   39 
 cursor/xcursor.c |   35 
 cursor/xcursor.h |   35 
 doc/Contributing |   88 +
 doc/doxygen/.gitignore   |1 
 doc/doxygen/Makefile.am  |   11 
 doc/doxygen/wayland.doxygen.in   | 1728 ---
 doc/publican/protocol-to-docbook.xsl |9 
 doc/publican/sources/Book_Info.xml   |   46 
 doc/publican/sources/Client.xml  |2 
 doc/publican/sources/Protocol.xml|   41 
 protocol/wayland.dtd |4 
 protocol/wayland.xml |  663 +++--
 publish-doc  |   15 
 src/connection.c |   75 -
 src/dtddata.S|   39 
 src/event-loop.c |   38 
 src/scanner.c|  802 
 src/wayland-client-core.h|  258 +
 src/wayland-client.c |  633 ++--
 src/wayland-client.h |  197 ---
 src/wayland-egl-core.h   |   59 +
 src/wayland-egl.h|   64 -
 src/wayland-os.c |   35 
 src/wayland-os.h |   35 
 src/wayland-private.h|  130 +-
 src/wayland-server-core.h|  489 +
 src/wayland-server.c |  162 ++-
 src/wayland-server.h |  421 
 src/wayland-shm.c|  143 +-
 src/wayland-util.c   |   49 
 src/wayland-util.h   |   82 +
 src/wayland-version.h.in |   35 
 tests/array-test.c   |   44 
 tests/client-test.c  |   35 
 tests/connection-test.c  |   47 
 tests/display-test.c |  362 ++-
 tests/event-loop-test.c  |   35 
 tests/exec-fd-leak-checker.c |   35 
 tests/fixed-benchmark.c  |   37 
 tests/fixed-test.c   |   35 
 tests/headers-protocol-core-test.c   |   34 
 tests/headers-protocol-test.c|   34 
 tests/headers-test.c |   53 +
 tests/list-test.c|   37 
 tests/map-test.c |   35 
 tests/message-test.c |   35 
 tests/os-wrappers-test.c |   37 
 tests/queue-test.c   |   41 
 tests/resources-test.c   |   35 
 tests/sanity-test.c  |   62 -
 tests/signal-test.c  |   35 
 tests/socket-test.c  |   55 -
 tests/test-compositor.c  |   83 +
 tests/test-compositor.h  |   46 
 tests/test-helpers.c |   35 
 tests/test-runner.c  |   35 
 tests/test-runner.h  |   24 
 67 files changed, 4979 insertions(+), 4351 deletions(-)

New commits:
commit 816a0ae09bd5c370b95cee459905976dc14cfac0
Author: Bryce Harrington 
Date:   Tue Feb 2 15:30:36 2016 -0800

configure.ac: bump to version 1.9.92 for the beta release

diff --git a/configure.ac b/configure.ac
index 2469cdb..63dd2cf 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],  [9])
-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 7b42788f212079c2ef4c69c095efa50e90ca1301
Author: Jonas Ådahl 
Date:   Mon Jan 25 17:28:06 2016 +0800

scanner: Print filename on DTD validation error

Don't just print prefix the errors with "protocol", but the actual file
name, if wayland-scanner was passed with the filename of the protocol
file. If wayland-scanner is reading from stdin, errors will be prefixed
with "" instead of "protocol".

Signed-off-by: Jonas Ådahl 
Reviewed-by: David Fort 
Reviewed-by: Derek Foreman 
Reviewed-by: Bryce Harrington 

diff --git a/src/scanner.c b/src/scanner.c
index 1d626f4..dda5473 100644
--- a/src/scanner.c
+++ b/src/scanner.c
@@ -71,7 +71,7 @@ usage(int ret)
 }
 
 static bool
-is_dtd_valid(FILE *input)
+is_dtd_valid(FILE *input, const char *filename)
 {
bool rc = true;
 #if HAVE_LIBXML
@@ -101,7 +101,7 @@ is_dtd_valid(FILE *input)
abort();
}
 
-   doc =

wayland: Changes to 'upstream-experimental'

2015-02-16 Thread Timo Aaltonen 
 configure.ac |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8e9d5a108476b3435a8286613b9a63b69afd92b7
Author: Bryce Harrington br...@osg.samsung.com
Date:   Fri Feb 13 19:17:56 2015 -0800

configure.ac: bump to version 1.7.0 for release

diff --git a/configure.ac b/configure.ac
index 7ef77eb..b2e1418 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], [6])
-m4_define([wayland_micro_version],  [93])
+m4_define([wayland_minor_version], [7])
+m4_define([wayland_micro_version],  [0])
 m4_define([wayland_version],
   [wayland_major_version.wayland_minor_version.wayland_micro_version])
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1yni4t-0007hu...@moszumanska.debian.org

wayland: Changes to 'upstream-experimental'

2015-02-10 Thread Timo Aaltonen 
Rebased ref, commits from common ancestor:
commit 52d971c924d0147d6949096c9cf001d75828a054
Author: Bryce Harrington br...@osg.samsung.com
Date:   Fri Feb 6 17:56:44 2015 -0800

configure.ac: bump to version 1.6.93 for rc2 release

diff --git a/configure.ac b/configure.ac
index 5a8e915..7ef77eb 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], [6])
-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 371a9e0aefcc2bdef9c044a59d613ce6c175ed73
Author: Bill Spitzak spit...@gmail.com
Date:   Tue Feb 3 14:26:58 2015 -0800

configure.ac: Fallback to older detection code if pkg-config can't find 
expat

This paritally reverts commit a4afd90f9f0c27ed5f3f313b915c260673f8be34.

On older expat versions (ie the one on Ubuntu 12.04) there is no pkg-config
file, so fall back to a test for the header and library. In addition the
source for expat does not seem to be in a git repository but in cvs instead
and it seems preferrable to not require cvs to build wayland.

The restored test has been updated to use AC_SEARCH_LIBS. This version
uses empty square brackets for the unused branches, similar to many other
if statements in configure.ac.
Reviewed-by: Bryce Harrington br...@osg.samsung.com
Reviewed-by: Andrew Oakley aoak...@espial.com

diff --git a/configure.ac b/configure.ac
index 0426b53..5a8e915 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,7 +85,16 @@ AC_ARG_WITH(icondir, [  --with-icondir=dirLook for 
cursor icons here],
 AC_SUBST([ICONDIR])
 
 if test x$enable_scanner = xyes; then
-   PKG_CHECK_MODULES(EXPAT, [expat])
+   PKG_CHECK_MODULES(EXPAT, [expat], [],
+   [AC_CHECK_HEADERS(expat.h, [],
+   [AC_MSG_ERROR([Can't find expat.h. Please install 
expat.])])
+SAVE_LIBS=$LIBS
+AC_SEARCH_LIBS(XML_ParserCreate, expat, [],
+   [AC_MSG_ERROR([Can't find expat library. Please install 
expat.])])
+EXPAT_LIBS=$LIBS
+LIBS=$SAVE_LIBS
+AC_SUBST(EXPAT_LIBS)
+   ])
 fi
 
 AC_PATH_PROG(XSLTPROC, xsltproc)

commit 76fe89ed535be7ff20e39d5d2ec3b26cb3fae37e
Author: Bryce Harrington br...@osg.samsung.com
Date:   Wed Jan 7 11:56:54 2015 -0800

tests: Fix FAIL in sanity-test (*timeout*) when Yama LSM enabled

This fixes a regression in the testsuite since c3653f7f, where four of
the timeout tests fail with Timeouts suppressed messages.

The timeouts are being suppressed because the testsuite is erroneously
detecting that a debugger is attached.  This detection mechanism
(adopted from libinput) uses ptrace to test if there is a debugger
parent process that can be attached.  Unfortunately, this is an
unreliable test: Kernel security policies exist to restrict the scope of
ptrace to prevent processes from snooping on one another.[1] This
security policy is set as the default on Ubuntu, and potentially other
Linux distributions.[2]

The Yama documentation suggests, For software that has defined
application-specific relationships between a debugging process and its
inferior (crash handlers, etc), prctl(PR_SET_PTRACER, pid, ...) can be
used.  An inferior can declare which other process (and its descendents)
are allowed to call PTRACE_ATTACH against it.  This prctl call has no
effect if Yama LSM is not loaded.

The child needs to be synchronized to the client to prevent a race
condition where the child might try to operate before the parent has
finished its prctl call.  This synchronization is done via pipes.

This patch can be tested by running sanity-test with
/proc/sys/kernel/yama/ptrace_scope set to 0 or 1; the test must pass for
either value.

1: 
http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=2d514487faf188938a4ee4fb3464eeecfbdcf8eb
2: 
https://wiki.ubuntu.com/SecurityTeam/Roadmap/KernelHardening#ptrace_Protection

Signed-off-by: Bryce Harrington br...@osg.samsung.com
Reviewed-by: Marek Chalupa mchqwe...@gmail.com
Reviewed-by: Daniel Stone dani...@collabora.com
Reviewed-by: Derek Foreman der...@osg.samsung.com

v4: Allow parent to communicate error state to child to prevent leaving
child in zombie state if parent hits an error.

v5: Check errno instead of rc for error.  Don't waitpid on ppid.
Signed-off-by: Bryce Harrington br...@osg.samsung.com

diff --git a/tests/test-runner.c b/tests/test-runner.c
index 0412e85..1e5f587 100644
--- a/tests/test-runner.c
+++ b/tests/test-runner.c
@@ -34,6 +34,10 @@
 #include errno.h
 #include limits.h
 #include sys/ptrace.h
+#include

wayland: Changes to 'upstream-experimental'

2015-01-24 Thread Hector Oron 
New branch 'upstream-experimental' available with the following commits:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1yewyr-00046j...@moszumanska.debian.org

wayland: Changes to 'upstream-experimental'

2013-06-06 Thread Emilio Pozuelo Monfort 
Rebased ref, commits from common ancestor:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ukjc2-0006w2...@vasks.debian.org

wayland: Changes to 'upstream-experimental'

2013-03-07 Thread Timo Aaltonen 
 README  |6 +++---
 configure.ac|4 ++--
 doc/man/Makefile.am |7 +++
 src/connection.c|   22 ++
 tests/queue-test.c  |5 +++--
 tests/test-runner.c |   23 ++-
 6 files changed, 51 insertions(+), 16 deletions(-)

New commits:
commit cf17fdf8b8cf7bb30eed31c9fedaee2a1b704501
Author: Kristian Høgsberg k...@bitplanet.net
Date:   Thu Jan 24 20:33:31 2013 -0500

configure.ac: Bump version to 1.0.5

Also update the bug URL to point to the right component and version.

diff --git a/configure.ac b/configure.ac
index c281125..436d912 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,13 +2,13 @@ AC_PREREQ([2.64])
 
 m4_define([wayland_major_version], [1])
 m4_define([wayland_minor_version], [0])
-m4_define([wayland_micro_version], [4])
+m4_define([wayland_micro_version], [5])
 m4_define([wayland_version],
   [wayland_major_version.wayland_minor_version.wayland_micro_version])
 
 AC_INIT([wayland],
 [wayland_version],
-[https://bugs.freedesktop.org/enter_bug.cgi?product=wayland],
+
[https://bugs.freedesktop.org/enter_bug.cgi?product=Waylandcomponent=waylandversion=1.0.5],
 [wayland],
 [http://wayland.freedesktop.org/])
 

commit 0fb588ed15d255ac1a453269b56f427264084307
Author: Armin K kre...@email.com
Date:   Thu Feb 14 14:44:08 2013 -0500

Make sure that man page xml files are always disted

diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index 1407953..41665eb 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -12,15 +12,14 @@ MANPAGES_ALIASES = \
 XML_FILES = \
${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst 
%.5,%.xml,${patsubst %.7,%.xml,$(MANPAGES)
 CLEANFILES =
-EXTRA_DIST =
-man_MANS =
+EXTRA_DIST = $(XML_FILES)
 
 if HAVE_XSLTPROC
 if HAVE_MANPAGES_STYLESHEET
 
 CLEANFILES += $(MANPAGES) $(MANPAGES_ALIASES)
-EXTRA_DIST += $(MANPAGES) $(MANPAGES_ALIASES) $(XML_FILES)
-man_MANS += $(MANPAGES) $(MANPAGES_ALIASES)
+EXTRA_DIST += $(MANPAGES) $(MANPAGES_ALIASES)
+dist_man_MANS = $(MANPAGES) $(MANPAGES_ALIASES)
 
 XSLTPROC_FLAGS = \
--stringparam man.authors.section.enabled 0 \

commit 1c156209ce571268947b0c9be914beefddbeebda
Author: Siddharth Heroor her...@gmail.com
Date:   Thu Feb 14 10:59:15 2013 +0530

README: Fix typos

Signed-off-by: Siddharth Heroor her...@gmail.com

diff --git a/README b/README
index 5f85888..ca26cc0 100644
--- a/README
+++ b/README
@@ -3,7 +3,7 @@ What is Wayland
 Wayland is a project to define a protocol for a compositor to talk to
 its clients as well as a library implementation of the protocol.  The
 compositor can be a standalone display server running on Linux kernel
-modesetting and evdev input devices, an X applications, or a wayland
+modesetting and evdev input devices, an X application, or a wayland
 client itself.  The clients can be traditional applications, X servers
 (rootless or fullscreen) or other display servers.
 
@@ -19,7 +19,7 @@ themselves, typically through cairo or OpenGL.
 
 The weston compositor is a reference implementation of a wayland
 compositor and the weston repository also includes a few example
-clients clients.
+clients.
 
 Building the wayland libraries is fairly simple, aside from libffi,
 they don't have many dependencies:
@@ -32,4 +32,4 @@ they don't have many dependencies:
 
 where PREFIX is where you want to install the libraries.  See
 http://wayland.freedesktop.org for more complete build instructions
-for wayland, weston, xwayland and various toolkits.
\ No newline at end of file
+for wayland, weston, xwayland and various toolkits.

commit acf1efe1f4c03aead1bd74ca1d8a8c39363fd255
Author: Kristian Høgsberg k...@bitplanet.net
Date:   Mon Feb 11 13:58:39 2013 -0500

tests: Add a help message for the test runner

In case we forget the name of the test case or typo it, the test runner
will now list the test cases in the test binary.

diff --git a/tests/test-runner.c b/tests/test-runner.c
index 8c79dff..9c6865a 100644
--- a/tests/test-runner.c
+++ b/tests/test-runner.c
@@ -90,6 +90,24 @@ find_test(const char *name)
 }
 
 static void
+usage(const char *name, int status)
+{
+   const struct test *t;
+
+   fprintf(stderr, Usage: %s [TEST]\n\n
+   With no arguments, run all test.  Specify test case to run\n
+   only that test without forking.  Available tests:\n\n,
+   name);
+
+   for (t = __start_test_section; t  __stop_test_section; t++)
+   fprintf(stderr,   %s\n, t-name);
+
+   fprintf(stderr, \n);
+
+   exit(status);
+}
+
+static void
 run_test(const struct test *t)
 {
int cur_alloc = num_alloc;
@@ -119,11 +137,14 @@ int main(int argc, char *argv[])
 
leak_check_enabled = !getenv(NO_ASSERT_LEAK_CHECK);
 
+   if (argc == 2  strcmp(argv[1], --help) == 0)
+   usage(argv[0], EXIT_SUCCESS);
+
if (argc == 2) {
t =

wayland: Changes to 'upstream-experimental'

2013-01-26 Thread Sven Joachim 
 .gitignore  |1 
 configure.ac|2 -
 src/event-loop.c|   21 
 src/wayland-server.c|   20 
 src/wayland-server.h|   11 ++
 tests/.gitignore|7 +++-
 tests/Makefile.am   |2 +
 tests/display-test.c|   79 
 tests/event-loop-test.c |   64 ++
 9 files changed, 204 insertions(+), 3 deletions(-)

New commits:
commit 9ebb18418a1c3dccc19d3931766240b54227f131
Author: Kristian Høgsberg k...@bitplanet.net
Date:   Thu Jan 24 20:33:31 2013 -0500

configure.ac: Bump version to 1.0.4

diff --git a/configure.ac b/configure.ac
index 571ca97..c281125 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], [0])
-m4_define([wayland_micro_version], [3])
+m4_define([wayland_micro_version], [4])
 m4_define([wayland_version],
   [wayland_major_version.wayland_minor_version.wayland_micro_version])
 

commit 0929033a85a4ef37601d399293b47f2b907dcb0d
Author: David Herrmann dh.herrm...@googlemail.com
Date:   Wed Jan 23 14:20:41 2013 +0100

gitignore: add test-suite files

The *.log and *.trs files should be ignored by git as well as the GNU
autotools ./test-driver helper script.

Signed-off-by: David Herrmann dh.herrm...@googlemail.com

diff --git a/.gitignore b/.gitignore
index 4f7a934..99b7089 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,5 +29,6 @@ ctags
 /ltmain.sh
 /missing
 /stamp-h1
+/test-driver
 Makefile
 Makefile.in
diff --git a/tests/.gitignore b/tests/.gitignore
index e97e294..ccd440a 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -1,6 +1,10 @@
+*.log
+*.trs
+
 array-test
 client-test
 connection-test
+display-test
 event-loop-test
 exec-fd-leak-checker
 fixed-benchmark
@@ -8,5 +12,6 @@ fixed-test
 list-test
 map-test
 os-wrappers-test
+queue-test
 sanity-test
-
+socket-test

commit 8a17f121cde0882a1de709ef3f54202bd8de6455
Author: David Herrmann dh.herrm...@googlemail.com
Date:   Wed Jan 23 14:11:19 2013 +0100

event-loop: fix returning the destroy-signal listener

We need to actually return the destroy-listener, otherwise the return
value is undefined.

Signed-off-by: David Herrmann dh.herrm...@googlemail.com

diff --git a/src/event-loop.c b/src/event-loop.c
index 25e8f9c..e556cc7 100644
--- a/src/event-loop.c
+++ b/src/event-loop.c
@@ -447,6 +447,6 @@ WL_EXPORT struct wl_listener *
 wl_event_loop_get_destroy_listener(struct wl_event_loop *loop,
   wl_notify_func_t notify)
 {
-   wl_signal_get(loop-destroy_signal, notify);
+   return wl_signal_get(loop-destroy_signal, notify);
 }
 

commit 8cddb70d21a8b93b479fdbe63529e7a9837dfe73
Author: Jason Ekstrand ja...@jlekstrand.net
Date:   Fri Jan 11 21:01:47 2013 -0600

Add a destroy signal to the wl_event_loop object

diff --git a/src/event-loop.c b/src/event-loop.c
index 8db9c7c..25e8f9c 100644
--- a/src/event-loop.c
+++ b/src/event-loop.c
@@ -43,6 +43,8 @@ struct wl_event_loop {
struct wl_list check_list;
struct wl_list idle_list;
struct wl_list destroy_list;
+
+   struct wl_signal destroy_signal;
 };
 
 struct wl_event_source_interface {
@@ -357,12 +359,16 @@ wl_event_loop_create(void)
wl_list_init(loop-idle_list);
wl_list_init(loop-destroy_list);
 
+   wl_signal_init(loop-destroy_signal);
+
return loop;
 }
 
 WL_EXPORT void
 wl_event_loop_destroy(struct wl_event_loop *loop)
 {
+   wl_signal_emit(loop-destroy_signal, loop);
+
wl_event_loop_process_destroy_list(loop);
close(loop-epoll_fd);
free(loop);
@@ -429,3 +435,18 @@ wl_event_loop_get_fd(struct wl_event_loop *loop)
 {
return loop-epoll_fd;
 }
+
+WL_EXPORT void
+wl_event_loop_add_destroy_listener(struct wl_event_loop *loop,
+  struct wl_listener *listener)
+{
+   wl_signal_add(loop-destroy_signal, listener);
+}
+
+WL_EXPORT struct wl_listener *
+wl_event_loop_get_destroy_listener(struct wl_event_loop *loop,
+  wl_notify_func_t notify)
+{
+   wl_signal_get(loop-destroy_signal, notify);
+}
+
diff --git a/src/wayland-server.h b/src/wayland-server.h
index 576304f..c7369eb 100644
--- a/src/wayland-server.h
+++ b/src/wayland-server.h
@@ -84,6 +84,12 @@ struct wl_touch;
 struct wl_listener;
 typedef void (*wl_notify_func_t)(struct wl_listener *listener, void *data);
 
+void wl_event_loop_add_destroy_listener(struct wl_event_loop *loop,
+   struct wl_listener * listener);
+struct wl_listener *wl_event_loop_get_destroy_listener(
+   struct wl_event_loop *loop,
+   wl_notify_func_t notify);
+
 struct wl_display *wl_display_create(void);
 void wl_display_destroy(struct

wayland: Changes to 'upstream-experimental'

2012-12-15 Thread Sven Joachim 
 configure.ac|   16 +++-
 doc/Wayland/Makefile.am |2 ++
 doc/man/Makefile.am |7 +--
 src/wayland-client.h|3 ---
 tests/connection-test.c |6 --
 5 files changed, 26 insertions(+), 8 deletions(-)

New commits:
commit ce1f41251a07600ed8c6b2e3dc1e868008aeb33a
Author: Kristian Høgsberg k...@bitplanet.net
Date:   Fri Dec 14 16:38:09 2012 -0500

configure.ac: Bump version to 1.0.3

diff --git a/configure.ac b/configure.ac
index c584439..571ca97 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], [0])
-m4_define([wayland_micro_version], [2])
+m4_define([wayland_micro_version], [3])
 m4_define([wayland_version],
   [wayland_major_version.wayland_minor_version.wayland_micro_version])
 

commit 8148896d19d0e5bb195c76825a4b140d5b16e501
Author: Pekka Paalanen ppaala...@gmail.com
Date:   Wed Dec 12 14:19:23 2012 +0200

client: remove two unused function pointer typedefs

The need for wl_display_update_func_t was removed in

commit 53d24713a31d59d9534c1c1a84a7ad46f44ee95f
Author: Kristian Høgsberg k...@bitplanet.net
Date:   Thu Oct 4 16:54:22 2012 -0400

Change filedescriptor API to be thread safe

and wl_callback_func_t does not seem to have ever been used in the first 
place.

Signed-off-by: Pekka Paalanen ppaala...@gmail.com

diff --git a/src/wayland-client.h b/src/wayland-client.h
index 8d2b8df..8b1fd0d 100644
--- a/src/wayland-client.h
+++ b/src/wayland-client.h
@@ -135,9 +135,6 @@ void wl_proxy_set_queue(struct wl_proxy *proxy, struct 
wl_event_queue *queue);
 
 #include wayland-client-protocol.h
 
-typedef int (*wl_display_update_func_t)(uint32_t mask, void *data);
-typedef void (*wl_callback_func_t)(void *data, uint32_t time);
-
 struct wl_display *wl_display_connect(const char *name);
 struct wl_display *wl_display_connect_to_fd(int fd);
 void wl_display_disconnect(struct wl_display *display);

commit 8bcfa5ad7061231495a65d39c4c9503a64fb2746
Author: Pekka Paalanen ppaala...@gmail.com
Date:   Mon Dec 3 16:58:25 2012 +0200

tests: rename temporary files

This is libwayland, not weston, so call the temporary files
wayland-tests-*, not weston-tests-*.

This is a candidate for the stable branch.

Signed-off-by: Pekka Paalanen ppaala...@gmail.com

diff --git a/tests/connection-test.c b/tests/connection-test.c
index 45744a0..1ac88d2 100644
--- a/tests/connection-test.c
+++ b/tests/connection-test.c
@@ -425,7 +425,7 @@ marshal_demarshal(struct marshal_data *data,
 TEST(connection_marshal_demarshal)
 {
struct marshal_data data;
-   char f[] = /tmp/weston-tests-XX;
+   char f[] = /tmp/wayland-tests-XX;
 
setup_marshal_data(data);
 
@@ -478,7 +478,7 @@ TEST(connection_marshal_alot)
 * for both regular data an fds. */
 
for (i = 0; i  2000; i++) {
-   strcpy(f, /tmp/weston-tests-XX);
+   strcpy(f, /tmp/wayland-tests-XX);
data.value.h = mkstemp(f);
assert(data.value.h = 0);
unlink(f);

commit 15625a5cc70f58aa466f3db5171a5fa1851aad71
Author: Sven Joachim svenj...@gmx.de
Date:   Sun Dec 2 22:42:11 2012 +0100

tests: Don't leave temporary files behind

Signed-off-by: Sven Joachim svenj...@gmx.de

diff --git a/tests/connection-test.c b/tests/connection-test.c
index d0113f1..45744a0 100644
--- a/tests/connection-test.c
+++ b/tests/connection-test.c
@@ -447,6 +447,7 @@ TEST(connection_marshal_demarshal)
 
data.value.h = mkstemp(f);
assert(data.value.h = 0);
+   unlink(f);
marshal_demarshal(data, (void *) validate_demarshal_h,
  8, h, data.value.h);
 
@@ -480,6 +481,7 @@ TEST(connection_marshal_alot)
strcpy(f, /tmp/weston-tests-XX);
data.value.h = mkstemp(f);
assert(data.value.h = 0);
+   unlink(f);
marshal_demarshal(data, (void *) validate_demarshal_h,
  8, h, data.value.h);
}

commit 7fd3ca049b2339363d31abcb7fe0e8305972317b
Author: Jonas Ådahl jad...@gmail.com
Date:   Sat Dec 1 17:33:23 2012 +0100

man, configure.ac: Only generate man pages if we can do it offline

Instead of relying on downloading the stylesheet from the Internet for
generating man pages, only generate them if the stylesheet is available
locally.

Signed-off-by: Jonas Ådahl jad...@gmail.com

diff --git a/configure.ac b/configure.ac
index 0d842e1..c584439 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,6 +76,20 @@ fi
 AC_PATH_PROG(XSLTPROC, xsltproc)
 AM_CONDITIONAL([HAVE_XSLTPROC], [test x$XSLTPROC != x])
 
+AC_MSG_CHECKING([for docbook manpages stylesheet])
+MANPAGES_STYLESHEET=http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl

wayland: Changes to 'upstream-experimental'

2012-12-01 Thread Sven Joachim 
 configure.ac|2 +-
 cursor/wayland-cursor.pc.in |8 
 protocol/wayland.xml|2 +-
 src/Makefile.am |1 +
 src/scanner.c   |2 +-
 src/wayland-client.c|   31 +++
 src/wayland-client.h|2 ++
 src/wayland-client.pc.in|8 
 src/wayland-server.c|2 +-
 src/wayland-server.pc.in|8 
 10 files changed, 46 insertions(+), 20 deletions(-)

New commits:
commit 64e37842983349dcb3bfd102885669db0c01b16c
Author: Kristian Høgsberg k...@bitplanet.net
Date:   Fri Nov 30 16:00:00 2012 -0500

configure.ac: Bump version to 1.0.2

diff --git a/configure.ac b/configure.ac
index aa7a62a..0d842e1 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], [0])
-m4_define([wayland_micro_version], [1])
+m4_define([wayland_micro_version], [2])
 m4_define([wayland_version],
   [wayland_major_version.wayland_minor_version.wayland_micro_version])
 

commit da999862716ea7824c254de68af4080d930384ea
Author: Kristian Høgsberg k...@bitplanet.net
Date:   Fri Nov 30 16:11:04 2012 -0500

client: Update libtool version for new entry points

We've added wl_display_dispatch_queue_pending, so update the libtool
library current and age fields accordingly.

diff --git a/src/Makefile.am b/src/Makefile.am
index f93954e..e1d04ea 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,6 +27,7 @@ libwayland_server_la_SOURCES =\
event-loop.c
 
 libwayland_client_la_LIBADD = $(FFI_LIBS) libwayland-util.la -lrt -lm
+libwayland_client_la_LDFLAGS = -version-info 1:0:1
 libwayland_client_la_SOURCES = \
wayland-protocol.c  \
wayland-client.c

commit 5c34b15f033eb0eb7062e99f7761d4cbd93af61e
Author: Kristian Høgsberg k...@bitplanet.net
Date:   Fri Nov 30 14:05:32 2012 -0500

client: Add \since tag for wl_display_dispatch_queue_pending() documentation

diff --git a/src/wayland-client.c b/src/wayland-client.c
index 5ba2c45..785f4ee 100644
--- a/src/wayland-client.c
+++ b/src/wayland-client.c
@@ -940,6 +940,7 @@ wl_display_dispatch_queue(struct wl_display *display,
  * If there are no events queued, this functions return immediately.
  *
  * \memberof wl_display
+ * \since 1.0.2
  */
 WL_EXPORT int
 wl_display_dispatch_queue_pending(struct wl_display *display,

commit 65a0bbdbdeaa4552a1af4ad4b1f3f4960305444f
Author: Quentin Glidic sardemff7+...@sardemff7.net
Date:   Tue Nov 27 22:35:18 2012 +0100

pkgconfig: Use configure provided directories

https://bugs.freedesktop.org/show_bug.cgi?id=57630

diff --git a/cursor/wayland-cursor.pc.in b/cursor/wayland-cursor.pc.in
index b10d039..fbbf5ff 100644
--- a/cursor/wayland-cursor.pc.in
+++ b/cursor/wayland-cursor.pc.in
@@ -1,8 +1,8 @@
 prefix=@prefix@
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
- 
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
 Name: Wayland Cursor
 Description: Wayland cursor helper library
 Version: @WAYLAND_VERSION@
diff --git a/src/wayland-client.pc.in b/src/wayland-client.pc.in
index b3df950..e453018 100644
--- a/src/wayland-client.pc.in
+++ b/src/wayland-client.pc.in
@@ -1,8 +1,8 @@
 prefix=@prefix@
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
- 
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
 Name: Wayland Client
 Description: Wayland client side library
 Version: @WAYLAND_VERSION@
diff --git a/src/wayland-server.pc.in b/src/wayland-server.pc.in
index 8e3214e..18a0b52 100644
--- a/src/wayland-server.pc.in
+++ b/src/wayland-server.pc.in
@@ -1,8 +1,8 @@
 prefix=@prefix@
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
- 
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
 Name: Wayland Server
 Description: Server side implementation of the Wayland protocol
 Version: @WAYLAND_VERSION@

commit 00639de12050c8755965a569de4f6df9dc36171f
Author: Ander Conselvan de Oliveira ander.conselvan.de.olive...@intel.com
Date:   Tue Nov 27 17:03:40 2012 +0200

scanner: Fix wrong restriction on since field

The scanner would not allow two consecutive requests on an interface to
have the same since number, so if a new version of an interface added
two new request the version number would have to be increased by two.

diff --git a/src/scanner.c b/src/scanner.c
index 5793c20..6d2eddd 100644
--- a/src/scanner.c
+++ b/src/scanner.c
@@ -356,7 +356,7 @@ start_element(void *data, const char *element_name, const 
char **atts)
version = strtol(since, end, 0);
if (errno == EINVAL || end == since || *end != '\0')
fail(ctx, invalid integer\n);
-   if (version =

wayland: Changes to 'upstream-experimental'

2012-11-20 Thread Sven Joachim 
 configure.ac|2 
 doc/Wayland/.gitignore  |1 
 doc/Wayland/Makefile.am |   16 +-
 doc/Wayland/doxygen-to-publican.xsl |   54 +-
 doc/Wayland/en_US/Architecture.xml  |4 
 doc/doxygen/.gitignore  |1 
 doc/doxygen/wayland.doxygen.in  |   19 --
 protocol/Makefile.am|   10 -
 protocol/protocol.xsl   |  204 -
 protocol/wayland-protocol.css   |   41 -
 protocol/wayland.xml|8 +
 src/wayland-client.c|  134 +---
 src/wayland-private.h   |2 
 tests/Makefile.am   |4 
 tests/queue-test.c  |  286 
 15 files changed, 471 insertions(+), 315 deletions(-)

New commits:
commit 5006829041b202f73d051be016a41adf3662bfdc
Author: Kristian Høgsberg k...@bitplanet.net
Date:   Mon Nov 19 17:27:04 2012 -0500

configure.ac: Bump version to 1.0.1

diff --git a/configure.ac b/configure.ac
index f681fc9..aa7a62a 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], [0])
-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])
 

commit edb0a1bef5e58f9db44116f62c34f481f990221c
Author: Kristian Høgsberg k...@bitplanet.net
Date:   Mon Nov 19 17:14:05 2012 -0500

doc: Fix out-of-source build so distcheck works again

The amount of generated files and hacks over hacks in the doc/ directory
is getting out of hand and we need a better solution.  For now, just get
distcheck back to working.

diff --git a/doc/Wayland/Makefile.am b/doc/Wayland/Makefile.am
index 2c41a49..53ad6ee 100644
--- a/doc/Wayland/Makefile.am
+++ b/doc/Wayland/Makefile.am
@@ -37,13 +37,13 @@ en-US/ProtocolInterfaces.xml: 
$(top_srcdir)/protocol/wayland.xml $(srcdir)/proto
 # the output methods.
 en-US/WaylandClientAPI.xml: $(top_builddir)/doc/doxygen/xml/index.xml 
$(srcdir)/doxygen-to-publican.xsl
$(AM_V_GEN)$(MKDIR_P) en-US/images
-   $(AM_V_GEN)mv $(top_srcdir)/doc/doxygen/xml/wayland-client_8h.xml \
-   $(top_srcdir)/doc/doxygen/
-   $(AM_V_GEN)$(XSLTPROC) $(top_srcdir)/doc/doxygen/xml/combine.xslt \
-   $(top_srcdir)/doc/doxygen/xml/index.xml  \
-   $(top_srcdir)/doc/doxygen/xml/clientAPI.xml
-   $(AM_V_GEN)mv $(top_srcdir)/doc/doxygen/wayland-client_8h.xml \
-   $(top_srcdir)/doc/doxygen/xml
+   $(AM_V_GEN)mv $(top_builddir)/doc/doxygen/xml/wayland-client_8h.xml \
+   $(top_builddir)/doc/doxygen/
+   $(AM_V_GEN)$(XSLTPROC) $(top_builddir)/doc/doxygen/xml/combine.xslt \
+   $(top_builddir)/doc/doxygen/xml/index.xml  \
+   $(top_builddir)/doc/doxygen/xml/clientAPI.xml
+   $(AM_V_GEN)mv $(top_builddir)/doc/doxygen/wayland-client_8h.xml \
+   $(top_builddir)/doc/doxygen/xml
$(AM_V_GEN)$(XSLTPROC) $(srcdir)/doxygen-to-publican.xsl \
$(top_builddir)/doc/doxygen/xml/clientAPI.xml  
en-US/WaylandClientAPI.xml
 

commit 173e1606322675149c09443e6037737748dd72f7
Author: Kristian Høgsberg k...@bitplanet.net
Date:   Mon Nov 19 17:11:58 2012 -0500

Fix distcheck by adding back protocol/Makefile.am

5909dddc78573774bd3a93c280831a7d18d82994 removed protocol/Makefile.am
which meant protocol/wayland.xml no longer got included in the tarball.
Add back protocol/Makefile.am and configure.ac bits and add protocol to
subdirs in Makefile.am to fix this.

diff --git a/Makefile.am b/Makefile.am
index 7f35034..306d7b3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ if BUILD_DOCS
 doc_subdir = doc
 endif
 
-SUBDIRS = src $(doc_subdir) tests cursor
+SUBDIRS = src protocol $(doc_subdir) tests cursor
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
diff --git a/configure.ac b/configure.ac
index a451948..f681fc9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -116,5 +116,6 @@ AC_CONFIG_FILES([Makefile
 src/wayland-server.pc
 src/wayland-client.pc
 src/wayland-version.h
+protocol/Makefile
 tests/Makefile])
 AC_OUTPUT
diff --git a/protocol/Makefile.am b/protocol/Makefile.am
new file mode 100644
index 000..08690b3
--- /dev/null
+++ b/protocol/Makefile.am
@@ -0,0 +1 @@
+EXTRA_DIST = wayland.xml

commit 3a671b4d3db6dd03bcc6e266484d30b9f3f4fd8b
Author: Kristian Høgsberg k...@bitplanet.net
Date:   Mon Nov 19 15:44:14 2012 -0500

protocol: Fix copy and paste summary

diff --git a/protocol/wayland.xml b/protocol/wayland.xml
index 0e51d83..ca3c56f 100644
--- a/protocol/wayland.xml
+++ b/protocol/wayland.xml
@@ -502,7 +502,7 @@
   /interface
 
   interface name=wl_data_device_manager version=1
-description

wayland: Changes to 'upstream-experimental'

2012-11-19 Thread Maarten Lankhorst 
 .gitignore |2 
 Makefile.am|6 
 TODO   |   21 
 configure.ac   |   28 
 cursor/Makefile.am |1 
 cursor/convert_font.c  |  531 +++
 cursor/cursor-data.h   |  548 +++
 cursor/cursor.pcf  |binary
 cursor/wayland-cursor.c|   73 +
 cursor/xcursor.c   |5 
 doc/Makefile.am|2 
 doc/Wayland/Makefile.am|   35 
 doc/Wayland/doxygen-to-publican.xsl|   46 
 doc/Wayland/en_US/Architecture.xml |2 
 doc/Wayland/en_US/Library.xml  |9 
 doc/Wayland/en_US/Protocol.xml |  458 +-
 doc/Wayland/en_US/Wayland.xml  |2 
 doc/Wayland/protocol-interfaces-to-docbook.xsl |   56 
 doc/Wayland/protocol-to-docbook.xsl|   33 
 doc/Wayland/publican.cfg   |2 
 doc/doxygen/.gitignore |1 
 doc/doxygen/Makefile.am|   13 
 doc/doxygen/wayland.doxygen.in | 1782 +
 doc/man/Makefile.am|   49 
 doc/man/wl_display_connect.xml |   88 +
 protocol/wayland.xml   |  366 -
 src/connection.c   |  328 ++--
 src/data-device.c  |   13 
 src/event-loop.c   |   15 
 src/scanner.c  |  157 +-
 src/wayland-client.c   |  853 ---
 src/wayland-client.h   |  144 +-
 src/wayland-egl.h  |9 
 src/wayland-private.h  |   25 
 src/wayland-server.c   |  272 ++-
 src/wayland-server.h   |   48 
 src/wayland-shm.c  |   47 
 src/wayland-util.c |   14 
 src/wayland-util.h |   32 
 tests/client-test.c|1 
 tests/connection-test.c|   82 -
 tests/os-wrappers-test.c   |   31 
 tests/sanity-test.c|8 
 tests/socket-test.c|   22 
 tests/test-runner.c|   10 
 45 files changed, 5110 insertions(+), 1160 deletions(-)

New commits:
commit 1f521a4f7760df73e1d1d8a6791d1c7bf536584e
Author: Kristian Høgsberg k...@bitplanet.net
Date:   Mon Oct 22 14:55:06 2012 -0400

configure.ac: Bump version to 1.0.0

diff --git a/configure.ac b/configure.ac
index 1a10cf8..f681fc9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 AC_PREREQ([2.64])
 
-m4_define([wayland_major_version], [0])
-m4_define([wayland_minor_version], [99])
+m4_define([wayland_major_version], [1])
+m4_define([wayland_minor_version], [0])
 m4_define([wayland_micro_version], [0])
 m4_define([wayland_version],
   [wayland_major_version.wayland_minor_version.wayland_micro_version])

commit 3b7d7b0c8014e31ec8ae1d2b31fb8c6de54cbc21
Author: Kristian Høgsberg k...@bitplanet.net
Date:   Sun Oct 21 22:24:33 2012 -0400

scanner: Preserve paragraph breaks in input XML

If we have a blank line in the incoming XML documentation, keep that in
the emitted doxygen comments.

diff --git a/src/scanner.c b/src/scanner.c
index 4a4e605..5793c20 100644
--- a/src/scanner.c
+++ b/src/scanner.c
@@ -177,7 +177,7 @@ desc_dump(char *desc, const char *fmt, ...)
 {
va_list ap;
char buf[128], hang;
-   int col, i, j, k, startcol;
+   int col, i, j, k, startcol, newlines;
 
va_start(ap, fmt);
vsnprintf(buf, sizeof buf, fmt, ap);
@@ -206,8 +206,12 @@ desc_dump(char *desc, const char *fmt, ...)
 
for (i = 0; desc[i]; ) {
k = i;
-   while (desc[i]  isspace(desc[i]))
+   newlines = 0;
+   while (desc[i]  isspace(desc[i])) {
+   if (desc[i] == '\n')
+   newlines++;
i++;
+   }
if (!desc[i])
break;
 
@@ -215,7 +219,9 @@ desc_dump(char *desc, const char *fmt, ...)
while (desc[i]  !isspace(desc[i]))
i++;
 
-   if (col + i - j  72) {
+   if (newlines  1)
+   printf(\n%s*, indent(startcol));
+   if (newlines  1 || col + i - j  72) {
printf(\n%s*%c, indent(startcol), hang);
col = startcol;
}

commit cc95db359c8b935699173ec921ba9316c762aea5
Author: Kristian Høgsberg k...@bitplanet.net
Date:

wayland: Changes to 'upstream-experimental'

2012-08-16 Thread Timo Aaltonen 
Rebased ref, commits from common ancestor:
commit f5ccd7a9e670e097ff9b5faae8a26b3af4bb7b60
Author: Kristian Høgsberg k...@bitplanet.net
Date:   Tue Jul 24 15:45:00 2012 -0400

Bump version to 0.95.0

diff --git a/configure.ac b/configure.ac
index ae32c19..46b3cdf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 AC_PREREQ([2.64])
 
 m4_define([wayland_major_version], [0])
-m4_define([wayland_minor_version], [94])
-m4_define([wayland_micro_version], [90])
+m4_define([wayland_minor_version], [95])
+m4_define([wayland_micro_version], [0])
 m4_define([wayland_version],
   [wayland_major_version.wayland_minor_version.wayland_micro_version])
 

commit 6ebde80f0f5c614a3ef95003b788ee6a7694413f
Author: Kristian Høgsberg k...@bitplanet.net
Date:   Tue Jul 24 15:10:12 2012 -0400

Make distcheck work from builddir configured  with --disable-documentation

diff --git a/doc/Wayland/Makefile.am b/doc/Wayland/Makefile.am
index c14082c..6d73de8 100644
--- a/doc/Wayland/Makefile.am
+++ b/doc/Wayland/Makefile.am
@@ -1,7 +1,3 @@
-if HAVE_PUBLICAN
-noinst_DATA = Wayland $(publican_targets)
-pubdir = $(docdir)/Wayland/en-US
-
 publican_sources = \
$(srcdir)/en_US/Wayland.ent \
$(srcdir)/en_US/Architecture.xml \
@@ -16,6 +12,10 @@ publican_sources = \
$(srcdir)/en_US/images/wayland.png  \
$(srcdir)/en_US/images/x-architecture.png
 
+if HAVE_PUBLICAN
+noinst_DATA = Wayland $(publican_targets)
+pubdir = $(docdir)/Wayland/en-US
+
 publican_targets = $(publican_sources:$(srcdir)/en_US%=$(builddir)/en-US%) \
en-US/ProtocolSpec.xml
 
@@ -66,6 +66,6 @@ uninstall-local:
  fi; \
fi;
 
-EXTRA_DIST = $(publican_sources) publican.cfg protocol-to-docbook.xsl
-
 endif
+
+EXTRA_DIST = $(publican_sources) publican.cfg protocol-to-docbook.xsl

commit 3ec40512c7e43c5e5a223a9d33e4737a0782916a
Author: Daniel Stone dan...@fooishbar.org
Date:   Mon Jul 23 19:54:42 2012 +0100

More consistent ID printing

Use unsigned rather than signed for IDs, so they match up with what we
see in other prints.

Signed-off-by: Daniel Stone dan...@fooishbar.org

diff --git a/src/connection.c b/src/connection.c
index 4ba7f63..2733ac9 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -738,7 +738,7 @@ wl_connection_demarshal(struct wl_connection *connection,
 * destroyed client side */
*object = NULL;
} else if (*object == NULL  *p != 0) {
-   printf(unknown object (%d), message %s(%s)\n,
+   printf(unknown object (%u), message %s(%s)\n,
   *p, message-name, message-signature);
*object = NULL;
errno = EINVAL;
@@ -747,7 +747,7 @@ wl_connection_demarshal(struct wl_connection *connection,
 
if (*object != NULL  message-types[i-2] != NULL 
(*object)-interface != message-types[i-2]) {
-   printf(invalid object (%d), type (%s), 
+   printf(invalid object (%u), type (%s), 
message %s(%s)\n,
   *p, (*object)-interface-name,
   message-name, message-signature);
diff --git a/src/wayland-client.c b/src/wayland-client.c
index 7130cb7..631ec5a 100644
--- a/src/wayland-client.c
+++ b/src/wayland-client.c
@@ -203,14 +203,14 @@ wl_proxy_marshal(struct wl_proxy *proxy, uint32_t opcode, 
...)
abort();
}
 
+   if (wl_debug)
+   wl_closure_print(closure, proxy-object, true);
+
if (wl_closure_send(closure, proxy-display-connection)) {
fprintf(stderr, Error sending request: %m\n);
abort();
}
 
-   if (wl_debug)
-   wl_closure_print(closure, proxy-object, true);
-
wl_closure_destroy(closure);
 }
 
@@ -235,7 +235,7 @@ display_handle_error(void *data,
 struct wl_display *display, struct wl_object *object,
 uint32_t code, const char *message)
 {
-   fprintf(stderr, %s@%d: error %d: %s\n,
+   fprintf(stderr, %s@%u: error %d: %s\n,
object-interface-name, object-id, code, message);
abort();
 }
@@ -531,14 +531,14 @@ handle_event(struct wl_display *display,
closure = wl_connection_demarshal(display-connection, size,
  display-objects, message);
 
+   if (wl_debug)
+   wl_closure_print(closure, proxy-object, false);
+
if (closure == NULL || create_proxies(display, closure)  0) {
fprintf(stderr, Error demarshalling event\n);
abort();
}
 
-   if (wl_debug)
-   wl_closure_print(closure, proxy-object, false);
-

wayland: Changes to 'upstream-experimental'

2012-02-10 Thread Cyril Brulebois 
 configure.ac |4 ++--
 protocol/wayland.xml |   10 +-
 spec/main.tex|2 +-
 src/scanner.c|3 ++-
 src/wayland-client.c |1 -
 src/wayland-client.pc.in |2 +-
 src/wayland-server.pc.in |2 +-
 src/wayland-util.h   |   18 +-
 8 files changed, 21 insertions(+), 21 deletions(-)

New commits:
commit 28e3cbc654a81c35a2948af93d6e86911159a13f
Author: Kristian Høgsberg k...@bitplanet.net
Date:   Thu Feb 9 11:16:30 2012 -0500

Release 0.85.0

diff --git a/configure.ac b/configure.ac
index a1c9d2a..e04deba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.64])
 AC_INIT([wayland],
-[master],
+[0.85.0],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=wayland],
 [wayland],
 [http://wayland.freedesktop.org/])
diff --git a/src/wayland-client.pc.in b/src/wayland-client.pc.in
index 59a925d..7e17532 100644
--- a/src/wayland-client.pc.in
+++ b/src/wayland-client.pc.in
@@ -5,6 +5,6 @@ includedir=${prefix}/include
  
 Name: Wayland Client
 Description: Wayland client side library
-Version: 0.1
+Version: 0.85
 Cflags: -I${includedir}
 Libs: -L${libdir} -lwayland-client
diff --git a/src/wayland-server.pc.in b/src/wayland-server.pc.in
index b317461..36e60cc 100644
--- a/src/wayland-server.pc.in
+++ b/src/wayland-server.pc.in
@@ -5,6 +5,6 @@ includedir=${prefix}/include
  
 Name: Wayland Server
 Description: Server side implementation of the Wayland protocol
-Version: 0.1
+Version: 0.85
 Cflags: -I${includedir}
 Libs: -L${libdir} -lwayland-server

commit 7c6dac8740f26f0fd2440016c218a9862fdfc271
Author: Kristian Høgsberg k...@bitplanet.net
Date:   Thu Feb 9 11:15:33 2012 -0500

Use dist-xz for tarballs

diff --git a/configure.ac b/configure.ac
index edf3d4f..a1c9d2a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,7 @@ AC_INIT([wayland],
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
-AM_INIT_AUTOMAKE([1.11 foreign dist-bzip2])
+AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz])
 
 AM_SILENT_RULES([yes])
 

commit c6b37ac05566d0a233da69a4f6b35409b278de34
Author: Kristian Høgsberg k...@bitplanet.net
Date:   Thu Feb 9 11:12:18 2012 -0500

Set version to 'master' on git master branch

diff --git a/configure.ac b/configure.ac
index 3ea77e6..edf3d4f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.64])
 AC_INIT([wayland],
-[0.1],
+[master],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=wayland],
 [wayland],
 [http://wayland.freedesktop.org/])

commit 8f9de83f7b1f9c6bc265fec4aec35eff0e9164a0
Author: Tiago Vignatti tiago.vigna...@intel.com
Date:   Tue Jan 24 18:30:13 2012 +0200

scanner: don't print new line when no descriptions are provided

Signed-off-by: Tiago Vignatti tiago.vigna...@intel.com

diff --git a/src/scanner.c b/src/scanner.c
index f88fb4d..699782f 100644
--- a/src/scanner.c
+++ b/src/scanner.c
@@ -661,8 +661,9 @@ emit_structs(struct wl_list *message_list, struct interface 
*interface)
if (mdesc) {
printf(\t * );
desc_dump(mdesc-text, 8);
+   printf(\n);
}
-   printf(\n\t */\n);
+   printf(\t */\n);
printf(\tvoid (*%s)(, m-name);
 
n = strlen(m-name) + 17;

commit 899652201f0be57b5dc664c5e4d0eeaf2caf34a7
Author: Tiago Vignatti tiago.vigna...@intel.com
Date:   Tue Jan 24 17:49:28 2012 +0200

protocol: fix typo

Signed-off-by: Tiago Vignatti tiago.vigna...@intel.com

diff --git a/protocol/wayland.xml b/protocol/wayland.xml
index cad2507..c445d3f 100644
--- a/protocol/wayland.xml
+++ b/protocol/wayland.xml
@@ -7,7 +7,7 @@
 
 Permission to use, copy, modify, distribute, and sell this
 software and its documentation for any purpose is hereby granted
-without fee, provided that\n the above copyright notice appear in
+without fee, provided that the above copyright notice appear in
 all copies and that both that copyright notice and this permission
 notice appear in supporting documentation, and that the name of
 the copyright holders not be used in advertising or publicity
@@ -172,7 +172,7 @@
   A buffer provides the content for a wl_surface.  Buffers are
   created through factory interfaces such as wl_drm, wl_shm or
   similar.  It has a width and a height and can be attached to a
-  wl_surface, but the mechnism by which a client provides and
+  wl_surface, but the mechanism by which a client provides and
   updates the contents is defined by the buffer factory interface
 /description
 
@@ -197,7 +197,7 @@
 /request
 
 event name=release
-  description summary=compositor releses buffer
+  description summary=compositor releases buffer
Sent when an attached buffer is no longer used by the compositor.

wayland: Changes to 'upstream-experimental'

2012-01-30 Thread Cyril Brulebois 
 protocol/wayland.xml  |  480 +++---
 spec/main.tex |  147 ++--
 spec/wayland-architecture.png |binary
 spec/x-architecture.png   |binary
 src/Makefile.am   |5 
 src/data-device.c |  464 
 src/event-loop.c  |6 
 src/scanner.c |  145 
 src/wayland-hash.c|  306 --
 src/wayland-private.h |2 
 src/wayland-server.c  |  150 -
 src/wayland-server.h  |   65 -
 src/wayland-shm.c |   11 
 src/wayland-util.h|   11 
 14 files changed, 1207 insertions(+), 585 deletions(-)

New commits:
commit 10eefa49470d97948719f58dfb62a97fb4701aed
Author: Jesse Barnes jbar...@virtuousgeek.org
Date:   Wed Jan 18 10:06:02 2012 -0800

spec: list core interfaces with short descriptions

Plus fix up misc. grammar.

diff --git a/spec/main.tex b/spec/main.tex
index 741c4e0..756bf38 100644
--- a/spec/main.tex
+++ b/spec/main.tex
@@ -162,7 +162,7 @@ The message header has 2 words in it:
 \end{itemize}
 
 The payload describes the request/event arguments.  Every argument is always
-aligned to 32-bit.  There is no prefix that describes the type, but it is
+aligned to 32-bits.  There is no prefix that describes the type, but it is
 inferred implicitly from the xml specification.
 
 The representation of argument types are as follows:
@@ -174,7 +174,7 @@ The representation of argument types are as follows:
   32-bit boundary.
 \item object: A 32-bit object ID.
 \item new\_id: the 32-bit object ID.  On requests, the client
-  decides the ID.  The only event with new\_id is advertisements of
+  decides the ID.  The only events with new\_id are advertisements of
   globals, and the server will use IDs below 0x1.
 \item array: Starts with 32-bit array size in bytes, followed by the array
   contents verbatim, and finally padding to a 32-bit boundary.
@@ -182,6 +182,33 @@ The representation of argument types are as follows:
   the ancillary data of the UNIX domain socket message (msg\_control).
 \end{itemize}
 
+\subsection{Interfaces}
+
+The protocol includes several interfaces which are used for
+interacting with the server.  Each interface provides requests,
+events, and errors (which are really just special events) as described
+above.  Specific compositor implementations may have their own
+interfaces provided as extensions, but there are several which are
+always expected to be present.
+
+Core interfaces:
+\begin{itemize}
+\item wl_display: provides global functionality like objecting binding and 
fatal error events
+\item wl_callback: callback interface for dnoe events
+\item wl_compositor: core compositor interface, allows surface creation
+\item wl_shm: buffer management interface with buffer creation and format 
handling
+\item wl_buffer: buffer handling interface for indicating damage and object 
destruction, also provides buffer release events from the server
+\item wl_data_offer: for accepting and receiving specific mime types
+\item wl_data_source: for offering specific mime types
+\item wl_data_Device: lets clients manage drag  drop, provides pointer 
enter/leave events and motion
+\item wl_data_device_manager: for managing data sources and devices
+\item wl_shell: shell surface handling
+\item wl_shell_surface: shell surface handling and desktop-like events (e.g. 
set a surface to fullscreen, display a popup, etc.)
+\item wl_surface: surface management (destruction, damage, buffer attach, 
frame handling)
+\item wl_input_device: cursor setting, motion, button, and key events, etc.
+\item wl_output: events describing an attached output (subpixel orientation, 
current mode  geometry, etc.)
+\end{itemize}
+
 \subsection{Connect Time}
 
 \begin{itemize}
@@ -228,7 +255,7 @@ The compositor is a global object, advertised at connect 
time.
 
 \begin{itemize}
 \item a global object
-\item broadcasts drm file name, or at least a string like drm:/dev/card0
+\item broadcasts drm file name, or at least a string like drm:/dev/dri/card0
 \item commit/ack/frame protocol
 \end{itemize}
 

commit fb84662f617d2d8ec3f5724d6962a4109e6fb0ea
Author: Jesse Barnes jbar...@virtuousgeek.org
Date:   Wed Jan 18 09:33:34 2012 -0800

spec: update high level description, add diagrams

Add diagrams from the Wayland architecture page and add some more high
level text describing X limitations and Wayland architecture.

diff --git a/spec/main.tex b/spec/main.tex
index f32e999..741c4e0 100644
--- a/spec/main.tex
+++ b/spec/main.tex
@@ -1,11 +1,12 @@
 \documentclass{article}
 \usepackage{palatino}
+\usepackage{graphicx}
 
 \author{Kristian Høgsberg\\
 \texttt{k...@bitplanet.net}
 }
 
-\title{The Wayland Display Server}
+\title{The Wayland Compositing System}
 
 \begin{document}
 
@@ -14,40 +15,97 @@
 \section{Wayland Overview}
 
 \begin{itemize}
-\item

wayland: Changes to 'upstream-experimental'

2011-12-30 Thread Cyril Brulebois 
 Makefile.am  |2 
 TODO |  139 --
 configure.ac |   18 
 protocol/screenshooter.xml   |7 
 protocol/wayland.xml |  457 -
 src/.gitignore   |4 
 src/Makefile.am  |   64 ++
 src/connection.c |  813 ++
 src/event-loop.c |  475 ++
 src/scanner.c|  870 
 src/scanner.mk   |8 
 src/wayland-client.c |  579 +++
 src/wayland-client.h |  101 
 src/wayland-client.pc.in |   10 
 src/wayland-egl.h|   66 +++
 src/wayland-hash.c   |  306 ++
 src/wayland-private.h|   91 
 src/wayland-server.c |  919 +++
 src/wayland-server.h |  277 
 src/wayland-server.pc.in |   10 
 src/wayland-shm.c|  253 +++
 src/wayland-util.c   |  272 
 src/wayland-util.h   |  163 +++
 wayland/.gitignore   |4 
 wayland/Makefile.am  |   63 --
 wayland/connection.c |  737 --
 wayland/connection.h |   68 ---
 wayland/event-loop.c |  466 -
 wayland/scanner.c|  730 --
 wayland/scanner.mk   |8 
 wayland/wayland-client.c |  575 --
 wayland/wayland-client.h |   90 
 wayland/wayland-client.pc.in |   10 
 wayland/wayland-egl.h|   68 ---
 wayland/wayland-hash.c   |  296 -
 wayland/wayland-server.c |  891 -
 wayland/wayland-server.h |  302 --
 wayland/wayland-server.pc.in |   10 
 wayland/wayland-shm.c|  222 --
 wayland/wayland-util.c   |  123 -
 wayland/wayland-util.h   |  152 ---
 41 files changed, 5569 insertions(+), 5150 deletions(-)

New commits:
commit bc79f1f820409fb92c158a9d2df8a99ad269018e
Author: Kristian Høgsberg k...@bitplanet.net
Date:   Thu Dec 22 15:32:37 2011 -0500

Rename all instances of typeof

diff --git a/src/wayland-util.h b/src/wayland-util.h
index 8061368..944e7f0 100644
--- a/src/wayland-util.h
+++ b/src/wayland-util.h
@@ -119,7 +119,7 @@ void wl_list_insert_list(struct wl_list *list, struct 
wl_list *other);
 
 #ifdef __GNUC__
 #define __container_of(ptr, sample, member)\
-   (typeof(sample))((char *)(ptr)  -   \
+   (__typeof__(sample))((char *)(ptr)  -   \
 ((char *)(sample)-member - (char *)(sample)))
 #else
 #define __container_of(ptr, sample, member)\

commit 5e078bfa5a64b1d3ebf78ff2cec0a8e7daaaf983
Author: Kristian Høgsberg k...@bitplanet.net
Date:   Thu Dec 22 15:23:54 2011 -0500

Use __typeof__ instead of typeof

Thiago Macieira compiles with -std=c++11.

diff --git a/src/wayland-util.h b/src/wayland-util.h
index 625a2d3..8061368 100644
--- a/src/wayland-util.h
+++ b/src/wayland-util.h
@@ -40,8 +40,8 @@ extern C {
 #define ALIGN(n, a) ( ((n) + ((a) - 1))  ~((a) - 1) )
 #define DIV_ROUNDUP(n, a) ( ((n) + ((a) - 1)) / (a) )
 
-#define container_of(ptr, type, member) ({ \
-   const typeof( ((type *)0)-member ) *__mptr = (ptr);\
+#define container_of(ptr, type, member) ({ \
+   const __typeof__( ((type *)0)-member ) *__mptr = (ptr);\
(type *)( (char *)__mptr - offsetof(type,member) );})
 
 struct wl_message {

commit aad1e190588a0edc5a39a9feba534e7a6d4532d4
Author: Pekka Paalanen ppaala...@gmail.com
Date:   Thu Dec 22 16:52:37 2011 +0200

server: destroy the socket event source on display destroy

On wl_display_add_socket(), the listening socket fd is added to the
event loop. However, wl_event_source object is not stored and hence
cannot be freed, resulting in a minor leak.

Store wl_event_source pointer in struct wl_socket so we can track it,
and destroy it on wl_display_destroy(). The event loop itself must be
destroyed after destroying the event sources linked to it.

Fixes a Valgrind reported memory leak.

Signed-off-by: Pekka Paalanen ppaala...@gmail.com

diff --git a/src/wayland-server.c b/src/wayland-server.c
index 87e4ed5..415173b 100644
--- a/src/wayland-server.c
+++ b/src/wayland-server.c
@@ -51,6 +51,7 @@ struct wl_socket {
struct sockaddr_un addr;
char lock_addr[113];
struct wl_list link;
+   struct wl_event_source *source;
 };
 
 struct wl_client {
@@ -667,14 +668,15 @@ wl_display_destroy(struct wl_display *display)
struct wl_socket *s, *next;
struct wl_global *global, *gnext;
 
-   wl_event_loop_destroy(display-loop);

wayland: Changes to 'upstream-experimental'

2011-06-18 Thread Cyril Brulebois 
New branch 'upstream-experimental' available with the following commits:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1qxubz-0006t7...@vasks.debian.org