mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
bump version to 2022.02.9
add miyoo_defconfig
This commit is contained in:
@@ -0,0 +1,38 @@
|
||||
From 2ac6b6b084a877adde64db7faff2ed22eb3ea97a Mon Sep 17 00:00:00 2001
|
||||
From: Daniel Stone <daniels@collabora.com>
|
||||
Date: Tue, 8 Feb 2022 22:39:42 +0000
|
||||
Subject: [PATCH] tests: Add dependency on screenshooter client protocol
|
||||
|
||||
Given that the test-helper code relies on the screenshooter protocol,
|
||||
make sure it's available for us to build, and the dependency ensures we
|
||||
build in order.
|
||||
|
||||
Fixes: #588
|
||||
|
||||
Signed-off-by: Daniel Stone <daniels@collabora.com>
|
||||
|
||||
[Retrieved from:
|
||||
https://gitlab.freedesktop.org/wayland/weston/-/commit/2ac6b6b084a877adde64db7faff2ed22eb3ea97a]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
tests/meson.build | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tests/meson.build b/tests/meson.build
|
||||
index 2d464ddcc..222091cd1 100644
|
||||
--- a/tests/meson.build
|
||||
+++ b/tests/meson.build
|
||||
@@ -29,8 +29,9 @@ lib_test_client = static_library(
|
||||
'weston-test-client-helper.c',
|
||||
'weston-test-fixture-compositor.c',
|
||||
weston_test_client_protocol_h,
|
||||
- weston_screenshooter_protocol_c,
|
||||
weston_test_protocol_c,
|
||||
+ weston_screenshooter_client_protocol_h,
|
||||
+ weston_screenshooter_protocol_c,
|
||||
viewporter_client_protocol_h,
|
||||
viewporter_protocol_c,
|
||||
'color_util.h',
|
||||
--
|
||||
GitLab
|
||||
|
||||
@@ -20,6 +20,7 @@ config BR2_PACKAGE_WESTON
|
||||
select BR2_PACKAGE_LIBDRM
|
||||
# Runtime dependency
|
||||
select BR2_PACKAGE_XKEYBOARD_CONFIG
|
||||
select BR2_PACKAGE_WESTON_SHELL_DESKTOP if !BR2_PACKAGE_WESTON_HAS_SHELL
|
||||
help
|
||||
Weston is the reference implementation of a Wayland
|
||||
compositor, and a useful compositor in its own right.
|
||||
@@ -33,44 +34,37 @@ if BR2_PACKAGE_WESTON
|
||||
choice
|
||||
prompt "default compositor"
|
||||
|
||||
config BR2_PACKAGE_WESTON_DEFAULT_FBDEV
|
||||
bool "fbdev"
|
||||
select BR2_PACKAGE_WESTON_FBDEV
|
||||
|
||||
config BR2_PACKAGE_WESTON_DEFAULT_DRM
|
||||
bool "drm"
|
||||
depends on BR2_PACKAGE_MESA3D_OPENGL_EGL || BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL
|
||||
select BR2_PACKAGE_WESTON_DRM
|
||||
|
||||
comment "drm backend needs mesa3d w/ EGL driver"
|
||||
depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL && !BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL
|
||||
config BR2_PACKAGE_WESTON_DEFAULT_HEADLESS
|
||||
bool "headless"
|
||||
select BR2_PACKAGE_WESTON_HEADLESS
|
||||
|
||||
config BR2_PACKAGE_WESTON_DEFAULT_WAYLAND
|
||||
bool "wayland (nested)"
|
||||
select BR2_PACKAGE_WESTON_WAYLAND
|
||||
|
||||
config BR2_PACKAGE_WESTON_DEFAULT_X11
|
||||
bool "X11"
|
||||
bool "X11 (nested)"
|
||||
depends on BR2_PACKAGE_XORG7
|
||||
select BR2_PACKAGE_WESTON_X11
|
||||
|
||||
comment "X11 backend needs X.org"
|
||||
comment "X11 (nested) backend needs X.org"
|
||||
depends on !BR2_PACKAGE_XORG7
|
||||
|
||||
endchoice
|
||||
|
||||
config BR2_PACKAGE_WESTON_DEFAULT_COMPOSITOR
|
||||
string
|
||||
default "fbdev" if BR2_PACKAGE_WESTON_DEFAULT_FBDEV
|
||||
default "drm" if BR2_PACKAGE_WESTON_DEFAULT_DRM
|
||||
default "x11" if BR2_PACKAGE_WESTON_DEFAULT_X11
|
||||
default "drm" if BR2_PACKAGE_WESTON_DEFAULT_DRM
|
||||
default "headless" if BR2_PACKAGE_WESTON_DEFAULT_HEADLESS
|
||||
default "wayland" if BR2_PACKAGE_WESTON_DEFAULT_WAYLAND
|
||||
default "x11" if BR2_PACKAGE_WESTON_DEFAULT_X11
|
||||
|
||||
config BR2_PACKAGE_WESTON_DRM
|
||||
bool "DRM compositor"
|
||||
depends on BR2_PACKAGE_MESA3D_OPENGL_EGL || BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL
|
||||
|
||||
# Uses libgbm from mesa3d
|
||||
comment "DRM compositor needs an OpenGL EGL backend provided by mesa3d"
|
||||
depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL && !BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL
|
||||
|
||||
config BR2_PACKAGE_WESTON_FBDEV
|
||||
bool "fbdev compositor"
|
||||
|
||||
# FreeRDP needs threads and !static, already the case for weston
|
||||
config BR2_PACKAGE_WESTON_RDP
|
||||
@@ -98,13 +92,19 @@ comment "RDP compositor needs a toolchain w/ wchar, C++"
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP
|
||||
|
||||
config BR2_PACKAGE_WESTON_HEADLESS
|
||||
bool "headless (testing) compositor"
|
||||
|
||||
config BR2_PACKAGE_WESTON_WAYLAND
|
||||
bool "Wayland (nested) compositor"
|
||||
|
||||
config BR2_PACKAGE_WESTON_X11
|
||||
bool "X11 compositor"
|
||||
bool "X11 (nested) compositor"
|
||||
depends on BR2_PACKAGE_XORG7
|
||||
select BR2_PACKAGE_LIBXCB
|
||||
select BR2_PACKAGE_XLIB_LIBX11
|
||||
|
||||
comment "X11 compositor needs X.org enabled"
|
||||
comment "X11 (nested) compositor needs X.org enabled"
|
||||
depends on !BR2_PACKAGE_XORG7
|
||||
|
||||
config BR2_PACKAGE_WESTON_XWAYLAND
|
||||
@@ -119,10 +119,35 @@ config BR2_PACKAGE_WESTON_XWAYLAND
|
||||
comment "XWayland support needs libepoxy and X.org enabled"
|
||||
depends on !BR2_PACKAGE_XORG7 || !BR2_PACKAGE_LIBEPOXY
|
||||
|
||||
# Weston needs at least one shell; this can be one of the bundled ones,
|
||||
# below, of from a third-party package, which should then select this.
|
||||
config BR2_PACKAGE_WESTON_HAS_SHELL
|
||||
bool
|
||||
|
||||
config BR2_PACKAGE_WESTON_SHELL_DESKTOP
|
||||
bool "desktop shell"
|
||||
default y
|
||||
|
||||
config BR2_PACKAGE_WESTON_SHELL_FULLSCREEN
|
||||
bool "fullscreen shell"
|
||||
default y
|
||||
select BR2_PACKAGE_WESTON_HAS_SHELL
|
||||
|
||||
config BR2_PACKAGE_WESTON_SHELL_IVI
|
||||
bool "ivi shell"
|
||||
default y
|
||||
select BR2_PACKAGE_WESTON_HAS_SHELL
|
||||
|
||||
config BR2_PACKAGE_WESTON_SHELL_KIOSK
|
||||
bool "kiosk shell"
|
||||
default y
|
||||
select BR2_PACKAGE_WESTON_HAS_SHELL
|
||||
|
||||
config BR2_PACKAGE_WESTON_DEMO_CLIENTS
|
||||
bool "demo clients"
|
||||
depends on BR2_USE_MMU # pango
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango
|
||||
depends on BR2_INSTALL_LIBSTDCPP # pango
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # pango
|
||||
depends on BR2_USE_WCHAR # pango
|
||||
@@ -132,11 +157,11 @@ config BR2_PACKAGE_WESTON_DEMO_CLIENTS
|
||||
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++"
|
||||
comment "demo clients needs an OpenGL ES provider, an OpenEGL-capable Wayland backend and a toolchain w/ wchar, threads, C++, gcc >= 4.9"
|
||||
depends on BR2_USE_MMU
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
|
||||
!BR2_USE_WCHAR || !BR2_PACKAGE_HAS_LIBGLES || \
|
||||
!BR2_PACKAGE_HAS_LIBEGL_WAYLAND
|
||||
!BR2_PACKAGE_HAS_LIBEGL_WAYLAND || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
|
||||
|
||||
endif
|
||||
|
||||
@@ -1,6 +1,4 @@
|
||||
# From https://lists.freedesktop.org/archives/wayland-devel/2020-September/041595.html
|
||||
md5 b406da0fe9139fd39653238fde22a6cf weston-9.0.0.tar.xz
|
||||
sha1 90b9540a0bd6d6f7a465817f1c696d4d393183c9 weston-9.0.0.tar.xz
|
||||
sha256 5cf5d6ce192e0eb15c1fc861a436bf21b5bb3b91dbdabbdebe83e1f83aa098fe weston-9.0.0.tar.xz
|
||||
sha512 ccc263f8279b7b23e5c593b4a8a023de2c3dc178b1b8d6593599171770bcfe97608de9fcb77aa1cab39255451d289d323e51c317dae190c7641282e085b84f90 weston-9.0.0.tar.xz
|
||||
# From https://lists.freedesktop.org/archives/wayland-devel/2022-June/042260.html
|
||||
sha256 8a9e52506a865a7410981b04f8341b89b84106db8531ab1f9fdd37b5dc034115 weston-10.0.1.tar.xz
|
||||
sha512 688d843096a95b463161b98e85ca3443b31ba2ee49fc8d456a2780cc96f576e9d097054e9f361997a66e9cc8373cf29e406a742dae3884b3b50b26acf1710c8c weston-10.0.1.tar.xz
|
||||
sha256 fdb65868f65d0fbdb05c2d3b779e10ce9969fa0c4b9262ba4f260e87086ab860 COPYING
|
||||
|
||||
@@ -4,19 +4,22 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
WESTON_VERSION = 9.0.0
|
||||
WESTON_SITE = https://wayland.freedesktop.org/releases
|
||||
WESTON_VERSION = 10.0.1
|
||||
WESTON_SITE = https://gitlab.freedesktop.org/wayland/weston/-/releases/$(WESTON_VERSION)/downloads
|
||||
WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz
|
||||
WESTON_LICENSE = MIT
|
||||
WESTON_LICENSE_FILES = COPYING
|
||||
WESTON_CPE_ID_VENDOR = wayland
|
||||
|
||||
WESTON_DEPENDENCIES = host-pkgconf wayland wayland-protocols \
|
||||
libxkbcommon pixman libpng jpeg udev cairo libinput libdrm
|
||||
libxkbcommon pixman libpng udev cairo libinput libdrm
|
||||
|
||||
WESTON_CONF_OPTS = \
|
||||
-Dbackend-headless=false \
|
||||
-Dcolor-management-colord=false \
|
||||
-Dremoting=false
|
||||
-Ddoc=false \
|
||||
-Dremoting=false \
|
||||
-Dtools=calibrator,debug,info,terminal,touch-calibrator
|
||||
|
||||
# Uses VIDIOC_EXPBUF, only available from 3.8+
|
||||
ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_8),y)
|
||||
@@ -32,6 +35,13 @@ else
|
||||
WESTON_CONF_OPTS += -Dlauncher-logind=false
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_JPEG),y)
|
||||
WESTON_CONF_OPTS += -Dimage-jpeg=true
|
||||
WESTON_DEPENDENCIES += jpeg
|
||||
else
|
||||
WESTON_CONF_OPTS += -Dimage-jpeg=false
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_WEBP),y)
|
||||
WESTON_CONF_OPTS += -Dimage-webp=true
|
||||
WESTON_DEPENDENCIES += webp
|
||||
@@ -47,10 +57,10 @@ endef
|
||||
define WESTON_USERS
|
||||
- - weston-launch -1 - - - - Weston launcher group
|
||||
endef
|
||||
WESTON_CONF_OPTS += -Dweston-launch=true
|
||||
WESTON_CONF_OPTS += -Ddeprecated-weston-launch=true
|
||||
WESTON_DEPENDENCIES += linux-pam
|
||||
else
|
||||
WESTON_CONF_OPTS += -Dweston-launch=false
|
||||
WESTON_CONF_OPTS += -Ddeprecated-weston-launch=false
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_HAS_LIBEGL_WAYLAND)$(BR2_PACKAGE_HAS_LIBGLES),yy)
|
||||
@@ -75,18 +85,24 @@ else
|
||||
WESTON_CONF_OPTS += -Dbackend-rdp=false
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_WESTON_FBDEV),y)
|
||||
WESTON_CONF_OPTS += -Dbackend-fbdev=true
|
||||
else
|
||||
WESTON_CONF_OPTS += -Dbackend-fbdev=false
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_WESTON_DRM),y)
|
||||
WESTON_CONF_OPTS += -Dbackend-drm=true
|
||||
else
|
||||
WESTON_CONF_OPTS += -Dbackend-drm=false
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_WESTON_HEADLESS),y)
|
||||
WESTON_CONF_OPTS += -Dbackend-headless=true
|
||||
else
|
||||
WESTON_CONF_OPTS += -Dbackend-headless=false
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_WESTON_WAYLAND),y)
|
||||
WESTON_CONF_OPTS += -Dbackend-wayland=true
|
||||
else
|
||||
WESTON_CONF_OPTS += -Dbackend-wayland=false
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_WESTON_X11),y)
|
||||
WESTON_CONF_OPTS += -Dbackend-x11=true
|
||||
WESTON_DEPENDENCIES += libxcb xlib_libX11
|
||||
@@ -132,6 +148,30 @@ else
|
||||
WESTON_CONF_OPTS += -Dtest-junit-xml=false
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_WESTON_SHELL_DESKTOP),y)
|
||||
WESTON_CONF_OPTS += -Dshell-desktop=true
|
||||
else
|
||||
WESTON_CONF_OPTS += -Dshell-desktop=false
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_WESTON_SHELL_FULLSCREEN),y)
|
||||
WESTON_CONF_OPTS += -Dshell-fullscreen=true
|
||||
else
|
||||
WESTON_CONF_OPTS += -Dshell-fullscreen=false
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_WESTON_SHELL_IVI),y)
|
||||
WESTON_CONF_OPTS += -Dshell-ivi=true
|
||||
else
|
||||
WESTON_CONF_OPTS += -Dshell-ivi=false
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_WESTON_SHELL_KIOSK),y)
|
||||
WESTON_CONF_OPTS += -Dshell-kiosk=true
|
||||
else
|
||||
WESTON_CONF_OPTS += -Dshell-kiosk=false
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_WESTON_DEMO_CLIENTS),y)
|
||||
WESTON_CONF_OPTS += -Ddemo-clients=true
|
||||
WESTON_DEPENDENCIES += pango
|
||||
|
||||
Reference in New Issue
Block a user