[PATCH weston] protocol: move sub-surfaces to Wayland
From: Pekka Paalanen pekka.paala...@collabora.co.uk This reverts commit 2396aec6842c709a714f3825dbad9fd88478f2e6. This exact version of the sub-surface protocol has been copied into Wayland core. Therefore it must be removed from here to avoid build conflicts and useless duplication. No other changes to sub-surface protocol consumers are needed, the identical API is now offered by libwayland-client and libwayland-server. The commit adding sub-surfaces to Wayland is: Author: Pekka Paalanen pekka.paala...@collabora.co.uk protocol: add sub-surfaces to the core Signed-off-by: Pekka Paalanen pekka.paala...@collabora.co.uk --- clients/.gitignore | 2 - clients/Makefile.am | 4 - clients/window.h| 1 - protocol/Makefile.am| 1 - protocol/subsurface.xml | 244 src/.gitignore | 3 - src/Makefile.am | 4 - src/compositor.c| 1 - tests/.gitignore| 2 - tests/Makefile.am | 6 +- tests/subsurface-test.c | 1 - 11 files changed, 1 insertion(+), 268 deletions(-) delete mode 100644 protocol/subsurface.xml diff --git a/clients/.gitignore b/clients/.gitignore index 23959cc..92e1659 100644 --- a/clients/.gitignore +++ b/clients/.gitignore @@ -27,8 +27,6 @@ weston-keyboard libtoytoolkit.a screenshooter-client-protocol.h screenshooter-protocol.c -subsurface-client-protocol.h -subsurface-protocol.c tablet-shell-client-protocol.h tablet-shell-protocol.c text-client-protocol.h diff --git a/clients/Makefile.am b/clients/Makefile.am index 4f9dc48..032d900 100644 --- a/clients/Makefile.am +++ b/clients/Makefile.am @@ -97,8 +97,6 @@ libtoytoolkit_la_SOURCES =\ window.h\ text-cursor-position-protocol.c \ text-cursor-position-client-protocol.h \ - subsurface-protocol.c \ - subsurface-client-protocol.h\ workspaces-protocol.c \ workspaces-client-protocol.h @@ -227,8 +225,6 @@ BUILT_SOURCES = \ desktop-shell-protocol.c\ tablet-shell-client-protocol.h \ tablet-shell-protocol.c \ - subsurface-client-protocol.h\ - subsurface-protocol.c \ workspaces-client-protocol.h\ workspaces-protocol.c diff --git a/clients/window.h b/clients/window.h index 838ea4e..66cf985 100644 --- a/clients/window.h +++ b/clients/window.h @@ -28,7 +28,6 @@ #include cairo.h #include ../shared/config-parser.h #include ../shared/zalloc.h -#include subsurface-client-protocol.h #define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0]) diff --git a/protocol/Makefile.am b/protocol/Makefile.am index d09d8eb..14a4b5a 100644 --- a/protocol/Makefile.am +++ b/protocol/Makefile.am @@ -6,7 +6,6 @@ protocol_sources = \ text.xml\ input-method.xml\ workspaces.xml \ - subsurface.xml \ text-cursor-position.xml\ wayland-test.xml diff --git a/protocol/subsurface.xml b/protocol/subsurface.xml deleted file mode 100644 index 9e4a658..000 --- a/protocol/subsurface.xml +++ /dev/null @@ -1,244 +0,0 @@ -?xml version=1.0 encoding=UTF-8? -protocol name=subsurface - - copyright -Copyright © 2012-2013 Collabora, Ltd. - -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. - /copyright - - interface name=wl_subcompositor version=1 -description summary=sub-surface compositing - The global interface exposing sub-surface compositing capabilities. - A wl_surface, that has sub-surfaces
Re: [PATCH weston] protocol: move sub-surfaces to Wayland
On Fri, Nov 15, 2013 at 04:12:13PM +0200, ppaala...@gmail.com wrote: From: Pekka Paalanen pekka.paala...@collabora.co.uk This reverts commit 2396aec6842c709a714f3825dbad9fd88478f2e6. This exact version of the sub-surface protocol has been copied into Wayland core. Therefore it must be removed from here to avoid build conflicts and useless duplication. No other changes to sub-surface protocol consumers are needed, the identical API is now offered by libwayland-client and libwayland-server. The commit adding sub-surfaces to Wayland is: Author: Pekka Paalanen pekka.paala...@collabora.co.uk protocol: add sub-surfaces to the core Signed-off-by: Pekka Paalanen pekka.paala...@collabora.co.uk Yup, about time - thanks Pekka. Both patches applied. Kristian --- clients/.gitignore | 2 - clients/Makefile.am | 4 - clients/window.h| 1 - protocol/Makefile.am| 1 - protocol/subsurface.xml | 244 src/.gitignore | 3 - src/Makefile.am | 4 - src/compositor.c| 1 - tests/.gitignore| 2 - tests/Makefile.am | 6 +- tests/subsurface-test.c | 1 - 11 files changed, 1 insertion(+), 268 deletions(-) delete mode 100644 protocol/subsurface.xml diff --git a/clients/.gitignore b/clients/.gitignore index 23959cc..92e1659 100644 --- a/clients/.gitignore +++ b/clients/.gitignore @@ -27,8 +27,6 @@ weston-keyboard libtoytoolkit.a screenshooter-client-protocol.h screenshooter-protocol.c -subsurface-client-protocol.h -subsurface-protocol.c tablet-shell-client-protocol.h tablet-shell-protocol.c text-client-protocol.h diff --git a/clients/Makefile.am b/clients/Makefile.am index 4f9dc48..032d900 100644 --- a/clients/Makefile.am +++ b/clients/Makefile.am @@ -97,8 +97,6 @@ libtoytoolkit_la_SOURCES = \ window.h\ text-cursor-position-protocol.c \ text-cursor-position-client-protocol.h \ - subsurface-protocol.c \ - subsurface-client-protocol.h\ workspaces-protocol.c \ workspaces-client-protocol.h @@ -227,8 +225,6 @@ BUILT_SOURCES = \ desktop-shell-protocol.c\ tablet-shell-client-protocol.h \ tablet-shell-protocol.c \ - subsurface-client-protocol.h\ - subsurface-protocol.c \ workspaces-client-protocol.h\ workspaces-protocol.c diff --git a/clients/window.h b/clients/window.h index 838ea4e..66cf985 100644 --- a/clients/window.h +++ b/clients/window.h @@ -28,7 +28,6 @@ #include cairo.h #include ../shared/config-parser.h #include ../shared/zalloc.h -#include subsurface-client-protocol.h #define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0]) diff --git a/protocol/Makefile.am b/protocol/Makefile.am index d09d8eb..14a4b5a 100644 --- a/protocol/Makefile.am +++ b/protocol/Makefile.am @@ -6,7 +6,6 @@ protocol_sources =\ text.xml\ input-method.xml\ workspaces.xml \ - subsurface.xml \ text-cursor-position.xml\ wayland-test.xml diff --git a/protocol/subsurface.xml b/protocol/subsurface.xml deleted file mode 100644 index 9e4a658..000 --- a/protocol/subsurface.xml +++ /dev/null @@ -1,244 +0,0 @@ -?xml version=1.0 encoding=UTF-8? -protocol name=subsurface - - copyright -Copyright © 2012-2013 Collabora, Ltd. - -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. - /copyright - -
