[PATCH weston 7/7] protocol: migrate to stable presentation-time.xml
ppaalanen at gmail.com
Tue Feb 23 12:19:32 UTC 2016
On Mon, 22 Feb 2016 16:12:49 -0800
Bryce Harrington <bryce at osg.samsung.com> wrote:
> On Mon, Feb 22, 2016 at 03:34:46PM +0200, Pekka Paalanen wrote:
> > From: Pekka Paalanen <pekka.paalanen at collabora.co.uk>
> > Remove the unstable presentation_timing.xml file, and use
> > presentation-time.xml from wayland-protocols instead to generate all the
> > Presentation extension bindings.
> > The following renames are done according to the XML changes:
> > - generated header includes
> > - enum constants and macros prefixed with WP_
> > - interface symbol names prefixed with wp_
> > - protocol API calls prefixed with wp_
> > Clients use wp_presentation_interface.name rather than hardcoding the
> > global interface name: presentation-shm, weston-info, presentation-test.
> > Signed-off-by: Pekka Paalanen <pekka.paalanen at collabora.co.uk>
> Reviewed-by: Bryce Harrington <bryce at osg.samsung.com>
> A bit of discussion down below relating to the note in configure.ac.
> Also, patches 5 and 6 in this series don't seem to depend on anything
> else in this patchset, so I'd propose we just go ahead and land those
> two directly.
I can do that, sure.
> > ---
> > Note: When landing this patch, check the wayland-protocols version that
> > released presentation-time, and fix the version dependency in
> > configure.ac.
> > ---
> > Makefile.am | 21 ++-
> > clients/presentation-shm.c | 65 +++++-----
> > clients/weston-info.c | 19 +--
> > configure.ac | 1 +
> > protocol/presentation_timing.xml | 274 ---------------------------------------
> > src/compositor-drm.c | 22 ++--
> > src/compositor-fbdev.c | 4 +-
> > src/compositor-headless.c | 4 +-
> > src/compositor-rdp.c | 2 +-
> > src/compositor-rpi.c | 8 +-
> > src/compositor-wayland.c | 2 +-
> > src/compositor-x11.c | 4 +-
> > src/compositor.c | 32 ++---
> > src/compositor.h | 2 +-
> > tests/presentation-test.c | 34 ++---
> > 15 files changed, 111 insertions(+), 383 deletions(-)
> > delete mode 100644 protocol/presentation_timing.xml
> > diff --git a/configure.ac b/configure.ac
> > index 276584f..92eaa3c 100644
> > --- a/configure.ac
> > +++ b/configure.ac
> > @@ -181,6 +181,7 @@ fi
> > PKG_CHECK_MODULES(LIBINPUT_BACKEND, [libinput >= 0.8.0])
> > PKG_CHECK_MODULES(COMPOSITOR, [$COMPOSITOR_MODULES])
> > +# XXX: wayland-protocols needs a version bump for stable/presentation-time.
> > PKG_CHECK_MODULES(WAYLAND_PROTOCOLS, [wayland-protocols >= 1.0],
> > [ac_wayland_protocols_pkgdatadir=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`])
> > AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, $ac_wayland_protocols_pkgdatadir)
> For what it's worth, the ideal place to put notes for the release
> manager is at the very top of the file, near where the version number
> is. That's the only place in the file that we can be 100% certain will
> be looked at during review time.
That's a good idea, I can move it there. Seems to be easy to find the
place where to edit.
> If you want to formalize this a bit, and we're not doing the .90 on
> wayland-protocols (which I still think is a fair idea), we could
> have these notes placed somewhere specifically, and either document in
> releasing.txt to check for notes, or even cause 'make dist' refuse to
> operate if these notes exist.
Making 'make dist' or distcheck to fail is an excellent idea. It could
grep configure.ac for 'RELEASE_BLOCKER' for instance, and then one
would just put that string in the comment anywhere.
There just one problem: people want to be able to run distcheck, and
dist is a dependency on distcheck, I believe. So we'd need an option to
avoid the check until release time, but... it's getting awkward.
I'll just move the comment up for now.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Size: 811 bytes
Desc: OpenPGP digital signature
More information about the wayland-devel