wayland: Changes to 'debian-experimental'
ChangeLog | 59 +++++++++++++++++++++++++++++++++++++++++++++++
configure.ac | 4 +--
debian/changelog | 10 +++++++
debian/watch | 3 +-
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 +++++++-------
11 files changed, 92 insertions(+), 22 deletions(-)
New commits:
commit 2cc0f08956b95971d67a69c3d382ec101fafa200
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Feb 10 11:51:43 2012 +0100
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index 49edce8..bb51de9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-wayland (0.85.0-1) UNRELEASED; urgency=low
+wayland (0.85.0-1) experimental; urgency=low
* First upstream release:
- http://article.gmane.org/gmane.comp.freedesktop.wayland.devel/1770
@@ -6,7 +6,7 @@ wayland (0.85.0-1) UNRELEASED; urgency=low
upstream releases xz tarballs, and the 1.0 source format only suports
gz.
- -- Cyril Brulebois <kibi@debian.org> Fri, 10 Feb 2012 11:26:53 +0100
+ -- Cyril Brulebois <kibi@debian.org> Fri, 10 Feb 2012 11:51:36 +0100
wayland (0.1.0~2-1) experimental; urgency=low
commit 4bfeae576f8c38ec66bf72dff9d15205f144d50d
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Feb 10 11:29:13 2012 +0100
Update watch file.
diff --git a/debian/changelog b/debian/changelog
index 286d9c5..49edce8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ wayland (0.85.0-1) UNRELEASED; urgency=low
* First upstream release:
- http://article.gmane.org/gmane.comp.freedesktop.wayland.devel/1770
+ * Update watch file, even if that's only useful for notifications:
+ upstream releases xz tarballs, and the 1.0 source format only suports
+ gz.
-- Cyril Brulebois <kibi@debian.org> Fri, 10 Feb 2012 11:26:53 +0100
diff --git a/debian/watch b/debian/watch
index 5f6c0ec..bcc66e6 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
#git=git://anongit.freedesktop.org/wayland/wayland
-# No release, so no tarball, yet.
+version=3
+http://wayland.freedesktop.org/releases/wayland-(.*)\.tar\.xz
commit 0c4350ab33acf6b9d72e637d51eeddfacec56ab4
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Feb 10 11:28:26 2012 +0100
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index f3c940d..bad9d3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,62 @@
+commit 28e3cbc654a81c35a2948af93d6e86911159a13f
+Author: Kristian Høgsberg <krh@bitplanet.net>
+Date: Thu Feb 9 11:16:30 2012 -0500
+
+ Release 0.85.0
+
+commit 7c6dac8740f26f0fd2440016c218a9862fdfc271
+Author: Kristian Høgsberg <krh@bitplanet.net>
+Date: Thu Feb 9 11:15:33 2012 -0500
+
+ Use dist-xz for tarballs
+
+commit c6b37ac05566d0a233da69a4f6b35409b278de34
+Author: Kristian Høgsberg <krh@bitplanet.net>
+Date: Thu Feb 9 11:12:18 2012 -0500
+
+ Set version to 'master' on git master branch
+
+commit 8f9de83f7b1f9c6bc265fec4aec35eff0e9164a0
+Author: Tiago Vignatti <tiago.vignatti@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.vignatti@intel.com>
+
+commit 899652201f0be57b5dc664c5e4d0eeaf2caf34a7
+Author: Tiago Vignatti <tiago.vignatti@intel.com>
+Date: Tue Jan 24 17:49:28 2012 +0200
+
+ protocol: fix typo
+
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
+
+commit 3cce6be20d5f81810d00eb89ae09eaa0025e10b3
+Author: Tiago Vignatti <tiago.vignatti@intel.com>
+Date: Tue Jan 24 16:11:33 2012 +0200
+
+ spec: fix typo
+
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
+
+commit 0bcb30a9a010790f6258c890000765b17f539a46
+Author: Kristian Høgsberg <krh@bitplanet.net>
+Date: Thu Feb 9 08:28:21 2012 -0500
+
+ Drop warning when we receive an event for zombie objects
+
+ Business as usual, but the message is confusing.
+
+commit fa525622e33216207b6bba6ef5b4c434d565e4d1
+Author: Kristian Høgsberg <krh@bitplanet.net>
+Date: Tue Jan 24 09:52:25 2012 -0500
+
+ wayland-util.h: Avoid un-namespaced _container_of
+
+ Yes, there are worse offenders in that file, but this one isn't used in
+ the code and it makes Xorg angry.
+
commit 10eefa49470d97948719f58dfb62a97fb4701aed
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Wed Jan 18 10:06:02 2012 -0800
diff --git a/debian/changelog b/debian/changelog
index bf5675e..286d9c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+wayland (0.85.0-1) UNRELEASED; urgency=low
+
+ * First upstream release:
+ - http://article.gmane.org/gmane.comp.freedesktop.wayland.devel/1770
+
+ -- Cyril Brulebois <kibi@debian.org> Fri, 10 Feb 2012 11:26:53 +0100
+
wayland (0.1.0~2-1) experimental; urgency=low
* New upstream snapshot.
commit 28e3cbc654a81c35a2948af93d6e86911159a13f
Author: Kristian Høgsberg <krh@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 <krh@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 <krh@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.vignatti@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.vignatti@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.vignatti@intel.com>
Date: Tue Jan 24 17:49:28 2012 +0200
protocol: fix typo
Signed-off-by: Tiago Vignatti <tiago.vignatti@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.
</description>
</event>
@@ -589,7 +589,7 @@
Notification that this input device's pointer is focused on
certain surface. When an input_device enters a surface, the
pointer image is undefined and a client should respond to this
- event by setting an apropriate pointer image.
+ event by setting an appropriate pointer image.
</description>
<arg name="time" type="uint"/>
@@ -643,7 +643,7 @@
<interface name="wl_output" version="1">
- <description summary="composior output region">
+ <description summary="compositor output region">
An output describes part of the compositor geometry. The
compositor work in the 'compositor coordinate system' and an
output corresponds to rectangular area in that space that is
commit 3cce6be20d5f81810d00eb89ae09eaa0025e10b3
Author: Tiago Vignatti <tiago.vignatti@intel.com>
Date: Tue Jan 24 16:11:33 2012 +0200
spec: fix typo
Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
diff --git a/spec/main.tex b/spec/main.tex
index 756bf38..59d4fe0 100644
--- a/spec/main.tex
+++ b/spec/main.tex
@@ -22,7 +22,7 @@
\subsection{Replacing X11}
In Linux and other Unix-like systems, the X stack has grown to
-encompass funcationality arguably belonging in client libraries,
+encompass functionality arguably belonging in client libraries,
helper libraries, or the host operating system kernel. Support for
things like PCI resource management, display configuration management,
direct rendering, and memory management has been integrated into the X
commit 0bcb30a9a010790f6258c890000765b17f539a46
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Thu Feb 9 08:28:21 2012 -0500
Drop warning when we receive an event for zombie objects
Business as usual, but the message is confusing.
diff --git a/src/wayland-client.c b/src/wayland-client.c
index bbfc035..7814379 100644
--- a/src/wayland-client.c
+++ b/src/wayland-client.c
@@ -465,7 +465,6 @@ handle_event(struct wl_display *display,
proxy = wl_map_lookup(&display->objects, id);
if (proxy == WL_ZOMBIE_OBJECT) {
- fprintf(stderr, "Message to zombie object\n");
wl_connection_consume(display->connection, size);
return;
} else if (proxy == NULL || proxy->object.implementation == NULL) {
commit fa525622e33216207b6bba6ef5b4c434d565e4d1
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Tue Jan 24 09:52:25 2012 -0500
wayland-util.h: Avoid un-namespaced _container_of
Yes, there are worse offenders in that file, but this one isn't used in
the code and it makes Xorg angry.
diff --git a/src/wayland-util.h b/src/wayland-util.h
index f56af59..25c0901 100644
--- a/src/wayland-util.h
+++ b/src/wayland-util.h
@@ -107,32 +107,32 @@ int wl_list_empty(struct wl_list *list);
void wl_list_insert_list(struct wl_list *list, struct wl_list *other);
#ifdef __GNUC__
-#define __container_of(ptr, sample, member) \
+#define __wl_container_of(ptr, sample, member) \
(__typeof__(sample))((char *)(ptr) - \
((char *)&(sample)->member - (char *)(sample)))
#else
-#define __container_of(ptr, sample, member) \
+#define __wl_container_of(ptr, sample, member) \
(void *)((char *)(ptr) - \
((char *)&(sample)->member - (char *)(sample)))
#endif
#define wl_list_for_each(pos, head, member) \
- for (pos = 0, pos = __container_of((head)->next, pos, member); \
+ for (pos = 0, pos = __wl_container_of((head)->next, pos, member); \
&pos->member != (head); \
- pos = __container_of(pos->member.next, pos, member))
+ pos = __wl_container_of(pos->member.next, pos, member))
#define wl_list_for_each_safe(pos, tmp, head, member) \
for (pos = 0, tmp = 0, \
- pos = __container_of((head)->next, pos, member), \
- tmp = __container_of((pos)->member.next, tmp, member); \
+ pos = __wl_container_of((head)->next, pos, member), \
+ tmp = __wl_container_of((pos)->member.next, tmp, member); \
&pos->member != (head); \
pos = tmp, \
- tmp = __container_of(pos->member.next, tmp, member))
+ tmp = __wl_container_of(pos->member.next, tmp, member))
#define wl_list_for_each_reverse(pos, head, member) \
- for (pos = 0, pos = __container_of((head)->prev, pos, member); \
+ for (pos = 0, pos = __wl_container_of((head)->prev, pos, member); \
&pos->member != (head); \
- pos = __container_of(pos->member.prev, pos, member))
+ pos = __wl_container_of(pos->member.prev, pos, member))
struct wl_array {
uint32_t size;
Reply to: