.gitignore | 3 Makefile.am | 6 TODO | 21 configure.ac | 44 cursor/Makefile.am | 1 cursor/cursor-data.h | 548 +++++++ cursor/wayland-cursor.c | 73 + cursor/wayland-cursor.pc.in | 8 cursor/xcursor.c | 5 debian/changelog | 103 + debian/clean | 1 debian/control | 6 debian/copyright | 64 debian/libwayland-dev.install | 3 debian/libwayland0.install | 11 debian/libwayland0.symbols | 183 ++ debian/libwayland0.symbols.in | 130 - debian/rules | 5 debian/source/format | 1 doc/Makefile.am | 2 doc/Wayland/.gitignore | 1 doc/Wayland/Makefile.am | 49 doc/Wayland/doxygen-to-publican.xsl | 72 + doc/Wayland/en_US/Architecture.xml | 6 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 | 2 doc/doxygen/Makefile.am | 13 doc/doxygen/wayland.doxygen.in | 1765 +++++++++++++++++++++++++ doc/man/Makefile.am | 52 doc/man/wl_display_connect.xml | 88 + protocol/Makefile.am | 10 protocol/protocol.xsl | 204 -- protocol/wayland-protocol.css | 41 protocol/wayland.xml | 374 ++++- src/Makefile.am | 1 src/connection.c | 328 ++-- src/data-device.c | 13 src/event-loop.c | 36 src/scanner.c | 159 +- src/wayland-client.c | 960 ++++++++++--- src/wayland-client.h | 149 +- src/wayland-client.pc.in | 8 src/wayland-egl.h | 9 src/wayland-private.h | 27 src/wayland-server.c | 294 +++- src/wayland-server.h | 59 src/wayland-server.pc.in | 8 src/wayland-shm.c | 47 src/wayland-util.c | 14 src/wayland-util.h | 32 tests/.gitignore | 7 tests/Makefile.am | 6 tests/client-test.c | 1 tests/connection-test.c | 86 - tests/display-test.c | 79 + tests/event-loop-test.c | 64 tests/os-wrappers-test.c | 31 tests/queue-test.c | 286 ++++ tests/sanity-test.c | 8 tests/socket-test.c | 22 tests/test-runner.c | 10 66 files changed, 5552 insertions(+), 1647 deletions(-)
New commits: commit b0b909a629e40465bd7880d38b86010fbac4aa64 Author: Timo Aaltonen <[email protected]> Date: Fri Feb 1 19:06:46 2013 +0200 release to raring diff --git a/debian/changelog b/debian/changelog index 8e8fb40..73ce4c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +wayland (1.0.4-0ubuntu1) raring; urgency=low + + * Merge from unreleased debian git. + - new upstream release + + -- Timo Aaltonen <[email protected]> Fri, 01 Feb 2013 19:05:50 +0200 + wayland (1.0.4-1) UNRELEASED; urgency=low [ Robert Ancell ] commit 4912b2dd2bbe7051fb529aee45881f7fe9f59886 Author: Timo Aaltonen <[email protected]> Date: Fri Feb 1 19:05:20 2013 +0200 bump policy to 3.9.4, no changes diff --git a/debian/changelog b/debian/changelog index e408886..e01eb59 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,7 +11,7 @@ wayland (1.0.4-1) UNRELEASED; urgency=low * New upstream release. * Migrate to multiarch (Closes: #690081). * copyright: Refresh. - * control: Update Standards-Version to 3.9.3, no changes. + * control: Update Standards-Version to 3.9.4, no changes. * rules: Make it non-fatal to fail the tests, which don't all succeed when ran in headless mode. * rules: Drop the creation of hard dependencies, wayland should be diff --git a/debian/control b/debian/control index 26a4583..3307e54 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Build-Depends: docbook-xsl, libexpat1-dev, libffi-dev, -Standards-Version: 3.9.3 +Standards-Version: 3.9.4 Vcs-Git: git://git.debian.org/git/pkg-xorg/wayland/wayland Vcs-Browser: http://git.debian.org/?p=pkg-xorg/wayland/wayland.git Homepage: http://wayland.freedesktop.org/ commit 78fca31c5f61535d0bf65f248fbeba976f41c443 Author: Timo Aaltonen <Timo Aaltonen [email protected]> Date: Fri Feb 1 18:33:15 2013 +0200 merge ubuntu changelog entries diff --git a/debian/changelog b/debian/changelog index 740d897..811753f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,61 @@ wayland (1.0.4-1) UNRELEASED; urgency=low -- Timo Aaltonen <[email protected]> Thu, 16 Aug 2012 13:04:41 +0300 +wayland (1.0.3-0ubuntu2) raring; urgency=low + + * debian/control: + - Build-depend on docbook-xsl + - Use standards-version 3.9.4 + + -- Robert Ancell <[email protected]> Thu, 10 Jan 2013 10:31:46 +1300 + +wayland (1.0.3-0ubuntu1) raring; urgency=low + + * New upstream release + + -- Robert Ancell <[email protected]> Thu, 10 Jan 2013 10:13:22 +1300 + +wayland (1.0.2-0ubuntu2) raring; urgency=low + + * debian/libwayland0.install: + - Fix library path + + -- Robert Ancell <[email protected]> Mon, 03 Dec 2012 18:07:04 +1300 + +wayland (1.0.2-0ubuntu1) raring; urgency=low + + * New upstream release + + -- Robert Ancell <[email protected]> Mon, 03 Dec 2012 15:34:32 +1300 + +wayland (1.0.1-0ubuntu1) raring; urgency=low + + * New upstream release + + -- Robert Ancell <[email protected]> Thu, 22 Nov 2012 10:14:02 +1300 + +wayland (1.0.0-0ubuntu3) raring; urgency=low + + * debian/control: + - Build-depend on xsltproc + + -- Robert Ancell <[email protected]> Fri, 16 Nov 2012 12:05:28 +1300 + +wayland (1.0.0-0ubuntu2) raring; urgency=low + + * debian/control: + - Build-depend on doxygen + + -- Robert Ancell <[email protected]> Fri, 16 Nov 2012 11:41:07 +1300 + +wayland (1.0.0-0ubuntu1) raring; urgency=low + + * New upstream release + * debian/libwayland-dev.install: + - Install development man pages + + -- Robert Ancell <[email protected]> Fri, 16 Nov 2012 10:07:08 +1300 + wayland (0.95.0-0ubuntu1) quantal; urgency=low * Merge from unreleased debian git, remaining changes commit fdc8e40f48437fa8952bf1e9a05dca53d468c02c Author: Sven Joachim <[email protected]> Date: Sat Jan 26 19:45:45 2013 +0100 Update libwayland0.symbols and bump shlibs for new symbols diff --git a/debian/changelog b/debian/changelog index 7c697e6..e408886 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,7 +24,7 @@ wayland (1.0.4-1) UNRELEASED; urgency=low * Add README.source [ Sven Joachim ] - * Update symbols file, bumping minver of all symbols to 1.0.2. + * Update symbols file, bumping minver of all symbols to at least 1.0.2. * Add docbook-xsl to Build-Depends. * Add Homepage field to debian/control. * Update debian/copyright. diff --git a/debian/libwayland0.symbols b/debian/libwayland0.symbols index 49632f1..fa63563 100644 --- a/debian/libwayland0.symbols +++ b/debian/libwayland0.symbols @@ -93,11 +93,13 @@ libwayland-server.so.0 libwayland0 #MINVER# wl_data_device_set_keyboard_focus@Base 1.0.2 wl_data_offer_interface@Base 1.0.2 wl_data_source_interface@Base 1.0.2 + wl_display_add_destroy_listener@Base 1.0.4 wl_display_add_global@Base 1.0.2 wl_display_add_socket@Base 1.0.2 wl_display_create@Base 1.0.2 wl_display_destroy@Base 1.0.2 wl_display_flush_clients@Base 1.0.2 + wl_display_get_destroy_listener@Base 1.0.4 wl_display_get_event_loop@Base 1.0.2 wl_display_get_serial@Base 1.0.2 wl_display_init_shm@Base 1.0.2 @@ -106,6 +108,7 @@ libwayland-server.so.0 libwayland0 #MINVER# wl_display_remove_global@Base 1.0.2 wl_display_run@Base 1.0.2 wl_display_terminate@Base 1.0.2 + wl_event_loop_add_destroy_listener@Base 1.0.4 wl_event_loop_add_fd@Base 1.0.2 wl_event_loop_add_idle@Base 1.0.2 wl_event_loop_add_signal@Base 1.0.2 @@ -114,6 +117,7 @@ libwayland-server.so.0 libwayland0 #MINVER# wl_event_loop_destroy@Base 1.0.2 wl_event_loop_dispatch@Base 1.0.2 wl_event_loop_dispatch_idle@Base 1.0.2 + wl_event_loop_get_destroy_listener@Base 1.0.4 wl_event_loop_get_fd@Base 1.0.2 wl_event_source_check@Base 1.0.2 wl_event_source_fd_update@Base 1.0.2 diff --git a/debian/rules b/debian/rules index abb5674..47dd135 100755 --- a/debian/rules +++ b/debian/rules @@ -9,7 +9,7 @@ override_dh_install: dh_install --fail-missing override_dh_makeshlibs: - dh_makeshlibs -V '$(PACKAGE) (>= 1.0.2)' -- -c4 + dh_makeshlibs -V '$(PACKAGE) (>= 1.0.4)' -- -c4 # Debug package: override_dh_strip: commit ff7db2d5d59cc2eb2726cc1bf39ca750dd498c46 Author: Sven Joachim <[email protected]> Date: Sat Jan 26 18:55:49 2013 +0100 New upstream release diff --git a/debian/changelog b/debian/changelog index 5fcae70..7c697e6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -wayland (1.0.3-1) UNRELEASED; urgency=low +wayland (1.0.4-1) UNRELEASED; urgency=low [ Robert Ancell ] * debian/libwayland-dev.install: commit 9ebb18418a1c3dccc19d3931766240b54227f131 Author: Kristian Høgsberg <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 wl_display *display); struct wl_event_loop *wl_display_get_event_loop(struct wl_display *display); diff --git a/tests/event-loop-test.c b/tests/event-loop-test.c index 2f3dcd4..c46d3b0 100644 --- a/tests/event-loop-test.c +++ b/tests/event-loop-test.c @@ -1,5 +1,6 @@ /* * Copyright © 2012 Intel Corporation + * Copyright © 2012 Jason Ekstrand * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -25,6 +26,7 @@ #include <unistd.h> #include <signal.h> #include "wayland-server.h" +#include "wayland-private.h" #include "test-runner.h" static int @@ -190,3 +192,58 @@ TEST(event_loop_timer) wl_event_source_remove(source); wl_event_loop_destroy(loop); } + +struct event_loop_destroy_listener { + struct wl_listener listener; + int done; +}; + +static void +event_loop_destroy_notify(struct wl_listener *l, void *data) +{ + struct event_loop_destroy_listener *listener = + container_of(l, struct event_loop_destroy_listener, listener); + + listener->done = 1; +} + +TEST(event_loop_destroy) +{ + struct wl_event_loop *loop; + struct wl_display * display; + struct event_loop_destroy_listener a, b; + + loop = wl_event_loop_create(); + assert(loop); + + a.listener.notify = &event_loop_destroy_notify; + a.done = 0; + wl_event_loop_add_destroy_listener(loop, &a.listener); + + assert(wl_event_loop_get_destroy_listener(loop, + event_loop_destroy_notify) == &a.listener); + + b.listener.notify = &event_loop_destroy_notify; + b.done = 0; + wl_event_loop_add_destroy_listener(loop, &b.listener); + + wl_list_remove(&a.listener.link); + wl_event_loop_destroy(loop); + + assert(!a.done); + assert(b.done); + + /* Test to make sure it gets fired on display destruction */ + display = wl_display_create(); + assert(display); + loop = wl_display_get_event_loop(display); + assert(loop); + + a.done = 0; + wl_event_loop_add_destroy_listener(loop, &a.listener); + + wl_display_destroy(display); + + assert(a.done); +} + commit 945771c3d52dff751b48fde3c5c053013dc50747 Author: Quentin Glidic <[email protected]> Date: Sun Jan 6 15:46:00 2013 +0100 test/event-loop: Check readable state on a pipe When redirecting stdout to a non-readable file makes the test fail as a false negative diff --git a/tests/event-loop-test.c b/tests/event-loop-test.c index e630cde..2f3dcd4 100644 --- a/tests/event-loop-test.c +++ b/tests/event-loop-test.c @@ -43,14 +43,19 @@ TEST(event_loop_post_dispatch_check) struct wl_event_loop *loop = wl_event_loop_create(); struct wl_event_source *source; int dispatch_ran = 0; + int p[2]; - source = wl_event_loop_add_fd(loop, 1, WL_EVENT_READABLE, + assert(pipe(p) == 0); + + source = wl_event_loop_add_fd(loop, p[0], WL_EVENT_READABLE, fd_dispatch, &dispatch_ran); wl_event_source_check(source); wl_event_loop_dispatch(loop, 0); assert(dispatch_ran); + assert(close(p[0]) == 0); + assert(close(p[1]) == 0); wl_event_source_remove(source); wl_event_loop_destroy(loop); } commit 30ccd3366eda63154a7b39569d85378c82dbef20 Author: Jason Ekstrand <[email protected]> Date: Fri Jan 11 14:29:32 2013 -0600 Added a destroy signal to the wl_display object. Added a destroy signal to the wl_display object. diff --git a/src/wayland-server.c b/src/wayland-server.c index f7f4c14..dae7177 100644 --- a/src/wayland-server.c +++ b/src/wayland-server.c @@ -90,6 +90,8 @@ struct wl_display { struct wl_list global_list; struct wl_list socket_list; struct wl_list client_list; + + struct wl_signal destroy_signal; }; struct wl_global { @@ -1096,6 +1098,8 @@ wl_display_create(void) wl_list_init(&display->client_list); wl_list_init(&display->registry_resource_list); + wl_signal_init(&display->destroy_signal); + display->id = 1; display->serial = 0; @@ -1115,6 +1119,8 @@ wl_display_destroy(struct wl_display *display) struct wl_socket *s, *next; struct wl_global *global, *gnext; + wl_signal_emit(&display->destroy_signal, display); + wl_list_for_each_safe(s, next, &display->socket_list, link) { wl_event_source_remove(s->source); unlink(s->addr.sun_path); @@ -1381,6 +1387,20 @@ wl_display_add_socket(struct wl_display *display, const char *name) return 0; } +WL_EXPORT void +wl_display_add_destroy_listener(struct wl_display *display, + struct wl_listener *listener) +{ + wl_signal_add(&display->destroy_signal, listener); +} + +WL_EXPORT struct wl_listener * +wl_display_get_destroy_listener(struct wl_display *display, + wl_notify_func_t notify) +{ + return wl_signal_get(&display->destroy_signal, notify); +} + WL_EXPORT struct wl_resource * wl_client_add_object(struct wl_client *client, const struct wl_interface *interface, diff --git a/src/wayland-server.h b/src/wayland-server.h index 3357105..576304f 100644 --- a/src/wayland-server.h +++ b/src/wayland-server.h @@ -106,6 +106,11 @@ void wl_display_remove_global(struct wl_display *display, uint32_t wl_display_get_serial(struct wl_display *display); uint32_t wl_display_next_serial(struct wl_display *display); +void wl_display_add_destroy_listener(struct wl_display *display, + struct wl_listener *listener); +struct wl_listener *wl_display_get_destroy_listener(struct wl_display *display, + wl_notify_func_t notify); + struct wl_client *wl_client_create(struct wl_display *display, int fd); void wl_client_destroy(struct wl_client *client); void wl_client_flush(struct wl_client *client); diff --git a/tests/Makefile.am b/tests/Makefile.am index cf821c0..54157bc 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,6 +1,7 @@ TESTS = \ array-test \ client-test \ + display-test \ connection-test \ event-loop-test \ fixed-test \ @@ -22,6 +23,7 @@ test_runner_src = test-runner.c test-runner.h test-helpers.c array_test_SOURCES = array-test.c $(test_runner_src) client_test_SOURCES = client-test.c $(test_runner_src) +display_test_SOURCES = display-test.c $(test_runner_src) connection_test_SOURCES = connection-test.c $(test_runner_src) event_loop_test_SOURCES = event-loop-test.c $(test_runner_src) fixed_test_SOURCES = fixed-test.c $(test_runner_src) diff --git a/tests/display-test.c b/tests/display-test.c new file mode 100644 index 0000000..95b939e --- /dev/null +++ b/tests/display-test.c @@ -0,0 +1,79 @@ +/* + * Copyright © 2012 Intel Corporation + * Copyright © 2013 Jason Ekstrand + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted 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 pertaining to distribution of the software without specific, + * written prior permission. The copyright holders make no representations + * about the suitability of this software for any purpose. It is provided "as + * is" without express or implied warranty. + * + * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE + * OF THIS SOFTWARE. + */ + +#include <stdio.h> +#include <stdlib.h> +#include <stdarg.h> +#include <string.h> +#include <assert.h> +#include <sys/socket.h> +#include <unistd.h> +#include <errno.h> +#include <sys/types.h> +#include <sys/stat.h> + +#include "wayland-server.h" +#include "wayland-private.h" +#include "test-runner.h" + +struct display_destroy_listener { + struct wl_listener listener; + int done; +}; + +static void +display_destroy_notify(struct wl_listener *l, void *data) +{ + struct display_destroy_listener *listener; + + listener = container_of(l, struct display_destroy_listener, listener); + listener->done = 1; +} + +TEST(display_destroy_listener) +{ + struct wl_display *display; + struct display_destroy_listener a, b; + + display = wl_display_create(); + assert(display); + + a.listener.notify = &display_destroy_notify; + a.done = 0; + wl_display_add_destroy_listener(display, &a.listener); + + assert(wl_display_get_destroy_listener(display, display_destroy_notify) == + &a.listener); + + b.listener.notify = display_destroy_notify; + b.done = 0; + wl_display_add_destroy_listener(display, &b.listener); + + wl_list_remove(&a.listener.link); + + wl_display_destroy(display); + + assert(!a.done); + assert(b.done); +} + commit c762403489347a0713ca36a4b7bbd2b95c811aa8 Author: Sven Joachim <[email protected]> Date: Sat Dec 15 18:10:56 2012 +0100 Add docbook-xsl to Build-Depends Necessary to generate the manpages, prior to commit 7fd3ca049b2339363d31abcb7fe0e8305972317b this had been hidden if the build machine had Internet access. diff --git a/debian/changelog b/debian/changelog index 06c5877..5fcae70 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,7 @@ wayland (1.0.3-1) UNRELEASED; urgency=low [ Sven Joachim ] * Update symbols file, bumping minver of all symbols to 1.0.2. + * Add docbook-xsl to Build-Depends. * Add Homepage field to debian/control. * Update debian/copyright. diff --git a/debian/control b/debian/control index 55a2f1c..26a4583 100644 --- a/debian/control +++ b/debian/control @@ -10,6 +10,7 @@ Build-Depends: pkg-config, doxygen, xsltproc, + docbook-xsl, libexpat1-dev, libffi-dev, Standards-Version: 3.9.3 commit de09d609d69c98541f7f494dd8691bf560a61ce4 Author: Sven Joachim <[email protected]> Date: Sat Dec 15 17:19:14 2012 +0100 Revert "Document the cherry-pick" This reverts commit f368a65dac42222197622c778776b12aac87e6f2. The fix has been included in the 1.0.3 release as commit 15625a5cc70f58aa466f3db5171a5fa1851aad71. diff --git a/debian/changelog b/debian/changelog index d2f5eb7..06c5877 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,8 +25,6 @@ wayland (1.0.3-1) UNRELEASED; urgency=low [ Sven Joachim ] * Update symbols file, bumping minver of all symbols to 1.0.2. - * Cherry-pick commit 7415e8eb (tests: Don't leave temporary files behind) - from upstream master to avoid putting 2001 files in /tmp at build time. * Add Homepage field to debian/control. * Update debian/copyright. commit 08fa76f3b244e7d233a7c7a92a1c337c8ffd652e Author: Sven Joachim <[email protected]> Date: Sat Dec 15 17:18:42 2012 +0100 New upstream release diff --git a/debian/changelog b/debian/changelog index cbb3513..d2f5eb7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -wayland (1.0.2-1) UNRELEASED; urgency=low +wayland (1.0.3-1) UNRELEASED; urgency=low [ Robert Ancell ] * debian/libwayland-dev.install: commit ce1f41251a07600ed8c6b2e3dc1e868008aeb33a Author: Kristian Høgsberg <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 fbeac51c15d489017790316831327945b91d22d1 Author: Sven Joachim <[email protected]> Date: Mon Dec 3 18:41:29 2012 +0100 Drop useless rm call from debian/rules The upstream installation process only installs manpages as documentation and does not put any files under /usr/share/doc. diff --git a/debian/rules b/debian/rules index 5331696..abb5674 100755 --- a/debian/rules +++ b/debian/rules @@ -6,8 +6,6 @@ PACKAGE=libwayland0 # Kill *.la files, and forget no-one: override_dh_install: find debian/tmp -name '*.la' -delete - # temporary, decide where to put these - rm -rf debian/tmp/usr/share/doc/wayland dh_install --fail-missing override_dh_makeshlibs: commit 3a377bf63c6fc48d2ca67d40d6a585036bb898d0 Author: Sven Joachim <[email protected]> Date: Mon Dec 3 18:30:03 2012 +0100 Remove two files not in the 1.0.2 tarball diff --git a/cursor/convert_font.c b/cursor/convert_font.c deleted file mode 100644 index de1b8ad..0000000 --- a/cursor/convert_font.c +++ /dev/null @@ -1,531 +0,0 @@ -/* - * Copyright © 2012 Philipp Brüschweiler - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted 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 pertaining to distribution of the software without specific, - * written prior permission. The copyright holders make no representations - * about the suitability of this software for any purpose. It is provided "as - * is" without express or implied warranty. - * - * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE - * OF THIS SOFTWARE. - */ - -/* - * This is a small, hacky tool to extract cursors from a .pcf file. - * The information about the file format has been gathered from - * http://fontforge.org/pcf-format.html - */ - -#include <assert.h> -#include <fcntl.h> -#include <stdint.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <sys/mman.h> -#include <sys/types.h> -#include <sys/stat.h> - -#define min(a, b) ((a) < (b) ? (a) : (b)) -#define max(a, b) ((a) > (b) ? (a) : (b)) - -struct glyph { - char *name; - int16_t left_bearing, right_bearing, ascent, descent; - - int16_t width, height; - int16_t hotx, hoty; - - int32_t data_format; - char *data; -}; - -static struct { - int count; - struct glyph *glyphs; -} extracted_font = {0, NULL}; - -#define PCF_PROPERTIES (1<<0) -#define PCF_ACCELERATORS (1<<1) -#define PCF_METRICS (1<<2) -#define PCF_BITMAPS (1<<3) -#define PCF_INK_METRICS (1<<4) -#define PCF_BDF_ENCODINGS (1<<5) -#define PCF_SWIDTHS (1<<6) -#define PCF_GLYPH_NAMES (1<<7) -#define PCF_BDF_ACCELERATORS (1<<8) - -#define PCF_DEFAULT_FORMAT 0x00000000 -#define PCF_INKBOUNDS 0x00000200 -#define PCF_ACCEL_W_INKBOUNDS 0x00000100 -#define PCF_COMPRESSED_METRICS 0x00000100 - -#define PCF_FORMAT_MASK 0xffffff00 - -struct pcf_header { - char header[4]; - int32_t table_count; - struct toc_entry { - int32_t type; - int32_t format; - int32_t size; - int32_t offset; - } tables[0]; -}; - -struct compressed_metrics { - uint8_t left_sided_bearing; - uint8_t right_side_bearing; - uint8_t character_width; - uint8_t character_ascent; - uint8_t character_descent; -}; - -struct uncompressed_metrics { - int16_t left_sided_bearing; - int16_t right_side_bearing; -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
