Commit f16ea649 authored by reveman's avatar reveman Committed by Commit bot

Update Wayland to version 1.9.91.

TBR=piman@chromium.org
BUG=

Review URL: https://codereview.chromium.org/1628333004

Cr-Commit-Position: refs/heads/master@{#371425}
parent efd3e5ee
...@@ -418,7 +418,7 @@ deps_os = { ...@@ -418,7 +418,7 @@ deps_os = {
# Display server protocol for Linux. # Display server protocol for Linux.
'src/third_party/wayland/src': 'src/third_party/wayland/src':
Var('chromium_git') + '/external/anongit.freedesktop.org/git/wayland/wayland.git' + '@' + 'b05668f0ad64ad9ba82e124965163daed4172ead', Var('chromium_git') + '/external/anongit.freedesktop.org/git/wayland/wayland.git' + '@' + '7ed00c1de77afbab23f4908fbd9d60ec070c209b',
# Wayland protocols that add functionality not available in the core protocol. # Wayland protocols that add functionality not available in the core protocol.
'src/third_party/wayland-protocols/src': 'src/third_party/wayland-protocols/src':
......
Name: wayland Name: wayland
URL: http://wayland.freedesktop.org/ URL: http://wayland.freedesktop.org/
Version: 1.9.0 Version: 1.9.91
License: MIT License: MIT
License File: src/COPYING License File: src/COPYING
Security Critical: yes Security Critical: yes
...@@ -13,7 +13,7 @@ Modifications: ...@@ -13,7 +13,7 @@ Modifications:
- None - None
To import a new snapshot of wayland: To import a new snapshot of wayland:
- Checkout the latest release tag: git checkout 1.9.0 - Checkout the latest release tag: git checkout 1.9.91
- Change the DEPS entry to the newly checked out commit. - Change the DEPS entry to the newly checked out commit.
- Update generated files: - Update generated files:
./autogen.sh && make ./autogen.sh && make
......
...@@ -16,6 +16,9 @@ ...@@ -16,6 +16,9 @@
/* Define to 1 if you have the <inttypes.h> header file. */ /* Define to 1 if you have the <inttypes.h> header file. */
#define HAVE_INTTYPES_H 1 #define HAVE_INTTYPES_H 1
/* libxml-2.0 is available */
#define HAVE_LIBXML 1
/* Define to 1 if you have the <memory.h> header file. */ /* Define to 1 if you have the <memory.h> header file. */
#define HAVE_MEMORY_H 1 #define HAVE_MEMORY_H 1
...@@ -54,13 +57,13 @@ ...@@ -54,13 +57,13 @@
#define PACKAGE "wayland" #define PACKAGE "wayland"
/* Define to the address where bug reports for this package should be sent. */ /* Define to the address where bug reports for this package should be sent. */
#define PACKAGE_BUGREPORT "https://bugs.freedesktop.org/enter_bug.cgi?product=Wayland&component=wayland&version=1.9.0" #define PACKAGE_BUGREPORT "https://bugs.freedesktop.org/enter_bug.cgi?product=Wayland&component=wayland&version=1.9.91"
/* Define to the full name of this package. */ /* Define to the full name of this package. */
#define PACKAGE_NAME "wayland" #define PACKAGE_NAME "wayland"
/* Define to the full name and version of this package. */ /* Define to the full name and version of this package. */
#define PACKAGE_STRING "wayland 1.9.0" #define PACKAGE_STRING "wayland 1.9.91"
/* Define to the one symbol short name of this package. */ /* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "wayland" #define PACKAGE_TARNAME "wayland"
...@@ -69,10 +72,10 @@ ...@@ -69,10 +72,10 @@
#define PACKAGE_URL "http://wayland.freedesktop.org/" #define PACKAGE_URL "http://wayland.freedesktop.org/"
/* Define to the version of this package. */ /* Define to the version of this package. */
#define PACKAGE_VERSION "1.9.0" #define PACKAGE_VERSION "1.9.91"
/* Define to 1 if you have the ANSI C header files. */ /* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1 #define STDC_HEADERS 1
/* Version number of package */ /* Version number of package */
#define VERSION "1.9.0" #define VERSION "1.9.91"
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#define WAYLAND_VERSION_MAJOR 1 #define WAYLAND_VERSION_MAJOR 1
#define WAYLAND_VERSION_MINOR 9 #define WAYLAND_VERSION_MINOR 9
#define WAYLAND_VERSION_MICRO 0 #define WAYLAND_VERSION_MICRO 91
#define WAYLAND_VERSION "1.9.0" #define WAYLAND_VERSION "1.9.91"
#endif #endif
/* /*
* Copyright © 2008-2011 Kristian Høgsberg * Copyright © 2008-2011 Kristian Høgsberg
* Copyright © 2010-2011 Intel Corporation * Copyright © 2010-2011 Intel Corporation
* Copyright © 2012-2013 Collabora, Ltd. * Copyright © 2012-2013 Collabora, Ltd.
* *
* Permission is hereby granted, free of charge, to any person * Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation files * obtaining a copy of this software and associated documentation files
* (the "Software"), to deal in the Software without restriction, * (the "Software"), to deal in the Software without restriction,
...@@ -10,11 +10,11 @@ ...@@ -10,11 +10,11 @@
* publish, distribute, sublicense, and/or sell copies of the Software, * publish, distribute, sublicense, and/or sell copies of the Software,
* and to permit persons to whom the Software is furnished to do so, * and to permit persons to whom the Software is furnished to do so,
* subject to the following conditions: * subject to the following conditions:
* *
* The above copyright notice and this permission notice (including the * The above copyright notice and this permission notice (including the
* next paragraph) shall be included in all copies or substantial * next paragraph) shall be included in all copies or substantial
* portions of the Software. * portions of the Software.
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
...@@ -191,7 +191,7 @@ static const struct wl_message wl_compositor_requests[] = { ...@@ -191,7 +191,7 @@ static const struct wl_message wl_compositor_requests[] = {
}; };
WL_EXPORT const struct wl_interface wl_compositor_interface = { WL_EXPORT const struct wl_interface wl_compositor_interface = {
"wl_compositor", 3, "wl_compositor", 4,
2, wl_compositor_requests, 2, wl_compositor_requests,
0, NULL, 0, NULL,
}; };
...@@ -240,33 +240,41 @@ static const struct wl_message wl_data_offer_requests[] = { ...@@ -240,33 +240,41 @@ static const struct wl_message wl_data_offer_requests[] = {
{ "accept", "u?s", types + 0 }, { "accept", "u?s", types + 0 },
{ "receive", "sh", types + 0 }, { "receive", "sh", types + 0 },
{ "destroy", "", types + 0 }, { "destroy", "", types + 0 },
{ "finish", "3", types + 0 },
{ "set_actions", "3uu", types + 0 },
}; };
static const struct wl_message wl_data_offer_events[] = { static const struct wl_message wl_data_offer_events[] = {
{ "offer", "s", types + 0 }, { "offer", "s", types + 0 },
{ "source_actions", "3u", types + 0 },
{ "action", "3u", types + 0 },
}; };
WL_EXPORT const struct wl_interface wl_data_offer_interface = { WL_EXPORT const struct wl_interface wl_data_offer_interface = {
"wl_data_offer", 1, "wl_data_offer", 3,
3, wl_data_offer_requests, 5, wl_data_offer_requests,
1, wl_data_offer_events, 3, wl_data_offer_events,
}; };
static const struct wl_message wl_data_source_requests[] = { static const struct wl_message wl_data_source_requests[] = {
{ "offer", "s", types + 0 }, { "offer", "s", types + 0 },
{ "destroy", "", types + 0 }, { "destroy", "", types + 0 },
{ "set_actions", "3u", types + 0 },
}; };
static const struct wl_message wl_data_source_events[] = { static const struct wl_message wl_data_source_events[] = {
{ "target", "?s", types + 0 }, { "target", "?s", types + 0 },
{ "send", "sh", types + 0 }, { "send", "sh", types + 0 },
{ "cancelled", "", types + 0 }, { "cancelled", "", types + 0 },
{ "dnd_drop_performed", "3", types + 0 },
{ "dnd_finished", "3", types + 0 },
{ "action", "3u", types + 0 },
}; };
WL_EXPORT const struct wl_interface wl_data_source_interface = { WL_EXPORT const struct wl_interface wl_data_source_interface = {
"wl_data_source", 1, "wl_data_source", 3,
2, wl_data_source_requests, 3, wl_data_source_requests,
3, wl_data_source_events, 6, wl_data_source_events,
}; };
static const struct wl_message wl_data_device_requests[] = { static const struct wl_message wl_data_device_requests[] = {
...@@ -285,7 +293,7 @@ static const struct wl_message wl_data_device_events[] = { ...@@ -285,7 +293,7 @@ static const struct wl_message wl_data_device_events[] = {
}; };
WL_EXPORT const struct wl_interface wl_data_device_interface = { WL_EXPORT const struct wl_interface wl_data_device_interface = {
"wl_data_device", 2, "wl_data_device", 3,
3, wl_data_device_requests, 3, wl_data_device_requests,
6, wl_data_device_events, 6, wl_data_device_events,
}; };
...@@ -296,7 +304,7 @@ static const struct wl_message wl_data_device_manager_requests[] = { ...@@ -296,7 +304,7 @@ static const struct wl_message wl_data_device_manager_requests[] = {
}; };
WL_EXPORT const struct wl_interface wl_data_device_manager_interface = { WL_EXPORT const struct wl_interface wl_data_device_manager_interface = {
"wl_data_device_manager", 2, "wl_data_device_manager", 3,
2, wl_data_device_manager_requests, 2, wl_data_device_manager_requests,
0, NULL, 0, NULL,
}; };
...@@ -346,6 +354,7 @@ static const struct wl_message wl_surface_requests[] = { ...@@ -346,6 +354,7 @@ static const struct wl_message wl_surface_requests[] = {
{ "commit", "", types + 0 }, { "commit", "", types + 0 },
{ "set_buffer_transform", "2i", types + 0 }, { "set_buffer_transform", "2i", types + 0 },
{ "set_buffer_scale", "3i", types + 0 }, { "set_buffer_scale", "3i", types + 0 },
{ "damage_buffer", "4iiii", types + 0 },
}; };
static const struct wl_message wl_surface_events[] = { static const struct wl_message wl_surface_events[] = {
...@@ -354,8 +363,8 @@ static const struct wl_message wl_surface_events[] = { ...@@ -354,8 +363,8 @@ static const struct wl_message wl_surface_events[] = {
}; };
WL_EXPORT const struct wl_interface wl_surface_interface = { WL_EXPORT const struct wl_interface wl_surface_interface = {
"wl_surface", 3, "wl_surface", 4,
9, wl_surface_requests, 10, wl_surface_requests,
2, wl_surface_events, 2, wl_surface_events,
}; };
...@@ -363,6 +372,7 @@ static const struct wl_message wl_seat_requests[] = { ...@@ -363,6 +372,7 @@ static const struct wl_message wl_seat_requests[] = {
{ "get_pointer", "n", types + 66 }, { "get_pointer", "n", types + 66 },
{ "get_keyboard", "n", types + 67 }, { "get_keyboard", "n", types + 67 },
{ "get_touch", "n", types + 68 }, { "get_touch", "n", types + 68 },
{ "release", "5", types + 0 },
}; };
static const struct wl_message wl_seat_events[] = { static const struct wl_message wl_seat_events[] = {
...@@ -371,8 +381,8 @@ static const struct wl_message wl_seat_events[] = { ...@@ -371,8 +381,8 @@ static const struct wl_message wl_seat_events[] = {
}; };
WL_EXPORT const struct wl_interface wl_seat_interface = { WL_EXPORT const struct wl_interface wl_seat_interface = {
"wl_seat", 4, "wl_seat", 5,
3, wl_seat_requests, 4, wl_seat_requests,
2, wl_seat_events, 2, wl_seat_events,
}; };
...@@ -387,12 +397,16 @@ static const struct wl_message wl_pointer_events[] = { ...@@ -387,12 +397,16 @@ static const struct wl_message wl_pointer_events[] = {
{ "motion", "uff", types + 0 }, { "motion", "uff", types + 0 },
{ "button", "uuuu", types + 0 }, { "button", "uuuu", types + 0 },
{ "axis", "uuf", types + 0 }, { "axis", "uuf", types + 0 },
{ "frame", "5", types + 0 },
{ "axis_source", "5u", types + 0 },
{ "axis_stop", "5uu", types + 0 },
{ "axis_discrete", "5ui", types + 0 },
}; };
WL_EXPORT const struct wl_interface wl_pointer_interface = { WL_EXPORT const struct wl_interface wl_pointer_interface = {
"wl_pointer", 3, "wl_pointer", 5,
2, wl_pointer_requests, 2, wl_pointer_requests,
5, wl_pointer_events, 9, wl_pointer_events,
}; };
static const struct wl_message wl_keyboard_requests[] = { static const struct wl_message wl_keyboard_requests[] = {
...@@ -409,7 +423,7 @@ static const struct wl_message wl_keyboard_events[] = { ...@@ -409,7 +423,7 @@ static const struct wl_message wl_keyboard_events[] = {
}; };
WL_EXPORT const struct wl_interface wl_keyboard_interface = { WL_EXPORT const struct wl_interface wl_keyboard_interface = {
"wl_keyboard", 4, "wl_keyboard", 5,
1, wl_keyboard_requests, 1, wl_keyboard_requests,
6, wl_keyboard_events, 6, wl_keyboard_events,
}; };
...@@ -427,7 +441,7 @@ static const struct wl_message wl_touch_events[] = { ...@@ -427,7 +441,7 @@ static const struct wl_message wl_touch_events[] = {
}; };
WL_EXPORT const struct wl_interface wl_touch_interface = { WL_EXPORT const struct wl_interface wl_touch_interface = {
"wl_touch", 3, "wl_touch", 5,
1, wl_touch_requests, 1, wl_touch_requests,
5, wl_touch_events, 5, wl_touch_events,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment