diff options
| -rw-r--r-- | meta/recipes-graphics/wayland/weston/install-examples.patch | 18 | ||||
| -rw-r--r-- | meta/recipes-graphics/wayland/weston_1.0.6.bb | 6 |
2 files changed, 23 insertions, 1 deletions
diff --git a/meta/recipes-graphics/wayland/weston/install-examples.patch b/meta/recipes-graphics/wayland/weston/install-examples.patch new file mode 100644 index 0000000000..3e2852ccfb --- /dev/null +++ b/meta/recipes-graphics/wayland/weston/install-examples.patch | |||
| @@ -0,0 +1,18 @@ | |||
| 1 | Install the examples so we can package them. | ||
| 2 | |||
| 3 | Upstream-Status: Pending | ||
| 4 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
| 5 | |||
| 6 | diff --git a/clients/Makefile.am b/clients/Makefile.am | ||
| 7 | index 621c7c3..749ef20 100644 | ||
| 8 | --- a/clients/Makefile.am | ||
| 9 | +++ b/clients/Makefile.am | ||
| 10 | @@ -2,7 +2,7 @@ bin_PROGRAMS = \ | ||
| 11 | weston-info \ | ||
| 12 | $(terminal) | ||
| 13 | |||
| 14 | -noinst_PROGRAMS = \ | ||
| 15 | +bin_PROGRAMS += \ | ||
| 16 | $(clients_programs) \ | ||
| 17 | $(poppler_programs) \ | ||
| 18 | $(simple_clients_programs) \ | ||
diff --git a/meta/recipes-graphics/wayland/weston_1.0.6.bb b/meta/recipes-graphics/wayland/weston_1.0.6.bb index cb41e05c46..dd17c03ad1 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://install-examples.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" |
| @@ -49,7 +50,10 @@ do_install_append() { | |||
| 49 | done | 50 | done |
| 50 | } | 51 | } |
| 51 | 52 | ||
| 52 | FILES_${PN} += "${datadir}/applications ${datadir}/icons" | 53 | PACKAGES += "${PN}-examples" |
| 54 | |||
| 55 | FILES_${PN} = "${bindir}/weston* ${bindir}/wcap-decode ${libexecdir} ${datadir}" | ||
| 56 | FILES_${PN}-examples = "${bindir}/*" | ||
| 53 | 57 | ||
| 54 | RDEPENDS_${PN} += "xkeyboard-config" | 58 | RDEPENDS_${PN} += "xkeyboard-config" |
| 55 | RRECOMMENDS_${PN} = "liberation-fonts" | 59 | RRECOMMENDS_${PN} = "liberation-fonts" |
