rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update buildroot to 2017.02.11

Browse Source
This commit is contained in:
jbnadal
2018-05-22 15:35:47 +02:00
parent 4bf1f5e091
commit a3c10bd762
9257 changed files with 433426 additions and 1701 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
bsp/buildroot-2017.02.11/package/weston/0001-os-compatibility-define-CLOCK_BOOTTIME-when-not-avai.patch Normal file
View File

@@ -0,0 +1,41 @@
From 66b71951f8ce66f02040f8814e1d89db34c34a87 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 22 Feb 2015 12:36:00 +0100
Subject: [PATCH] os-compatibility: define CLOCK_BOOTTIME when not available
CLOCK_BOOTTIME is supposed to be provided by the C library headers,
but uClibc 0.9.33.2 does not provide it. Instead of depending on an
uClibc patch, let's make Weston define it to the right value when not
already defined by the C library.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
shared/os-compatibility.h | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/shared/os-compatibility.h b/shared/os-compatibility.h
index 172bb7e..e369899 100644
--- a/shared/os-compatibility.h
+++ b/shared/os-compatibility.h
@@ -26,6 +26,7 @@
#include "config.h"
#include <sys/types.h>
+#include <time.h>
#ifdef HAVE_EXECINFO_H
#include <execinfo.h>
@@ -37,6 +38,10 @@ backtrace(void **buffer, int size)
}
#endif
+#ifndef CLOCK_BOOTTIME
+#define CLOCK_BOOTTIME 7
+#endif
+
int
os_socketpair_cloexec(int domain, int type, int protocol, int *sv);
--
2.1.0

38
bsp/buildroot-2017.02.11/package/weston/0002-shared-platform-include-weston-egl-ext.h-only-if-ENA.patch Normal file
View File

