jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-25 12:16:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/weston: bump to version 8.0.0

Browse Source 
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
which is only ever used with systemd, so add it to the condition.

Replaced WESTON_NATIVE_BACKEND with backend-default in meson.

Added systemd dependency as launcher-logind depends on both dbus
and systemd and is the only dependency that requires dbus.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
Tested-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
James Hilliard 2020-02-03 04:08:10 -07:00 committed by Yann E. MORIN
parent 5bfad39d08
commit e672eb5c39
5 changed files with 149 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
package/weston/0001-unconditionally-include-sys-mman.h-in-os-compatibili.patch Normal file
View File

@ -0,0 +1,38 @@
From 888dd1ae6a0261230b2bc47079d7b20df8c05e68 Mon Sep 17 00:00:00 2001
From: James Hilliard <james.hilliard1@gmail.com>
Date: Sat, 1 Feb 2020 20:02:29 -0700
Subject: [PATCH] unconditionally include sys/mman.h in os-compatibility.c
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Fixes:
../shared/os-compatibility.c:273:25: error: ‘PROT_READ’ undeclared (first use in this function); did you mean ‘LOCK_READ’?
map = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, file->fd, 0);
^~~~~~~~~
LOCK_READ
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
[Upstream status:
https://gitlab.freedesktop.org/wayland/weston/merge_requests/368]
---
shared/os-compatibility.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/shared/os-compatibility.c b/shared/os-compatibility.c
index 5e1ce479..ddc37807 100644
--- a/shared/os-compatibility.c
+++ b/shared/os-compatibility.c
@@ -35,9 +35,7 @@
#include <stdlib.h>
#include <libweston/zalloc.h>
-#ifdef HAVE_MEMFD_CREATE
#include <sys/mman.h>
-#endif
#include "os-compatibility.h"
--
2.20.1

42
package/weston/0002-add-missing-defines-for-pre-v3.17-kernels.patch Normal file
View File

@ -0,0 +1,42 @@
From f43c98b23e0d7731cd8d7a9b4510c359f3df7930 Mon Sep 17 00:00:00 2001
From: James Hilliard <james.hilliard1@gmail.com>
Date: Sat, 1 Feb 2020 23:32:29 -0700
Subject: [PATCH] add missing defines for pre-v3.17 kernels
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
[Upstream status:
https://gitlab.freedesktop.org/wayland/weston/merge_requests/369]
---
shared/os-compatibility.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/shared/os-compatibility.c b/shared/os-compatibility.c
index ddc37807..26c39e67 100644
--- a/shared/os-compatibility.c
+++ b/shared/os-compatibility.c
@@ -39,6 +39,22 @@
#include "os-compatibility.h"
+#ifndef F_GET_SEALS
+#define F_GET_SEALS (1034)
+#endif
+
+#ifndef F_SEAL_SHRINK
+#define F_SEAL_SHRINK 0x0002
+#endif
+
+#ifndef F_SEAL_GROW
+#define F_SEAL_GROW 0x0004
+#endif
+
+#ifndef F_SEAL_WRITE
+#define F_SEAL_WRITE 0x0008
+#endif
+
#define READONLY_SEALS (F_SEAL_SHRINK | F_SEAL_GROW | F_SEAL_WRITE)
int
--
2.20.1

15
package/weston/Config.in
View File

@ -121,7 +121,22 @@ comment "XWayland support needs libepoxy and X.org enabled"
config BR2_PACKAGE_WESTON_DEMO_CLIENTS config BR2_PACKAGE_WESTON_DEMO_CLIENTS
bool "demo clients" bool "demo clients"
depends on BR2_USE_MMU # pango
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango
depends on BR2_INSTALL_LIBSTDCPP # pango
depends on BR2_TOOLCHAIN_HAS_THREADS # pango
depends on BR2_USE_WCHAR # pango
depends on BR2_PACKAGE_HAS_LIBGLES
depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND
select BR2_PACKAGE_PANGO
help help
This enables the installation of Weston's demo clients. 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_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
!BR2_USE_WCHAR || !BR2_PACKAGE_HAS_LIBGLES || \
!BR2_PACKAGE_HAS_LIBEGL_WAYLAND
endif endif

10
package/weston/weston.hash
View File

@ -1,6 +1,6 @@
# From https://lists.freedesktop.org/archives/wayland-devel/2019-June/040661.html # From https://lists.freedesktop.org/archives/wayland-devel/2020-January/041147.html
md5 e7b10710ef1eac82258f97bfd41fe534 weston-6.0.1.tar.xz md5 53e4810d852df0601d01fd986a5b22b3 weston-8.0.0.tar.xz
sha1 3b39e454b3dc8dc32598790cfcc65728b448378b weston-6.0.1.tar.xz sha1 80200a9c677d34c2de52230be444bd03ecd84229 weston-8.0.0.tar.xz
sha256 bf2f6d5aae2e11cabb6bd69a76bcf9edb084f8c3e14ca769bea7234a513155b4 weston-6.0.1.tar.xz sha256 7518b49b2eaa1c3091f24671bdcc124fd49fc8f1af51161927afa4329c027848 weston-8.0.0.tar.xz
sha512 3da04ff9b884480ce0824950347185e55584e3938021fe62014423d3d51577eafdda8de650a5de6eb37a842130c9cb14c7a952a560f6be93ff973164363af3d9 weston-6.0.1.tar.xz sha512 74853b0c9cabbabe942a2d057b65e4e97b48dc5f4df6d7b9ffc10ec52bc787009b12b900be6b426551902b920b7308baa967b7489761641dc9c31cf90440950c weston-8.0.0.tar.xz
sha256 fdb65868f65d0fbdb05c2d3b779e10ce9969fa0c4b9262ba4f260e87086ab860 COPYING sha256 fdb65868f65d0fbdb05c2d3b779e10ce9969fa0c4b9262ba4f260e87086ab860 COPYING

95
package/weston/weston.mk
View File

@ -4,37 +4,41 @@
# #
################################################################################ ################################################################################
WESTON_VERSION = 6.0.1 WESTON_VERSION = 8.0.0
WESTON_SITE = http://wayland.freedesktop.org/releases WESTON_SITE = http://wayland.freedesktop.org/releases
WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz
WESTON_LICENSE = MIT WESTON_LICENSE = MIT
WESTON_LICENSE_FILES = COPYING WESTON_LICENSE_FILES = COPYING
WESTON_DEPENDENCIES = host-pkgconf wayland wayland-protocols \ WESTON_DEPENDENCIES = host-pkgconf wayland wayland-protocols \
libxkbcommon pixman libpng jpeg udev cairo libinput libdrm \ libxkbcommon pixman libpng jpeg udev cairo libinput libdrm
$(if $(BR2_PACKAGE_WEBP),webp)
WESTON_CONF_OPTS = \ WESTON_CONF_OPTS = \
--with-dtddir=$(STAGING_DIR)/usr/share/wayland \ -Dbuild.pkg_config_path=$(HOST_DIR)/lib/pkgconfig \
--disable-headless-compositor \ -Dbackend-headless=false \
--disable-colord \ -Dcolor-management-colord=false \
--disable-devdocs \ -Dremoting=false \
--disable-setuid-install \ -Dpipewire=false
--enable-autotools
WESTON_MAKE_OPTS = \
WAYLAND_PROTOCOLS_DATADIR=$(STAGING_DIR)/usr/share/wayland-protocols
# Uses VIDIOC_EXPBUF, only available from 3.8+ # Uses VIDIOC_EXPBUF, only available from 3.8+
ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_8),) ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_8),y)
WESTON_CONF_OPTS += --disable-simple-dmabuf-v4l-client WESTON_CONF_OPTS += -Dsimple-clients=dmabuf-v4l
else
WESTON_CONF_OPTS += -Dsimple-clients=
endif endif
ifeq ($(BR2_PACKAGE_DBUS),y) ifeq ($(BR2_PACKAGE_DBUS)$(BR2_PACKAGE_SYSTEMD),yy)
WESTON_CONF_OPTS += --enable-dbus WESTON_CONF_OPTS += -Dlauncher-logind=true
WESTON_DEPENDENCIES += dbus WESTON_DEPENDENCIES += dbus systemd
else else
WESTON_CONF_OPTS += --disable-dbus WESTON_CONF_OPTS += -Dlauncher-logind=false
endif
ifeq ($(BR2_PACKAGE_WEBP),y)
WESTON_CONF_OPTS += -Dimage-webp=true
WESTON_DEPENDENCIES += webp
else
WESTON_CONF_OPTS += -Dimage-webp=false
endif endif
# weston-launch must be u+s root in order to work properly # weston-launch must be u+s root in order to work properly
@ -45,90 +49,89 @@ endef
define WESTON_USERS define WESTON_USERS
- - weston-launch -1 - - - - Weston launcher group - - weston-launch -1 - - - - Weston launcher group
endef endef
WESTON_CONF_OPTS += --enable-weston-launch WESTON_CONF_OPTS += -Dweston-launch=true
WESTON_DEPENDENCIES += linux-pam WESTON_DEPENDENCIES += linux-pam
else else
WESTON_CONF_OPTS += --disable-weston-launch WESTON_CONF_OPTS += -Dweston-launch=false
endif endif
ifeq ($(BR2_PACKAGE_HAS_LIBEGL_WAYLAND)$(BR2_PACKAGE_HAS_LIBGLES),yy) 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 WESTON_DEPENDENCIES += libegl libgles
else else
WESTON_CONF_OPTS += \ WESTON_CONF_OPTS += \
--disable-egl \ -Drenderer-gl=false
--disable-simple-dmabuf-drm-client \
--disable-simple-egl-clients
endif endif
ifeq ($(BR2_PACKAGE_WESTON_RDP),y) ifeq ($(BR2_PACKAGE_WESTON_RDP),y)
WESTON_DEPENDENCIES += freerdp WESTON_DEPENDENCIES += freerdp
WESTON_CONF_OPTS += --enable-rdp-compositor WESTON_CONF_OPTS += -Dbackend-rdp=true
else else
WESTON_CONF_OPTS += --disable-rdp-compositor WESTON_CONF_OPTS += -Dbackend-rdp=false
endif endif
ifeq ($(BR2_PACKAGE_WESTON_FBDEV),y) ifeq ($(BR2_PACKAGE_WESTON_FBDEV),y)
WESTON_CONF_OPTS += --enable-fbdev-compositor WESTON_CONF_OPTS += -Dbackend-fbdev=true
else else
WESTON_CONF_OPTS += --disable-fbdev-compositor WESTON_CONF_OPTS += -Dbackend-fbdev=false
endif endif
ifeq ($(BR2_PACKAGE_WESTON_DRM),y) ifeq ($(BR2_PACKAGE_WESTON_DRM),y)
WESTON_CONF_OPTS += --enable-drm-compositor WESTON_CONF_OPTS += -Dbackend-drm=true
else else
WESTON_CONF_OPTS += --disable-drm-compositor WESTON_CONF_OPTS += -Dbackend-drm=false
endif endif
ifeq ($(BR2_PACKAGE_WESTON_X11),y) ifeq ($(BR2_PACKAGE_WESTON_X11),y)
WESTON_CONF_OPTS += --enable-x11-compositor WESTON_CONF_OPTS += -Dbackend-x11=true
WESTON_DEPENDENCIES += libxcb xlib_libX11 WESTON_DEPENDENCIES += libxcb xlib_libX11
else else
WESTON_CONF_OPTS += --disable-x11-compositor WESTON_CONF_OPTS += -Dbackend-x11=false
endif endif
# We're guaranteed to have at least one backend # We're guaranteed to have at least one backend
WESTON_CONF_OPTS += WESTON_NATIVE_BACKEND=$(call qstrip,$(BR2_PACKAGE_WESTON_DEFAULT_COMPOSITOR)) WESTON_CONF_OPTS += -Dbackend-default=$(call qstrip,$(BR2_PACKAGE_WESTON_DEFAULT_COMPOSITOR))
ifeq ($(BR2_PACKAGE_WESTON_XWAYLAND),y) 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 WESTON_DEPENDENCIES += cairo libepoxy libxcb xlib_libX11 xlib_libXcursor
else else
WESTON_CONF_OPTS += --disable-xwayland WESTON_CONF_OPTS += -Dxwayland=false
endif endif
ifeq ($(BR2_PACKAGE_LIBVA),y) ifeq ($(BR2_PACKAGE_LIBVA),y)
WESTON_CONF_OPTS += --enable-vaapi-recorder WESTON_CONF_OPTS += -Dbackend-drm-screencast-vaapi=true
WESTON_DEPENDENCIES += libva WESTON_DEPENDENCIES += libva
else else
WESTON_CONF_OPTS += --disable-vaapi-recorder WESTON_CONF_OPTS += -Dbackend-drm-screencast-vaapi=false
endif endif
ifeq ($(BR2_PACKAGE_LCMS2),y) ifeq ($(BR2_PACKAGE_LCMS2),y)
WESTON_CONF_OPTS += --enable-lcms WESTON_CONF_OPTS += -Dcolor-management-lcms=true
WESTON_DEPENDENCIES += lcms2 WESTON_DEPENDENCIES += lcms2
else else
WESTON_CONF_OPTS += --disable-lcms WESTON_CONF_OPTS += -Dcolor-management-lcms=false
endif endif
ifeq ($(BR2_PACKAGE_SYSTEMD),y) ifeq ($(BR2_PACKAGE_SYSTEMD),y)
WESTON_CONF_OPTS += --enable-systemd-login --enable-systemd-notify WESTON_CONF_OPTS += -Dsystemd=true
WESTON_DEPENDENCIES += systemd WESTON_DEPENDENCIES += systemd
else else
WESTON_CONF_OPTS += --disable-systemd-login --disable-systemd-notify WESTON_CONF_OPTS += -Dsystemd=false
endif endif
ifeq ($(BR2_PACKAGE_LIBXML2),y) ifeq ($(BR2_PACKAGE_LIBXML2),y)
WESTON_CONF_OPTS += --enable-junit-xml WESTON_CONF_OPTS += -Dtest-junit-xml=true
WESTON_DEPENDENCIES += libxml2 WESTON_DEPENDENCIES += libxml2
else else
WESTON_CONF_OPTS += --disable-junit-xml WESTON_CONF_OPTS += -Dtest-junit-xml=false
endif endif
ifeq ($(BR2_PACKAGE_WESTON_DEMO_CLIENTS),y) ifeq ($(BR2_PACKAGE_WESTON_DEMO_CLIENTS),y)
WESTON_CONF_OPTS += --enable-demo-clients-install WESTON_CONF_OPTS += -Ddemo-clients=true
WESTON_DEPENDENCIES += pango
else else
WESTON_CONF_OPTS += --disable-demo-clients-install WESTON_CONF_OPTS += -Ddemo-clients=false
endif endif
$(eval $(autotools-package)) $(eval $(meson-package))