summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-06-03 13:00:13 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-02 23:08:40 +0100
commit3ff474c64235579316c6fe104fd61af90062ac65 (patch)
treed64e55ecf7bf4e633d7d2fe16ab0ed3cb881546c
parentedb240b43f382f68206397c6e7c7d791b89e3da4 (diff)
downloadpoky-3ff474c64235579316c6fe104fd61af90062ac65.tar.gz
weston: Upgrade weston_1.6.0.bb -> weston_1.8.0.bb
Make error() portable, Fix build on musl copyright year changed for weston compositor.c - * Copyright © 2012 Collabora, Ltd. + * Copyright © 2012-2015 Collabora, Ltd. (From OE-Core rev: 4f401540b2055fd6fb8a5edac6811199379dba90) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch80
-rw-r--r--meta/recipes-graphics/wayland/weston/disable-wayland-scanner-pkg-check.patch20
-rw-r--r--meta/recipes-graphics/wayland/weston_1.8.0.bb (renamed from meta/recipes-graphics/wayland/weston_1.6.0.bb)22
3 files changed, 105 insertions, 17 deletions
diff --git a/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch b/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
new file mode 100644
index 0000000000..148848d8d2
--- /dev/null
+++ b/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
@@ -0,0 +1,80 @@
1From c22e90365d89346258394833cbcad03ff32b2e27 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 29 May 2015 20:56:00 -0700
4Subject: [PATCH weston] make error() portable
5
6error() is not posix but gnu extension so may not be available on all
7kind of systemsi e.g. musl.
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11Upstream-Status: Submitted
12
13 configure.ac | 2 ++
14 src/weston-error.h | 20 ++++++++++++++++++++
15 src/weston-launch.c | 2 +-
16 3 files changed, 23 insertions(+), 1 deletion(-)
17 create mode 100644 src/weston-error.h
18
19diff --git a/configure.ac b/configure.ac
20index 263fc22..f52cd62 100644
21--- a/configure.ac
22+++ b/configure.ac
23@@ -57,6 +57,8 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[],
24 [[#include <time.h>]])
25 AC_CHECK_HEADERS([execinfo.h])
26
27+AC_CHECK_HEADERS([error.h])
28+
29 AC_CHECK_FUNCS([mkostemp strchrnul initgroups posix_fallocate])
30
31 COMPOSITOR_MODULES="wayland-server >= 1.7.93 pixman-1 >= 0.25.2"
32diff --git a/src/weston-error.h b/src/weston-error.h
33new file mode 100644
34index 0000000..2089d02
35--- /dev/null
36+++ b/src/weston-error.h
37@@ -0,0 +1,20 @@
38+#ifndef _WESTON_ERROR_H
39+#define _WESTON_ERROR_H
40+
41+#if defined(HAVE_ERROR_H)
42+#include <error.h>
43+#else
44+#include <err.h>
45+#include <string.h>
46+#define _weston_error(S, E, F, ...) do { \
47+ if (E) \
48+ err(S, F ": %s", ##__VA_ARGS__, strerror(E)); \
49+ else \
50+ err(S, F, ##__VA_ARGS__); \
51+} while(0)
52+
53+#define error _weston_error
54+#endif
55+
56+#endif
57+
58diff --git a/src/weston-launch.c b/src/weston-launch.c
59index 10c66de..3e6d30a 100644
60--- a/src/weston-launch.c
61+++ b/src/weston-launch.c
62@@ -30,7 +30,6 @@
63 #include <poll.h>
64 #include <errno.h>
65
66-#include <error.h>
67 #include <getopt.h>
68
69 #include <sys/types.h>
70@@ -56,6 +55,7 @@
71 #endif
72
73 #include "weston-launch.h"
74+#include "weston-error.h"
75
76 #define DRM_MAJOR 226
77
78--
792.1.4
80
diff --git a/meta/recipes-graphics/wayland/weston/disable-wayland-scanner-pkg-check.patch b/meta/recipes-graphics/wayland/weston/disable-wayland-scanner-pkg-check.patch
index 062da5cee5..68ba38ba8e 100644
--- a/meta/recipes-graphics/wayland/weston/disable-wayland-scanner-pkg-check.patch
+++ b/meta/recipes-graphics/wayland/weston/disable-wayland-scanner-pkg-check.patch
@@ -1,13 +1,17 @@
1Index: weston-1.5.0/configure.ac 1Index: git/configure.ac
2=================================================================== 2===================================================================
3--- weston-1.5.0.orig/configure.ac 3--- git.orig/configure.ac
4+++ weston-1.5.0/configure.ac 4+++ git/configure.ac
5@@ -503,7 +503,7 @@ if test x$wayland_scanner = x; then 5@@ -501,12 +501,6 @@ if test "x$have_lcms" = xyes; then
6 AC_MSG_ERROR([wayland-scanner is needed to compile weston])
7 fi 6 fi
7 AM_CONDITIONAL(HAVE_LCMS, [test "x$have_lcms" = xyes])
8 8
9-PKG_CHECK_MODULES(WAYLAND_SCANNER, wayland-scanner) 9-AC_PATH_PROG([wayland_scanner], [wayland-scanner])
10+#PKG_CHECK_MODULES(WAYLAND_SCANNER, wayland-scanner) 10-if test x$wayland_scanner = x; then
11 11- PKG_CHECK_MODULES(WAYLAND_SCANNER, [wayland-scanner])
12- wayland_scanner=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`
13-fi
14-
12 AC_CONFIG_FILES([Makefile src/version.h src/weston.pc]) 15 AC_CONFIG_FILES([Makefile src/version.h src/weston.pc])
13 16
17 AM_CONDITIONAL([HAVE_GIT_REPO], [test -f $srcdir/.git/logs/HEAD])
diff --git a/meta/recipes-graphics/wayland/weston_1.6.0.bb b/meta/recipes-graphics/wayland/weston_1.8.0.bb
index 74ad8162b9..ac6bd9784b 100644
--- a/meta/recipes-graphics/wayland/weston_1.6.0.bb
+++ b/meta/recipes-graphics/wayland/weston_1.8.0.bb
@@ -3,34 +3,38 @@ DESCRIPTION = "Weston is the reference implementation of a Wayland compositor"
3HOMEPAGE = "http://wayland.freedesktop.org" 3HOMEPAGE = "http://wayland.freedesktop.org"
4LICENSE = "MIT" 4LICENSE = "MIT"
5LIC_FILES_CHKSUM = "file://COPYING;md5=275efac2559a224527bd4fd593d38466 \ 5LIC_FILES_CHKSUM = "file://COPYING;md5=275efac2559a224527bd4fd593d38466 \
6 file://src/compositor.c;endline=23;md5=aa98a8db03480fe7d500d0b1f4b8850c" 6 file://src/compositor.c;endline=23;md5=a9793f1edc8d1a4c344ca8ae252352fb"
7 7
8SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ 8SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
9 file://weston.png \ 9 file://weston.png \
10 file://weston.desktop \ 10 file://weston.desktop \
11 file://disable-wayland-scanner-pkg-check.patch \
12 file://make-lcms-explicitly-configurable.patch \ 11 file://make-lcms-explicitly-configurable.patch \
13 file://make-libwebp-explicitly-configurable.patch \ 12 file://make-libwebp-explicitly-configurable.patch \
13 file://0001-make-error-portable.patch \
14" 14"
15SRC_URI[md5sum] = "c60ce9dde99a089db0539d8f6b557827" 15SRC_URI[md5sum] = "24cb8a7ed0535b4fc3642643988dab36"
16SRC_URI[sha256sum] = "dc3ea5d13bbf025fabc006216c5ddc0d80d5f4ebe778912b8c4d1d4acaaa614d" 16SRC_URI[sha256sum] = "8963e69f328e815cec42c58046c4af721476c7541bb7d9edc71740fada5ad312"
17 17
18inherit autotools pkgconfig useradd 18inherit autotools pkgconfig useradd
19 19
20DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 jpeg" 20DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 jpeg"
21DEPENDS += "wayland virtual/egl pango" 21DEPENDS += "wayland libinput virtual/egl pango"
22 22
23EXTRA_OECONF = "--enable-setuid-install \ 23EXTRA_OECONF = "--enable-setuid-install \
24 --disable-xwayland \ 24 --disable-xwayland \
25 --enable-simple-clients \ 25 --enable-simple-clients \
26 --enable-clients \ 26 --enable-clients \
27 --enable-demo-clients-install \ 27 --enable-demo-clients-install \
28 --disable-libunwind \
29 --disable-rpi-compositor \ 28 --disable-rpi-compositor \
30 --disable-rdp-compositor \ 29 --disable-rdp-compositor \
31 " 30 "
32 31
33 32EXTRA_OECONF_append_qemux86 = "\
33 WESTON_NATIVE_BACKEND=fbdev-backend.so \
34 "
35EXTRA_OECONF_append_qemux86-64 = "\
36 WESTON_NATIVE_BACKEND=fbdev-backend.so \
37 "
34PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \ 38PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \
35 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ 39 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
36 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'launch', '', d)} \ 40 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'launch', '', d)} \
@@ -60,8 +64,8 @@ PACKAGECONFIG[cairo-glesv2] = "--with-cairo-glesv2,--with-cairo=image,cairo"
60PACKAGECONFIG[lcms] = "--enable-lcms,--disable-lcms,lcms" 64PACKAGECONFIG[lcms] = "--enable-lcms,--disable-lcms,lcms"
61# Weston with webp support 65# Weston with webp support
62PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp" 66PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp"
63# Weston with libinput backend 67# Weston with unwinding support
64PACKAGECONFIG[libinput] = "--enable-libinput-backend,--disable-libinput-backend,libinput" 68PACKAGECONFIG[libunwind] = "--enable-libunwind,--disable-libunwind,libunwind"
65 69
66do_install_append() { 70do_install_append() {
67 # Weston doesn't need the .la files to load modules, so wipe them 71 # Weston doesn't need the .la files to load modules, so wipe them