From 04234dfc2bc4c1bc4f3840fa9a162b25ba6ba049 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 31 May 2013 11:33:06 +0000 Subject: weston: install the examples into weston-examples Signed-off-by: Ross Burton Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../wayland/weston/install-examples.patch | 18 ++++++++++++++++++ meta/recipes-graphics/wayland/weston_1.0.6.bb | 6 +++++- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-graphics/wayland/weston/install-examples.patch (limited to 'meta/recipes-graphics/wayland') 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 @@ +Install the examples so we can package them. + +Upstream-Status: Pending +Signed-off-by: Ross Burton + +diff --git a/clients/Makefile.am b/clients/Makefile.am +index 621c7c3..749ef20 100644 +--- a/clients/Makefile.am ++++ b/clients/Makefile.am +@@ -2,7 +2,7 @@ bin_PROGRAMS = \ + weston-info \ + $(terminal) + +-noinst_PROGRAMS = \ ++bin_PROGRAMS += \ + $(clients_programs) \ + $(poppler_programs) \ + $(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 \ file://src/compositor.c;endline=23;md5=aa98a8db03480fe7d500d0b1f4b8850c" SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ + file://install-examples.patch \ file://weston.png \ file://weston.desktop" SRC_URI[md5sum] = "63202129d66d5514e572814da5dfa1f7" @@ -49,7 +50,10 @@ do_install_append() { done } -FILES_${PN} += "${datadir}/applications ${datadir}/icons" +PACKAGES += "${PN}-examples" + +FILES_${PN} = "${bindir}/weston* ${bindir}/wcap-decode ${libexecdir} ${datadir}" +FILES_${PN}-examples = "${bindir}/*" RDEPENDS_${PN} += "xkeyboard-config" RRECOMMENDS_${PN} = "liberation-fonts" -- cgit 1.2.3-korg