From patchwork Fri Oct 4 14:46:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Hilliard X-Patchwork-Id: 1171881 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Q7yaVZDN"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46lCPW6LMpz9sNw for ; Sat, 5 Oct 2019 00:46:39 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 7112D23B28; Fri, 4 Oct 2019 14:46:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id sZIq94d9Gbft; Fri, 4 Oct 2019 14:46:34 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 6EC6A20478; Fri, 4 Oct 2019 14:46:34 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 9833F1BF285 for ; Fri, 4 Oct 2019 14:46:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 8F6B120489 for ; Fri, 4 Oct 2019 14:46:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DFLfg1mTSzeN for ; Fri, 4 Oct 2019 14:46:32 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-io1-f67.google.com (mail-io1-f67.google.com [209.85.166.67]) by silver.osuosl.org (Postfix) with ESMTPS id 460A020478 for ; Fri, 4 Oct 2019 14:46:32 +0000 (UTC) Received: by mail-io1-f67.google.com with SMTP id q10so14143789iop.2 for ; Fri, 04 Oct 2019 07:46:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4RrWhLaWOOiuvonA28Mm6jRzghbGHtKnct5lYwruUk8=; b=Q7yaVZDNvN0fVlZHNQGNIdYJpOh+OtQ0R57cvdcWDY++JvxBwIi6oU0MVCX9IbG0o1 6m18Fd/vCpsZl5aTCk3KRVI88WiLvXi/cNZmkwpiaaJdGyBmCLP+UdRgHfYFR4NBQ7PW UozCLvBHsAAk9a98fRVzejnV9IgnNx8KdlBOWJh/KuO1gnRNSGS5D4A1WPl8s5HsGoHG B+2OYVbpuUbQQ+qLBB+TawHvGJNnaypRJEPUCTxpHPRqc62tCVdqArdG+ywcS2yXerEX cOzF/x5cw9neT8sPQh5kn9UQo7ZoeKgpbdIGZ6+rk4uf8UivZ8ZGtlGZUoaKoOCdN6C2 Zb4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4RrWhLaWOOiuvonA28Mm6jRzghbGHtKnct5lYwruUk8=; b=JEmSLYzDTdimOXrhyaAQCkRNTc9DZztZB6fCeXkRawbakrkykmHUcUQUJNhtCGgWZI K0PC/pUM60sHbj628XlgM7j6Mq9i/uc1UVWhXps1qE1OW9yTHgToEmRbKptCiKRnrWaf CakK6Nf3wkHHgNS51w0iKM400MYSv+J7YnB+x2ogaybGNxNybeEgnV6knXQwJV664+T9 bzWMPm7tw/l9tHlSlLIM6oyc9Q+ICScuvwwZeR8fM+S+odW7R2nEb6bndTw1xevGCA9v URXxuVteypZJy4i+QFyKf5djmfqzFHPXVJgJCRbA1Vl891uXRfkWdtSSuT9q+DGXjtBF fiJQ== X-Gm-Message-State: APjAAAVu1gyyXk+lDTVqJW1jxzYiiuTVMgGOgJh69UpwkrciR8+2GxTw PsSL8sQjG9foZ33MQaOksf1x5+iFARA= X-Google-Smtp-Source: APXvYqx0wMFpc7wMzwF3tlPzAEahv5hfI1sSpsnFjlana9xOSLzrn8WN2Rk61Dioi9u7DJwDyDkzig== X-Received: by 2002:a05:6602:2803:: with SMTP id d3mr1890981ioe.75.1570200391105; Fri, 04 Oct 2019 07:46:31 -0700 (PDT) Received: from james-x399.localdomain (97-118-144-139.hlrn.qwest.net. [97.118.144.139]) by smtp.gmail.com with ESMTPSA id l16sm2733641ilm.67.2019.10.04.07.46.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Oct 2019 07:46:30 -0700 (PDT) From: James Hilliard To: buildroot@buildroot.org Date: Fri, 4 Oct 2019 08:46:18 -0600 Message-Id: <20191004144618.37845-3-james.hilliard1@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191004144618.37845-1-james.hilliard1@gmail.com> References: <20191004144618.37845-1-james.hilliard1@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v5 3/3] package/weston: bump to version 7.0.0 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bernd Kuhls , James Hilliard , "Yann E . MORIN" , Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The autotools build system is deprecated and replaced with meson for weston. We need to enable pango when building demo clients since it is required by meson. The dbus option in autotools is replaced with launcher-logind in meson. We need to explicitly set the image-webp option to avoid failures when building without webp. Replaced WESTON_NATIVE_BACKEND with backend-default in meson. Signed-off-by: James Hilliard Tested-by: Bernd Kuhls --- Changes v4 -> v5: - fix up demo clients dependencies Changes v3 -> v4: - bump weston from 6.0.1 to 7.0.0 Changes v2 -> v3: - fix dmabuf-v4l headers check - add choice menu to select default weston backend Changes v1 -> v2: - Require both systemd and dbus for launcher-logind - Move dmabuf-v4l out of egl/gl block - Update imx-gpu-g2d requirement block --- package/weston/Config.in | 35 ++++++++++++ package/weston/weston.hash | 10 ++-- package/weston/weston.mk | 113 ++++++++++++++++++++----------------- 3 files changed, 100 insertions(+), 58 deletions(-) diff --git a/package/weston/Config.in b/package/weston/Config.in index 5a5e288540..a707b64d00 100644 --- a/package/weston/Config.in +++ b/package/weston/Config.in @@ -35,6 +35,26 @@ config BR2_PACKAGE_WESTON if BR2_PACKAGE_WESTON +choice + prompt "Backend default" + depends on BR2_PACKAGE_WESTON_FBDEV || \ + BR2_PACKAGE_WESTON_DRM || \ + BR2_PACKAGE_WESTON_X11 + +config BR2_PACKAGE_WESTON_DEFAULT_BACKEND_FBDEV + bool "fbdev" + depends on BR2_PACKAGE_WESTON_FBDEV + +config BR2_PACKAGE_WESTON_DEFAULT_BACKEND_DRM + bool "drm" + depends on BR2_PACKAGE_WESTON_DRM + +config BR2_PACKAGE_WESTON_DEFAULT_BACKEND_X11 + bool "X11" + depends on BR2_PACKAGE_WESTON_X11 + +endchoice + # Helper to make sure at least one compositor is selected. config BR2_PACKAGE_WESTON_HAS_COMPOSITOR bool @@ -102,7 +122,22 @@ comment "XWayland support needs libepoxy and X.org enabled" config BR2_PACKAGE_WESTON_DEMO_CLIENTS bool "demo clients" + depends on BR2_PACKAGE_HAS_LIBGLES + depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND + depends on BR2_USE_WCHAR # pango + depends on BR2_TOOLCHAIN_HAS_THREADS # pango + depends on BR2_USE_MMU # pango + depends on BR2_INSTALL_LIBSTDCPP # pango + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango + select BR2_PACKAGE_PANGO help This enables the installation of Weston's demo clients. +comment "demo clients needs an OpenGL ES provider, an OpenEGL-capable Wayland backend and a toolchain w/ wchar, threads, C++" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_INSTALL_LIBSTDCPP || !BR2_PACKAGE_HAS_LIBGLES || \ + !BR2_PACKAGE_HAS_LIBEGL_WAYLAND + endif diff --git a/package/weston/weston.hash b/package/weston/weston.hash index c9b2d4b1ce..73c491b34b 100644 --- a/package/weston/weston.hash +++ b/package/weston/weston.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2019-June/040661.html -md5 e7b10710ef1eac82258f97bfd41fe534 weston-6.0.1.tar.xz -sha1 3b39e454b3dc8dc32598790cfcc65728b448378b weston-6.0.1.tar.xz -sha256 bf2f6d5aae2e11cabb6bd69a76bcf9edb084f8c3e14ca769bea7234a513155b4 weston-6.0.1.tar.xz -sha512 3da04ff9b884480ce0824950347185e55584e3938021fe62014423d3d51577eafdda8de650a5de6eb37a842130c9cb14c7a952a560f6be93ff973164363af3d9 weston-6.0.1.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2019-August/040812.html +md5 cbfda483bc2501d0831af3f33c707850 weston-7.0.0.tar.xz +sha1 914c6d0ee569c54c13377a1c5582e534ed7c71f9 weston-7.0.0.tar.xz +sha256 a00a6d207b6a45f95f4401c604772a307c3767e5e2beecf3d879110c43909a64 weston-7.0.0.tar.xz +sha512 fa14467ab89fb12175830d9cf29d89dc04899fd21d801e60e85836e8e52e17e144be78098b3eedfab6c51b7fb055ecfabb456a8a74f4e40485134da59ac58ea3 weston-7.0.0.tar.xz diff --git a/package/weston/weston.mk b/package/weston/weston.mk index 154ae38b83..952c98c9f7 100644 --- a/package/weston/weston.mk +++ b/package/weston/weston.mk @@ -4,37 +4,35 @@ # ################################################################################ -WESTON_VERSION = 6.0.1 +WESTON_VERSION = 7.0.0 WESTON_SITE = http://wayland.freedesktop.org/releases WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz WESTON_LICENSE = MIT WESTON_LICENSE_FILES = COPYING WESTON_DEPENDENCIES = host-pkgconf wayland wayland-protocols \ - libxkbcommon pixman libpng jpeg udev cairo libinput libdrm \ - $(if $(BR2_PACKAGE_WEBP),webp) + libxkbcommon pixman libpng jpeg udev cairo libinput libdrm WESTON_CONF_OPTS = \ - --with-dtddir=$(STAGING_DIR)/usr/share/wayland \ - --disable-headless-compositor \ - --disable-colord \ - --disable-devdocs \ - --disable-setuid-install \ - --enable-autotools - -WESTON_MAKE_OPTS = \ - WAYLAND_PROTOCOLS_DATADIR=$(STAGING_DIR)/usr/share/wayland-protocols - -# Uses VIDIOC_EXPBUF, only available from 3.8+ -ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_8),) -WESTON_CONF_OPTS += --disable-simple-dmabuf-v4l-client + -Dbuild.pkg_config_path=$(HOST_DIR)/lib/pkgconfig \ + -Dremoting=false \ + -Dbackend-headless=false \ + -Dcolor-management-colord=false \ + -Dpipewire=false \ + -Dsimple-dmabuf-drm=auto + +ifeq ($(BR2_PACKAGE_DBUS)$(BR2_PACKAGE_SYSTEMD),yy) +WESTON_CONF_OPTS += -Dlauncher-logind=true +WESTON_DEPENDENCIES += dbus systemd +else +WESTON_CONF_OPTS += -Dlauncher-logind=false endif -ifeq ($(BR2_PACKAGE_DBUS),y) -WESTON_CONF_OPTS += --enable-dbus -WESTON_DEPENDENCIES += dbus +ifeq ($(BR2_PACKAGE_WEBP),y) +WESTON_CONF_OPTS += -Dimage-webp=true +WESTON_DEPENDENCIES += webp else -WESTON_CONF_OPTS += --disable-dbus +WESTON_CONF_OPTS += -Dimage-webp=false endif # weston-launch must be u+s root in order to work properly @@ -45,93 +43,102 @@ endef define WESTON_USERS - - weston-launch -1 - - - - Weston launcher group endef -WESTON_CONF_OPTS += --enable-weston-launch +WESTON_CONF_OPTS += -Dweston-launch=true WESTON_DEPENDENCIES += linux-pam else -WESTON_CONF_OPTS += --disable-weston-launch +WESTON_CONF_OPTS += -Dweston-launch=false +endif + +# Uses VIDIOC_EXPBUF, only available from 3.8+ +ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_8),y) +WESTON_CONF_OPTS += -Dsimple-clients=dmabuf-v4l +else +WESTON_CONF_OPTS += -Dsimple-clients= endif ifeq ($(BR2_PACKAGE_HAS_LIBEGL_WAYLAND)$(BR2_PACKAGE_HAS_LIBGLES),yy) -WESTON_CONF_OPTS += --enable-egl +WESTON_CONF_OPTS += -Drenderer-gl=true WESTON_DEPENDENCIES += libegl libgles else WESTON_CONF_OPTS += \ - --disable-egl \ - --disable-simple-dmabuf-drm-client \ - --disable-simple-egl-clients + -Drenderer-gl=false endif ifeq ($(BR2_PACKAGE_WESTON_RDP),y) WESTON_DEPENDENCIES += freerdp -WESTON_CONF_OPTS += --enable-rdp-compositor +WESTON_CONF_OPTS += -Dbackend-rdp=true else -WESTON_CONF_OPTS += --disable-rdp-compositor +WESTON_CONF_OPTS += -Dbackend-rdp=false endif ifeq ($(BR2_PACKAGE_WESTON_FBDEV),y) -WESTON_CONF_OPTS += \ - --enable-fbdev-compositor \ - WESTON_NATIVE_BACKEND=fbdev-backend.so +WESTON_CONF_OPTS += -Dbackend-fbdev=true +ifeq ($(BR2_PACKAGE_WESTON_DEFAULT_BACKEND_FBDEV),y) +WESTON_CONF_OPTS += -Dbackend-default=fbdev +endif else -WESTON_CONF_OPTS += --disable-fbdev-compositor +WESTON_CONF_OPTS += -Dbackend-fbdev=false endif ifeq ($(BR2_PACKAGE_WESTON_DRM),y) -WESTON_CONF_OPTS += \ - --enable-drm-compositor \ - WESTON_NATIVE_BACKEND=drm-backend.so +WESTON_CONF_OPTS += -Dbackend-drm=true +ifeq ($(BR2_PACKAGE_WESTON_DEFAULT_BACKEND_DRM),y) +WESTON_CONF_OPTS += -Dbackend-default=drm +endif else -WESTON_CONF_OPTS += --disable-drm-compositor +WESTON_CONF_OPTS += -Dbackend-drm=false endif ifeq ($(BR2_PACKAGE_WESTON_X11),y) -WESTON_CONF_OPTS += \ - --enable-x11-compositor \ - WESTON_NATIVE_BACKEND=x11-backend.so +WESTON_CONF_OPTS += -Dbackend-x11=true +ifeq ($(BR2_PACKAGE_WESTON_DEFAULT_BACKEND_X11),y) +WESTON_CONF_OPTS += -Dbackend-default=x11 +endif WESTON_DEPENDENCIES += libxcb xlib_libX11 else -WESTON_CONF_OPTS += --disable-x11-compositor +WESTON_CONF_OPTS += -Dbackend-x11=false endif ifeq ($(BR2_PACKAGE_WESTON_XWAYLAND),y) -WESTON_CONF_OPTS += --enable-xwayland +WESTON_CONF_OPTS += -Dxwayland=true WESTON_DEPENDENCIES += cairo libepoxy libxcb xlib_libX11 xlib_libXcursor else -WESTON_CONF_OPTS += --disable-xwayland +WESTON_CONF_OPTS += -Dxwayland=false endif ifeq ($(BR2_PACKAGE_LIBVA),y) -WESTON_CONF_OPTS += --enable-vaapi-recorder +WESTON_CONF_OPTS += -Dbackend-drm-screencast-vaapi=true WESTON_DEPENDENCIES += libva else -WESTON_CONF_OPTS += --disable-vaapi-recorder +WESTON_CONF_OPTS += -Dbackend-drm-screencast-vaapi=false endif ifeq ($(BR2_PACKAGE_LCMS2),y) -WESTON_CONF_OPTS += --enable-lcms +WESTON_CONF_OPTS += -Dcolor-management-lcms=true WESTON_DEPENDENCIES += lcms2 else -WESTON_CONF_OPTS += --disable-lcms +WESTON_CONF_OPTS += -Dcolor-management-lcms=false endif ifeq ($(BR2_PACKAGE_SYSTEMD),y) -WESTON_CONF_OPTS += --enable-systemd-login --enable-systemd-notify +WESTON_CONF_OPTS += -Dsystemd=true WESTON_DEPENDENCIES += systemd else -WESTON_CONF_OPTS += --disable-systemd-login --disable-systemd-notify +WESTON_CONF_OPTS += -Dsystemd=false endif ifeq ($(BR2_PACKAGE_LIBXML2),y) -WESTON_CONF_OPTS += --enable-junit-xml +WESTON_CONF_OPTS += -Dtest-junit-xml=true WESTON_DEPENDENCIES += libxml2 else -WESTON_CONF_OPTS += --disable-junit-xml +WESTON_CONF_OPTS += -Dtest-junit-xml=false endif ifeq ($(BR2_PACKAGE_WESTON_DEMO_CLIENTS),y) -WESTON_CONF_OPTS += --enable-demo-clients-install +WESTON_CONF_OPTS += -Ddemo-clients=true +WESTON_DEPENDENCIES += pango else -WESTON_CONF_OPTS += --disable-demo-clients-install +WESTON_CONF_OPTS += -Ddemo-clients=false endif -$(eval $(autotools-package)) +$(eval $(meson-package))