summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2016-05-16 16:22:49 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-17 21:18:44 +0100
commitaac99fb37faf71b9c14a9932b07c943e232323e8 (patch)
treedca1b75e6d8556d0f2e585db212ab1427b14f9fd /meta
parentc88aee4cde91cc67aee1989cea71c7097acc063e (diff)
downloadpoky-aac99fb37faf71b9c14a9932b07c943e232323e8.tar.gz
wayland-protocols: Add recipe
wayland-protocols is a collection of Wayland protocols split out from weston. It is a build dependency for Weston 1.10. * Added a patch to enable allarch build. * Use HTTPS for tarball uri. (From OE-Core rev: fc1f9c487de5a54a767932bcee7db039e3bcef30) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/wayland/wayland-protocols/dont-use-AC_CANONICAL.patch29
-rw-r--r--meta/recipes-graphics/wayland/wayland-protocols_1.3.bb20
2 files changed, 49 insertions, 0 deletions
diff --git a/meta/recipes-graphics/wayland/wayland-protocols/dont-use-AC_CANONICAL.patch b/meta/recipes-graphics/wayland/wayland-protocols/dont-use-AC_CANONICAL.patch
new file mode 100644
index 0000000000..6cc0f3bfc1
--- /dev/null
+++ b/meta/recipes-graphics/wayland/wayland-protocols/dont-use-AC_CANONICAL.patch
@@ -0,0 +1,29 @@
1Check autoconfs $cross_compiling instead as AC_CANONICAL_HOST call
2will fail if the host cpu is not recognised (which can happen when
3e.g. Yocto builds for "allarch").
4
5Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
6Upstream-Status: Backport [cc276dfa41]
7
8diff --git a/configure.ac b/configure.ac
9index 5b48b1a..3d45a4b 100644
10--- a/configure.ac
11+++ b/configure.ac
12@@ -15,13 +15,10 @@ AC_CONFIG_MACRO_DIR([m4])
13
14 AC_SUBST([WAYLAND_PROTOCOLS_VERSION], [wayland_protocols_version])
15
16-AC_CANONICAL_HOST
17-AC_CANONICAL_BUILD
18-
19 AC_ARG_VAR([wayland_scanner], [The wayland-scanner executable])
20 AC_PATH_PROG([wayland_scanner], [wayland-scanner])
21 if test x$wayland_scanner = x; then
22- if test x$host = x$build; then
23+ if test "x$cross_compiling" != "xyes"; then
24 PKG_CHECK_MODULES(WAYLAND_SCANNER, [wayland-scanner])
25 wayland_scanner=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`
26 else
27--
28cgit v0.10.2
29
diff --git a/meta/recipes-graphics/wayland/wayland-protocols_1.3.bb b/meta/recipes-graphics/wayland/wayland-protocols_1.3.bb
new file mode 100644
index 0000000000..86e89b5946
--- /dev/null
+++ b/meta/recipes-graphics/wayland/wayland-protocols_1.3.bb
@@ -0,0 +1,20 @@
1SUMMARY = "Collection of additional Wayland protocols"
2DESCRIPTION = "Wayland protocols that add functionality not \
3available in the Wayland core protocol. Such protocols either add \
4completely new functionality, or extend the functionality of some other \
5protocol either in Wayland core, or some other protocol in \
6wayland-protocols."
7HOMEPAGE = "http://wayland.freedesktop.org"
8LICENSE = "MIT"
9LIC_FILES_CHKSUM = "file://COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \
10 file://stable/presentation-time/presentation-time.xml;endline=26;md5=4646cd7d9edc9fa55db941f2d3a7dc53"
11
12SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
13 file://dont-use-AC_CANONICAL.patch"
14SRC_URI[md5sum] = "88b5e3dce52908c7e74fad3e2cf8abb0"
15SRC_URI[sha256sum] = "6bcd0633fdf9225ef1c7d2831f542e947f7d79811c79fc37f57b2e5375ded82f"
16
17inherit allarch autotools pkgconfig
18
19PACKAGES = "${PN}"
20FILES_${PN} += "${datadir}/pkgconfig/wayland-protocols.pc"