@@ -0,0 +1,38 @@
From e338ced1e04bf4b97322d5eed2b5bdf5b052095a Mon Sep 17 00:00:00 2001
From: Krzysztof Konopko <kris@youview.com>
Date: Thu, 15 Sep 2016 13:01:49 +0200
Subject: [PATCH] shared/platform: include weston-egl-ext.h only if ENABLE_EGL
is defined
Including `weston-egl-ext.h` causes compilation failure for configurations
with EGL disabled.
Verified with `--disable-egl`, `--disable-x11-compositor`
and `--disable-drm-compositor`.
Signed-off-by: Krzysztof Konopko <kris@youview.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
[yann.morin.1998@free.fr: backported from upstream]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
shared/platform.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/shared/platform.h b/shared/platform.h
index 1eb96fd..30db1a6 100644
--- a/shared/platform.h
+++ b/shared/platform.h
@@ -33,9 +33,9 @@
#include <wayland-egl.h>
#include <EGL/egl.h>
#include <EGL/eglext.h>
-#endif
#include "weston-egl-ext.h"
+#endif
#ifdef __cplusplus
extern "C" {
--
2.7.4

47
bsp/buildroot-2017.02.11/package/weston/0003-configure-search-for-lib-with-clock_getres.patch Normal file
View File

@@ -0,0 +1,47 @@
From e269012c4b919624ca92d80afd1d6a6f5399e041 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Mon, 19 Dec 2016 18:07:07 +0100
Subject: [PATCH] configure: search for lib with clock_getres()
Like clock_gettime(), clock_getres() is in -lrt for glibc < 2.17.
Add a check for it, like is done for clock_gettime().
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
Upstream status: submitted
https://lists.freedesktop.org/archives/wayland-devel/2016-December/032354.html
---
Makefile.am | 1 +
configure.ac | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
index 2219e3d..53f8f51 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -190,6 +190,7 @@ weston_CFLAGS = $(AM_CFLAGS) $(COMPOSITOR_CFLAGS) $(LIBUNWIND_CFLAGS)
weston_LDADD = libshared.la libweston-@LIBWESTON_MAJOR@.la \
$(COMPOSITOR_LIBS) $(LIBUNWIND_LIBS) \
$(DLOPEN_LIBS) $(LIBINPUT_BACKEND_LIBS) \
+ $(CLOCK_GETRES_LIBS) \
-lm
weston_SOURCES = \
diff --git a/configure.ac b/configure.ac
index 1e251bf..604f51b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -88,8 +88,9 @@ PKG_PROG_PKG_CONFIG()
WESTON_SEARCH_LIBS([DLOPEN], [dl], [dlopen])
-# In old glibc versions (< 2.17) clock_gettime() is in librt
+# In old glibc versions (< 2.17) clock_gettime() and clock_getres() are in librt
WESTON_SEARCH_LIBS([CLOCK_GETTIME], [rt], [clock_gettime])
+WESTON_SEARCH_LIBS([CLOCK_GETRES], [rt], [clock_getres])
AC_CHECK_DECL(SFD_CLOEXEC,[],
[AC_MSG_ERROR("SFD_CLOEXEC is needed to compile weston")],
--
2.7.4

58
bsp/buildroot-2017.02.11/package/weston/0004-libweston-include-weston-egl-ext.h-in-drm-x11-and-wa.patch Normal file
View File

@@ -0,0 +1,58 @@
From c950667e87dc175bd2741a51460ebd3e29a57c92 Mon Sep 17 00:00:00 2001
From: Vincent Abriou <vincent.abriou@st.com>
Date: Wed, 5 Oct 2016 16:14:07 +0200
Subject: [PATCH] libweston: include weston-egl-ext.h in drm, x11 and wayland
compositor
As to what is done for gl-renderer.c, weston-egl-ext.h should be
include in compositor-drm.c, compositor-x11.c and compositor-wayland.c.
This fix building issue with GPU that does not have EGL_PLATFORM_xxx_KHR
in their extension header file eglext.h.
Signed-off-by: Vincent Abriou <vincent.abriou@st.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
---
libweston/compositor-drm.c | 1 +
libweston/compositor-wayland.c | 1 +
libweston/compositor-x11.c | 1 +
3 files changed, 3 insertions(+)
diff --git a/libweston/compositor-drm.c b/libweston/compositor-drm.c
index 567240f..f61e3d9 100644
--- a/libweston/compositor-drm.c
+++ b/libweston/compositor-drm.c
@@ -52,6 +52,7 @@
#include "shared/helpers.h"
#include "shared/timespec-util.h"
#include "gl-renderer.h"
+#include "weston-egl-ext.h"
#include "pixman-renderer.h"
#include "libbacklight.h"
#include "libinput-seat.h"
diff --git a/libweston/compositor-wayland.c b/libweston/compositor-wayland.c
index 580c7b5..46fdde1 100644
--- a/libweston/compositor-wayland.c
+++ b/libweston/compositor-wayland.c
@@ -44,6 +44,7 @@
#include "compositor.h"
#include "compositor-wayland.h"
#include "gl-renderer.h"
+#include "weston-egl-ext.h"
#include "pixman-renderer.h"
#include "shared/helpers.h"
#include "shared/image-loader.h"
diff --git a/libweston/compositor-x11.c b/libweston/compositor-x11.c
index dadcd10..1c6de08 100644
--- a/libweston/compositor-x11.c
+++ b/libweston/compositor-x11.c
@@ -56,6 +56,7 @@
#include "shared/helpers.h"
#include "shared/image-loader.h"
#include "gl-renderer.h"
+#include "weston-egl-ext.h"
#include "pixman-renderer.h"
#include "presentation-time-server-protocol.h"
#include "linux-dmabuf.h"
--
2.7.4

47
bsp/buildroot-2017.02.11/package/weston/0005-libweston-fix-building-issue-when-EGL-support-is-not.patch Normal file
View File

@@ -0,0 +1,47 @@
From 7327d5a7a29ad31af871e144ebe053cb1ab478f7 Mon Sep 17 00:00:00 2001
From: Vincent Abriou <vincent.abriou@st.com>
Date: Tue, 11 Oct 2016 13:47:03 +0200
Subject: [PATCH] libweston: fix building issue when EGL support is not enabled
weston-egl-ext.h has been include in compositor-xx.c file in order to
define EGL_PLATFORM_xxx_KHR extensions used by the compositors.
But in case EGL support is not enabled, all EGL related definition must
be skipped except EGL_PLATFORM_xxx_KHR that must be still defined to
allow compositor-xx.c to build.
Signed-off-by: Vincent Abriou <vincent.abriou@st.com>
Reviewed-by: Giulio Camuffo <giuliocamuffo@gmail.com>
---
libweston/weston-egl-ext.h | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/libweston/weston-egl-ext.h b/libweston/weston-egl-ext.h
index 6e36996..70556fd 100644
--- a/libweston/weston-egl-ext.h
+++ b/libweston/weston-egl-ext.h
@@ -28,6 +28,8 @@
#ifndef WESTON_EGL_EXT_H
#define WESTON_EGL_EXT_H
+#ifdef ENABLE_EGL
+
#ifndef EGL_WL_bind_wayland_display
#define EGL_WL_bind_wayland_display 1
@@ -152,5 +154,13 @@ typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEPLATFORMPIXMAPSURFACEEXTPROC) (EGLD
#define EGL_PLATFORM_X11_KHR 0x31D5
#endif
+#else /* ENABLE_EGL */
+
+/* EGL platform definition are keept to allow compositor-xx.c to build */
+#define EGL_PLATFORM_GBM_KHR 0x31D7
+#define EGL_PLATFORM_WAYLAND_KHR 0x31D8
+#define EGL_PLATFORM_X11_KHR 0x31D5
+
+#endif /* ENABLE_EGL */
#endif
--
2.7.4

36
bsp/buildroot-2017.02.11/package/weston/0006-tests-add-missing-include.patch Normal file
View File

@@ -0,0 +1,36 @@
From 4c9e149d641a9945c3a8e15707b8712834f08c4f Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 22 Jan 2017 14:46:28 +0100
Subject: [PATCH] tests: add missing include
The int32_t type is defined in stdint.h.
The musl C library is very conservative in the headers that it
internally includes, and stdint.h is not included by any other header,
unlike with glibc or uClibc, which breaks the build.
Add the missing header.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
Status: sent upstream
https://lists.freedesktop.org/archives/wayland-devel/2017-January/032771.html
---
tests/string-test.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/tests/string-test.c b/tests/string-test.c
index a72ec30..5571b52 100644
--- a/tests/string-test.c
+++ b/tests/string-test.c
@@ -28,6 +28,7 @@
#include <stdlib.h>
#include <stdbool.h>
#include <stdio.h>
+#include <stdint.h>
#include <assert.h>
#include "shared/string-helpers.h"
--
2.7.4

107
bsp/buildroot-2017.02.11/package/weston/Config.in Normal file
View File

@@ -0,0 +1,107 @@
comment "weston needs udev and a toolchain w/ locale, threads, dynamic library, headers >= 3.0"
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"
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_MTDEV
select BR2_PACKAGE_LIBINPUT
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
# Runtime dependency
select BR2_PACKAGE_XKEYBOARD_CONFIG
# Make sure at least one compositor is selected.
select BR2_PACKAGE_WESTON_FBDEV if !BR2_PACKAGE_WESTON_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
# Helper to make sure at least one compositor is selected.
config BR2_PACKAGE_WESTON_HAS_COMPOSITOR
bool
config BR2_PACKAGE_WESTON_DRM
bool "DRM compositor"
depends on BR2_PACKAGE_MESA3D_OPENGL_EGL
select BR2_PACKAGE_LIBDRM
select BR2_PACKAGE_WESTON_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_FBDEV
bool "fbdev compositor"
# FreeRDP needs threads and !static, already the case for weston
config BR2_PACKAGE_WESTON_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_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_X11
bool "X11 compositor"
depends on BR2_PACKAGE_XORG7
select BR2_PACKAGE_LIBXCB
select BR2_PACKAGE_XLIB_LIBX11
select BR2_PACKAGE_WESTON_HAS_COMPOSITOR
comment "X11 compositor needs X.org enabled"
depends on !BR2_PACKAGE_XORG7
config BR2_PACKAGE_WESTON_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_DEMO_CLIENTS
bool "demo clients"
help
This enables the installation of Weston's demo clients.
endif

2
bsp/buildroot-2017.02.11/package/weston/weston.hash Normal file
View File

@@ -0,0 +1,2 @@
# From https://lists.freedesktop.org/archives/wayland-devel/2016-September/031123.html
sha256 ac7ac2a32e3b9f50131fccded5d2326bd36b2226712d90b61999118a09af5033 weston-1.12.0.tar.xz

145
bsp/buildroot-2017.02.11/package/weston/weston.mk Normal file
View File

@@ -0,0 +1,145 @@
################################################################################
#
# weston
#
################################################################################
WESTON_VERSION = 1.12.0
WESTON_SITE = http://wayland.freedesktop.org/releases
WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz
WESTON_LICENSE = MIT
WESTON_LICENSE_FILES = COPYING
# configure.ac patched by 0003-configure-search-for-lib-with-clock_getres.patch
WESTON_AUTORECONF = YES
WESTON_DEPENDENCIES = host-pkgconf wayland wayland-protocols \
libxkbcommon pixman libpng jpeg mtdev udev cairo libinput \
$(if $(BR2_PACKAGE_WEBP),webp)
WESTON_CONF_OPTS = \
--with-dtddir=$(STAGING_DIR)/usr/share/wayland \
--disable-headless-compositor \
--disable-colord \
--disable-devdocs \
--disable-setuid-install
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
endif
ifeq ($(BR2_PACKAGE_DBUS),y)
WESTON_CONF_OPTS += --enable-dbus
WESTON_DEPENDENCIES += dbus
else
WESTON_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_PERMISSIONS
/usr/bin/weston-launch f 4755 0 0 - - - - -
endef
define WESTON_USERS
- - weston-launch -1 - - - - Weston launcher group
endef
WESTON_CONF_OPTS += --enable-weston-launch
WESTON_DEPENDENCIES += linux-pam
else
WESTON_CONF_OPTS += --disable-weston-launch
endif
# Needs wayland-egl, which normally only mesa provides
ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL)$(BR2_PACKAGE_MESA3D_OPENGL_ES),yy)
WESTON_CONF_OPTS += --enable-egl
WESTON_DEPENDENCIES += libegl
else
WESTON_CONF_OPTS += \
--disable-egl \
--disable-simple-egl-clients
endif
ifeq ($(BR2_PACKAGE_LIBUNWIND),y)
WESTON_DEPENDENCIES += libunwind
else
WESTON_CONF_OPTS += --disable-libunwind
endif
ifeq ($(BR2_PACKAGE_WESTON_RDP),y)
WESTON_DEPENDENCIES += freerdp
WESTON_CONF_OPTS += --enable-rdp-compositor
else
WESTON_CONF_OPTS += --disable-rdp-compositor
endif
ifeq ($(BR2_PACKAGE_WESTON_FBDEV),y)
WESTON_CONF_OPTS += \
--enable-fbdev-compositor \
WESTON_NATIVE_BACKEND=fbdev-backend.so
else
WESTON_CONF_OPTS += --disable-fbdev-compositor
endif
ifeq ($(BR2_PACKAGE_WESTON_DRM),y)
WESTON_CONF_OPTS += \
--enable-drm-compositor \
WESTON_NATIVE_BACKEND=drm-backend.so
WESTON_DEPENDENCIES += libdrm
else
WESTON_CONF_OPTS += --disable-drm-compositor
endif
ifeq ($(BR2_PACKAGE_WESTON_X11),y)
WESTON_CONF_OPTS += \
--enable-x11-compositor \
WESTON_NATIVE_BACKEND=x11-backend.so
WESTON_DEPENDENCIES += libxcb xlib_libX11
else
WESTON_CONF_OPTS += --disable-x11-compositor
endif
ifeq ($(BR2_PACKAGE_WESTON_XWAYLAND),y)
WESTON_CONF_OPTS += --enable-xwayland
WESTON_DEPENDENCIES += cairo libepoxy libxcb xlib_libX11 xlib_libXcursor
else
WESTON_CONF_OPTS += --disable-xwayland
endif
ifeq ($(BR2_PACKAGE_LIBVA),y)
WESTON_CONF_OPTS += --enable-vaapi-recorder
WESTON_DEPENDENCIES += libva
else
WESTON_CONF_OPTS += --disable-vaapi-recorder
endif
ifeq ($(BR2_PACKAGE_LCMS2),y)
WESTON_CONF_OPTS += --enable-lcms
WESTON_DEPENDENCIES += lcms2
else
WESTON_CONF_OPTS += --disable-lcms
endif
ifeq ($(BR2_PACKAGE_SYSTEMD),y)
WESTON_CONF_OPTS += --enable-systemd-login --enable-systemd-notify
WESTON_DEPENDENCIES += systemd
else
WESTON_CONF_OPTS += --disable-systemd-login --disable-systemd-notify
endif
ifeq ($(BR2_PACKAGE_LIBXML2),y)
WESTON_CONF_OPTS += --enable-junit-xml
WESTON_DEPENDENCIES += libxml2
else
WESTON_CONF_OPTS += --disable-junit-xml
endif
ifeq ($(BR2_PACKAGE_WESTON_DEMO_CLIENTS),y)
WESTON_CONF_OPTS += --enable-demo-clients-install
else
WESTON_CONF_OPTS += --disable-demo-clients-install
endif
$(eval $(autotools-package))