Patchwork [4/7] weston: install the examples into weston-examples

login
register
mail settings
Submitter Ross Burton
Date May 31, 2013, 3:08 p.m.
Message ID <5daa7f85f92b90a26bc0791463ba3edd90370f02.1370012830.git.ross.burton@intel.com>
Download mbox | patch
Permalink /patch/50995/
State Accepted
Commit 04234dfc2bc4c1bc4f3840fa9a162b25ba6ba049
Headers show

Comments

Ross Burton - May 31, 2013, 3:08 p.m.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 .../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

Patch

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 0000000..3e2852c
--- /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 <ross.burton@intel.com>
+
+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 cb41e05..dd17c03 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"