weston: Changes to 'upstream-experimental'
Makefile.am | 3 +--
configure.ac | 10 +++++-----
releasing.txt | 19 +++++++++++++------
src/input.c | 9 +++++++--
src/weston-egl-ext.h | 28 +++++++++++++++++++++++-----
tests/weston-test.c | 1 +
6 files changed, 50 insertions(+), 20 deletions(-)
New commits:
commit dbd8606a2a9425605102db9e722289934ab7b8b4
Author: Bryce Harrington <bryce@osg.samsung.com>
Date: Fri Feb 13 20:47:09 2015 -0800
configure.ac: bump to version 1.7.0 for release
diff --git a/configure.ac b/configure.ac
index e5f395f..b722441 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
m4_define([weston_major_version], [1])
-m4_define([weston_minor_version], [6])
-m4_define([weston_micro_version], [93])
+m4_define([weston_minor_version], [7])
+m4_define([weston_micro_version], [0])
m4_define([weston_version],
[weston_major_version.weston_minor_version.weston_micro_version])
@@ -59,7 +59,7 @@ AC_CHECK_HEADERS([execinfo.h])
AC_CHECK_FUNCS([mkostemp strchrnul initgroups posix_fallocate])
-COMPOSITOR_MODULES="wayland-server >= 1.6.93 pixman-1 >= 0.25.2"
+COMPOSITOR_MODULES="wayland-server >= 1.7.0 pixman-1 >= 0.25.2"
AC_ARG_ENABLE(egl, [ --disable-egl],,
enable_egl=yes)
@@ -292,7 +292,7 @@ AC_SUBST(JPEG_LIBS)
PKG_CHECK_MODULES(CAIRO, [cairo])
-PKG_CHECK_MODULES(TEST_CLIENT, [wayland-client >= 1.6.93])
+PKG_CHECK_MODULES(TEST_CLIENT, [wayland-client >= 1.7.0])
AC_ARG_ENABLE(simple-clients,
AS_HELP_STRING([--disable-simple-clients],
commit 8a88cec7d4f01ea0698f3a4f19ae266d1526a13a
Author: Bryce Harrington <bryce@osg.samsung.com>
Date: Fri Feb 13 20:46:41 2015 -0800
releasing: Note that Xwayland installation required only for Weston releases
diff --git a/releasing.txt b/releasing.txt
index 4ea210b..8188ddf 100644
--- a/releasing.txt
+++ b/releasing.txt
@@ -15,10 +15,10 @@ To make a release of Weston and/or Wayland, follow these steps.
$ git commit configure.ac -m "configure.ac: bump to version x.y.z for the xxx release"
$ git push
- 2. Install Xwayland, either from your distro or manually (see
- http://wayland.freedesktop.org/building.html). If you install it
- to a location other than /usr/bin/Xwayland, specify this in the
- following env var:
+ 2. For Weston releases, install Xwayland, either from your distro or
+ manually (see http://wayland.freedesktop.org/building.html). If
+ you install it to a location other than /usr/bin/Xwayland, specify
+ this in the following env var:
export DISTCHECK_CONFIGURE_FLAGS="--with-xserver-path=<your-Xwayland-path>"
commit ad1218ffe6968faa94bc261c9cc71f030e2ba205
Author: Daniel Stone <daniels@collabora.com>
Date: Wed Feb 11 18:15:18 2015 +0000
weston-egl-ext: Define EGL tokens harder for old Mesa
Older versions of Mesa provided header definitions for the
EGL_WL_bind_wayland_display extension, but an earlier version of the
extension which only provided the (un)bind entrypoints, and not
QueryWaylandBuffer. Detect this half-provision and make sure we export
the QueryWaylandBuffer definitions as well.
Fixes build failure with EGL on Ubuntu 12.04.
Signed-off-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
Reviewed-by: Pekka Paalanen <ppaalanen@gmail.com>
diff --git a/src/weston-egl-ext.h b/src/weston-egl-ext.h
index 4888323..145322b 100644
--- a/src/weston-egl-ext.h
+++ b/src/weston-egl-ext.h
@@ -33,6 +33,29 @@
#ifndef EGL_WL_bind_wayland_display
#define EGL_WL_bind_wayland_display 1
+struct wl_display;
+
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLBoolean EGLAPIENTRY eglBindWaylandDisplayWL(EGLDisplay dpy, struct wl_display *display);
+EGLAPI EGLBoolean EGLAPIENTRY eglUnbindWaylandDisplayWL(EGLDisplay dpy, struct wl_display *display);
+#endif
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLBINDWAYLANDDISPLAYWL) (EGLDisplay dpy, struct wl_display *display);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLUNBINDWAYLANDDISPLAYWL) (EGLDisplay dpy, struct wl_display *display);
+#endif
+
+/*
+ * This is a little different to the tests shipped with EGL implementations,
+ * which wrap the entire thing in #ifndef EGL_WL_bind_wayland_display, then go
+ * on to define both BindWaylandDisplay and QueryWaylandBuffer.
+ *
+ * Unfortunately, some implementations (particularly the version of Mesa shipped
+ * in Ubuntu 12.04) define EGL_WL_bind_wayland_display, but then only provide
+ * prototypes for (Un)BindWaylandDisplay, completely omitting
+ * QueryWaylandBuffer.
+ *
+ * Detect this, and provide our own definitions if necessary.
+ */
+#ifndef EGL_WAYLAND_BUFFER_WL
#define EGL_WAYLAND_BUFFER_WL 0x31D5 /* eglCreateImageKHR target */
#define EGL_WAYLAND_PLANE_WL 0x31D6 /* eglCreateImageKHR target */
@@ -41,15 +64,10 @@
#define EGL_TEXTURE_Y_XUXV_WL 0x31D9
#define EGL_TEXTURE_EXTERNAL_WL 0x31DA
-struct wl_display;
struct wl_resource;
#ifdef EGL_EGLEXT_PROTOTYPES
-EGLAPI EGLBoolean EGLAPIENTRY eglBindWaylandDisplayWL(EGLDisplay dpy, struct wl_display *display);
-EGLAPI EGLBoolean EGLAPIENTRY eglUnbindWaylandDisplayWL(EGLDisplay dpy, struct wl_display *display);
EGLAPI EGLBoolean EGLAPIENTRY eglQueryWaylandBufferWL(EGLDisplay dpy, struct wl_resource *buffer, EGLint attribute, EGLint *value);
#endif
-typedef EGLBoolean (EGLAPIENTRYP PFNEGLBINDWAYLANDDISPLAYWL) (EGLDisplay dpy, struct wl_display *display);
-typedef EGLBoolean (EGLAPIENTRYP PFNEGLUNBINDWAYLANDDISPLAYWL) (EGLDisplay dpy, struct wl_display *display);
typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYWAYLANDBUFFERWL) (EGLDisplay dpy, struct wl_resource *buffer, EGLint attribute, EGLint *value);
#endif
commit e78977196c8a1c74990396f1c97a7a384145abc8
Author: Daniel Stone <daniels@collabora.com>
Date: Wed Feb 11 18:15:17 2015 +0000
tests: Include weston-egl-ext from weston-test
weston-test uses eglBindWaylandDisplayWL and friends, which are defined
either by the EGL implementation, or weston-egl-ext.h as a fallback.
Include weston-egl-ext.h from weston-test, so we can build on systems
whose native EGL implementation doesn't give us the needed defines.
Signed-off-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
Reviewed-by: Pekka Paalanen <ppaalanen@gmail.com>
diff --git a/tests/weston-test.c b/tests/weston-test.c
index 77eaa23..8777f70 100644
--- a/tests/weston-test.c
+++ b/tests/weston-test.c
@@ -33,6 +33,7 @@
#ifdef ENABLE_EGL
#include <EGL/egl.h>
#include <EGL/eglext.h>
+#include "../src/weston-egl-ext.h"
#endif /* ENABLE_EGL */
struct weston_test {
commit a9d0b6836e69cccc072b894505b6db636117abd0
Author: Bryce Harrington <bryce@osg.samsung.com>
Date: Thu Feb 12 16:49:15 2015 -0800
releasing: Revert fix and just document work-around of Xwayland path
If Xwayland is not in /usr/bin, distcheck will fail without patch
023b265b, which propagates @XSERVER_PATH@ to distcheck but blocks other
use of the DISTCHECK_CONFIGURE_FLAGS env var. Instead, revert the fix
and merely document the need for setting DISTCHECK_CONFIGURE_FLAGS
manually.
Revert "build: Pass along any user-specified xserver path to distcheck"
This reverts commit 023b265b44a8ffc9dd303abc50f8b060a2115e55.
diff --git a/Makefile.am b/Makefile.am
index 0ee674d..1864b70 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,6 @@ noinst_LTLIBRARIES =
BUILT_SOURCES =
AM_DISTCHECK_CONFIGURE_FLAGS = --disable-setuid-install
-DISTCHECK_CONFIGURE_FLAGS = --with-xserver-path='@XSERVER_PATH@'
EXTRA_DIST = weston.ini.in ivi-shell/weston.ini.in
diff --git a/releasing.txt b/releasing.txt
index b704725..4ea210b 100644
--- a/releasing.txt
+++ b/releasing.txt
@@ -15,7 +15,14 @@ To make a release of Weston and/or Wayland, follow these steps.
$ git commit configure.ac -m "configure.ac: bump to version x.y.z for the xxx release"
$ git push
- 2. Run the release.sh script to generate the tarballs, sign and
+ 2. Install Xwayland, either from your distro or manually (see
+ http://wayland.freedesktop.org/building.html). If you install it
+ to a location other than /usr/bin/Xwayland, specify this in the
+ following env var:
+
+ export DISTCHECK_CONFIGURE_FLAGS="--with-xserver-path=<your-Xwayland-path>"
+
+ 3. Run the release.sh script to generate the tarballs, sign and
upload them, and generate a release announcement template.
This script can be obtained from X.org's modular package:
@@ -27,26 +34,26 @@ To make a release of Weston and/or Wayland, follow these steps.
skip testsuite by specifying the --dist argument. Pass --help to
see other supported options.
- 3. Compose the release announcements. The script will generate
+ 4. Compose the release announcements. The script will generate
*.x.y.0.announce files with a list of changes and tags, one for
wayland, one for weston. Prepend these with a human-readable
listing of the most notable changes. For x.y.0 releases, indicate
the schedule for the x.y+1.0 release.
- 4. Send the release announcements to
+ 5. Send the release announcements to
wayland-devel@lists.freedesktop.org
- 5. Get your freshly posted release email URL from
+ 6. Get your freshly posted release email URL from
http://lists.freedesktop.org/archives/wayland-devel/
- 6. Update releases.html in wayland-web with links to tarballs and
+ 7. Update releases.html in wayland-web with links to tarballs and
the release email URL.
$ git commit releases.html -m "Add x.y.z release"
$ git push
$ rsync -avz * wayland.freedesktop.org:/srv/wayland.freedesktop.org/www/
- 7. Update topic in #wayland to point to the release announcement URL
+ 8. Update topic in #wayland to point to the release announcement URL
For x.y.0 releases, also create the x.y branch. The x.y branch is for
commit b6ddf6c229ae3c83a196736a3e67eed77f87f7f4
Author: Giulio Camuffo <giuliocamuffo@gmail.com>
Date: Fri Feb 6 19:06:54 2015 +0200
input: store the grab serial of the keyboard
The serial can be checked against the one passed to wl_shell.set_popup
or equivalent.
Reviewed-by: Daniel Stone <daniels@collabora.com>
diff --git a/src/input.c b/src/input.c
index c039af0..3867de2 100644
--- a/src/input.c
+++ b/src/input.c
@@ -1321,8 +1321,6 @@ notify_key(struct weston_seat *seat, uint32_t time, uint32_t key,
if (state == WL_KEYBOARD_KEY_STATE_PRESSED) {
weston_compositor_idle_inhibit(compositor);
- keyboard->grab_key = key;
- keyboard->grab_time = time;
} else {
weston_compositor_idle_release(compositor);
}
@@ -1361,6 +1359,13 @@ notify_key(struct weston_seat *seat, uint32_t time, uint32_t key,
key,
state);
}
+
+ if (state == WL_KEYBOARD_KEY_STATE_PRESSED) {
+ keyboard->grab_serial =
+ wl_display_get_serial(compositor->wl_display);
+ keyboard->grab_time = time;
+ keyboard->grab_key = key;
+ }
}
WL_EXPORT void
commit 023b265b44a8ffc9dd303abc50f8b060a2115e55
Author: Bryce Harrington <bryce@osg.samsung.com>
Date: Mon Feb 9 18:13:15 2015 -0800
build: Pass along any user-specified xserver path to distcheck
diff --git a/Makefile.am b/Makefile.am
index 1864b70..0ee674d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,6 +9,7 @@ noinst_LTLIBRARIES =
BUILT_SOURCES =
AM_DISTCHECK_CONFIGURE_FLAGS = --disable-setuid-install
+DISTCHECK_CONFIGURE_FLAGS = --with-xserver-path='@XSERVER_PATH@'
EXTRA_DIST = weston.ini.in ivi-shell/weston.ini.in
commit 2ef9e81748936728a242a5384ade8b31a5fb21a3
Author: Derek Foreman <derekf@osg.samsung.com>
Date: Mon Feb 9 09:57:29 2015 -0600
build: Enable xwayland-test during distcheck
The replacement xwayland-test should succeed, so we should run it
from distcheck again.
Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
diff --git a/Makefile.am b/Makefile.am
index 589b47b..1864b70 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,8 +8,7 @@ module_LTLIBRARIES =
noinst_LTLIBRARIES =
BUILT_SOURCES =
-# Do not run xwayland test while it is known broken.
-AM_DISTCHECK_CONFIGURE_FLAGS = --disable-setuid-install --disable-xwayland-test
+AM_DISTCHECK_CONFIGURE_FLAGS = --disable-setuid-install
EXTRA_DIST = weston.ini.in ivi-shell/weston.ini.in
commit 1f9d4f9cf91bc7c7a1e75150fddaa632dde72d37
Author: Derek Foreman <derekf@osg.samsung.com>
Date: Mon Feb 9 09:57:28 2015 -0600
configure.ac: Don't look for Xwayland in the weston install destination
Xwayland isn't part of this distribution so looking for Xwayland in
weston's install dir will cause distcheck to fail. Let's set the
default to /usr/bin where it's likely to live.
It can still be overriden during configure exactly as before.
Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
diff --git a/configure.ac b/configure.ac
index 1db9f79..e5f395f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -100,7 +100,7 @@ if test x$enable_xwayland = xyes; then
AC_ARG_WITH(xserver-path, AS_HELP_STRING([--with-xserver-path=PATH],
[Path to X server]), [XSERVER_PATH="$withval"],
- [XSERVER_PATH="$bindir/Xwayland"])
+ [XSERVER_PATH="/usr/bin/Xwayland"])
AC_SUBST([XSERVER_PATH])
if test x$enable_xwayland_test = xyes; then
PKG_CHECK_MODULES([XWAYLAND_TEST], x11)
Reply to: