From patchwork Fri Oct 4 14:46:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Hilliard X-Patchwork-Id: 1171880 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.138; helo=whitealder.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="mHsa6xBv"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46lCPS41xjz9sPq for ; Sat, 5 Oct 2019 00:46:36 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 774B08790E; Fri, 4 Oct 2019 14:46:33 +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 ESbRRWbpBDF7; Fri, 4 Oct 2019 14:46:30 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 6E90A878A9; Fri, 4 Oct 2019 14:46:30 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 63FDA1BF285 for ; Fri, 4 Oct 2019 14:46:29 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 60FC488386 for ; Fri, 4 Oct 2019 14:46:29 +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 pt3Ao3psLkpC for ; Fri, 4 Oct 2019 14:46:28 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-io1-f48.google.com (mail-io1-f48.google.com [209.85.166.48]) by hemlock.osuosl.org (Postfix) with ESMTPS id 191F08839C for ; Fri, 4 Oct 2019 14:46:28 +0000 (UTC) Received: by mail-io1-f48.google.com with SMTP id c25so14011159iot.12 for ; Fri, 04 Oct 2019 07:46:28 -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:mime-version :content-transfer-encoding; bh=bKkasIjsJY88mAsYjLcBbq3nUBRXjZEG/iIEQpCdDrU=; b=mHsa6xBvOgH07HUKs9kcnRzDzMSRByQV2vbr9UXLiUSsWZGk0PJSl+/vtgmc6jxMKG lxS1ADEokEWTjXX6ueBtbPdJTpGtExqKy3Ub4qnFrPyWZG6aSWDW4RybxNTYNxOY8z5S xDb9Lk4cop/srgjLIS+WpWLRGPgqfbNANWzVHCL0Pf8T2nZQRZnxZe7++89jLCm84wlS RlRo6g0moT39zTJxR08Hp05Oo3cWYbJSPLpgCIA130Vld+3qvX6/ACMQ2eKBH+EN5A29 GR74QAd7YkPVyLnfJh6XruD3KbOS/AvpNqdOdgWz9lblGZkqx6LtquhFtTcVhZldLwst wySA== 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:mime-version :content-transfer-encoding; bh=bKkasIjsJY88mAsYjLcBbq3nUBRXjZEG/iIEQpCdDrU=; b=L4Vq3DUQBZFwpFgwQOYjjcIpzyJ+qPrO9/ucWX306itwWmXx9OqrgwTHAt9mp6UTrV JhRM4U0qmMzV+ADdFamZnO8fX/qSPuBpthur9qFSB20heV4vyYZeB9vD5UhFITTSFf30 /FDiEBpdabWp4d1bKeSoKmeK8aSKEerZpKyK1RSyeg0BRbPZpm2Op7usNTTU2HYWe7hA cTLiIgQmniwhreeG4SS/2ch5QGuFoOO0OhUJesGUjtkxdBz08lDpo8VO31fxRI4NAG5Z muS2tca5NXjdKau9KRShpA1oe+JD3fRCEUowPhrmlGTd9zqY4df7A0A8GDVO8g8La31p eP1w== X-Gm-Message-State: APjAAAVjZu7H4NVRx9VEWxXhnvvGzqcomJszhPipdyqZrDhwLOXY8utG 8CI5SThObNGN39QVYRrkbRLgkf/QWFg= X-Google-Smtp-Source: APXvYqxNkWyoNY4Jt4jPcOsr0XkQ+uBjLHADn2uNpPnCqKVKuvcL4TNs8EewhpK58Q6oyBtRJz9hlw== X-Received: by 2002:a92:d30c:: with SMTP id x12mr16943676ila.133.1570200386772; Fri, 04 Oct 2019 07:46:26 -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.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Oct 2019 07:46:25 -0700 (PDT) From: James Hilliard To: buildroot@buildroot.org Date: Fri, 4 Oct 2019 08:46:16 -0600 Message-Id: <20191004144618.37845-1-james.hilliard1@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v5 1/3] package/weston-imx: Split weston-imx off from weston 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" This is in preparation for migration of weston to the meson build system. Since weston-imx is based off of a much older version of weston it is difficult to maintain as part of the weston package. Signed-off-by: James Hilliard --- package/Config.in | 1 + package/weston-imx/Config.in | 108 ++++++++++++++++++++++ package/weston-imx/weston-imx.hash | 2 + package/weston-imx/weston-imx.mk | 144 +++++++++++++++++++++++++++++ package/weston/Config.in | 2 + package/weston/weston.hash | 2 - package/weston/weston.mk | 16 ---- 7 files changed, 257 insertions(+), 18 deletions(-) create mode 100644 package/weston-imx/Config.in create mode 100644 package/weston-imx/weston-imx.hash create mode 100644 package/weston-imx/weston-imx.mk diff --git a/package/Config.in b/package/Config.in index b52b2a96e3..b59dae33c0 100644 --- a/package/Config.in +++ b/package/Config.in @@ -337,6 +337,7 @@ comment "QT libraries and helper libraries" endif source "package/tekui/Config.in" source "package/weston/Config.in" + source "package/weston-imx/Config.in" source "package/x11r7/Config.in" comment "X applications" diff --git a/package/weston-imx/Config.in b/package/weston-imx/Config.in new file mode 100644 index 0000000000..a82cb947a0 --- /dev/null +++ b/package/weston-imx/Config.in @@ -0,0 +1,108 @@ +comment "weston-imx needs udev and a toolchain w/ locale, threads, dynamic library, headers >= 3.0" + depends on BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL + depends on !BR2_PACKAGE_HAS_UDEV || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 || BR2_STATIC_LIBS || \ + !BR2_ENABLE_LOCALE + +config BR2_PACKAGE_WESTON_IMX + bool "weston-imx" + depends on BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL + depends on BR2_ENABLE_LOCALE # libinput + depends on BR2_PACKAGE_HAS_UDEV + depends on !BR2_STATIC_LIBS # wayland + depends on BR2_TOOLCHAIN_HAS_THREADS # wayland + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 + select BR2_PACKAGE_WAYLAND + select BR2_PACKAGE_WAYLAND_PROTOCOLS + select BR2_PACKAGE_LIBXKBCOMMON + select BR2_PACKAGE_CAIRO + select BR2_PACKAGE_CAIRO_PNG + select BR2_PACKAGE_LIBPNG + select BR2_PACKAGE_JPEG + select BR2_PACKAGE_LIBINPUT + select BR2_PACKAGE_LIBDRM + # Runtime dependency + select BR2_PACKAGE_XKEYBOARD_CONFIG + # Make sure at least one compositor is selected. + select BR2_PACKAGE_WESTON_IMX_FBDEV if !BR2_PACKAGE_WESTON_IMX_HAS_COMPOSITOR + help + Weston is the reference implementation of a Wayland + compositor, and a useful compositor in its own right. + Weston has various backends that lets it run on Linux kernel + modesetting and evdev input as well as under X11. + + http://wayland.freedesktop.org/ + +if BR2_PACKAGE_WESTON_IMX + +# Helper to make sure at least one compositor is selected. +config BR2_PACKAGE_WESTON_IMX_HAS_COMPOSITOR + bool + +config BR2_PACKAGE_WESTON_IMX_DRM + bool "DRM compositor" + depends on BR2_PACKAGE_MESA3D_OPENGL_EGL + select BR2_PACKAGE_WESTON_IMX_HAS_COMPOSITOR + +# Uses libgbm from mesa3d +comment "DRM compositor needs an OpenGL EGL backend provided by mesa3d" + depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL + +config BR2_PACKAGE_WESTON_IMX_FBDEV + bool "fbdev compositor" + +# FreeRDP needs threads and !static, already the case for weston +config BR2_PACKAGE_WESTON_IMX_RDP + bool "RDP compositor" + depends on BR2_USE_MMU # freerdp, libglib2 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on BR2_USE_WCHAR # freerdp + depends on BR2_INSTALL_LIBSTDCPP # freerdp + select BR2_PACKAGE_FREERDP + select BR2_PACKAGE_WESTON_IMX_HAS_COMPOSITOR + help + This enables the RDP backend, which allows accessing weston + through the network with any RDP-compliant client. + + Please note that one must pass those options to weston for RDP + to be functional: + --rdp-tls-cert=/path/to/server.crt + --rdp-tls-key=/path/to/server.key + + By default, Buildroot installs such files in + /etc/freerdp/server/ so you may want to change them in a + post-build script or a rootfs overlay. + +comment "RDP compositor needs a toolchain w/ wchar, C++" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP + +config BR2_PACKAGE_WESTON_IMX_X11 + bool "X11 compositor" + depends on BR2_PACKAGE_XORG7 + select BR2_PACKAGE_LIBXCB + select BR2_PACKAGE_XLIB_LIBX11 + select BR2_PACKAGE_WESTON_IMX_HAS_COMPOSITOR + +comment "X11 compositor needs X.org enabled" + depends on !BR2_PACKAGE_XORG7 + +config BR2_PACKAGE_WESTON_IMX_XWAYLAND + bool "XWayland support" + depends on BR2_PACKAGE_XORG7 + depends on BR2_PACKAGE_LIBEPOXY + select BR2_PACKAGE_CAIRO + select BR2_PACKAGE_LIBXCB + select BR2_PACKAGE_XLIB_LIBX11 + select BR2_PACKAGE_XLIB_LIBXCURSOR + +comment "XWayland support needs libepoxy and X.org enabled" + depends on !BR2_PACKAGE_XORG7 || !BR2_PACKAGE_LIBEPOXY + +config BR2_PACKAGE_WESTON_IMX_DEMO_CLIENTS + bool "demo clients" + help + This enables the installation of Weston's demo clients. + +endif diff --git a/package/weston-imx/weston-imx.hash b/package/weston-imx/weston-imx.hash new file mode 100644 index 0000000000..759a9b6554 --- /dev/null +++ b/package/weston-imx/weston-imx.hash @@ -0,0 +1,2 @@ +# locally computed +sha256 f39f7a24a01b023aa204ad47977a6476c17a307769f29d408621a05b5cbbcfc7 weston-imx-rel_imx_4.9.51_8mq_ga.tar.gz diff --git a/package/weston-imx/weston-imx.mk b/package/weston-imx/weston-imx.mk new file mode 100644 index 0000000000..9dd2088502 --- /dev/null +++ b/package/weston-imx/weston-imx.mk @@ -0,0 +1,144 @@ +################################################################################ +# +# weston +# +################################################################################ + +WESTON_IMX_VERSION = rel_imx_4.9.51_8mq_ga +WESTON_IMX_SITE = https://source.codeaurora.org/external/imx/weston-imx +WESTON_IMX_SITE_METHOD = git +WESTON_IMX_AUTORECONF = YES +WESTON_IMX_LICENSE = MIT +WESTON_IMX_LICENSE_FILES = COPYING + +WESTON_IMX_DEPENDENCIES = host-pkgconf wayland wayland-protocols \ + libxkbcommon pixman libpng jpeg udev cairo libinput libdrm \ + $(if $(BR2_PACKAGE_WEBP),webp) + +WESTON_IMX_CONF_OPTS = \ + --with-dtddir=$(STAGING_DIR)/usr/share/wayland \ + --disable-headless-compositor \ + --disable-colord \ + --disable-devdocs \ + --disable-setuid-install + +WESTON_IMX_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_IMX_CONF_OPTS += --disable-simple-dmabuf-v4l-client +endif + +ifeq ($(BR2_PACKAGE_DBUS),y) +WESTON_IMX_CONF_OPTS += --enable-dbus +WESTON_IMX_DEPENDENCIES += dbus +else +WESTON_IMX_CONF_OPTS += --disable-dbus +endif + +# weston-launch must be u+s root in order to work properly +ifeq ($(BR2_PACKAGE_LINUX_PAM),y) +define WESTON_IMX_PERMISSIONS + /usr/bin/weston-launch f 4755 0 0 - - - - - +endef +define WESTON_IMX_USERS + - - weston-launch -1 - - - - Weston launcher group +endef +WESTON_IMX_CONF_OPTS += --enable-weston-launch +WESTON_IMX_DEPENDENCIES += linux-pam +else +WESTON_IMX_CONF_OPTS += --disable-weston-launch +endif + +ifeq ($(BR2_PACKAGE_IMX_GPU_G2D),y) +WESTON_IMX_DEPENDENCIES += imx-gpu-g2d +# --enable-imxg2d actually disables it, so no CONF_OPTS +else +WESTON_IMX_CONF_OPTS += --disable-imxg2d +endif + +ifeq ($(BR2_PACKAGE_HAS_LIBEGL_WAYLAND)$(BR2_PACKAGE_HAS_LIBGLES),yy) +WESTON_IMX_CONF_OPTS += --enable-egl +WESTON_IMX_DEPENDENCIES += libegl libgles +else +WESTON_IMX_CONF_OPTS += \ + --disable-egl \ + --disable-simple-dmabuf-drm-client \ + --disable-simple-egl-clients +endif + +ifeq ($(BR2_PACKAGE_WESTON_IMX_RDP),y) +WESTON_IMX_DEPENDENCIES += freerdp +WESTON_IMX_CONF_OPTS += --enable-rdp-compositor +else +WESTON_IMX_CONF_OPTS += --disable-rdp-compositor +endif + +ifeq ($(BR2_PACKAGE_WESTON_IMX_FBDEV),y) +WESTON_IMX_CONF_OPTS += \ + --enable-fbdev-compositor \ + WESTON_IMX_NATIVE_BACKEND=fbdev-backend.so +else +WESTON_IMX_CONF_OPTS += --disable-fbdev-compositor +endif + +ifeq ($(BR2_PACKAGE_WESTON_IMX_DRM),y) +WESTON_IMX_CONF_OPTS += \ + --enable-drm-compositor \ + WESTON_IMX_NATIVE_BACKEND=drm-backend.so +else +WESTON_IMX_CONF_OPTS += --disable-drm-compositor +endif + +ifeq ($(BR2_PACKAGE_WESTON_IMX_X11),y) +WESTON_IMX_CONF_OPTS += \ + --enable-x11-compositor \ + WESTON_IMX_NATIVE_BACKEND=x11-backend.so +WESTON_IMX_DEPENDENCIES += libxcb xlib_libX11 +else +WESTON_IMX_CONF_OPTS += --disable-x11-compositor +endif + +ifeq ($(BR2_PACKAGE_WESTON_IMX_XWAYLAND),y) +WESTON_IMX_CONF_OPTS += --enable-xwayland +WESTON_IMX_DEPENDENCIES += cairo libepoxy libxcb xlib_libX11 xlib_libXcursor +else +WESTON_IMX_CONF_OPTS += --disable-xwayland +endif + +ifeq ($(BR2_PACKAGE_LIBVA),y) +WESTON_IMX_CONF_OPTS += --enable-vaapi-recorder +WESTON_IMX_DEPENDENCIES += libva +else +WESTON_IMX_CONF_OPTS += --disable-vaapi-recorder +endif + +ifeq ($(BR2_PACKAGE_LCMS2),y) +WESTON_IMX_CONF_OPTS += --enable-lcms +WESTON_IMX_DEPENDENCIES += lcms2 +else +WESTON_IMX_CONF_OPTS += --disable-lcms +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +WESTON_IMX_CONF_OPTS += --enable-systemd-login --enable-systemd-notify +WESTON_IMX_DEPENDENCIES += systemd +else +WESTON_IMX_CONF_OPTS += --disable-systemd-login --disable-systemd-notify +endif + +ifeq ($(BR2_PACKAGE_LIBXML2),y) +WESTON_IMX_CONF_OPTS += --enable-junit-xml +WESTON_IMX_DEPENDENCIES += libxml2 +else +WESTON_IMX_CONF_OPTS += --disable-junit-xml +endif + +ifeq ($(BR2_PACKAGE_WESTON_IMX_DEMO_CLIENTS),y) +WESTON_IMX_CONF_OPTS += --enable-demo-clients-install +else +WESTON_IMX_CONF_OPTS += --disable-demo-clients-install +endif + +$(eval $(autotools-package)) diff --git a/package/weston/Config.in b/package/weston/Config.in index f874b0cc6a..5a5e288540 100644 --- a/package/weston/Config.in +++ b/package/weston/Config.in @@ -1,10 +1,12 @@ comment "weston needs udev and a toolchain w/ locale, threads, dynamic library, headers >= 3.0" + depends on !BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL depends on !BR2_PACKAGE_HAS_UDEV || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 || BR2_STATIC_LIBS || \ !BR2_ENABLE_LOCALE config BR2_PACKAGE_WESTON bool "weston" + depends on !BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL depends on BR2_ENABLE_LOCALE # libinput depends on BR2_PACKAGE_HAS_UDEV depends on !BR2_STATIC_LIBS # wayland diff --git a/package/weston/weston.hash b/package/weston/weston.hash index a2dddf7a5b..c9b2d4b1ce 100644 --- a/package/weston/weston.hash +++ b/package/weston/weston.hash @@ -3,5 +3,3 @@ 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 -# locally computed -sha256 0f0de7b7b1f65870139c95dde7abc19ed305631ae7c5d37c386db40cde108632 weston-rel_imx_4.9.51_8mq_ga.tar.gz diff --git a/package/weston/weston.mk b/package/weston/weston.mk index ee3d3be87e..154ae38b83 100644 --- a/package/weston/weston.mk +++ b/package/weston/weston.mk @@ -4,16 +4,9 @@ # ################################################################################ -ifeq ($(BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL),y) -WESTON_VERSION = rel_imx_4.9.51_8mq_ga -WESTON_SITE = https://source.codeaurora.org/external/imx/weston-imx -WESTON_SITE_METHOD = git -WESTON_AUTORECONF = YES -else WESTON_VERSION = 6.0.1 WESTON_SITE = http://wayland.freedesktop.org/releases WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz -endif WESTON_LICENSE = MIT WESTON_LICENSE_FILES = COPYING @@ -58,15 +51,6 @@ else WESTON_CONF_OPTS += --disable-weston-launch endif -ifeq ($(BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL),y) -ifeq ($(BR2_PACKAGE_IMX_GPU_G2D),y) -WESTON_DEPENDENCIES += imx-gpu-g2d -# --enable-imxg2d actually disables it, so no CONF_OPTS -else -WESTON_CONF_OPTS += --disable-imxg2d -endif -endif - ifeq ($(BR2_PACKAGE_HAS_LIBEGL_WAYLAND)$(BR2_PACKAGE_HAS_LIBGLES),yy) WESTON_CONF_OPTS += --enable-egl WESTON_DEPENDENCIES += libegl libgles From patchwork Fri Oct 4 14:46:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Hilliard X-Patchwork-Id: 1171879 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.137; helo=fraxinus.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="tCXTK7eE"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46lCPR14pRz9sNw for ; Sat, 5 Oct 2019 00:46:34 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1595686BF2; Fri, 4 Oct 2019 14:46:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zzPYIOVdHfYv; Fri, 4 Oct 2019 14:46:32 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 8713E86C3A; Fri, 4 Oct 2019 14:46:32 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 1C5ED1BF285 for ; Fri, 4 Oct 2019 14:46:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id EEF09878BE for ; Fri, 4 Oct 2019 14:46:30 +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 Jotu5uKVWYUQ for ; Fri, 4 Oct 2019 14:46:30 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-io1-f53.google.com (mail-io1-f53.google.com [209.85.166.53]) by whitealder.osuosl.org (Postfix) with ESMTPS id 2AAD0878A4 for ; Fri, 4 Oct 2019 14:46:30 +0000 (UTC) Received: by mail-io1-f53.google.com with SMTP id n197so14032033iod.9 for ; Fri, 04 Oct 2019 07:46:30 -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=DRHi9idQQHmJ57vTvxDGke+KNQ9vhxN/ew4G4B/nxFQ=; b=tCXTK7eEqGlmN2Uz7qrt5oiOGKdlh4Uz6iPRQvqEoG6y1tb5opkCkdABWnTtspjXW6 Otqn3oUpXug2zQZOn0U0XZbN/Vs9ZikKt7TKVzmXNn5f00XMJ6RvBYiqtmrrBJ8VbooV 4MPdJciquTJxhtF8QCnFAWcHL7Twu5lG2DyOe/TicVF94PYgN00Msk5XmR/jh3e3G0Xd 83VNMtW8ZJCnzMO0AyBlhUPji0gG3LGch3DpQRJJnI8BggcivvkVrVV3wKovQIIB9k6W l8SOCBPwxoAH2hl/sAdOCPMT6OCcQqPflNe1/tOSBFwBmubNQyKGld2lgj5eZlNHDBNi f3dg== 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=DRHi9idQQHmJ57vTvxDGke+KNQ9vhxN/ew4G4B/nxFQ=; b=qwLcFGWPEoprXkUu1aT54wREMxLkCS7W3r0WZnAiUsxlsu2HKJGgXspcdF6NQFUOgY /75A9WKUxP5CJmQejezukLPrbVC//QRY2RwSQjIRJV1zqmC/3oatdUbnQpNJ5NH1/Dne Y0x4vqzlnEx973Df5+HqjfmEocIc4EESQd+SGkcJ5GRxtpdplLWLRpl4N5HUw2M55Ul8 ENXrhZjWIzA3AF39J5DDswpltsP+nldrdJFc6WIfhflahQnBr7TPmwezuLnNtwu1mmmI 2l/MN/X++dYGnB6aVub2wGz+0yAIy1mFDowoOld7RoZt0/S3xnXvuaYkK6FxJvh2De48 4a/A== X-Gm-Message-State: APjAAAUNiVxBflNwC1sgRdfGgdntLXwyMZV8A0d5plUEAZjJFgC7BrCx o2Xs63jo2emr0vOb6IhMpGUrCsfCgXc= X-Google-Smtp-Source: APXvYqyfLcLh4B9oCTWoaoBMcoDvsRAR91rSvk+d2ilXFh2vcD1fmNZ39rJnsx2D0l0AkFOblvN1lg== X-Received: by 2002:a02:5ec4:: with SMTP id h187mr14863140jab.101.1570200388991; Fri, 04 Oct 2019 07:46:28 -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.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Oct 2019 07:46:28 -0700 (PDT) From: James Hilliard To: buildroot@buildroot.org Date: Fri, 4 Oct 2019 08:46:17 -0600 Message-Id: <20191004144618.37845-2-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 2/3] package/wayland-protocols: bump to version 1.18 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" Signed-off-by: James Hilliard Tested-by: Bernd Kuhls --- package/wayland-protocols/wayland-protocols.hash | 8 ++++---- package/wayland-protocols/wayland-protocols.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/wayland-protocols/wayland-protocols.hash b/package/wayland-protocols/wayland-protocols.hash index d62a433dfd..a27ff9e52c 100644 --- a/package/wayland-protocols/wayland-protocols.hash +++ b/package/wayland-protocols/wayland-protocols.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2018-November/039662.html -md5 55ddd5fdb02b73b9de9559aaec267315 wayland-protocols-1.17.tar.xz -sha1 7d2569c838c776545e3eb1b1049b9c37178aae24 wayland-protocols-1.17.tar.xz -sha256 df1319cf9705643aea9fd16f9056f4e5b2471bd10c0cc3713d4a4cdc23d6812f wayland-protocols-1.17.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2019-July/040756.html +md5 af38f22d8e233c2f2e00ddc8dcc94694 wayland-protocols-1.18.tar.xz +sha1 aa2f132c082f3c790bd046283b3ef7ce3fb11370 wayland-protocols-1.18.tar.xz +sha256 3d73b7e7661763dc09d7d9107678400101ecff2b5b1e531674abfa81e04874b3 wayland-protocols-1.18.tar.xz sha256 f1a2b233e8a9a71c40f4aa885be08a0842ac85bb8588703c1dd7e6e6502e3124 COPYING diff --git a/package/wayland-protocols/wayland-protocols.mk b/package/wayland-protocols/wayland-protocols.mk index 5ed4c3bc90..fbfa99558d 100644 --- a/package/wayland-protocols/wayland-protocols.mk +++ b/package/wayland-protocols/wayland-protocols.mk @@ -4,7 +4,7 @@ # ################################################################################ -WAYLAND_PROTOCOLS_VERSION = 1.17 +WAYLAND_PROTOCOLS_VERSION = 1.18 WAYLAND_PROTOCOLS_SITE = http://wayland.freedesktop.org/releases WAYLAND_PROTOCOLS_SOURCE = wayland-protocols-$(WAYLAND_PROTOCOLS_VERSION).tar.xz WAYLAND_PROTOCOLS_LICENSE = MIT 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))