diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-graphics/wayland/weston/0001-autotools-Add-a-libunwind-configure-switch.patch | 40 | ||||
-rw-r--r-- | meta/recipes-graphics/wayland/weston_1.0.6.bb | 3 |
2 files changed, 42 insertions, 1 deletions
diff --git a/meta/recipes-graphics/wayland/weston/0001-autotools-Add-a-libunwind-configure-switch.patch b/meta/recipes-graphics/wayland/weston/0001-autotools-Add-a-libunwind-configure-switch.patch new file mode 100644 index 0000000000..faf96806d5 --- /dev/null +++ b/meta/recipes-graphics/wayland/weston/0001-autotools-Add-a-libunwind-configure-switch.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From cc802f5f34c6ea4fe66f70225830c97ef7abbfc3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Quentin Glidic <sardemff7+git@sardemff7.net> | ||
3 | Date: Wed, 3 Apr 2013 20:19:45 +0200 | ||
4 | Subject: [PATCH] autotools: Add a libunwind configure switch | ||
5 | |||
6 | Upstream-Status: Backport from 1.1 (5daccc373eddf94086fcc4662c38605de6356c6c) | ||
7 | |||
8 | Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net> | ||
9 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
10 | --- | ||
11 | configure.ac | 12 +++++++----- | ||
12 | 1 file changed, 7 insertions(+), 5 deletions(-) | ||
13 | |||
14 | diff --git a/configure.ac b/configure.ac | ||
15 | index 71d0978..1e76ded 100644 | ||
16 | --- a/configure.ac | ||
17 | +++ b/configure.ac | ||
18 | @@ -251,12 +251,14 @@ fi | ||
19 | AC_SUBST(GCC_CFLAGS) | ||
20 | AC_SUBST(GCC_CXXFLAGS) | ||
21 | |||
22 | -PKG_CHECK_MODULES(LIBUNWIND, libunwind, | ||
23 | - [have_libunwind=yes], [have_libunwind=no]) | ||
24 | -if test "x$have_libunwind" = xyes; then | ||
25 | - AC_DEFINE(HAVE_LIBUNWIND, 1, [Have libunwind support]) | ||
26 | +AC_ARG_ENABLE(libunwind, AS_HELP_STRING([ --disable-libunwind], | ||
27 | + [Disable libunwind usage for backtraces]),, | ||
28 | + enable_libunwind=yes) | ||
29 | +if test "x$enable_libunwind" = xyes; then | ||
30 | + PKG_CHECK_MODULES(LIBUNWIND, libunwind) | ||
31 | + AC_DEFINE(HAVE_LIBUNWIND, 1, [Have libunwind support]) | ||
32 | fi | ||
33 | -AM_CONDITIONAL(HAVE_LIBUNWIND, [test "x$have_libunwind" = xyes]) | ||
34 | +AM_CONDITIONAL(HAVE_LIBUNWIND, [test "x$enable_libunwind" = xyes]) | ||
35 | |||
36 | WAYLAND_SCANNER_RULES(['$(top_srcdir)/protocol']) | ||
37 | |||
38 | -- | ||
39 | 1.8.3.2 | ||
40 | |||
diff --git a/meta/recipes-graphics/wayland/weston_1.0.6.bb b/meta/recipes-graphics/wayland/weston_1.0.6.bb index cb41e05c46..9dea495ebd 100644 --- a/meta/recipes-graphics/wayland/weston_1.0.6.bb +++ b/meta/recipes-graphics/wayland/weston_1.0.6.bb | |||
@@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=275efac2559a224527bd4fd593d38466 \ | |||
6 | file://src/compositor.c;endline=23;md5=aa98a8db03480fe7d500d0b1f4b8850c" | 6 | file://src/compositor.c;endline=23;md5=aa98a8db03480fe7d500d0b1f4b8850c" |
7 | 7 | ||
8 | SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ | 8 | SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ |
9 | file://0001-autotools-Add-a-libunwind-configure-switch.patch \ | ||
9 | file://weston.png \ | 10 | file://weston.png \ |
10 | file://weston.desktop" | 11 | file://weston.desktop" |
11 | SRC_URI[md5sum] = "63202129d66d5514e572814da5dfa1f7" | 12 | SRC_URI[md5sum] = "63202129d66d5514e572814da5dfa1f7" |
@@ -17,7 +18,7 @@ DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 mtdev jpeg" | |||
17 | DEPENDS += "wayland mesa virtual/egl" | 18 | DEPENDS += "wayland mesa virtual/egl" |
18 | 19 | ||
19 | EXTRA_OECONF = "--disable-android-compositor --enable-setuid-install" | 20 | EXTRA_OECONF = "--disable-android-compositor --enable-setuid-install" |
20 | EXTRA_OECONF += "--disable-tablet-shell --disable-xwayland" | 21 | EXTRA_OECONF += "--disable-tablet-shell --disable-xwayland --disable-libunwind" |
21 | EXTRA_OECONF += "--enable-simple-clients --enable-clients --disable-simple-egl-clients" | 22 | EXTRA_OECONF += "--enable-simple-clients --enable-clients --disable-simple-egl-clients" |
22 | 23 | ||
23 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'kms wayland', '', d)} \ | 24 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'kms wayland', '', d)} \ |