Pull request for branch yem/wayland-bump
From: "Yann E. MORIN" <[email protected]>
Hello All!
This series bumps the couple wayland/weston to the latest released version 1.3.0.
Changes v1 -> v2:
- don't build tests, they fail with no EGL (Peter)
- drop Arnout's fixes, they've been applied (Peter)
Regards,
Yann E. MORIN.
The following changes since commit 4b1eba735e03ee6ad2147325f0a73408454d960a:
noip: add license information (2013-10-14 23:03:10 +0200)
are available in the git repository at:
git://gitorious.org/buildroot/buildroot.git yem/wayland-bump
for you to fetch changes up to 801b3c42bed982f8296db2f8227dfcbbdecf5f48:
package/weston: bump to 1.3.0 (2013-10-14 23:18:19 +0200)
----------------------------------------------------------------
Tag base for branch "yem/wayland-egl"
----------------------------------------------------------------
Yann E. MORIN (2):
package/wayland: bump to 1.3.0
package/weston: bump to 1.3.0
package/wayland/wayland.mk | 2 +- ...eston-0000-dont-leak-fd-on-launcher-error.patch | 77 ++++++++++++++++++++++ ...pendent-code-only-when-the-DRM-compositor.patch | 47 ------------- .../weston-0001-enable-build-without-libdrm.patch | 45 +++++++++++++ ...on-0002-fbdev-fix-compilation-without-EGL.patch | 29 ++++++++ ...02-fix-configure.ac-check-wayland-scanner.patch | 26 -------- ...ompositor-fbdev-drop-dependency-on-libdrm.patch | 22 ------- package/weston/weston-0003-dont-build-tests.patch | 18 +++++ package/weston/weston.mk | 4 +- 9 files changed, 172 insertions(+), 98 deletions(-) create mode 100644 package/weston/weston-0000-dont-leak-fd-on-launcher-error.patch delete mode 100644 package/weston/weston-0001-Pull-DRM-dependent-code-only-when-the-DRM-compositor.patch create mode 100644 package/weston/weston-0001-enable-build-without-libdrm.patch create mode 100644 package/weston/weston-0002-fbdev-fix-compilation-without-EGL.patch delete mode 100644 package/weston/weston-0002-fix-configure.ac-check-wayland-scanner.patch delete mode 100644 package/weston/weston-0003-compositor-fbdev-drop-dependency-on-libdrm.patch create mode 100644 package/weston/weston-0003-dont-build-tests.patch
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 1/2 package/wayland: bump to 1.3.0
From: "Yann E. MORIN" <[email protected]>
--- package/wayland/wayland.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/wayland/wayland.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -WAYLAND_VERSION = 1.2.1 +WAYLAND_VERSION = 1.3.0 WAYLAND_SITE = http://wayland.freedesktop.org/releases/ WAYLAND_SOURCE = wayland-$(WAYLAND_VERSION).tar.xz WAYLAND_LICENSE = MIT
Signature · 1 line
1.8.1.2
PATCH 1/2 package/wayland: bump to 1.3.0
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Yann" == Yann E MORIN <[email protected]> writes:
Yann> From: "Yann E. MORIN" <[email protected]> Yann> Signed-off-by: "Yann E. MORIN" <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 2/2 package/weston: bump to 1.3.0
In reply to Yann E. MORINFrom: "Yann E. MORIN" <[email protected]>
Needs three patches from upstream, plus a custom patch to disable tests. Drop old patches, all applied upstream or no longer needed.
--- ...eston-0000-dont-leak-fd-on-launcher-error.patch | 77 ++++++++++++++++++++++ ...pendent-code-only-when-the-DRM-compositor.patch | 47 ------------- .../weston-0001-enable-build-without-libdrm.patch | 45 +++++++++++++ ...on-0002-fbdev-fix-compilation-without-EGL.patch | 29 ++++++++ ...02-fix-configure.ac-check-wayland-scanner.patch | 26 -------- ...ompositor-fbdev-drop-dependency-on-libdrm.patch | 22 ------- package/weston/weston-0003-dont-build-tests.patch | 18 +++++ package/weston/weston.mk | 4 +- 8 files changed, 171 insertions(+), 97 deletions(-) create mode 100644 package/weston/weston-0000-dont-leak-fd-on-launcher-error.patch delete mode 100644 package/weston/weston-0001-Pull-DRM-dependent-code-only-when-the-DRM-compositor.patch create mode 100644 package/weston/weston-0001-enable-build-without-libdrm.patch create mode 100644 package/weston/weston-0002-fbdev-fix-compilation-without-EGL.patch delete mode 100644 package/weston/weston-0002-fix-configure.ac-check-wayland-scanner.patch delete mode 100644 package/weston/weston-0003-compositor-fbdev-drop-dependency-on-libdrm.patch create mode 100644 package/weston/weston-0003-dont-build-tests.patch
package/weston/weston-0000-dont-leak-fd-on-launcher-error.patch new file +77 -0
@@ -0,0 +1,77 @@ +commit 4a74d5a4a45423752105f865a8310ce878b1790a +Author: Kristian H?gsberg <[email protected]> +Date: Wed Oct 9 11:19:11 2013 -0700 + + launcher: Don't leak tty file descriptor on error + +--- +Signed-off-by: "Yann E. MORIN" <[email protected]> + +diff --git a/src/launcher-util.c b/src/launcher-util.c +index d90271f..8ab61f1 100644 +--- a/src/launcher-util.c ++++ b/src/launcher-util.c +@@ -275,7 +275,7 @@ setup_tty(struct weston_launcher *launcher, int tty) + weston_log("%s not a vt\n", tty_device); + weston_log("if running weston from ssh, " + "use --tty to specify a tty\n"); +- return -1; ++ goto err_close; + } + + ret = ioctl(launcher->tty, KDGETMODE, &kd_mode); +@@ -286,7 +286,7 @@ setup_tty(struct weston_launcher *launcher, int tty) + if (kd_mode != KD_TEXT) { + weston_log("%s is already in graphics mode, " + "is another display server running?\n", tty_device); +- return -1; ++ goto err_close; + } + + ret = ioctl(launcher->tty, VT_ACTIVATE, minor(buf.st_rdev)); +@@ -297,19 +297,19 @@ setup_tty(struct weston_launcher *launcher, int tty) + + if (ioctl(launcher->tty, KDGKBMODE, &launcher->kb_mode)) { + weston_log("failed to read keyboard mode: %m\n"); +- return -1; ++ goto err_close; + } + + if (ioctl(launcher->tty, KDSKBMUTE, 1) && + ioctl(launcher->tty, KDSKBMODE, K_OFF)) { + weston_log("failed to set K_OFF keyboard mode: %m\n"); +- return -1; ++ goto err_close; + } + + ret = ioctl(launcher->tty, KDSETMODE, KD_GRAPHICS); + if (ret) { + weston_log("failed to set KD_GRAPHICS mode on tty: %m\n"); +- return -1; ++ goto err_close; + } + + mode.mode = VT_PROCESS; +@@ -317,16 +317,20 @@ setup_tty(struct weston_launcher *launcher, int tty) + mode.acqsig = SIGUSR1; + if (ioctl(launcher->tty, VT_SETMODE, &mode) < 0) { + weston_log("failed to take control of vt handling\n"); +- return -1; ++ goto err_close; + } + + loop = wl_display_get_event_loop(launcher->compositor->wl_display); + launcher->vt_source = + wl_event_loop_add_signal(loop, SIGUSR1, vt_handler, launcher); + if (!launcher->vt_source) +- return -1; ++ goto err_close; + + return 0; ++ ++ err_close: ++ close(launcher->tty); ++ return -1; + } + + int
package/weston/weston-0001-Pull-DRM-dependent-code-only-when-the-DRM-compositor.patch deleted +0 -47
47 lines not on this page · raw message
package/weston/weston-0001-enable-build-without-libdrm.patch new file +45 -0
45 lines not on this page · raw message
package/weston/weston-0002-fbdev-fix-compilation-without-EGL.patch new file +29 -0
@@ -0,0 +1,29 @@ +commit 9acd374822022793b09427d67ea4033915343dd8 +Author: Kristian H?gsberg <[email protected]> +Date: Fri Oct 11 15:25:42 2013 -0700 + + fbdev: Fix compilation without EGL + + We have to duplicate #defines and typedefs for the EGL types and constants + we use in gl-renderer.h so we can compile the fbdev backend without EGL. + + https://bugs.freedesktop.org/show_bug.cgi?id=70392 + +--- +Signed-off-by: "Yann E. MORIN" <[email protected]> + +To be noted: the bug referenced above was opened by me, +and quickly fixed during an IRC session. Nice! :-) + +diff --git a/src/gl-renderer.h b/src/gl-renderer.h +index 4919a1e..d16ade2 100644 +--- a/src/gl-renderer.h ++++ b/src/gl-renderer.h +@@ -56,6 +56,7 @@ typedef void *EGLDisplay; + typedef void *EGLSurface; + typedef intptr_t EGLNativeDisplayType; + typedef intptr_t EGLNativeWindowType; ++#define EGL_DEFAULT_DISPLAY NULL + + static const EGLint gl_renderer_opaque_attribs[]; + static const EGLint gl_renderer_alpha_attribs[];
package/weston/weston-0002-fix-configure.ac-check-wayland-scanner.patch deleted +0 -26
@@ -1,26 +0,0 @@ -commit 9f43cb48aac9d27aa49fe955104f5cfd204703ed -Author: Quentin Glidic <[email protected]> -Date: Sat Aug 24 20:36:10 2013 +0200 - - autotools: Fix AC_PATH_PROG call - - Signed-off-by: Quentin Glidic <[email protected]> - Signed-off-by: "Yann E. MORIN" <[email protected]> - -diff --git a/configure.ac b/configure.ac -index 0129157..43e5e5c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -424,8 +424,10 @@ if test "x$have_lcms" = xyes; then - fi - AM_CONDITIONAL(HAVE_LCMS, [test "x$have_lcms" = xyes]) - --AC_PATH_PROG([wayland_scanner], [wayland-scanner], -- [AC_MSG_ERROR("wayland-scanner is needed to compile weston")]) -+AC_PATH_PROG([wayland_scanner], [wayland-scanner]) -+if test x$wayland_scanner = x; then -+ AC_MSG_ERROR([wayland-scanner is needed to compile weston]) -+fi - - AC_CONFIG_FILES([Makefile - shared/Makefile
package/weston/weston-0003-compositor-fbdev-drop-dependency-on-libdrm.patch deleted +0 -22
@@ -1,22 +0,0 @@ -commit 7b8e970ad1f1ef96db23b379a41edeb40ef1e8b6 -Author: Adrian Negreanu <[email protected]> -Date: Thu Sep 26 19:31:32 2013 +0300 - - compositor-fbdev: drop dependency on libdrm - - Signed-off-by: Adrian Negreanu <[email protected]> - Signed-off-by: "Yann E. MORIN" <[email protected]> - -diff --git a/configure.ac b/configure.ac -index 7c2da44..a43bf5b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -190,7 +190,7 @@ AM_CONDITIONAL([ENABLE_FBDEV_COMPOSITOR], - [test x$enable_fbdev_compositor = xyes]) - AS_IF([test x$enable_fbdev_compositor = xyes], [ - AC_DEFINE([BUILD_FBDEV_COMPOSITOR], [1], [Build the fbdev compositor]) -- PKG_CHECK_MODULES([FBDEV_COMPOSITOR], [libudev >= 136 mtdev >= 1.1.0 libdrm >= 2.4.30]) -+ PKG_CHECK_MODULES([FBDEV_COMPOSITOR], [libudev >= 136 mtdev >= 1.1.0]) - ]) - - AC_ARG_ENABLE([rdp-compositor], [ --enable-rdp-compositor],,
package/weston/weston-0003-dont-build-tests.patch new file +18 -0
@@ -0,0 +1,18 @@ +MAkefile: do not build tests + +Tests are broken if no EGL support is available. + +Reported-by: Peter Korsgaard <[email protected]> +Signed-off-by: "Yann E. MORIN" <[email protected]> +diff -durN weston-1.3.0.orig/Makefile.am weston-1.3.0/Makefile.am +--- weston-1.3.0.orig/Makefile.am 2013-08-20 20:15:19.000000000 +0200 ++++ weston-1.3.0/Makefile.am 2013-10-14 23:08:12.016392097 +0200 +@@ -2,7 +2,7 @@ + wcap_subdir = wcap + endif + +-SUBDIRS = shared src clients data protocol tests $(wcap_subdir) man ++SUBDIRS = shared src clients data protocol $(wcap_subdir) man + + DISTCHECK_CONFIGURE_FLAGS = --disable-setuid-install +
package/weston/weston.mk +2 -2
@@ -4,7 +4,7 @@ # ################################################################################ -WESTON_VERSION = 1.2.2 +WESTON_VERSION = 1.3.0 WESTON_SITE = http://wayland.freedesktop.org/releases/ WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz WESTON_LICENSE = MIT
@@ -13,7 +13,7 @@ WESTON_LICENSE_FILES = COPYING WESTON_DEPENDENCIES = host-pkgconf wayland libxkbcommon pixman libpng \ jpeg mtdev udev cairo -# We touch configure.ac with one of our patches +# We're touching Makefile.am WESTON_AUTORECONF = YES WESTON_CONF_OPT = \
Signature · 1 line
1.8.1.2
PATCH 2/2 package/weston: bump to 1.3.0
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Yann" == Yann E MORIN <[email protected]> writes:
Yann> From: "Yann E. MORIN" <[email protected]>
Yann> Needs three patches from upstream, plus a custom patch to disable tests. Yann> Drop old patches, all applied upstream or no longer needed.
Yann> Signed-off-by: "Yann E. MORIN" <[email protected]>
[snip]
Yann> +++ b/package/weston/weston-0003-dont-build-tests.patch Yann> @@ -0,0 +1,18 @@
Yann> +MAkefile: do not build tests
I dropped the upper case 'A' and committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 2/2 package/weston: bump to 1.3.0
Peter, All,
On 2013-10-15 08:39 +0200, Peter Korsgaard spake thusly:
Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Yann" == Yann E MORIN <[email protected]> writes:
Yann> From: "Yann E. MORIN" <[email protected]>
Yann> Needs three patches from upstream, plus a custom patch to disable tests. Yann> Drop old patches, all applied upstream or no longer needed.Yann> Signed-off-by: "Yann E. MORIN" <[email protected]>
Quoted 7 lines
[snip]
Yann> +++
b/package/weston/weston-0003-dont-build-tests.patchYann> @@ -0,0 +1,18 @@
Yann> +MAkefile: do not build testsI dropped the upper case 'A' and committed, thanks.
Doh.
/me has to train his pinky to be faster... ;-)
Thanks!
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'