diff options
| author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2016-07-15 10:29:33 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-20 10:24:56 +0100 |
| commit | 4c6de7dc96648db134cff85250026e307d0700b0 (patch) | |
| tree | fd795492f3a4f852c76ef70504b9f8eb8892fd37 /meta/recipes-graphics/wayland | |
| parent | 6da724dc9cb72e77aa8b1613c3ad71fefc81903f (diff) | |
| download | openembedded-core-4c6de7dc96648db134cff85250026e307d0700b0.tar.gz openembedded-core-4c6de7dc96648db134cff85250026e307d0700b0.tar.bz2 openembedded-core-4c6de7dc96648db134cff85250026e307d0700b0.zip | |
wayland-protocols: Upgrade 1.3 -> 1.4
Remove backported patch.
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Diffstat (limited to 'meta/recipes-graphics/wayland')
| -rw-r--r-- | meta/recipes-graphics/wayland/wayland-protocols/dont-use-AC_CANONICAL.patch | 29 | ||||
| -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 @@ -Check autoconfs $cross_compiling instead as AC_CANONICAL_HOST call -will fail if the host cpu is not recognised (which can happen when -e.g. Yocto builds for "allarch"). - -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> -Upstream-Status: Backport [cc276dfa41] - -diff --git a/configure.ac b/configure.ac -index 5b48b1a..3d45a4b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -15,13 +15,10 @@ AC_CONFIG_MACRO_DIR([m4]) - - AC_SUBST([WAYLAND_PROTOCOLS_VERSION], [wayland_protocols_version]) - --AC_CANONICAL_HOST --AC_CANONICAL_BUILD -- - AC_ARG_VAR([wayland_scanner], [The wayland-scanner executable]) - AC_PATH_PROG([wayland_scanner], [wayland-scanner]) - if test x$wayland_scanner = x; then -- if test x$host = x$build; then -+ if test "x$cross_compiling" != "xyes"; then - PKG_CHECK_MODULES(WAYLAND_SCANNER, [wayland-scanner]) - wayland_scanner=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner` - else --- -cgit v0.10.2 - 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 \ file://stable/presentation-time/presentation-time.xml;endline=26;md5=4646cd7d9edc9fa55db941f2d3a7dc53" SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ - file://dont-use-AC_CANONICAL.patch" -SRC_URI[md5sum] = "88b5e3dce52908c7e74fad3e2cf8abb0" -SRC_URI[sha256sum] = "6bcd0633fdf9225ef1c7d2831f542e947f7d79811c79fc37f57b2e5375ded82f" + " +SRC_URI[md5sum] = "fd8089abf13a1d04e4baa6509ee72baf" +SRC_URI[sha256sum] = "014a9a23c21ed14f49b1005b3e8efa66d6337d4ceafc97f7b0d6707e7e3df572" inherit allarch autotools pkgconfig |