From 4c6de7dc96648db134cff85250026e307d0700b0 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Fri, 15 Jul 2016 10:29:33 +0300 Subject: wayland-protocols: Upgrade 1.3 -> 1.4 Remove backported patch. Signed-off-by: Jussi Kukkonen --- .../wayland-protocols/dont-use-AC_CANONICAL.patch | 29 ---------------------- .../wayland/wayland-protocols_1.3.bb | 20 --------------- .../wayland/wayland-protocols_1.4.bb | 20 +++++++++++++++ 3 files changed, 20 insertions(+), 49 deletions(-) delete mode 100644 meta/recipes-graphics/wayland/wayland-protocols/dont-use-AC_CANONICAL.patch delete mode 100644 meta/recipes-graphics/wayland/wayland-protocols_1.3.bb create mode 100644 meta/recipes-graphics/wayland/wayland-protocols_1.4.bb 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 -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.3.bb deleted file mode 100644 index 86e89b5946..0000000000 --- a/meta/recipes-graphics/wayland/wayland-protocols_1.3.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Collection of additional Wayland protocols" -DESCRIPTION = "Wayland protocols that add functionality not \ -available in the Wayland core protocol. Such protocols either add \ -completely new functionality, or extend the functionality of some other \ -protocol either in Wayland core, or some other protocol in \ -wayland-protocols." -HOMEPAGE = "http://wayland.freedesktop.org" -LICENSE = "MIT" -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" - -inherit allarch autotools pkgconfig - -PACKAGES = "${PN}" -FILES_${PN} += "${datadir}/pkgconfig/wayland-protocols.pc" diff --git a/meta/recipes-graphics/wayland/wayland-protocols_1.4.bb b/meta/recipes-graphics/wayland/wayland-protocols_1.4.bb new file mode 100644 index 0000000000..fcc156fea9 --- /dev/null +++ b/meta/recipes-graphics/wayland/wayland-protocols_1.4.bb @@ -0,0 +1,20 @@ +SUMMARY = "Collection of additional Wayland protocols" +DESCRIPTION = "Wayland protocols that add functionality not \ +available in the Wayland core protocol. Such protocols either add \ +completely new functionality, or extend the functionality of some other \ +protocol either in Wayland core, or some other protocol in \ +wayland-protocols." +HOMEPAGE = "http://wayland.freedesktop.org" +LICENSE = "MIT" +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 \ + " +SRC_URI[md5sum] = "fd8089abf13a1d04e4baa6509ee72baf" +SRC_URI[sha256sum] = "014a9a23c21ed14f49b1005b3e8efa66d6337d4ceafc97f7b0d6707e7e3df572" + +inherit allarch autotools pkgconfig + +PACKAGES = "${PN}" +FILES_${PN} += "${datadir}/pkgconfig/wayland-protocols.pc" -- cgit 1.2.3-korg