summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2016-07-15 10:29:33 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-20 10:28:52 +0100
commit534cc8612c0ec4d474daad9dbb09a0d2e9ae2abe (patch)
treee5c15a6c0c5de3f0e5b7c4c6adef6ac5725d20ef /meta/recipes-graphics
parentd18a28c09aaa6c15c806d598e0ae03c5e4ebbd21 (diff)
downloadpoky-534cc8612c0ec4d474daad9dbb09a0d2e9ae2abe.tar.gz
wayland-protocols: Upgrade 1.3 -> 1.4
Remove backported patch. (From OE-Core rev: 4c6de7dc96648db134cff85250026e307d0700b0) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/wayland/wayland-protocols/dont-use-AC_CANONICAL.patch29
-rw-r--r--meta/recipes-graphics/wayland/wayland-protocols_1.4.bb (renamed from meta/recipes-graphics/wayland/wayland-protocols_1.3.bb)6
2 files changed, 3 insertions, 32 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
deleted file mode 100644
index 6cc0f3bfc1..0000000000
--- a/meta/recipes-graphics/wayland/wayland-protocols/dont-use-AC_CANONICAL.patch
+++ /dev/null
@@ -1,29 +0,0 @@
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.4.bb
index 86e89b5946..fcc156fea9 100644
--- a/meta/recipes-graphics/wayland/wayland-protocols_1.3.bb
+++ b/meta/recipes-graphics/wayland/wayland-protocols_1.4.bb
@@ -10,9 +10,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \
10 file://stable/presentation-time/presentation-time.xml;endline=26;md5=4646cd7d9edc9fa55db941f2d3a7dc53" 10 file://stable/presentation-time/presentation-time.xml;endline=26;md5=4646cd7d9edc9fa55db941f2d3a7dc53"
11 11
12SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ 12SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
13 file://dont-use-AC_CANONICAL.patch" 13 "
14SRC_URI[md5sum] = "88b5e3dce52908c7e74fad3e2cf8abb0" 14SRC_URI[md5sum] = "fd8089abf13a1d04e4baa6509ee72baf"
15SRC_URI[sha256sum] = "6bcd0633fdf9225ef1c7d2831f542e947f7d79811c79fc37f57b2e5375ded82f" 15SRC_URI[sha256sum] = "014a9a23c21ed14f49b1005b3e8efa66d6337d4ceafc97f7b0d6707e7e3df572"
16 16
17inherit allarch autotools pkgconfig 17inherit allarch autotools pkgconfig
18 18