summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-05-31 11:33:06 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-06-07 16:48:23 +0100
commit1377d9d51c962a10c6a0aef52a428bc216e62481 (patch)
treeb971cfd9ff930f457a0261fb781ce21e7be6f658 /meta/recipes-graphics
parenta9f1a780d728a4317ed923c61ea53f4ada656744 (diff)
downloadpoky-1377d9d51c962a10c6a0aef52a428bc216e62481.tar.gz
weston: install the examples into weston-examples
(From OE-Core rev: 04234dfc2bc4c1bc4f3840fa9a162b25ba6ba049) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/wayland/weston/install-examples.patch18
-rw-r--r--meta/recipes-graphics/wayland/weston_1.0.6.bb6
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 @@
1Install the examples so we can package them.
2
3Upstream-Status: Pending
4Signed-off-by: Ross Burton <ross.burton@intel.com>
5
6diff --git a/clients/Makefile.am b/clients/Makefile.am
7index 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
8SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ 8SRC_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"
11SRC_URI[md5sum] = "63202129d66d5514e572814da5dfa1f7" 12SRC_URI[md5sum] = "63202129d66d5514e572814da5dfa1f7"
@@ -49,7 +50,10 @@ do_install_append() {
49 done 50 done
50} 51}
51 52
52FILES_${PN} += "${datadir}/applications ${datadir}/icons" 53PACKAGES += "${PN}-examples"
54
55FILES_${PN} = "${bindir}/weston* ${bindir}/wcap-decode ${libexecdir} ${datadir}"
56FILES_${PN}-examples = "${bindir}/*"
53 57
54RDEPENDS_${PN} += "xkeyboard-config" 58RDEPENDS_${PN} += "xkeyboard-config"
55RRECOMMENDS_${PN} = "liberation-fonts" 59RRECOMMENDS_${PN} = "liberation-fonts"