From 84f5a23a72e1888f7062204a7c2dc13e03343fee Mon Sep 17 00:00:00 2001 From: Carlos Rafael Giani Date: Fri, 24 May 2019 20:04:57 +0200 Subject: [PATCH] wayland-protocols-imx: Upgrade to version 1.17 This is needed for GStreamer 1.16 Wayland support Signed-off-by: Carlos Rafael Giani --- conf/machine/include/imx-base.inc | 6 +++--- .../0001-unstable-Add-alpha-compositing-protocol.patch | 8 ++++---- .../0002-unstable-Add-hdr10-metadata-protocol.patch | 6 +++--- ...rotocols_1.13.imx.bb => wayland-protocols_1.17.imx.bb} | 8 +++++--- 4 files changed, 15 insertions(+), 13 deletions(-) rename recipes-graphics/wayland/{wayland-protocols_1.13.imx.bb => wayland-protocols_1.17.imx.bb} (81%) diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 9e88935c..ffc46c11 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -254,9 +254,9 @@ 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" +PREFERRED_VERSION_wayland-protocols_mx6 ?= "1.17.imx" +PREFERRED_VERSION_wayland-protocols_mx7 ?= "1.17.imx" +PREFERRED_VERSION_wayland-protocols_mx8 ?= "1.17.imx" # Use i.MX libdrm Version PREFERRED_VERSION_libdrm_mx6 ?= "2.4.91.imx" diff --git a/recipes-graphics/wayland/wayland-protocols/0001-unstable-Add-alpha-compositing-protocol.patch b/recipes-graphics/wayland/wayland-protocols/0001-unstable-Add-alpha-compositing-protocol.patch index 10dc2198..55f4cb8f 100644 --- a/recipes-graphics/wayland/wayland-protocols/0001-unstable-Add-alpha-compositing-protocol.patch +++ b/recipes-graphics/wayland/wayland-protocols/0001-unstable-Add-alpha-compositing-protocol.patch @@ -27,10 +27,10 @@ diff --git a/Makefile.am b/Makefile.am index 4b9a901..e6c44ec 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -17,6 +17,7 @@ unstable_protocols = \ - unstable/keyboard-shortcuts-inhibit/keyboard-shortcuts-inhibit-unstable-v1.xml \ - unstable/xdg-output/xdg-output-unstable-v1.xml \ - unstable/input-timestamps/input-timestamps-unstable-v1.xml \ +@@ -23,6 +23,7 @@ unstable_protocols = \ + unstable/xdg-decoration/xdg-decoration-unstable-v1.xml \ + unstable/linux-explicit-synchronization/linux-explicit-synchronization-unstable-v1.xml \ + unstable/primary-selection/primary-selection-unstable-v1.xml \ + unstable/alpha-compositing/alpha-compositing-unstable-v1.xml \ $(NULL) diff --git a/recipes-graphics/wayland/wayland-protocols/0002-unstable-Add-hdr10-metadata-protocol.patch b/recipes-graphics/wayland/wayland-protocols/0002-unstable-Add-hdr10-metadata-protocol.patch index 654e8b09..01cac46e 100644 --- a/recipes-graphics/wayland/wayland-protocols/0002-unstable-Add-hdr10-metadata-protocol.patch +++ b/recipes-graphics/wayland/wayland-protocols/0002-unstable-Add-hdr10-metadata-protocol.patch @@ -21,9 +21,9 @@ diff --git a/Makefile.am b/Makefile.am index e6c44ec..b8206c7 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -18,6 +18,7 @@ unstable_protocols = \ - unstable/xdg-output/xdg-output-unstable-v1.xml \ - unstable/input-timestamps/input-timestamps-unstable-v1.xml \ +@@ -24,6 +24,7 @@ unstable_protocols = \ + unstable/linux-explicit-synchronization/linux-explicit-synchronization-unstable-v1.xml \ + unstable/primary-selection/primary-selection-unstable-v1.xml \ unstable/alpha-compositing/alpha-compositing-unstable-v1.xml \ + unstable/hdr10-metadata/hdr10-metadata-unstable-v1.xml \ $(NULL) diff --git a/recipes-graphics/wayland/wayland-protocols_1.13.imx.bb b/recipes-graphics/wayland/wayland-protocols_1.17.imx.bb similarity index 81% rename from recipes-graphics/wayland/wayland-protocols_1.13.imx.bb rename to recipes-graphics/wayland/wayland-protocols_1.17.imx.bb index 9e087432..d070f03f 100644 --- a/recipes-graphics/wayland/wayland-protocols_1.13.imx.bb +++ b/recipes-graphics/wayland/wayland-protocols_1.17.imx.bb @@ -9,14 +9,16 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \ file://stable/presentation-time/presentation-time.xml;endline=26;md5=4646cd7d9edc9fa55db941f2d3a7dc53" -ARCHIVE_NAME = "${BPN}-1.13" +ARCHIVE_NAME = "${BPN}-1.17" SRC_URI = "https://wayland.freedesktop.org/releases/${ARCHIVE_NAME}.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" +SRC_URI[md5sum] = "55ddd5fdb02b73b9de9559aaec267315" +SRC_URI[sha256sum] = "df1319cf9705643aea9fd16f9056f4e5b2471bd10c0cc3713d4a4cdc23d6812f" S = "${WORKDIR}/${ARCHIVE_NAME}" +UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" + inherit autotools pkgconfig PACKAGES = "${PN}" -- 2.40.1