[meta-freescale] [PATCH 2/2] Revert "wayland-protocols: Downgrade to 1.13 for i.MX"

Andreas Müller schnitzeltony at gmail.com
Mon Sep 10 05:48:28 PDT 2018


This reverts commit d48643e7826674b2fed265464904272b50698f8d.

1. It does not fetch - there is no mainline wayland-protocols-1.13.imx.tar.xz
   | ERROR: wayland-protocols-1.13.imx-r0 do_fetch: Fetcher failure for URL: 'https://wayland.freedesktop.org/releases/wayland-protocols-1.13.imx.tar.xz'. Unable to fetch URL from any source.
2. I breaks ALL!!! non imx+vivante boards: Our machine override magic does not
   seem to work for allarch - wayland-protocols is allarch. Tested with
   raspberrypi3: Also that wants wayland-protocols-1.13.imx.

Conflicts:
	recipes-graphics/wayland/wayland-protocols_1.13.imx.bb
---
 conf/machine/include/imx-base.inc                   |  4 ----
 .../wayland/wayland-protocols_1.13.imx.bb           | 21 ---------------------
 2 files changed, 25 deletions(-)
 delete mode 100644 recipes-graphics/wayland/wayland-protocols_1.13.imx.bb

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index b0474891..e0e0b470 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -243,10 +243,6 @@ PREFERRED_VERSION_weston_mx6 ?= "4.0.0.imx"
 PREFERRED_VERSION_weston_mx7 ?= "4.0.0.imx"
 PREFERRED_VERSION_weston_mx8 ?= "4.0.0.imx"
 
-PREFERRED_VERSION_wayland-protocols_mx6 ?= "1.13.imx"
-PREFERRED_VERSION_wayland-protocols_mx7 ?= "1.13.imx"
-PREFERRED_VERSION_wayland-protocols_mx8 ?= "1.13.imx"
-
 # Use i.MX libdrm Version
 PREFERRED_VERSION_libdrm_mx6 ?= "2.4.84.imx"
 PREFERRED_VERSION_libdrm_mx7 ?= "2.4.84.imx"
diff --git a/recipes-graphics/wayland/wayland-protocols_1.13.imx.bb b/recipes-graphics/wayland/wayland-protocols_1.13.imx.bb
deleted file mode 100644
index ef8fd730..00000000
--- a/recipes-graphics/wayland/wayland-protocols_1.13.imx.bb
+++ /dev/null
@@ -1,21 +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://0001-unstable-Add-alpha-compositing-protocol.patch \
-           file://0002-unstable-Add-hdr10-metadata-protocol.patch"
-SRC_URI[md5sum] = "29312149dafcd4a0e739ba94995a574d"
-SRC_URI[sha256sum] = "0758bc8008d5332f431b2a84fea7de64d971ce270ed208206a098ff2ebc68f38"
-
-inherit allarch autotools pkgconfig
-
-PACKAGES = "${PN}"
-FILES_${PN} += "${datadir}/pkgconfig/wayland-protocols.pc"
-- 
2.14.4



More information about the meta-freescale mailing list