Hi, Weston doesn't compile with this patchset - some source files in clients directory still use old or removed headers. I had to replace xdg-shell-server-protocol.h in desktop-shell/shell.c with xdg-shell-unstable-v5-server-protocol.h and disable clients compilation in order to be able to compile weston. If that's not an issue:
Reviewed-by: Mariusz Ceier <mceier+wayl...@gmail.com> Mariusz Ceier On 4 November 2015 at 09:49, Jonas Ådahl <jad...@gmail.com> wrote: > Hi, > > This series changes weston to depend on wayland-protocols for the > majority of the protocols previously in the protocols/ directory. The > protocols moved are also renamed to comply with the unstable naming > conventions of wayland-protocols, with the exception of xdg_shell which > will use the current name until the next version. > > I'd appreciate if maintainers of given protocols could at least Ack the > patch changing their protocol implementation, as a semi formal stamp of > approval of the name change. > > Other than that, the workspaces protocol is removed, mostly because it > wasn't a significant enough proof of concept needed for any particular > feature. text-cursor-position.xml however I have left intact, because > without it the zoom accessibility feature proof of concept becomes > a bit too useless. I'd prefer to prefix it with something like toy_ or > weston_, but would like to hear input on this one. Given that it is > completely undocumented it is quite far from a real attempt, but it > seems like something that will be needed sooner or later for > accessibility reasons, so not sure what to do with it right now. > > Things that seemed more weston specific was weston_ prefixed. The > screenshooter protocol and the desktop shell protocol fell into this > category. > > Another protocol left to migrate is scalar.xml. I didn't do this yet > because Pekka had plans on renaming it, and I'll simply wait until he > has a name for it before migrating anything. > > Other than that, the wayland-protocols have shaped up some, with the > pointer gestures protocol as well as the protocols of this series > migrated there. I wouldn't mind if people went and had a look to see if > there are any opinions of how things should work before we make an > initial release. The procedures and some details are explained in the > README file in the toplevel directory. > > One current inconvenience that would be nice with some opinions is what > to do with unstable protocol files after a protocol has been declared > stable. Currently specified to work by having one directory containing > the stable XML file together with a README in the stable/ toplevel > directory, and yet another directory containing the unstable protocol > files together with a README in the unstable/ directory. This seems a bit > backward to me. Deprecating a protocol by moving it into deprecated/ > would still require us to have the protocol in the stable/ and probably > even in the unstable/ directory. This all is a bit awkward to me. One > idea is restructure the tree a bit and put protocols in the directory of > the current state (stable/unstable/obsolete) and then keep the old XML > files in subdirectories in there, having the Makefile deal with > installing XML files appropriately in the corresponding > stable/unstable/obsolete directories. Or we could have all protocols in > the toplevel directory and always have the corresponding XML files in > stable/unstable/obsolete subdirectories and just installing that. Any > opinions about this? > > > Jonas > > > Jonas Ådahl (10): > Use fullscreen-shell.xml from wayland-protocols > Use linux-dmabuf protocol from wayland-protocols > Use presentation timing protocol from wayland-protocols > Use text input protocol from wayland-protocols > Use input method protocol from wayland-protocols > Makefile.am: Make the external xml scanning rule version generic > Use xdg_shell protocol from wayland-protocols > desktop-shell: Rename protocol weston_desktop_shell > Rename screenshooter protocol to weston_screenshooter > Remove workspaces protocol > > Makefile.am | 194 ++++++------ > clients/desktop-shell.c | 79 ++--- > clients/editor.c | 119 +++---- > clients/fullscreen.c | 60 ++-- > clients/keyboard.c | 186 +++++------ > clients/presentation-shm.c | 65 ++-- > clients/screenshot.c | 21 +- > clients/simple-damage.c | 18 +- > clients/simple-dmabuf.c | 74 ++--- > clients/simple-shm.c | 18 +- > clients/weston-info.c | 19 +- > clients/weston-simple-im.c | 122 +++---- > clients/window.c | 57 +--- > configure.ac | 7 + > desktop-shell/input-panel.c | 14 +- > desktop-shell/shell.c | 183 +++-------- > desktop-shell/shell.h | 4 +- > fullscreen-shell/fullscreen-shell.c | 54 ++-- > ivi-shell/input-panel-ivi.c | 12 +- > protocol/desktop-shell.xml | 138 -------- > protocol/fullscreen-shell.xml | 206 ------------ > protocol/input-method.xml | 291 ----------------- > protocol/linux-dmabuf.xml | 274 ---------------- > protocol/presentation_timing.xml | 274 ---------------- > protocol/screenshooter.xml | 12 - > protocol/text.xml | 374 ---------------------- > protocol/weston-desktop-shell.xml | 134 ++++++++ > protocol/weston-screenshooter.xml | 12 + > protocol/workspaces.xml | 27 -- > protocol/xdg-shell.xml | 616 > ------------------------------------ > src/compositor-drm.c | 14 +- > src/compositor-fbdev.c | 2 +- > src/compositor-headless.c | 2 +- > src/compositor-rpi.c | 6 +- > src/compositor-wayland.c | 50 +-- > src/compositor-x11.c | 2 +- > src/compositor.c | 29 +- > src/gl-renderer.c | 6 +- > src/linux-dmabuf.c | 40 +-- > src/screen-share.c | 34 +- > src/screenshooter.c | 12 +- > src/text-backend.c | 82 ++--- > tests/presentation-test.c | 34 +- > tests/text-test.c | 52 +-- > 44 files changed, 921 insertions(+), 3108 deletions(-) > delete mode 100644 protocol/desktop-shell.xml > delete mode 100644 protocol/fullscreen-shell.xml > delete mode 100644 protocol/input-method.xml > delete mode 100644 protocol/linux-dmabuf.xml > delete mode 100644 protocol/presentation_timing.xml > delete mode 100644 protocol/screenshooter.xml > delete mode 100644 protocol/text.xml > create mode 100644 protocol/weston-desktop-shell.xml > create mode 100644 protocol/weston-screenshooter.xml > delete mode 100644 protocol/workspaces.xml > delete mode 100644 protocol/xdg-shell.xml > > -- > 2.4.3 > > _______________________________________________ > wayland-devel mailing list > wayland-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/wayland-devel >
_______________________________________________ wayland-devel mailing list wayland-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/wayland-devel