From patchwork Wed Jan 29 22:08:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 315236 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 709712C00C8 for ; Thu, 30 Jan 2014 09:08:16 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 865CE94BBE; Wed, 29 Jan 2014 22:08:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id PFQAT-pp6Fyd; Wed, 29 Jan 2014 22:08:12 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id BF44E94B8F; Wed, 29 Jan 2014 22:08:11 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 921B01C105A for ; Wed, 29 Jan 2014 22:08:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 8BDB7903D8 for ; Wed, 29 Jan 2014 22:08:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 45SWXxKs-Zlp for ; Wed, 29 Jan 2014 22:08:07 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f45.google.com (mail-wg0-f45.google.com [74.125.82.45]) by whitealder.osuosl.org (Postfix) with ESMTPS id 16F2C903FF for ; Wed, 29 Jan 2014 22:08:06 +0000 (UTC) Received: by mail-wg0-f45.google.com with SMTP id n12so4709522wgh.0 for ; Wed, 29 Jan 2014 14:08:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=TKYj5KfYi1hoXxg3g03VdKhTymK64aaBN4vBKpuoEDc=; b=MJxTIjsQL5iAiezd+ZXunjNX8O6Y4z+Q3g40Lcs5O8oJdGkab+KgwG+OXloYodjxhf THIdjWCaOXi3vT1V+F5IYOOoPlhOqzMKH6f7gTyILF7gyAHE/Pi3qDyRr/aPyEI7dKnz JNUefc0L9BZPI5Wd/Pkw08C/IGBNeNmRtUn3OVXiRrZH3frN56FHpTUCYz8k5M0za2Gx H9IDOltWQ1a7zSXVaRVLa3xbEwwdRCa4ds2zKChUFEOQTWXcNnUHHlWt1h/yHJc6qRvT y4nbse5xV0fsjaRURXYqTx4+XY9SOl0JT4CBrj9SoRTkTeHLThSdoXQFpKnWYWWMq7R3 ZEXg== X-Received: by 10.180.39.43 with SMTP id m11mr20729089wik.8.1391033285447; Wed, 29 Jan 2014 14:08:05 -0800 (PST) Received: from gourin.bzh.lan (ks3095497.kimsufi.com. [94.23.60.27]) by mx.google.com with ESMTPSA id fb8sm20891710wic.3.2014.01.29.14.08.04 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 29 Jan 2014 14:08:04 -0800 (PST) From: "Yann E. MORIN" To: buildroot@busybox.net Date: Wed, 29 Jan 2014 23:08:00 +0100 Message-Id: <886c1b28d5599a5238c8df18f011f51c542a2566.1391033178.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: References: MIME-Version: 1.0 Cc: "Yann E. MORIN" Subject: [Buildroot] [PATCH 3/3] package/weston: bump to 1.4.0 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net From: "Yann E. MORIN" Drop patches applied upstream. Mark the rpi-backend as broken, since it segfaults. Signed-off-by: "Yann E. MORIN" --- package/weston/Config.in | 1 + ...eston-0000-dont-leak-fd-on-launcher-error.patch | 77 ---------------------- .../weston-0001-enable-build-without-libdrm.patch | 45 ------------- ...on-0002-fbdev-fix-compilation-without-EGL.patch | 29 -------- package/weston/weston-0003-dont-build-tests.patch | 15 ++--- ...weston-0004-fbdev-open-launcher-only-once.patch | 46 ------------- package/weston/weston.mk | 3 +- 7 files changed, 10 insertions(+), 206 deletions(-) delete mode 100644 package/weston/weston-0000-dont-leak-fd-on-launcher-error.patch delete mode 100644 package/weston/weston-0001-enable-build-without-libdrm.patch delete mode 100644 package/weston/weston-0002-fbdev-fix-compilation-without-EGL.patch delete mode 100644 package/weston/weston-0004-fbdev-open-launcher-only-once.patch diff --git a/package/weston/Config.in b/package/weston/Config.in index 247efc8..1ab3c2f 100644 --- a/package/weston/Config.in +++ b/package/weston/Config.in @@ -41,6 +41,7 @@ comment "RPi compositor needs a toolchain w/ C++, largefile, threads" config BR2_PACKAGE_WESTON_RPI bool "RPi compositor" + depends on BROKEN # rpi-backend broken in 1.4.0 depends on BR2_arm # rpi-userland depends on BR2_INSTALL_LIBSTDCPP # rpi-userland depends on BR2_LARGEFILE # rpi-userland diff --git a/package/weston/weston-0000-dont-leak-fd-on-launcher-error.patch b/package/weston/weston-0000-dont-leak-fd-on-launcher-error.patch deleted file mode 100644 index 0929d01..0000000 --- a/package/weston/weston-0000-dont-leak-fd-on-launcher-error.patch +++ /dev/null @@ -1,77 +0,0 @@ -commit 4a74d5a4a45423752105f865a8310ce878b1790a -Author: Kristian Høgsberg -Date: Wed Oct 9 11:19:11 2013 -0700 - - launcher: Don't leak tty file descriptor on error - ---- -Signed-off-by: "Yann E. MORIN" - -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 diff --git a/package/weston/weston-0001-enable-build-without-libdrm.patch b/package/weston/weston-0001-enable-build-without-libdrm.patch deleted file mode 100644 index 9d11623..0000000 --- a/package/weston/weston-0001-enable-build-without-libdrm.patch +++ /dev/null @@ -1,45 +0,0 @@ -commit 0b12db5f519a347ce0e1d5262e0cb2e9e2cc6990 -Author: Tomeu Vizoso -Date: Wed Oct 9 11:30:57 2013 +0200 - - launcher: Wrap drmGetMagic and drmAuthMagic so we can build without libdrm - ---- -Signed-off-by: "Yann E. MORIN" - -diff --git a/src/launcher-util.c b/src/launcher-util.c -index 6b6a5f3..35a5698 100644 ---- a/src/launcher-util.c -+++ b/src/launcher-util.c -@@ -80,9 +80,19 @@ drm_set_master(int drm_fd) - return drmSetMaster(drm_fd); - return -EBADF; - } -+static int -+drm_check_master(int drm_fd) -+{ -+ drm_magic_t magic; -+ if (drm_fd != -1) -+ return drmGetMagic(drm_fd, &magic) != 0 || -+ drmAuthMagic(drm_fd, magic) != 0; -+ return 0; -+} - #else - static int drm_drop_master(int drm_fd) {return 0;} - static int drm_set_master(int drm_fd) {return 0;} -+static int drm_check_master(int drm_fd) {return 1;} - #endif - - int -@@ -110,10 +120,8 @@ weston_launcher_open(struct weston_launcher *launcher, - } - - if (major(s.st_rdev) == DRM_MAJOR) { -- drm_magic_t magic; - launcher->drm_fd = fd; -- if (drmGetMagic(fd, &magic) != 0 || -- drmAuthMagic(fd, magic) != 0) { -+ if (!drm_check_master(fd)) { - weston_log("drm fd not master\n"); - close(fd); - return -1; diff --git a/package/weston/weston-0002-fbdev-fix-compilation-without-EGL.patch b/package/weston/weston-0002-fbdev-fix-compilation-without-EGL.patch deleted file mode 100644 index 501822b..0000000 --- a/package/weston/weston-0002-fbdev-fix-compilation-without-EGL.patch +++ /dev/null @@ -1,29 +0,0 @@ -commit 9acd374822022793b09427d67ea4033915343dd8 -Author: Kristian Høgsberg -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" - -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[]; diff --git a/package/weston/weston-0003-dont-build-tests.patch b/package/weston/weston-0003-dont-build-tests.patch index a8ace51..daf8452 100644 --- a/package/weston/weston-0003-dont-build-tests.patch +++ b/package/weston/weston-0003-dont-build-tests.patch @@ -7,12 +7,11 @@ Signed-off-by: "Yann E. MORIN" 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 +@@ -14,7 +14,6 @@ + clients \ + data \ + protocol \ +- tests \ + $(wcap_subdir) \ + man diff --git a/package/weston/weston-0004-fbdev-open-launcher-only-once.patch b/package/weston/weston-0004-fbdev-open-launcher-only-once.patch deleted file mode 100644 index eaf7e31..0000000 --- a/package/weston/weston-0004-fbdev-open-launcher-only-once.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 1641d14b824df487bba23597aa128219c057df88 Mon Sep 17 00:00:00 2001 -From: David Herrmann -Date: Tue, 15 Oct 2013 14:29:57 +0200 -Subject: [PATCH] fbdev: open launcher only once - -We currently call launcher_connect() twice, which is redundant and -amazingly works (ugh?). Fix this and connect only once to the launcher. - -Signed-off-by: Eric Le Bihan ---- - src/compositor-fbdev.c | 12 ++---------- - 1 file changed, 2 insertions(+), 10 deletions(-) - -diff --git a/src/compositor-fbdev.c b/src/compositor-fbdev.c -index 002ce0b..4376345 100644 ---- a/src/compositor-fbdev.c -+++ b/src/compositor-fbdev.c -@@ -883,15 +883,6 @@ fbdev_compositor_create(struct wl_display *display, int *argc, char *argv[], - config) < 0) - goto out_free; - -- /* Check if we run fbdev-backend using weston-launch */ -- compositor->base.launcher = -- weston_launcher_connect(&compositor->base, param->tty); -- if (compositor->base.launcher == NULL && geteuid() != 0) { -- weston_log("fatal: fbdev backend should be run " -- "using weston-launch binary or as root\n"); -- goto out_compositor; -- } -- - compositor->udev = udev_new(); - if (compositor->udev == NULL) { - weston_log("Failed to initialize udev context.\n"); -@@ -905,7 +896,8 @@ fbdev_compositor_create(struct wl_display *display, int *argc, char *argv[], - compositor->base.launcher = - weston_launcher_connect(&compositor->base, param->tty); - if (!compositor->base.launcher) { -- weston_log("Failed to set up launcher.\n"); -+ weston_log("fatal: fbdev backend should be run " -+ "using weston-launch binary or as root\n"); - goto out_udev; - } - --- -1.7.9.5 - diff --git a/package/weston/weston.mk b/package/weston/weston.mk index 1682fdf..6d1408f 100644 --- a/package/weston/weston.mk +++ b/package/weston/weston.mk @@ -4,7 +4,7 @@ # ################################################################################ -WESTON_VERSION = 1.3.0 +WESTON_VERSION = 1.4.0 WESTON_SITE = http://wayland.freedesktop.org/releases/ WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz WESTON_LICENSE = MIT @@ -17,6 +17,7 @@ WESTON_DEPENDENCIES = host-pkgconf wayland libxkbcommon pixman libpng \ WESTON_AUTORECONF = YES WESTON_CONF_OPT = \ + --with-dtddir=$(STAGING_DIR)/usr/share/wayland \ --disable-egl \ --disable-simple-egl-clients \ --disable-xwayland \