wayland-protocols: Switch to i.MX fork for source

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>

4 files changed, 3 insertions, 389 deletions

diff --git a/recipes-graphics/wayland/wayland-protocols/0001-linux-dmabuf-support-passing-buffer-DTRC-meta-to-com.patch b/recipes-graphics/wayland/wayland-protocols/0001-linux-dmabuf-support-passing-buffer-DTRC-meta-to-com.patch
deleted file mode 100644
index 16aabec8..00000000
--- a/recipes-graphics/wayland/wayland-protocols/0001-linux-dmabuf-support-passing-buffer-DTRC-meta-to-com.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 50ea8fbdd1b768ccaa33dfee43b0f12245ef09b8 Mon Sep 17 00:00:00 2001
-From: Haihua Hu <jared.hu@nxp.com>
-Date: Wed, 5 Sep 2018 13:00:47 +0800
-Subject: [PATCH] linux-dmabuf: support passing buffer DTRC meta to compositor
-
-DTRC meta is untilized to pass offset to DTRC in drm dcss driver
-to enable video tile compress
-
-Signed-off-by: Haihua Hu <jared.hu@nxp.com>
----
- unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml | 22 ++++++++++++++++++++++
- 1 file changed, 22 insertions(+)
-
-diff --git a/unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml b/unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml
-index 154afe2..9c955c7 100644
---- a/unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml
-+++ b/unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml
-@@ -343,6 +343,28 @@
-       <arg name="flags" type="uint" summary="see enum flags"/>
-     </request>
- 
-+    <request name="add_dtrc_meta">
-+      <description summary="add dtrc meta in this dmabuf">
-+        This request adds one dmabuf to the set in this
-+        zwp_linux_buffer_params_v1.
-+
-+        The 64-bit unsigned value combined from modifier_hi and modifier_lo
-+        is the dmabuf layout modifier. DRM AddFB2 ioctl calls this the
-+        fb modifier, which is defined in drm_mode.h of Linux UAPI.
-+        This is an opaque token. Drivers use this token to express tiling,
-+        compression, etc. driver-specific modifications to the base format
-+        defined by the DRM fourcc code.
-+
-+        This request raises the PLANE_IDX error if plane_idx is too large.
-+        The error PLANE_SET is raised if attempting to set a plane that
-+        was already set.
-+      </description>
-+      <arg name="rfc_chroma_offset" type="uint"
-+           summary="high 32 bits of DTRC offset"/>
-+      <arg name="rfc_luma_offset" type="uint"
-+           summary="low 32 bits of DTRC offset"/>
-+    </request>
-+
-   </interface>
- 
- </protocol>
--- 
-2.7.4
-
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
deleted file mode 100644
index 55f4cb8f..00000000
--- a/recipes-graphics/wayland/wayland-protocols/0001-unstable-Add-alpha-compositing-protocol.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-From b4be5e338be2301f83f4dfdc0cbb740f0a783464 Mon Sep 17 00:00:00 2001
-From: Haihua Hu <jared.hu@nxp.com>
-Date: Thu, 14 Jun 2018 13:54:08 +0800
-Subject: [PATCH 1/2] unstable: Add alpha-compositing protocol
-
-It's based on the Chromium Wayland protocol of the same name ([1])
-and Alexandros's modified version ([2])with a few changes
-made to the blending_equation enumeration.
-
-Add one more blending_equation "src_alpha / src_alpha"
-
-[1] https://chromium.googlesource.com/chromium/src/+/master/third_party/wayland-protocols/unstable/alpha-compositing/alpha-compositing-unstable-v1.xml
-[2] https://lists.freedesktop.org/archives/wayland-devel/2017-August/034741.html
-
-Upstream-Status: Inappropriate [i.MX specific]
-
-Signed-off-by: Haihua Hu <jared.hu@nxp.com>
----
- Makefile.am                                        |   1 +
- unstable/alpha-compositing/README                  |   6 +
- .../alpha-compositing-unstable-v1.xml              | 136 +++++++++++++++++++++
- 3 files changed, 143 insertions(+)
- create mode 100644 unstable/alpha-compositing/README
- create mode 100644 unstable/alpha-compositing/alpha-compositing-unstable-v1.xml
-
-diff --git a/Makefile.am b/Makefile.am
-index 4b9a901..e6c44ec 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -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)
- 
- stable_protocols =                                                             \
-diff --git a/unstable/alpha-compositing/README b/unstable/alpha-compositing/README
-new file mode 100644
-index 0000000..d874156
---- /dev/null
-+++ b/unstable/alpha-compositing/README
-@@ -0,0 +1,6 @@
-+Alpha compositing protocol
-+
-+Maintainers:
-+David Reveman <reveman at chromium.org>
-+Alexandros Frantzis <alexandros.frantzis at collabora.com>
-+Jared Hu <Jared Hu at nxp.com>
-diff --git a/unstable/alpha-compositing/alpha-compositing-unstable-v1.xml b/unstable/alpha-compositing/alpha-compositing-unstable-v1.xml
-new file mode 100644
-index 0000000..0844b3f
---- /dev/null
-+++ b/unstable/alpha-compositing/alpha-compositing-unstable-v1.xml
-@@ -0,0 +1,136 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<protocol name="alpha_compositing_unstable_v1">
-+
-+  <copyright>
-+    Copyright 2016 The Chromium Authors.
-+    Copyright 2017 Collabora Ltd
-+    Copyright 2018 NXP
-+
-+    Permission is hereby granted, free of charge, to any person obtaining a
-+    copy of this software and associated documentation files (the "Software"),
-+    to deal in the Software without restriction, including without limitation
-+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+    and/or sell copies of the Software, and to permit persons to whom the
-+    Software is furnished to do so, subject to the following conditions:
-+
-+    The above copyright notice and this permission notice (including the next
-+    paragraph) shall be included in all copies or substantial portions of the
-+    Software.
-+
-+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+    DEALINGS IN THE SOFTWARE.
-+  </copyright>
-+
-+  <description summary="Protocol for more advanced compositing and blending">
-+    This protocol specifies a set of interfaces used to control the alpha
-+    compositing and blending of surface contents.
-+
-+    Warning! The protocol described in this file is experimental and backward
-+    incompatible changes may be made. Backward compatible changes may be added
-+    together with the corresponding interface version bump. Backward
-+    incompatible changes are done by bumping the version number in the protocol
-+    and interface names and resetting the interface version. Once the protocol
-+    is to be declared stable, the 'z' prefix and the version number in the
-+    protocol and interface names are removed and the interface version number is
-+    reset.
-+  </description>
-+
-+  <interface name="zwp_alpha_compositing_v1" version="1">
-+    <description summary="alpha_compositing">
-+      The global interface exposing compositing and blending capabilities is
-+      used to instantiate an interface extension for a wl_surface object.
-+      This extended interface will then allow the client to specify the
-+      blending equation and alpha value used for compositing the wl_surface.
-+    </description>
-+
-+    <request name="destroy" type="destructor">
-+      <description summary="unbind from the blending interface">
-+        Informs the server that the client will not be using this
-+        protocol object anymore. This does not affect any other objects,
-+        blending objects included.
-+      </description>
-+    </request>
-+
-+    <enum name="error">
-+      <entry name="blending_exists" value="0"
-+             summary="the surface already has a blending object associated"/>
-+    </enum>
-+
-+    <request name="get_blending">
-+      <description summary="extend surface interface for blending">
-+        Instantiate an interface extension for the given wl_surface to
-+        provide surface blending. If the given wl_surface already has
-+        a blending object associated, the blending_exists protocol error
-+        is raised.
-+      </description>
-+
-+      <arg name="id" type="new_id" interface="zwp_blending_v1"
-+           summary="the new blending interface id"/>
-+      <arg name="surface" type="object" interface="wl_surface"
-+           summary="the surface"/>
-+    </request>
-+  </interface>
-+
-+  <interface name="zwp_blending_v1" version="1">
-+    <description summary="blending interface to a wl_surface">
-+      An additional interface to a wl_surface object, which allows the
-+      client to specify the blending equation used for compositing and
-+      an alpha value applied to the whole surface.
-+
-+      When the blending object is created its blending equation is
-+      'none' and its alpha is 1.0, i.e., it's inactive by default. Clients
-+      can activate it by setting the blending equation and alpha value.
-+
-+      If the wl_surface associated with the blending object is destroyed,
-+      the blending object becomes inert.
-+
-+      If the blending object is destroyed, the blending state is removed
-+      from the wl_surface. The change will be applied on the next
-+      wl_surface.commit.
-+    </description>
-+
-+    <request name="destroy" type="destructor">
-+      <description summary="remove blending from the surface">
-+        The associated wl_surface's blending state is removed.
-+        The change is applied on the next wl_surface.commit.
-+      </description>
-+    </request>
-+
-+    <enum name="blending_equation">
-+      <description summary="different blending equations for compositing">
-+        Blending equations that can be used when compositing a surface.
-+      </description>
-+      <entry name="none" value="0" summary="blending object is inactive"/>
-+      <entry name="opaque" value="1" summary="(one, zero)"/>
-+      <entry name="premultiplied" value="2" summary="(one, one_minus_src_alpha)"/>
-+      <entry name="straight" value="3" summary="(src_alpha, one_minus_src_alpha)" />
-+      <entry name="fromsource" value="4" summary="(src_alpha, src_alpha)" />
-+    </enum>
-+
-+    <request name="set_blending">
-+      <description summary="set the blending equation">
-+        Set the blending equation for compositing the wl_surface.
-+
-+        The blending equation state is double-buffered state,
-+        and will be applied on the next wl_surface.commit.
-+      </description>
-+      <arg name="equation" type="uint" summary="the new blending equation"/>
-+    </request>
-+
-+    <request name="set_alpha">
-+      <description summary="set the alpha value">
-+        Set the alpha value applied to the whole surface for compositing.
-+
-+        The alpha value state is double-buffered state,
-+        and will be applied on the next wl_surface.commit.
-+      </description>
-+      <arg name="value" type="fixed" summary="the new alpha value"/>
-+    </request>
-+  </interface>
-+
-+</protocol>
-\ No newline at end of file
--- 
-2.7.4
-
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
deleted file mode 100644
index 01cac46e..00000000
--- a/recipes-graphics/wayland/wayland-protocols/0002-unstable-Add-hdr10-metadata-protocol.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-From 54e847c10a75ec7bd6fbb8fbdd700d085145cdce Mon Sep 17 00:00:00 2001
-From: Haihua Hu <jared.hu@nxp.com>
-Date: Tue, 26 Jun 2018 15:30:18 +0800
-Subject: [PATCH 2/2] unstable: Add hdr10-metadata protocol
-
-this protocol is used to support hdr10 video playback.
-HDR10 metadata is passed to compositor via this interface
-
-Upstream-Status: Inappropriate [i.MX specific]
-
-Signed-off-by: Haihua Hu <jared.hu@nxp.com>
----
- Makefile.am                                        |  1 +
- unstable/hdr10-metadata/README                     |  4 ++
- .../hdr10-metadata/hdr10-metadata-unstable-v1.xml  | 84 ++++++++++++++++++++++
- 3 files changed, 89 insertions(+)
- create mode 100644 unstable/hdr10-metadata/README
- create mode 100644 unstable/hdr10-metadata/hdr10-metadata-unstable-v1.xml
-
-diff --git a/Makefile.am b/Makefile.am
-index e6c44ec..b8206c7 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -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)
- 
- stable_protocols =                                                             \
-diff --git a/unstable/hdr10-metadata/README b/unstable/hdr10-metadata/README
-new file mode 100644
-index 0000000..58a82f8
---- /dev/null
-+++ b/unstable/hdr10-metadata/README
-@@ -0,0 +1,4 @@
-+hdr10 metadata protocol
-+
-+Maintainers:
-+Jared Hu <Jared Hu at nxp.com>
-diff --git a/unstable/hdr10-metadata/hdr10-metadata-unstable-v1.xml b/unstable/hdr10-metadata/hdr10-metadata-unstable-v1.xml
-new file mode 100644
-index 0000000..5b1bac4
---- /dev/null
-+++ b/unstable/hdr10-metadata/hdr10-metadata-unstable-v1.xml
-@@ -0,0 +1,84 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<protocol name="hdr10_metadata_unstable_v1">
-+
-+  <copyright>
-+    Copyright 2018 NXP
-+
-+    Permission is hereby granted, free of charge, to any person obtaining a
-+    copy of this software and associated documentation files (the "Software"),
-+    to deal in the Software without restriction, including without limitation
-+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+    and/or sell copies of the Software, and to permit persons to whom the
-+    Software is furnished to do so, subject to the following conditions:
-+
-+    The above copyright notice and this permission notice (including the next
-+    paragraph) shall be included in all copies or substantial portions of the
-+    Software.
-+
-+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+    DEALINGS IN THE SOFTWARE.
-+  </copyright>
-+
-+  <description summary="Protocol for sending hdr10 metadata to compositor">
-+    This protocol specifies a set of interfaces used to set and control
-+    hdr10 metadata of video contents.
-+
-+    Warning! The protocol described in this file is experimental and backward
-+    incompatible changes may be made. Backward compatible changes may be added
-+    together with the corresponding interface version bump. Backward
-+    incompatible changes are done by bumping the version number in the protocol
-+    and interface names and resetting the interface version. Once the protocol
-+    is to be declared stable, the 'z' prefix and the version number in the
-+    protocol and interface names are removed and the interface version number is
-+    reset.
-+  </description>
-+
-+  <interface name="zwp_hdr10_metadata_v1" version="1">
-+    <description summary="hdr10_metadata">
-+      The global interface exposing hdr10 metadata capabilities is
-+      used to instantiate an interface extension for compositor.
-+      This extended interface will then allow the client to pass hdr10 metadata
-+      to compositor and send to display driver if supported.
-+    </description>
-+
-+    <request name="destroy" type="destructor">
-+      <description summary="unbind from the hdr10 metadata interface">
-+        Informs the server that the client will not be using this
-+        protocol object anymore. This does not affect any other objects.
-+      </description>
-+    </request>
-+
-+    <enum name="error">
-+      <entry name="sending_meta_error" value="0"
-+             summary="error occurs when compositor handle metadata"/>
-+    </enum>
-+
-+    <request name="set_metadata">
-+      <description summary="interface of setting and controling hdr10 metadata">
-+        client can use this interface pass hdr10 metadata to server. Server need
-+        use the recived metadata to enable hdr mode.
-+      </description>
-+
-+      <arg name="eotf" type="uint" summary="supported eotf"/>
-+      <arg name="type" type="uint" summary="supported type"/>
-+      <arg name="display_primaries_red" type="uint"
-+        summary="display primaries of red, high 16bits for x, and low 16bits for y"/>
-+      <arg name="display_primaries_green" type="uint"
-+        summary="display primaries of green, high 16bits for x, and low 16bits for y"/>
-+      <arg name="display_primaries_blue" type="uint"
-+        summary="display primaries of blue, high 16bits for x, and low 16bits for y"/>
-+      <arg name="white_point" type="uint"
-+        summary="white point, high 16bits for x, and low 16bits for blue"/>
-+      <arg name="mastering_display_luminance" type="uint"
-+        summary="max and min mastering display luminance, high 16 bits for max, and low 16 bits for min"/>
-+      <arg name="max_cll" type="uint" summary="max content light level"/>
-+      <arg name="max_fall" type="uint" summary="max frame average light level"/>
-+    </request>
-+  </interface>
-+
-+</protocol>
--- 
-2.7.4
-
diff --git a/recipes-graphics/wayland/wayland-protocols_1.17.imx.bb b/recipes-graphics/wayland/wayland-protocols_1.17.imx.bb
index 069bbea0..0c82c84d 100644
--- a/recipes-graphics/wayland/wayland-protocols_1.17.imx.bb
+++ b/recipes-graphics/wayland/wayland-protocols_1.17.imx.bb
@@ -9,17 +9,9 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \
                     file://stable/presentation-time/presentation-time.xml;endline=26;md5=4646cd7d9edc9fa55db941f2d3a7dc53"
 
-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 \
-           file://0001-linux-dmabuf-support-passing-buffer-DTRC-meta-to-com.patch \
-           "
-SRC_URI[md5sum] = "55ddd5fdb02b73b9de9559aaec267315"
-SRC_URI[sha256sum] = "df1319cf9705643aea9fd16f9056f4e5b2471bd10c0cc3713d4a4cdc23d6812f"
-S = "${WORKDIR}/${ARCHIVE_NAME}"
-
-UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html"
+SRC_URI = "git://source.codeaurora.org/external/imx/wayland-protocols-imx.git;protocol=https;branch=wayland-protocols-imx-1.17"
+SRCREV = "50ea8fbdd1b768ccaa33dfee43b0f12245ef09b8"
+S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig