[for master] [PATCH v2 0/4] Adding support for Wayland for DRM backends

[for master] [PATCH v2 0/4] Adding support for Wayland for DRM backends

[Karthik Ramanan]

This patchset first brings in the default Wayland and Weston 1.3.0
version from the oe-core. Correspondin commit ID in the oe-core
: 7508b61d1cb869233f3d841183edd6fd19d5102e

The remaining two patches, bring in the TI specific adaptions 
to the recipes to use the underlying layers. Note that there are 
some issues with the current omapdrm (kernel driver) 
and related dependencies on the TI platform such as dra7xx.
This patch set aims to provide solution to some of it.

Weston version 1.3.0 has been very highly tested and is 
currently shipping to customers who are using wayland with 
DRM backend. 

This patch set brings in support for Weston and also includes 
patches that help resolve some important issues in the Weston. 
These issues are specific to TI platforms and cannot be 
submitted upstream.


Karthik Ramanan (2):
  wayland: add support for version 1.3.0 for drm backend
  weston: weston 1.3.0 for DRM backend

Ross Burton (2):
  wayland: upgrade to 1.3.0
  weston: upgrade to 1.3.0

 .../recipes-graphics/wayland/wayland.inc           |   5 +
 .../recipes-graphics/wayland/wayland_1.3.0.bb      |  34 +++++
 ...tor-drm-Change-path-of-gbm.h-to-gbm-gbm.h.patch |  26 ++++
 ...e-Include-option-to-search-in-include-drm.patch |  47 +++++++
 ...urce-prevent-input-disable-during-repaint.patch |  34 +++++
 .../0005-temp-hack-to-enable-weston-1.3.patch      |  33 +++++
 .../0006-weston-drm-Enable-multiple-displays.patch |  43 ++++++
 .../recipes-graphics/wayland/weston/pattern.png    | Bin 0 -> 1846 bytes
 .../recipes-graphics/wayland/weston/profile        |   9 ++
 .../recipes-graphics/wayland/weston/terminal.png   | Bin 0 -> 1005 bytes
 .../recipes-graphics/wayland/weston_1.3.0.bb       | 148 +++++++++++++++++++++
 11 files changed, 379 insertions(+)
 create mode 100644 meta-arago-extras/recipes-graphics/wayland/wayland.inc
 create mode 100644 meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb
 create mode 100755 meta-arago-extras/recipes-graphics/wayland/weston/0001-compositor-drm-Change-path-of-gbm.h-to-gbm-gbm.h.patch
 create mode 100755 meta-arago-extras/recipes-graphics/wayland/weston/0002-Makefile-Include-option-to-search-in-include-drm.patch
 create mode 100644 meta-arago-extras/recipes-graphics/wayland/weston/0003-input-source-prevent-input-disable-during-repaint.patch
 create mode 100644 meta-arago-extras/recipes-graphics/wayland/weston/0005-temp-hack-to-enable-weston-1.3.patch
 create mode 100644 meta-arago-extras/recipes-graphics/wayland/weston/0006-weston-drm-Enable-multiple-displays.patch
 create mode 100644 meta-arago-extras/recipes-graphics/wayland/weston/pattern.png
 create mode 100644 meta-arago-extras/recipes-graphics/wayland/weston/profile
 create mode 100644 meta-arago-extras/recipes-graphics/wayland/weston/terminal.png
 create mode 100644 meta-arago-extras/recipes-graphics/wayland/weston_1.3.0.bb

-- 
2.0.1

[for master] [PATCH v2 1/4] wayland: upgrade to 1.3.0

[Karthik Ramanan]

From: Ross Burton <ross.burton@intel.com>

wayland-scanner now uses pkg-config instead of hard-coding paths, so edit the
script to use pkg-config-native.

Based on work by Ewan Le Bideau-Canevet <Ewan.LEBIDEAU-CANEVET@eurogiciel.fr>.

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../recipes-graphics/wayland/wayland_1.3.0.bb      | 36 ++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb

diff --git a/meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb b/meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb
new file mode 100644
index 0000000..212e08a
--- /dev/null
+++ b/meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb
@@ -0,0 +1,36 @@
+SUMMARY = "Wayland, a protocol between a compositor and clients"
+DESCRIPTION = "Wayland is a protocol for a compositor to talk to its clients \
+as well as a C library implementation of that protocol. The compositor can be \
+a standalone display server running on Linux kernel modesetting and evdev \
+input devices, an X application, or a wayland client itself. The clients can \
+be traditional applications, X servers (rootless or fullscreen) or other \
+display servers."
+HOMEPAGE = "http://wayland.freedesktop.org"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=1d4476a7d98dd5691c53d4d43a510c72 \
+                    file://src/wayland-server.c;endline=21;md5=079ae21dbf98ada52ec23744851b0a5c"
+
+SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz"
+SRC_URI[md5sum] = "d16d27081e0871de82d08840c2f133fc"
+SRC_URI[sha256sum] = "2e817685f68a26acd19964d69ddbc4549ba5412114ad95e1a9f5934cce470d6e"
+
+SRC_URI_append_class-native = " file://just-scanner.patch"
+
+inherit autotools pkgconfig
+
+# We need wayland-native for the wayland-scanner utility
+BBCLASSEXTEND = "native"
+
+DEPENDS_virtclass-native = "expat-native libffi-native"
+DEPENDS = "expat libffi wayland-native"
+
+EXTRA_OECONF_virtclass-native = "--disable-documentation"
+EXTRA_OECONF = "--disable-documentation --disable-scanner"
+
+# Wayland installs a M4 macro for other projects to use, which uses the target
+# pkg-config to find files.  Replace pkg-config with pkg-config-native.
+do_install_append_class-native() {
+  sed -e 's,PKG_CHECK_MODULES(.*),,g' \
+      -e 's,$PKG_CONFIG,pkg-config-native,g' \
+      -i ${D}/${datadir}/aclocal/wayland-scanner.m4
+}
-- 
2.0.1

[for master] [PATCH v2 2/4] weston: upgrade to 1.3.0

[Karthik Ramanan]

From: Ross Burton <ross.burton@intel.com>

Remove backported patches that are now integrated.

No need to patch build to install examples with --enable-demo-clients, update
FILES now that all examples are being installed.

Remove cairo-gl option as our cairo doesn't support GL (yet), remove
--disable-android-compositor as it was dropped upstream, and add PACKAGECONFIG
for the VAAPI-based recorder as otherwise it's a floating dependency (libva is
in meta-intel).

Based on work by Ewan Le Bideau-Canevet <Ewan.LEBIDEAU-CANEVET@eurogiciel.fr>.

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Karthik Ramanan <a0393906@ti.com>
---
 .../recipes-graphics/wayland/weston_1.3.0.bb       | 80 ++++++++++++++++++++++
 1 file changed, 80 insertions(+)
 create mode 100644 meta-arago-extras/recipes-graphics/wayland/weston_1.3.0.bb

diff --git a/meta-arago-extras/recipes-graphics/wayland/weston_1.3.0.bb b/meta-arago-extras/recipes-graphics/wayland/weston_1.3.0.bb
new file mode 100644
index 0000000..eb38ce1
--- /dev/null
+++ b/meta-arago-extras/recipes-graphics/wayland/weston_1.3.0.bb
@@ -0,0 +1,80 @@
+SUMMARY = "Weston, a Wayland compositor"
+DESCRIPTION = "Weston is the reference implementation of a Wayland compositor"
+HOMEPAGE = "http://wayland.freedesktop.org"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=275efac2559a224527bd4fd593d38466 \
+                    file://src/compositor.c;endline=23;md5=aa98a8db03480fe7d500d0b1f4b8850c"
+
+SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
+           file://weston.png \
+           file://weston.desktop"
+SRC_URI[md5sum] = "29ad994dd5ea07f52d7bffb24c25d9f7"
+SRC_URI[sha256sum] = "8e4f5b4736358b63d83c3252567ba7aa49cc0da9e2e2c30f59ddf635159702a0"
+
+
+inherit autotools pkgconfig useradd
+
+DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 jpeg"
+DEPENDS += "wayland virtual/mesa virtual/egl pango"
+
+EXTRA_OECONF = "--enable-setuid-install \
+                --disable-tablet-shell \
+                --disable-xwayland \
+                --enable-simple-clients \
+                --enable-clients \
+                --enable-demo-clients \
+                --disable-simple-egl-clients \
+                --disable-libunwind \
+                --disable-rpi-compositor \
+                --disable-rdp-compositor"
+
+
+PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'kms wayland', '', d)} \
+                   ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
+                   ${@base_contains('DISTRO_FEATURES', 'opengles2', 'gles', '', d)} \
+                   ${@base_contains('DISTRO_FEATURES', 'pam', 'launch', '', d)} \
+                  "
+#
+# Compositor choices
+#
+# Weston on KMS
+PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev mesa mtdev"
+# Weston on Wayland (nested Weston)
+PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable-wayland-compositor,mesa"
+# Weston on X11
+PACKAGECONFIG[x11] = "--enable-x11-compositor,--disable-x11-compositor,virtual/libx11 libxcb libxcb libxcursor cairo"
+# Headless Weston
+PACKAGECONFIG[headless] = "--enable-headless-compositor,--disable-headless-compositor"
+# Weston on framebuffer
+PACKAGECONFIG[fbdev] = "--enable-fbdev-compositor,--disable-fbdev-compositor,udev mtdev"
+# weston-launch
+PACKAGECONFIG[launch] = "--enable-weston-launch,--disable-weston-launch,libpam"
+# VA-API desktop recorder
+PACKAGECONFIG[vaapi] = "--enable-vaapi-recorder,--disable-vaapi-recorder,libva"
+
+do_install_append() {
+	# Weston doesn't need the .la files to load modules, so wipe them
+	rm -f ${D}/${libdir}/weston/*.la
+
+	for feature in ${DISTRO_FEATURES}; do
+		# If X11, ship a desktop file to launch it
+		if [ "$feature" = "x11" ]; then
+			install -d ${D}${datadir}/applications
+			install ${WORKDIR}/weston.desktop ${D}${datadir}/applications
+
+			install -d ${D}${datadir}/icons/hicolor/48x48/apps
+			install ${WORKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps
+                fi
+	done
+}
+
+PACKAGES += "${PN}-examples"
+
+FILES_${PN} = "${bindir}/weston ${bindir}/weston-terminal ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode ${libexecdir} ${datadir}"
+FILES_${PN}-examples = "${bindir}/*"
+
+RDEPENDS_${PN} += "xkeyboard-config"
+RRECOMMENDS_${PN} = "liberation-fonts"
+
+USERADD_PACKAGES = "${PN}"
+GROUPADD_PARAM_${PN} = "--system weston-launch"
-- 
2.0.1

[for master] [PATCH v2 3/4] wayland: add support for version 1.3.0 for drm backend

[Karthik Ramanan]

For DRM based devices, it is desired to stick with version 1.3.0
due to some known issues and limitations with omapdrm and other
dependent foundation software

Signed-off-by: Karthik Ramanan <a0393906@ti.com>
---
 .../recipes-graphics/wayland/wayland.inc           |  5 ++++
 .../recipes-graphics/wayland/wayland_1.3.0.bb      | 32 ++++++++++------------
 2 files changed, 20 insertions(+), 17 deletions(-)
 create mode 100644 meta-arago-extras/recipes-graphics/wayland/wayland.inc

diff --git a/meta-arago-extras/recipes-graphics/wayland/wayland.inc b/meta-arago-extras/recipes-graphics/wayland/wayland.inc
new file mode 100644
index 0000000..8eb445d
--- /dev/null
+++ b/meta-arago-extras/recipes-graphics/wayland/wayland.inc
@@ -0,0 +1,5 @@
+HOMEPAGE = "http://wayland.freedesktop.org/"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=1d4476a7d98dd5691c53d4d43a510c72"
+
+inherit autotools pkgconfig
diff --git a/meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb b/meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb
index 212e08a..f40a98b 100644
--- a/meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb
+++ b/meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb
@@ -1,20 +1,4 @@
-SUMMARY = "Wayland, a protocol between a compositor and clients"
-DESCRIPTION = "Wayland is a protocol for a compositor to talk to its clients \
-as well as a C library implementation of that protocol. The compositor can be \
-a standalone display server running on Linux kernel modesetting and evdev \
-input devices, an X application, or a wayland client itself. The clients can \
-be traditional applications, X servers (rootless or fullscreen) or other \
-display servers."
-HOMEPAGE = "http://wayland.freedesktop.org"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=1d4476a7d98dd5691c53d4d43a510c72 \
-                    file://src/wayland-server.c;endline=21;md5=079ae21dbf98ada52ec23744851b0a5c"
-
-SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz"
-SRC_URI[md5sum] = "d16d27081e0871de82d08840c2f133fc"
-SRC_URI[sha256sum] = "2e817685f68a26acd19964d69ddbc4549ba5412114ad95e1a9f5934cce470d6e"
-
-SRC_URI_append_class-native = " file://just-scanner.patch"
+require wayland.inc
 
 inherit autotools pkgconfig
 
@@ -27,6 +11,19 @@ DEPENDS = "expat libffi wayland-native"
 EXTRA_OECONF_virtclass-native = "--disable-documentation"
 EXTRA_OECONF = "--disable-documentation --disable-scanner"
 
+PR = "r3"
+
+COMPATIBLE_MACHINE = "dra7xx-evm"
+
+SRC_URI = "git://anongit.freedesktop.org/wayland/wayland;protocol=git"
+SRC_URI_append_class-native = " file://just-scanner.patch"
+
+S = "${WORKDIR}/git"
+
+FILESEXTRAPATHS_prepend := "${THISDIR}:"
+
+SRCREV = "2c3dbb89031f120fb191492634e53a583f99d57d"
+
 # Wayland installs a M4 macro for other projects to use, which uses the target
 # pkg-config to find files.  Replace pkg-config with pkg-config-native.
 do_install_append_class-native() {
@@ -34,3 +31,4 @@ do_install_append_class-native() {
       -e 's,$PKG_CONFIG,pkg-config-native,g' \
       -i ${D}/${datadir}/aclocal/wayland-scanner.m4
 }
+
-- 
2.0.1

[for master] [PATCH v2 4/4] weston: weston 1.3.0 for DRM backend

[Karthik Ramanan]

On devices where the backend is chosen as DRM, as in the case
of dra7xx, there are some addition patches that are specific
to the omapdrm which are needed for basic functionality and
some bug fixes.

This will fully enable
* multiple display support
* Handle screensavers more efficient
* Be compatible with libgbm, TI adaptation of libgbm

Signed-off-by: Karthik Ramanan <a0393906@ti.com>
---
 ...tor-drm-Change-path-of-gbm.h-to-gbm-gbm.h.patch |  26 ++++++
 ...e-Include-option-to-search-in-include-drm.patch |  47 ++++++++++
 ...urce-prevent-input-disable-during-repaint.patch |  34 +++++++
 .../0005-temp-hack-to-enable-weston-1.3.patch      |  33 +++++++
 .../0006-weston-drm-Enable-multiple-displays.patch |  43 +++++++++
 .../recipes-graphics/wayland/weston/pattern.png    | Bin 0 -> 1846 bytes
 .../recipes-graphics/wayland/weston/profile        |   9 ++
 .../recipes-graphics/wayland/weston/terminal.png   | Bin 0 -> 1005 bytes
 .../recipes-graphics/wayland/weston_1.3.0.bb       |  98 +++++++++++++++++----
 9 files changed, 275 insertions(+), 15 deletions(-)
 create mode 100755 meta-arago-extras/recipes-graphics/wayland/weston/0001-compositor-drm-Change-path-of-gbm.h-to-gbm-gbm.h.patch
 create mode 100755 meta-arago-extras/recipes-graphics/wayland/weston/0002-Makefile-Include-option-to-search-in-include-drm.patch
 create mode 100644 meta-arago-extras/recipes-graphics/wayland/weston/0003-input-source-prevent-input-disable-during-repaint.patch
 create mode 100644 meta-arago-extras/recipes-graphics/wayland/weston/0005-temp-hack-to-enable-weston-1.3.patch
 create mode 100644 meta-arago-extras/recipes-graphics/wayland/weston/0006-weston-drm-Enable-multiple-displays.patch
 create mode 100644 meta-arago-extras/recipes-graphics/wayland/weston/pattern.png
 create mode 100644 meta-arago-extras/recipes-graphics/wayland/weston/profile
 create mode 100644 meta-arago-extras/recipes-graphics/wayland/weston/terminal.png

diff --git a/meta-arago-extras/recipes-graphics/wayland/weston/0001-compositor-drm-Change-path-of-gbm.h-to-gbm-gbm.h.patch b/meta-arago-extras/recipes-graphics/wayland/weston/0001-compositor-drm-Change-path-of-gbm.h-to-gbm-gbm.h.patch
new file mode 100755
index 0000000..cd0581a
--- /dev/null
+++ b/meta-arago-extras/recipes-graphics/wayland/weston/0001-compositor-drm-Change-path-of-gbm.h-to-gbm-gbm.h.patch
@@ -0,0 +1,26 @@
+From 5f655cb89813e39d6410493b4725e447212ea3a3 Mon Sep 17 00:00:00 2001
+From: Mrinmayee Hingolikar <mrinmayee@ti.com>
+Date: Tue, 24 Sep 2013 19:13:50 +0530
+Subject: [PATCH] compositor-drm: Change path of gbm.h to gbm/gbm.h
+
+Signed-off-by: Mrinmayee Hingolikar <mrinmayee@ti.com>
+---
+ src/compositor-drm.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/compositor-drm.c b/src/compositor-drm.c
+index f055118..7a59872 100644
+--- a/src/compositor-drm.c
++++ b/src/compositor-drm.c
+@@ -35,7 +35,7 @@
+ #include <xf86drmMode.h>
+ #include <drm_fourcc.h>
+ 
+-#include <gbm.h>
++#include <gbm/gbm.h>
+ #include <libbacklight.h>
+ #include <libudev.h>
+ 
+-- 
+1.7.9.5
+
diff --git a/meta-arago-extras/recipes-graphics/wayland/weston/0002-Makefile-Include-option-to-search-in-include-drm.patch b/meta-arago-extras/recipes-graphics/wayland/weston/0002-Makefile-Include-option-to-search-in-include-drm.patch
new file mode 100755
index 0000000..557373d
--- /dev/null
+++ b/meta-arago-extras/recipes-graphics/wayland/weston/0002-Makefile-Include-option-to-search-in-include-drm.patch
@@ -0,0 +1,47 @@
+From c8b6fe71ad0231c4787836f4156e604cedfe45a8 Mon Sep 17 00:00:00 2001
+From: Mrinmayee Hingolikar <mrinmayee@ti.com>
+Date: Thu, 3 Jul 2014 15:06:31 +0530
+Subject: [PATCH] Makefile change to search for correct drm headers
+
+Signed-off-by: Mrinmayee Hingolikar <mrinmayee@ti.com>
+---
+ src/Makefile.am   | 3 ++-
+ tests/Makefile.am | 1 +
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 749c074..a6e44e7 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -2,6 +2,7 @@ bin_PROGRAMS = weston				\
+ 	$(weston_launch)
+ 
+ AM_CPPFLAGS =					\
++        $(DRM_COMPOSITOR_CFLAGS)                \
+ 	-I$(top_srcdir)/shared			\
+ 	-DDATADIR='"$(datadir)"'		\
+ 	-DMODULEDIR='"$(moduledir)"'		\
+@@ -9,7 +10,7 @@ AM_CPPFLAGS =					\
+ 	-DIN_WESTON
+ 
+ weston_LDFLAGS = -export-dynamic
+-weston_CFLAGS = $(GCC_CFLAGS) $(COMPOSITOR_CFLAGS) $(LIBUNWIND_CFLAGS)
++weston_CFLAGS = $(GCC_CFLAGS) $(COMPOSITOR_CFLAGS) $(LIBUNWIND_CFLAGS) 
+ weston_LDADD = $(COMPOSITOR_LIBS) $(LIBUNWIND_LIBS) \
+ 	$(DLOPEN_LIBS) -lm ../shared/libshared.la
+ 
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 5be52c6..42ebd2b 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -47,6 +47,7 @@ AM_CPPFLAGS =					\
+ 	-I$(top_srcdir)/shared			\
+ 	-I$(top_builddir)/src			\
+ 	-DUNIT_TEST				\
++	$(DRM_COMPOSITOR_CFLAGS)                \
+ 	$(COMPOSITOR_CFLAGS)
+ 
+ surface_global_test_la_SOURCES = surface-global-test.c
+-- 
+2.0.1
+
diff --git a/meta-arago-extras/recipes-graphics/wayland/weston/0003-input-source-prevent-input-disable-during-repaint.patch b/meta-arago-extras/recipes-graphics/wayland/weston/0003-input-source-prevent-input-disable-during-repaint.patch
new file mode 100644
index 0000000..74e82fb
--- /dev/null
+++ b/meta-arago-extras/recipes-graphics/wayland/weston/0003-input-source-prevent-input-disable-during-repaint.patch
@@ -0,0 +1,34 @@
+From cdd9043580e0f0a6c60c21b955f1966c78b2098b Mon Sep 17 00:00:00 2001
+From: Karthik Ramanan <a0393906@ti.com>
+Date: Mon, 2 Dec 2013 15:52:41 +0530
+Subject: [PATCH] input source: prevent input disable during repaint
+
+Under certain race conditions, the input source was getting
+disabled which was preventing the evdev events from keyboard or
+mouse to reach Weston. The side effect of this issue was
+that after the screen gets locked, it was not possible to
+come to Weston desktop without killing Weston.
+
+Signed-off-by: Karthik Ramanan <a0393906@ti.com>
+---
+ src/compositor.c |    4 ----
+ 1 files changed, 0 insertions(+), 4 deletions(-)
+
+diff --git a/src/compositor.c b/src/compositor.c
+index 0e0835f..ced3883 100644
+--- a/src/compositor.c
++++ b/src/compositor.c
+@@ -1084,10 +1084,6 @@ weston_output_schedule_repaint(struct weston_output *output)
+ 	wl_event_loop_add_idle(loop, idle_repaint, output);
+ 	output->repaint_scheduled = 1;
+ 
+-	if (compositor->input_loop_source) {
+-		wl_event_source_remove(compositor->input_loop_source);
+-		compositor->input_loop_source = NULL;
+-	}
+ }
+ 
+ WL_EXPORT void
+-- 
+1.7.0.4
+
diff --git a/meta-arago-extras/recipes-graphics/wayland/weston/0005-temp-hack-to-enable-weston-1.3.patch b/meta-arago-extras/recipes-graphics/wayland/weston/0005-temp-hack-to-enable-weston-1.3.patch
new file mode 100644
index 0000000..0c860b3
--- /dev/null
+++ b/meta-arago-extras/recipes-graphics/wayland/weston/0005-temp-hack-to-enable-weston-1.3.patch
@@ -0,0 +1,33 @@
+From 518fe5aea452a4660e07855716349a0c84e59b14 Mon Sep 17 00:00:00 2001
+From: Karthik Ramanan <a0393906@ti.com>
+Date: Tue, 21 Jan 2014 11:48:19 +0000
+Subject: [PATCH] temp-hack: to enable weston 1.3
+
+This patch resolves the issue with the black display seen
+when running weston 1.3 version on the dra7xx target.
+
+Known issues:
+1. simple-egl application does not work
+2. weston on multiple displays does not work
+
+Signed-off-by: Karthik Ramanan <a0393906@ti.com>
+---
+ src/compositor-drm.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/compositor-drm.c b/src/compositor-drm.c
+index 0ac5efa..dd28f0f 100644
+--- a/src/compositor-drm.c
++++ b/src/compositor-drm.c
+@@ -616,7 +616,7 @@ drm_output_repaint(struct weston_output *output_base,
+ 			.request.sequence = 1,
+ 		};
+ 
+-		if ((!s->current && !s->next) ||
++		if ((!s->current && !s->next) &&
+ 		    !drm_sprite_crtc_supported(output_base, s->possible_crtcs))
+ 			continue;
+ 
+-- 
+1.7.9.5
+
diff --git a/meta-arago-extras/recipes-graphics/wayland/weston/0006-weston-drm-Enable-multiple-displays.patch b/meta-arago-extras/recipes-graphics/wayland/weston/0006-weston-drm-Enable-multiple-displays.patch
new file mode 100644
index 0000000..abc4295
--- /dev/null
+++ b/meta-arago-extras/recipes-graphics/wayland/weston/0006-weston-drm-Enable-multiple-displays.patch
@@ -0,0 +1,43 @@
+From dce69cadd858bd959dd41edf82860cd370ca1fa8 Mon Sep 17 00:00:00 2001
+From: Karthik Ramanan <a0393906@ti.com>
+Date: Fri, 14 Mar 2014 18:55:12 +0530
+Subject: [PATCH] weston-drm: Enable multiple displays
+
+We are currently seeing an issue with missing VBlanks for LCD and
+HDMI connectors which leads to display not getting refreshed.
+This patch can be considered as a workaround.
+
+Signed-off-by: Karthik Ramanan <a0393906@ti.com>
+---
+ src/compositor-drm.c |    8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/compositor-drm.c b/src/compositor-drm.c
+index 79dcc6c..ef2fbd2 100644
+--- a/src/compositor-drm.c
++++ b/src/compositor-drm.c
+@@ -709,6 +709,7 @@ page_flip_handler(int fd, unsigned int frame,
+ {
+ 	struct drm_output *output = (struct drm_output *) data;
+ 	uint32_t msecs;
++	uint32_t bail;
+ 
+ 	/* We don't set page_flip_pending on start_repaint_loop, in that case
+ 	 * we just want to page flip to the current buffer to get an accurate
+@@ -721,7 +722,12 @@ page_flip_handler(int fd, unsigned int frame,
+ 
+ 	output->page_flip_pending = 0;
+ 
+-	if (!output->vblank_pending) {
++	if (output->vblank_pending) {
++		weston_log("VBlank is pending for connector = %d, frame = %d\n", output->connector_id, frame);
++		bail = 1;
++	}
++
++	if (!output->vblank_pending || bail) {
+ 		msecs = sec * 1000 + usec / 1000;
+ 		weston_output_finish_frame(&output->base, msecs);
+ 
+-- 
+1.7.9.5
+
diff --git a/meta-arago-extras/recipes-graphics/wayland/weston/pattern.png b/meta-arago-extras/recipes-graphics/wayland/weston/pattern.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ac8986d6721b4c19794f1d24e513af7015aa395
GIT binary patch
literal 1846
zcmV-62g&$}P)<h;3K|Lk000e1NJLTq0027x001Hg0ssI2Zk{%`00009a7bBm000XU
z000XU0RWnu7ytkO2XskIMF-pg859yTWl~)@000KnNkl<ZSi`MY+mh=l4h1B@j?;Vp
z>r~C#{PdYlVhp;R2PK4doYbCEL-j*f%te=_#S;EM|Na*MoK7bnf^%-$wyhNBoO5nj
z&Vb;K#()3%%Y7VqnsUyszpKdi_jjM8s&(5wpVddJZC!8Zy+19B_x`?1&cTOuy*cN$
zt(<WAutf+V=Lr#f2u$2st+jT`4wr1(X8+9dDW+%^hY-x%Qc8+3035nn%Icg8IZxeO
z8!^QgqjQdks8L_A-fs8*Rh@Gw=jD8kDOz#>VVdW8KHcNdnoS!A6Prsh#+agW&U-)4
zr_<@a%6oskUh7tO3x)Z1yV-^zMtpT>nrCxkU2no{v1zSYgj8gnPt&w_)x4di*}UrL
z8cx05_n)S5$rw~sEoHrYf4AD0n2Ad%*Xxy;Z30?^cEfugW308R>h*d}Ik(oFbJSYS
zIRG3c&PK|Ks1cEcGw19>XtkBHT99Ilhll=fPsEV<I`G{Z#Arv3(dvm7W>x3CJ2V|J
z5|MMR)+e&ZukL>w-ur&^fyKfc0A4fhoI^xaE$eC__uhZ~`t>>u0Gx9WK%L4<35NFp
zW}-f)FZAB0n6`Q^S!}gg5%dbXTrTf+1i;$>snhA0Nr=fg$HG&dYO5k*{#%@0E3(%m
zJuLRlr<j<@`w$UjSc0Xj0HG(>hk%HEW%oFyq^d03%>{r%24&*<pfFX<F^OvMzP8G$
zMw)=jE{Aoi+g5gof)2USVpY9dE_s?#O18^<I*ox0AuQ*!eG-0J!_3#q1rYn$s>(!t
zp(WILAH28xu++W~V+=m1Q&pwbM(}v=5pjp(4(0oYt(3ZLF-9xx<$M<AM#MyjvD*{?
z#tbm?Xy2Y~hJ_Zh>@zd7u!wZef7A(J2mxNI*`RD|!}x0m;2wZu7GYLZQE~sLp{lC#
z4#&<pQBl>y31*3^qS-o4bFV*PzFx0SA`{6e8H0|+;hak;h44fhGmCKN#M)~1xibS1
zHENx6Vodf)M2MP^kBEo}F{Q`XZf<RNmc$XJHu`<oXJ0NCGi%%h0H%5VQ7Z`M#^|uB
zGBW^(-0>4*oFCV+a}FHD6!Q=!RV8XE<<W*G4b1atG*_5KB!n>jsH#LnL;#pl>Je?V
z9mpeqoTq!)Ik(lVQ7c>N3>9NKT(vCA0MS51Wh=GT9ixXGLj{0ezki><z7DyTs7>>n
zAFANpMS4$&54F`X*iQmERDuAez>LcqHRIE9lTWwwA^eRQa?U9wVF}^*Y@5cyotVZr
zG4neq8~|KvyVFMyf3lb!RRRDhWz#V|Jl^{c0=zzM)M=ViP6oDhUCk4sW<UP3fhzK<
zq*TO8K7?R;pM~qTSv4>*F&(xTrb{iNd78Rq0pPSOb}<nV6MybFQc8#sBdQ1ycircl
z3$-0o&$_M;<#4adoKj~%K-fyTU9Yc=MsK>j_dA!o_w$2Wtefado_&LA2w_>y(>!BD
zQw=f2^Ve7B&``Hce%@PUU5#{8N~7M`rILugzrV}6n(l73UB17&F6}k6r;%wgD3^7$
zWNxLb>zz-%_sjX9;j`AxxD`#a&-2MrP)cc!sCOd!Fb);4d3c=e7|knd7Y0GX81Ws_
zdVh7jUeFfwerD8b9~zB6k>1A>LI40O!S(`3Gu?Y1AiR<wAb9W5^oJ?hKh)hLibm;;
zfZqFl6(7*0st@6ij{yQT>hS0!^UCyhc8eJ8q#mRXp(;bm88I@ms+yebyw+;nrFbjl
z5I<%Iv-CV8;-R^A;TtL>#;0Vl{=_cfu|0V_8kC*hKP)m4DeF24kKQ=$+Au)eU7w?(
z_|appYu9dJgh5aAy55+R4*>$OurTkCXL9x@mVh51skJimG|g7~7;&CYqh(|2$IWlI
zYyA1nBFsc|SM&%Ne+vE_6PY@G+#|2$g@AC>y;|>Jn*H8xTrVMnlyb@`rik$uHDV@a
z9#fxE9>dXEbM3eug1!iLy~}6){GK3(?^LR<k{l5`|Eq}kBk~U$1!R%h+DN@y-8!Gg
zl;Y!gp;5DjOjTK#g@Iwm*^OwVofzXZO`V&|x{gV!TkT=)CEFWee6WHkxb~2p_z3G=
zaE*kzEXxQcK+v4WlDBC6Y!;r8v$w$UWpanHQr6b0Ro+<5({#V02fc<lXLHzU4q9uq
zRr~9V6OKB>X`V-NP}N$uvh4{35qCUeVsO`WGIQNFYHb<bSGTPka;v=tJ~}O?Kh)i(
zj|Uhu7E#qkt=4KAI_CiQI(9yte*ONvoX`03$<n<%l*7C3=6Qp#@H<uhR(Br>|HFO$
kxK|L<X!fG_PKy%J-z0HV3sWdKrT_o{07*qoM6N<$g6D&ck^lez

literal 0
HcmV?d00001

diff --git a/meta-arago-extras/recipes-graphics/wayland/weston/profile b/meta-arago-extras/recipes-graphics/wayland/weston/profile
new file mode 100644
index 0000000..69564f2
--- /dev/null
+++ b/meta-arago-extras/recipes-graphics/wayland/weston/profile
@@ -0,0 +1,9 @@
+if test -z "${XDG_RUNTIME_DIR}"; then
+    export XDG_RUNTIME_DIR=/tmp/${UID}-runtime-dir
+    if ! test -d "${XDG_RUNTIME_DIR}"; then
+        mkdir "${XDG_RUNTIME_DIR}"
+        chmod 0700 "${XDG_RUNTIME_DIR}"
+    fi
+else 
+   echo "Doing nothing"
+fi
diff --git a/meta-arago-extras/recipes-graphics/wayland/weston/terminal.png b/meta-arago-extras/recipes-graphics/wayland/weston/terminal.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c02dd2100aa31389ace70cbf649215a982674b2
GIT binary patch
literal 1005
zcmV<J0}}j+P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H101k9TSaeirbZlh+RAq8)X>MU`)%&240000NbVXQnL3MO!Z*l-k
zVQ_CCLt$)TZDDR?a%E}Xks2xh001d;MObu1WpiV4X>fFDZ*BlWVRL0<Aa7<MN?~ht
zVjxp=Wod3@awl^jcW-iQC(|dH0008`Nkl<ZNQu3aJ#QRk6osGnV|J6^*!u-G4F<Ug
z73p`8V);klAd!Ls(I5)`1_h!-6i7fpD&z<uf-S*+NEDPHAt8hViDO&q-I;gh{kRnS
z;ay^&@P;$G(u_27&fIg)dzFarETNw%`~M+e0p5A{?XO~t+lwSN#@zh$lh3YOfEeTU
z`|o`~mSs<swRY~_7(<K^@BOqw2y@R>Rq@fsA8rFv0hCf)+uB;l-~X_;M~o2|Ta;2_
zlBOq*9!+1=TBDSr_j-@UN`pMldGPZC9_~M+exXjU+rv3Wzu#v#95NgZao&?sBBgY;
zz)E9<8*kmfImgbeTPOvqt7~YjP(~v_tJCJyD_6L@vW&470HrlbE8OAHoPZu#bShAJ
z&*xu$!E0Bqa{Kmopf!S!JICY42joS8HimZRd5WSSAD43l!#oE-M2PWk9Zb+{wdi%b
zbh};d+`Y@%i)&=H8UpwfXm#4GzqC%RUPD9(DG^g7N+OC-xRP1Ur!4XzaCm&o8*g66
z2T!Nn=43FS@}9$^Bed2mEiEw^4souaC>(j7PiHXcU`}AxqGq$n{{B7}FJ0m}qj_ax
zgLbn;?s5(epU`P{u(b>ku(cXljMUQw;+W7C?re*uGYB4wV3c5#;pO#p8jU8-72Laj
zA8if&lRm!klvPDpI*L4}sz&GG%nnkDGbw6}4wSW6W4QCvJrqz@6{|0-l4TjuXcCYy
z`o`Fd7y=;#PLBIyfthnKYmxUAGIN~_1{h;7#!&hSS32T2hA~EB3{&#p{eP$E^71m7
zwU{i!&a4M*G+OIvLQ)(FOo*fR_z?K>_dotUMP*r%M6iIU)3RE@*pehdNRbc&A&mEt
z_xP&%rx~0I{PxSQoELKfN-4Fubq#=Tc6QE9J`tFmL6%ZtcW;->W(yJUVYKj+QpN(c
zs;qw8-TQuXA?#y_$hUx1z(rsK*aQrq&dUvW;A`MOjY(@jeF5YXB%lC-5)qVAYJubv
bh=|Bv8b1-Z;i*mk00000NkvXXu0mjftX;i`

literal 0
HcmV?d00001

diff --git a/meta-arago-extras/recipes-graphics/wayland/weston_1.3.0.bb b/meta-arago-extras/recipes-graphics/wayland/weston_1.3.0.bb
index eb38ce1..c34b35e 100644
--- a/meta-arago-extras/recipes-graphics/wayland/weston_1.3.0.bb
+++ b/meta-arago-extras/recipes-graphics/wayland/weston_1.3.0.bb
@@ -5,28 +5,45 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=275efac2559a224527bd4fd593d38466 \
                     file://src/compositor.c;endline=23;md5=aa98a8db03480fe7d500d0b1f4b8850c"
 
-SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
+SRC_URI = "git://anongit.freedesktop.org/wayland/weston;protocol=git \
            file://weston.png \
-           file://weston.desktop"
-SRC_URI[md5sum] = "29ad994dd5ea07f52d7bffb24c25d9f7"
-SRC_URI[sha256sum] = "8e4f5b4736358b63d83c3252567ba7aa49cc0da9e2e2c30f59ddf635159702a0"
+           file://weston.desktop \
+           file://terminal.png \
+           file://pattern.png \
+           file://profile \
+           file://0001-compositor-drm-Change-path-of-gbm.h-to-gbm-gbm.h.patch \
+           file://0002-Makefile-Include-option-to-search-in-include-drm.patch \
+	   file://0003-input-source-prevent-input-disable-during-repaint.patch \
+	   file://0005-temp-hack-to-enable-weston-1.3.patch \
+	   file://0006-weston-drm-Enable-multiple-displays.patch "
+          
 
+SRCREV = "95659c03219b057d9d703b04cf89bc0329ce947a" 
+
+S = "${WORKDIR}/git"
+
+PR = "r1"
 
 inherit autotools pkgconfig useradd
 
-DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 jpeg"
-DEPENDS += "wayland virtual/mesa virtual/egl pango"
+DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 jpeg mtdev libpam"
+DEPENDS += "wayland libgbm omap5-sgx-ddk-um-linux pango"
 
-EXTRA_OECONF = "--enable-setuid-install \
+COMPATIBLE_MACHINE = "dra7xx-evm"
+
+EXTRA_OECONF = "--disable-android-compositor \
+                 --disable-simple-egl-clients \
+                 --enable-fbdev-compositor \
+                --enable-setuid-install \
                 --disable-tablet-shell \
                 --disable-xwayland \
                 --enable-simple-clients \
                 --enable-clients \
-                --enable-demo-clients \
-                --disable-simple-egl-clients \
                 --disable-libunwind \
                 --disable-rpi-compositor \
-                --disable-rdp-compositor"
+                --disable-rdp-compositor \
+                --prefix=${STAGING_DIR_TARGET} \
+                --with-libtool-sysroot=${STAGING_DIR_TARGET}"
 
 
 PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'kms wayland', '', d)} \
@@ -38,9 +55,9 @@ PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'kms wayland',
 # Compositor choices
 #
 # Weston on KMS
-PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev mesa mtdev"
+PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev libgbm mtdev"
 # Weston on Wayland (nested Weston)
-PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable-wayland-compositor,mesa"
+PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable-wayland-compositor,libgbm"
 # Weston on X11
 PACKAGECONFIG[x11] = "--enable-x11-compositor,--disable-x11-compositor,virtual/libx11 libxcb libxcb libxcursor cairo"
 # Headless Weston
@@ -49,8 +66,10 @@ PACKAGECONFIG[headless] = "--enable-headless-compositor,--disable-headless-compo
 PACKAGECONFIG[fbdev] = "--enable-fbdev-compositor,--disable-fbdev-compositor,udev mtdev"
 # weston-launch
 PACKAGECONFIG[launch] = "--enable-weston-launch,--disable-weston-launch,libpam"
-# VA-API desktop recorder
-PACKAGECONFIG[vaapi] = "--enable-vaapi-recorder,--disable-vaapi-recorder,libva"
+# Use cairo-gl or cairo-glesv2
+PACKAGECONFIG[gles] = "--with-cairo-glesv2,,virtual/libgles2"
+
+
 
 do_install_append() {
 	# Weston doesn't need the .la files to load modules, so wipe them
@@ -66,15 +85,64 @@ do_install_append() {
 			install ${WORKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps
                 fi
 	done
+        install ${WORKDIR}/terminal.png ${D}${datadir}/icons/hicolor/48x48/apps
+        install ${WORKDIR}/pattern.png ${D}${datadir}/icons/hicolor/48x48/apps
+
+        mkdir -p ${D}/usr/bin/weston-clients
+        cp ${S}/clients/weston-calibrator ${D}/usr/bin/weston-clients/
+        cp ${S}/clients/weston-clickdot ${D}/usr/bin/weston-clients/
+        cp ${S}/clients/weston-cliptest ${D}/usr/bin/weston-clients/
+        cp ${S}/clients/weston-dnd ${D}/usr/bin/weston-clients/
+        cp ${S}/clients/weston-editor ${D}/usr/bin/weston-clients/
+        cp ${S}/clients/weston-eventdemo ${D}/usr/bin/weston-clients/
+        cp ${S}/clients/weston-flower ${D}/usr/bin/weston-clients/
+        cp ${S}/clients/weston-fullscreen ${D}/usr/bin/weston-clients/
+        cp ${S}/clients/weston-image ${D}/usr/bin/weston-clients/
+        cp ${S}/clients/weston-keyboard ${D}/usr/bin/weston-clients/
+        cp ${S}/clients/weston-multi-resource ${D}/usr/bin/weston-clients/
+        cp ${S}/clients/weston-resizor ${D}/usr/bin/weston-clients/
+        cp ${S}/clients/weston-simple-egl ${D}/usr/bin/weston-clients/
+        cp ${S}/clients/weston-simple-im ${D}/usr/bin/weston-clients/
+        cp ${S}/clients/weston-simple-shm ${D}/usr/bin/weston-clients/
+        cp ${S}/clients/weston-simple-touch ${D}/usr/bin/weston-clients/
+        cp ${S}/clients/weston-smoke ${D}/usr/bin/weston-clients/
+        cp ${S}/clients/weston-subsurfaces ${D}/usr/bin/weston-clients/
+        cp ${S}/clients/weston-desktop-shell ${D}/usr/bin/weston-clients/
+        cp ${S}/clients/weston-info ${D}/usr/bin/weston-clients/
+        cp ${S}/clients/weston-screenshooter ${D}/usr/bin/weston-clients/
+        cp ${S}/clients/weston-tablet-shell ${D}/usr/bin/weston-clients/
+        cp ${S}/clients/weston-terminal ${D}/usr/bin/weston-clients/
+        cp ${S}/clients/weston-transformed ${D}/usr/bin/weston-clients/
+
+        mkdir -p ${D}/usr/libexec
+        cp ${S}/clients/weston-desktop-shell ${D}/usr/libexec/
+        cp ${S}/clients/weston-screenshooter ${D}/usr/libexec/
+        cp ${S}/clients/weston-tablet-shell ${D}/usr/libexec/
+
+	mkdir -p ${D}/home/root
+        mkdir -p ${D}/home/root/.config
+        cp ${S}/weston.ini ${D}/home/root/.config/
+        cp ${WORKDIR}/profile ${D}/home/root/.profile
+
+}
+
+do_configure() {
+	aclocal -I ${STAGING_DIR_TARGET}/usr/share/aclocal
+        ./autogen.sh --prefix=/usr --host=arm-linux --with-libtool-sysroot=${STAGING_DIR_TARGET} --enable-weston-launch
 }
 
 PACKAGES += "${PN}-examples"
 
-FILES_${PN} = "${bindir}/weston ${bindir}/weston-terminal ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode ${libexecdir} ${datadir}"
+FILES_${PN} = "${bindir}/weston* ${bindir}/wcap-decode ${libexecdir} ${datadir} ${libdir}/weston/* /home/root/.profile /home/root/.config/* /usr/libexec/weston-desktop-shell /usr/libexec/weston-screenshooter /usr/libexec/weston-tablet-shell" 
 FILES_${PN}-examples = "${bindir}/*"
 
+FILES_${PN}-dbg += "${bindir}/weston-clients/.debug"
+
 RDEPENDS_${PN} += "xkeyboard-config"
 RRECOMMENDS_${PN} = "liberation-fonts"
 
 USERADD_PACKAGES = "${PN}"
 GROUPADD_PARAM_${PN} = "--system weston-launch"
+
+INSANE_SKIP_weston += "dev-deps"
+
-- 
2.0.1

Re: [for master] [PATCH v2 1/4] wayland: upgrade to 1.3.0

[Denys Dmytriyenko]

On Fri, Sep 05, 2014 at 08:22:44PM +0530, Karthik Ramanan wrote:
> From: Ross Burton <ross.burton@intel.com>
> 
> wayland-scanner now uses pkg-config instead of hard-coding paths, so edit the
> script to use pkg-config-native.
> 
> Based on work by Ewan Le Bideau-Canevet <Ewan.LEBIDEAU-CANEVET@eurogiciel.fr>.
> 
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

First of all, you ended up copying all those people above. It is rarelly a 
good idea to use an existing commit for overlaying the recipe locally...


> ---
>  .../recipes-graphics/wayland/wayland_1.3.0.bb      | 36 ++++++++++++++++++++++
>  1 file changed, 36 insertions(+)
>  create mode 100644 meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb
> 
> diff --git a/meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb b/meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb
> new file mode 100644
> index 0000000..212e08a
> --- /dev/null
> +++ b/meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb
> @@ -0,0 +1,36 @@
> +SUMMARY = "Wayland, a protocol between a compositor and clients"
> +DESCRIPTION = "Wayland is a protocol for a compositor to talk to its clients \
> +as well as a C library implementation of that protocol. The compositor can be \
> +a standalone display server running on Linux kernel modesetting and evdev \
> +input devices, an X application, or a wayland client itself. The clients can \
> +be traditional applications, X servers (rootless or fullscreen) or other \
> +display servers."
> +HOMEPAGE = "http://wayland.freedesktop.org"
> +LICENSE = "MIT"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=1d4476a7d98dd5691c53d4d43a510c72 \
> +                    file://src/wayland-server.c;endline=21;md5=079ae21dbf98ada52ec23744851b0a5c"
> +
> +SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz"
> +SRC_URI[md5sum] = "d16d27081e0871de82d08840c2f133fc"
> +SRC_URI[sha256sum] = "2e817685f68a26acd19964d69ddbc4549ba5412114ad95e1a9f5934cce470d6e"
> +
> +SRC_URI_append_class-native = " file://just-scanner.patch"
> +
> +inherit autotools pkgconfig
> +
> +# We need wayland-native for the wayland-scanner utility
> +BBCLASSEXTEND = "native"
> +
> +DEPENDS_virtclass-native = "expat-native libffi-native"
> +DEPENDS = "expat libffi wayland-native"
> +
> +EXTRA_OECONF_virtclass-native = "--disable-documentation"
> +EXTRA_OECONF = "--disable-documentation --disable-scanner"
> +
> +# Wayland installs a M4 macro for other projects to use, which uses the target
> +# pkg-config to find files.  Replace pkg-config with pkg-config-native.
> +do_install_append_class-native() {
> +  sed -e 's,PKG_CHECK_MODULES(.*),,g' \
> +      -e 's,$PKG_CONFIG,pkg-config-native,g' \
> +      -i ${D}/${datadir}/aclocal/wayland-scanner.m4
> +}
> -- 
> 2.0.1
> 
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
> 

Re: [for master] [PATCH v2 3/4] wayland: add support for version 1.3.0 for drm backend

[Denys Dmytriyenko]

On Fri, Sep 05, 2014 at 08:22:46PM +0530, Karthik Ramanan wrote:
> For DRM based devices, it is desired to stick with version 1.3.0
> due to some known issues and limitations with omapdrm and other
> dependent foundation software
> 
> Signed-off-by: Karthik Ramanan <a0393906@ti.com>
> ---
>  .../recipes-graphics/wayland/wayland.inc           |  5 ++++
>  .../recipes-graphics/wayland/wayland_1.3.0.bb      | 32 ++++++++++------------
>  2 files changed, 20 insertions(+), 17 deletions(-)
>  create mode 100644 meta-arago-extras/recipes-graphics/wayland/wayland.inc
> 
> diff --git a/meta-arago-extras/recipes-graphics/wayland/wayland.inc b/meta-arago-extras/recipes-graphics/wayland/wayland.inc
> new file mode 100644
> index 0000000..8eb445d
> --- /dev/null
> +++ b/meta-arago-extras/recipes-graphics/wayland/wayland.inc
> @@ -0,0 +1,5 @@
> +HOMEPAGE = "http://wayland.freedesktop.org/"
> +LICENSE = "MIT"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=1d4476a7d98dd5691c53d4d43a510c72"
> +
> +inherit autotools pkgconfig
> diff --git a/meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb b/meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb
> index 212e08a..f40a98b 100644
> --- a/meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb
> +++ b/meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb
> @@ -1,20 +1,4 @@
> -SUMMARY = "Wayland, a protocol between a compositor and clients"
> -DESCRIPTION = "Wayland is a protocol for a compositor to talk to its clients \
> -as well as a C library implementation of that protocol. The compositor can be \
> -a standalone display server running on Linux kernel modesetting and evdev \
> -input devices, an X application, or a wayland client itself. The clients can \
> -be traditional applications, X servers (rootless or fullscreen) or other \
> -display servers."
> -HOMEPAGE = "http://wayland.freedesktop.org"
> -LICENSE = "MIT"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=1d4476a7d98dd5691c53d4d43a510c72 \
> -                    file://src/wayland-server.c;endline=21;md5=079ae21dbf98ada52ec23744851b0a5c"
> -
> -SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz"
> -SRC_URI[md5sum] = "d16d27081e0871de82d08840c2f133fc"
> -SRC_URI[sha256sum] = "2e817685f68a26acd19964d69ddbc4549ba5412114ad95e1a9f5934cce470d6e"
> -
> -SRC_URI_append_class-native = " file://just-scanner.patch"
> +require wayland.inc
>  
>  inherit autotools pkgconfig
>  
> @@ -27,6 +11,19 @@ DEPENDS = "expat libffi wayland-native"
>  EXTRA_OECONF_virtclass-native = "--disable-documentation"
>  EXTRA_OECONF = "--disable-documentation --disable-scanner"
>  
> +PR = "r3"
> +
> +COMPATIBLE_MACHINE = "dra7xx-evm"

So, the only thing you do here is set COMPATIBLE_MACHINE and switch from 
release tarball to a specific git commit. What's the point of creating a .inc 
file, as I don't see it being used outside of this one recipe...


> +SRC_URI = "git://anongit.freedesktop.org/wayland/wayland;protocol=git"
> +SRC_URI_append_class-native = " file://just-scanner.patch"
> +
> +S = "${WORKDIR}/git"
> +
> +FILESEXTRAPATHS_prepend := "${THISDIR}:"
> +
> +SRCREV = "2c3dbb89031f120fb191492634e53a583f99d57d"
> +
>  # Wayland installs a M4 macro for other projects to use, which uses the target
>  # pkg-config to find files.  Replace pkg-config with pkg-config-native.
>  do_install_append_class-native() {
> @@ -34,3 +31,4 @@ do_install_append_class-native() {
>        -e 's,$PKG_CONFIG,pkg-config-native,g' \
>        -i ${D}/${datadir}/aclocal/wayland-scanner.m4
>  }
> +
> -- 
> 2.0.1
> 
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

Re: [for master] [PATCH v2 4/4] weston: weston 1.3.0 for DRM backend

[Denys Dmytriyenko]

Now, this is the messiest patch from the series. There are whitespaces, tabs 
and indentation all over the place, but that's not the biggest issue, as I 
would not reject a patch solely due to indentation issues - see below for 
details on other problems.

Moreover, there's lots of customizations and hacking going on in this recipe - 
I won't let it into "extras" part, as it should go into the corresponding 
bbappend in the "distro" section instead... Please see how it's currently done 
for 1.5.0 and 1.6.0 wayland/weston in meta-arago.


On Fri, Sep 05, 2014 at 08:22:47PM +0530, Karthik Ramanan wrote:
> On devices where the backend is chosen as DRM, as in the case
> of dra7xx, there are some addition patches that are specific
> to the omapdrm which are needed for basic functionality and
> some bug fixes.


> diff --git a/meta-arago-extras/recipes-graphics/wayland/weston/profile b/meta-arago-extras/recipes-graphics/wayland/weston/profile
> new file mode 100644
> index 0000000..69564f2
> --- /dev/null
> +++ b/meta-arago-extras/recipes-graphics/wayland/weston/profile
> @@ -0,0 +1,9 @@
> +if test -z "${XDG_RUNTIME_DIR}"; then
> +    export XDG_RUNTIME_DIR=/tmp/${UID}-runtime-dir
> +    if ! test -d "${XDG_RUNTIME_DIR}"; then
> +        mkdir "${XDG_RUNTIME_DIR}"
> +        chmod 0700 "${XDG_RUNTIME_DIR}"
> +    fi
> +else 
> +   echo "Doing nothing"
> +fi

We have a similar code for weston-init, BTW. Can that be re-used?


> diff --git a/meta-arago-extras/recipes-graphics/wayland/weston_1.3.0.bb b/meta-arago-extras/recipes-graphics/wayland/weston_1.3.0.bb
> index eb38ce1..c34b35e 100644
> --- a/meta-arago-extras/recipes-graphics/wayland/weston_1.3.0.bb
> +++ b/meta-arago-extras/recipes-graphics/wayland/weston_1.3.0.bb
> @@ -5,28 +5,45 @@ LICENSE = "MIT"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=275efac2559a224527bd4fd593d38466 \
>                      file://src/compositor.c;endline=23;md5=aa98a8db03480fe7d500d0b1f4b8850c"
>  
> -SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
> +SRC_URI = "git://anongit.freedesktop.org/wayland/weston;protocol=git \
>             file://weston.png \
> -           file://weston.desktop"
> -SRC_URI[md5sum] = "29ad994dd5ea07f52d7bffb24c25d9f7"
> -SRC_URI[sha256sum] = "8e4f5b4736358b63d83c3252567ba7aa49cc0da9e2e2c30f59ddf635159702a0"
> +           file://weston.desktop \
> +           file://terminal.png \
> +           file://pattern.png \
> +           file://profile \
> +           file://0001-compositor-drm-Change-path-of-gbm.h-to-gbm-gbm.h.patch \
> +           file://0002-Makefile-Include-option-to-search-in-include-drm.patch \
> +	   file://0003-input-source-prevent-input-disable-during-repaint.patch \
> +	   file://0005-temp-hack-to-enable-weston-1.3.patch \
> +	   file://0006-weston-drm-Enable-multiple-displays.patch "

Indents are off.


> +          
>  
> +SRCREV = "95659c03219b057d9d703b04cf89bc0329ce947a" 
> +
> +S = "${WORKDIR}/git"
> +
> +PR = "r1"
>  
>  inherit autotools pkgconfig useradd
>  
> -DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 jpeg"
> -DEPENDS += "wayland virtual/mesa virtual/egl pango"
> +DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 jpeg mtdev libpam"

mtdev and libpam dependencies are added automatically for corresponding 
PACKAGCONFIGs below...


> +DEPENDS += "wayland libgbm omap5-sgx-ddk-um-linux pango"

Why would you replace virtuals with the specific package names? That should 
not be required.


> -EXTRA_OECONF = "--enable-setuid-install \
> +COMPATIBLE_MACHINE = "dra7xx-evm"
> +
> +EXTRA_OECONF = "--disable-android-compositor \
> +                 --disable-simple-egl-clients \
> +                 --enable-fbdev-compositor \
> +                --enable-setuid-install \

Same with indents above.

>                  --disable-tablet-shell \
>                  --disable-xwayland \
>                  --enable-simple-clients \
>                  --enable-clients \
> -                --enable-demo-clients \
> -                --disable-simple-egl-clients \
>                  --disable-libunwind \
>                  --disable-rpi-compositor \
> -                --disable-rdp-compositor"
> +                --disable-rdp-compositor \
> +                --prefix=${STAGING_DIR_TARGET} \
> +                --with-libtool-sysroot=${STAGING_DIR_TARGET}"

Why the last 2 lines?


>  PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'kms wayland', '', d)} \
> @@ -38,9 +55,9 @@ PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'kms wayland',
>  # Compositor choices
>  #
>  # Weston on KMS
> -PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev mesa mtdev"
> +PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev libgbm mtdev"

I see libgbm being unconditionally added above to DEPENDS, why the duplication?

I would understand removing mesa here though, as it was later fixed to require 
virtual/mesa instead...


>  # Weston on Wayland (nested Weston)
> -PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable-wayland-compositor,mesa"
> +PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable-wayland-compositor,libgbm"

No need to add libgbm the third time here.


>  # Weston on X11
>  PACKAGECONFIG[x11] = "--enable-x11-compositor,--disable-x11-compositor,virtual/libx11 libxcb libxcb libxcursor cairo"
>  # Headless Weston
> @@ -49,8 +66,10 @@ PACKAGECONFIG[headless] = "--enable-headless-compositor,--disable-headless-compo
>  PACKAGECONFIG[fbdev] = "--enable-fbdev-compositor,--disable-fbdev-compositor,udev mtdev"
>  # weston-launch
>  PACKAGECONFIG[launch] = "--enable-weston-launch,--disable-weston-launch,libpam"
> -# VA-API desktop recorder
> -PACKAGECONFIG[vaapi] = "--enable-vaapi-recorder,--disable-vaapi-recorder,libva"

Why remove unused flag?


> +# Use cairo-gl or cairo-glesv2
> +PACKAGECONFIG[gles] = "--with-cairo-glesv2,,virtual/libgles2"

Can't a similar line from 1.4.0+ be copied?


>  do_install_append() {
>  	# Weston doesn't need the .la files to load modules, so wipe them
> @@ -66,15 +85,64 @@ do_install_append() {
>  			install ${WORKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps
>                  fi
>  	done
> +        install ${WORKDIR}/terminal.png ${D}${datadir}/icons/hicolor/48x48/apps
> +        install ${WORKDIR}/pattern.png ${D}${datadir}/icons/hicolor/48x48/apps
> +
> +        mkdir -p ${D}/usr/bin/weston-clients
> +        cp ${S}/clients/weston-calibrator ${D}/usr/bin/weston-clients/
> +        cp ${S}/clients/weston-clickdot ${D}/usr/bin/weston-clients/
> +        cp ${S}/clients/weston-cliptest ${D}/usr/bin/weston-clients/
> +        cp ${S}/clients/weston-dnd ${D}/usr/bin/weston-clients/
> +        cp ${S}/clients/weston-editor ${D}/usr/bin/weston-clients/
> +        cp ${S}/clients/weston-eventdemo ${D}/usr/bin/weston-clients/
> +        cp ${S}/clients/weston-flower ${D}/usr/bin/weston-clients/
> +        cp ${S}/clients/weston-fullscreen ${D}/usr/bin/weston-clients/
> +        cp ${S}/clients/weston-image ${D}/usr/bin/weston-clients/
> +        cp ${S}/clients/weston-keyboard ${D}/usr/bin/weston-clients/
> +        cp ${S}/clients/weston-multi-resource ${D}/usr/bin/weston-clients/
> +        cp ${S}/clients/weston-resizor ${D}/usr/bin/weston-clients/
> +        cp ${S}/clients/weston-simple-egl ${D}/usr/bin/weston-clients/
> +        cp ${S}/clients/weston-simple-im ${D}/usr/bin/weston-clients/
> +        cp ${S}/clients/weston-simple-shm ${D}/usr/bin/weston-clients/
> +        cp ${S}/clients/weston-simple-touch ${D}/usr/bin/weston-clients/
> +        cp ${S}/clients/weston-smoke ${D}/usr/bin/weston-clients/
> +        cp ${S}/clients/weston-subsurfaces ${D}/usr/bin/weston-clients/
> +        cp ${S}/clients/weston-desktop-shell ${D}/usr/bin/weston-clients/
> +        cp ${S}/clients/weston-info ${D}/usr/bin/weston-clients/
> +        cp ${S}/clients/weston-screenshooter ${D}/usr/bin/weston-clients/
> +        cp ${S}/clients/weston-tablet-shell ${D}/usr/bin/weston-clients/
> +        cp ${S}/clients/weston-terminal ${D}/usr/bin/weston-clients/
> +        cp ${S}/clients/weston-transformed ${D}/usr/bin/weston-clients/

Unless these are very selective, why not copy them all in one line?


> +        mkdir -p ${D}/usr/libexec
> +        cp ${S}/clients/weston-desktop-shell ${D}/usr/libexec/
> +        cp ${S}/clients/weston-screenshooter ${D}/usr/libexec/
> +        cp ${S}/clients/weston-tablet-shell ${D}/usr/libexec/

Aren't those get installed by the default make install target?


> +	mkdir -p ${D}/home/root
> +        mkdir -p ${D}/home/root/.config
> +        cp ${S}/weston.ini ${D}/home/root/.config/
> +        cp ${WORKDIR}/profile ${D}/home/root/.profile

This part is a huge hack. Can those be installed in /etc as we do in 1.5.0 and 
1.6.0, instead of the user's home dir?


> +}
> +
> +do_configure() {
> +	aclocal -I ${STAGING_DIR_TARGET}/usr/share/aclocal
> +        ./autogen.sh --prefix=/usr --host=arm-linux --with-libtool-sysroot=${STAGING_DIR_TARGET} --enable-weston-launch

Why overwrite the default again? I'm pretty sure weston-launch is controlled 
by the corresponding PACKAGECONFIG above...


>  }
>  
>  PACKAGES += "${PN}-examples"
>  
> -FILES_${PN} = "${bindir}/weston ${bindir}/weston-terminal ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode ${libexecdir} ${datadir}"
> +FILES_${PN} = "${bindir}/weston* ${bindir}/wcap-decode ${libexecdir} ${datadir} ${libdir}/weston/* /home/root/.profile /home/root/.config/* /usr/libexec/weston-desktop-shell /usr/libexec/weston-screenshooter /usr/libexec/weston-tablet-shell" 
>  FILES_${PN}-examples = "${bindir}/*"
>  
> +FILES_${PN}-dbg += "${bindir}/weston-clients/.debug"
> +
>  RDEPENDS_${PN} += "xkeyboard-config"
>  RRECOMMENDS_${PN} = "liberation-fonts"
>  
>  USERADD_PACKAGES = "${PN}"
>  GROUPADD_PARAM_${PN} = "--system weston-launch"
> +
> +INSANE_SKIP_weston += "dev-deps"
> +
> -- 
> 2.0.1
> 
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

Re: [for master] [PATCH v2 1/4] wayland: upgrade to 1.3.0

[Karthik Ramanan]

On 27-Sep-14 12:16 AM, Denys Dmytriyenko wrote:
> On Fri, Sep 05, 2014 at 08:22:44PM +0530, Karthik Ramanan wrote:
>> From: Ross Burton <ross.burton@intel.com>
>>
>> wayland-scanner now uses pkg-config instead of hard-coding paths, so edit the
>> script to use pkg-config-native.
>>
>> Based on work by Ewan Le Bideau-Canevet <Ewan.LEBIDEAU-CANEVET@eurogiciel.fr>.
>>
>> Signed-off-by: Ross Burton <ross.burton@intel.com>
>> Signed-off-by: Saul Wold <sgw@linux.intel.com>
>> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
>
> First of all, you ended up copying all those people above. It is rarelly a
> good idea to use an existing commit for overlaying the recipe locally...

Denys,

On the kernel tree, atleast in the past, when we pulled in patches from 
other branch it was encouraged to preserve authorship and try to bring 
in the patch as it is.

So if I understand correctly and also look at some recently submitted 
patches, like the wayland/weston 1.5.0 submission it seems like we can 
simply copy the patch and not worry about the authorship. So I will take 
care of this from the next time.

Sorry about the fact that there was a deviation, I was not aware of that 
the simpler approach of simply copying the files was allowed.

Would you be merging this if its acceptable to you?

Regards
Karthik

>
>
>> ---
>>   .../recipes-graphics/wayland/wayland_1.3.0.bb      | 36 ++++++++++++++++++++++
>>   1 file changed, 36 insertions(+)
>>   create mode 100644 meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb
>>
>> diff --git a/meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb b/meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb
>> new file mode 100644
>> index 0000000..212e08a
>> --- /dev/null
>> +++ b/meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb
>> @@ -0,0 +1,36 @@
>> +SUMMARY = "Wayland, a protocol between a compositor and clients"
>> +DESCRIPTION = "Wayland is a protocol for a compositor to talk to its clients \
>> +as well as a C library implementation of that protocol. The compositor can be \
>> +a standalone display server running on Linux kernel modesetting and evdev \
>> +input devices, an X application, or a wayland client itself. The clients can \
>> +be traditional applications, X servers (rootless or fullscreen) or other \
>> +display servers."
>> +HOMEPAGE = "http://wayland.freedesktop.org"
>> +LICENSE = "MIT"
>> +LIC_FILES_CHKSUM = "file://COPYING;md5=1d4476a7d98dd5691c53d4d43a510c72 \
>> +                    file://src/wayland-server.c;endline=21;md5=079ae21dbf98ada52ec23744851b0a5c"
>> +
>> +SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz"
>> +SRC_URI[md5sum] = "d16d27081e0871de82d08840c2f133fc"
>> +SRC_URI[sha256sum] = "2e817685f68a26acd19964d69ddbc4549ba5412114ad95e1a9f5934cce470d6e"
>> +
>> +SRC_URI_append_class-native = " file://just-scanner.patch"
>> +
>> +inherit autotools pkgconfig
>> +
>> +# We need wayland-native for the wayland-scanner utility
>> +BBCLASSEXTEND = "native"
>> +
>> +DEPENDS_virtclass-native = "expat-native libffi-native"
>> +DEPENDS = "expat libffi wayland-native"
>> +
>> +EXTRA_OECONF_virtclass-native = "--disable-documentation"
>> +EXTRA_OECONF = "--disable-documentation --disable-scanner"
>> +
>> +# Wayland installs a M4 macro for other projects to use, which uses the target
>> +# pkg-config to find files.  Replace pkg-config with pkg-config-native.
>> +do_install_append_class-native() {
>> +  sed -e 's,PKG_CHECK_MODULES(.*),,g' \
>> +      -e 's,$PKG_CONFIG,pkg-config-native,g' \
>> +      -i ${D}/${datadir}/aclocal/wayland-scanner.m4
>> +}
>> --
>> 2.0.1
>>
>> _______________________________________________
>> meta-arago mailing list
>> meta-arago@arago-project.org
>> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
>>

Re: [for master] [PATCH v2 3/4] wayland: add support for version 1.3.0 for drm backend

[Karthik Ramanan]

On 27-Sep-14 12:19 AM, Denys Dmytriyenko wrote:
> On Fri, Sep 05, 2014 at 08:22:46PM +0530, Karthik Ramanan wrote:
>> For DRM based devices, it is desired to stick with version 1.3.0
>> due to some known issues and limitations with omapdrm and other
>> dependent foundation software
>>
>> Signed-off-by: Karthik Ramanan <a0393906@ti.com>
>> ---
>>   .../recipes-graphics/wayland/wayland.inc           |  5 ++++
>>   .../recipes-graphics/wayland/wayland_1.3.0.bb      | 32 ++++++++++------------
>>   2 files changed, 20 insertions(+), 17 deletions(-)
>>   create mode 100644 meta-arago-extras/recipes-graphics/wayland/wayland.inc
>>
>> diff --git a/meta-arago-extras/recipes-graphics/wayland/wayland.inc b/meta-arago-extras/recipes-graphics/wayland/wayland.inc
>> new file mode 100644
>> index 0000000..8eb445d
>> --- /dev/null
>> +++ b/meta-arago-extras/recipes-graphics/wayland/wayland.inc
>> @@ -0,0 +1,5 @@
>> +HOMEPAGE = "http://wayland.freedesktop.org/"
>> +LICENSE = "MIT"
>> +LIC_FILES_CHKSUM = "file://COPYING;md5=1d4476a7d98dd5691c53d4d43a510c72"
>> +
>> +inherit autotools pkgconfig
>> diff --git a/meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb b/meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb
>> index 212e08a..f40a98b 100644
>> --- a/meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb
>> +++ b/meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb
>> @@ -1,20 +1,4 @@
>> -SUMMARY = "Wayland, a protocol between a compositor and clients"
>> -DESCRIPTION = "Wayland is a protocol for a compositor to talk to its clients \
>> -as well as a C library implementation of that protocol. The compositor can be \
>> -a standalone display server running on Linux kernel modesetting and evdev \
>> -input devices, an X application, or a wayland client itself. The clients can \
>> -be traditional applications, X servers (rootless or fullscreen) or other \
>> -display servers."
>> -HOMEPAGE = "http://wayland.freedesktop.org"
>> -LICENSE = "MIT"
>> -LIC_FILES_CHKSUM = "file://COPYING;md5=1d4476a7d98dd5691c53d4d43a510c72 \
>> -                    file://src/wayland-server.c;endline=21;md5=079ae21dbf98ada52ec23744851b0a5c"
>> -
>> -SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz"
>> -SRC_URI[md5sum] = "d16d27081e0871de82d08840c2f133fc"
>> -SRC_URI[sha256sum] = "2e817685f68a26acd19964d69ddbc4549ba5412114ad95e1a9f5934cce470d6e"
>> -
>> -SRC_URI_append_class-native = " file://just-scanner.patch"
>> +require wayland.inc
>>
>>   inherit autotools pkgconfig
>>
>> @@ -27,6 +11,19 @@ DEPENDS = "expat libffi wayland-native"
>>   EXTRA_OECONF_virtclass-native = "--disable-documentation"
>>   EXTRA_OECONF = "--disable-documentation --disable-scanner"
>>
>> +PR = "r3"
>> +
>> +COMPATIBLE_MACHINE = "dra7xx-evm"
>
> So, the only thing you do here is set COMPATIBLE_MACHINE and switch from
> release tarball to a specific git commit. What's the point of creating a .inc
> file, as I don't see it being used outside of this one recipe...
>

1. Yes, the COMPATIBLE_MACHINE was incorporated because of the comment 
from V1 patch.

2. We are using the git versions because it allows us to revert some 
patches easily during the active development (I mean reverting some 
already existing commits in the upstream).

3. In the past GLSDK supported 1.0.6 and 1.3.0 version. Both the recipes 
had a common portion. The reason of creating the .inc file was to 
include the common portions of the wayland recipe and only have the non 
common portions in the actual recipe. The inc file could evolve as per 
the need, but I can rework and submit a single file if you think the inc 
file would not be necessary. If you look at the difference between 1.3.0 
and 1.5.0, there are lots of similarities in the common portion which 
can go into the inc file.

>
>> +SRC_URI = "git://anongit.freedesktop.org/wayland/wayland;protocol=git"
>> +SRC_URI_append_class-native = " file://just-scanner.patch"
>> +
>> +S = "${WORKDIR}/git"
>> +
>> +FILESEXTRAPATHS_prepend := "${THISDIR}:"
>> +
>> +SRCREV = "2c3dbb89031f120fb191492634e53a583f99d57d"
>> +
>>   # Wayland installs a M4 macro for other projects to use, which uses the target
>>   # pkg-config to find files.  Replace pkg-config with pkg-config-native.
>>   do_install_append_class-native() {
>> @@ -34,3 +31,4 @@ do_install_append_class-native() {
>>         -e 's,$PKG_CONFIG,pkg-config-native,g' \
>>         -i ${D}/${datadir}/aclocal/wayland-scanner.m4
>>   }
>> +
>> --
>> 2.0.1
>>
>> _______________________________________________
>> meta-arago mailing list
>> meta-arago@arago-project.org
>> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

Re: [for master] [PATCH v2 1/4] wayland: upgrade to 1.3.0

[Denys Dmytriyenko]

On Tue, Sep 30, 2014 at 04:47:11PM +0530, Karthik Ramanan wrote:
> On 27-Sep-14 12:16 AM, Denys Dmytriyenko wrote:
> >On Fri, Sep 05, 2014 at 08:22:44PM +0530, Karthik Ramanan wrote:
> >>From: Ross Burton <ross.burton@intel.com>
> >>
> >>wayland-scanner now uses pkg-config instead of hard-coding paths, so edit the
> >>script to use pkg-config-native.
> >>
> >>Based on work by Ewan Le Bideau-Canevet <Ewan.LEBIDEAU-CANEVET@eurogiciel.fr>.
> >>
> >>Signed-off-by: Ross Burton <ross.burton@intel.com>
> >>Signed-off-by: Saul Wold <sgw@linux.intel.com>
> >>Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> >
> >First of all, you ended up copying all those people above. It is rarelly a
> >good idea to use an existing commit for overlaying the recipe locally...
> 
> Denys,
> 
> On the kernel tree, atleast in the past, when we pulled in patches
> from other branch it was encouraged to preserve authorship and try
> to bring in the patch as it is.
> 
> So if I understand correctly and also look at some recently
> submitted patches, like the wayland/weston 1.5.0 submission it seems
> like we can simply copy the patch and not worry about the
> authorship. So I will take care of this from the next time.
> 
> Sorry about the fact that there was a deviation, I was not aware of
> that the simpler approach of simply copying the files was allowed.

Well, it's not as simple as it seems. In this case we are overlaying an old 
recipe into our own layer. Yes, meta-arago is publicly available, although 
somewhat specific to our products, but the recipe is almost a year old. And 
even with the kernel, I believe I've heard that kernel maintainers won't care 
much for any company forks and vendor trees...

If you want to preserve authorship, you can add a description along the lines 
of "overlayed from oe-core/dora" and/or provide a name. But git would spam 
everyone mentioned in SOB line by default.


> Would you be merging this if its acceptable to you?

I think #4 will need some attenton...


> >>---
> >>  .../recipes-graphics/wayland/wayland_1.3.0.bb      | 36 ++++++++++++++++++++++
> >>  1 file changed, 36 insertions(+)
> >>  create mode 100644 meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb
> >>
> >>diff --git a/meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb b/meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb
> >>new file mode 100644
> >>index 0000000..212e08a
> >>--- /dev/null
> >>+++ b/meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb
> >>@@ -0,0 +1,36 @@
> >>+SUMMARY = "Wayland, a protocol between a compositor and clients"
> >>+DESCRIPTION = "Wayland is a protocol for a compositor to talk to its clients \
> >>+as well as a C library implementation of that protocol. The compositor can be \
> >>+a standalone display server running on Linux kernel modesetting and evdev \
> >>+input devices, an X application, or a wayland client itself. The clients can \
> >>+be traditional applications, X servers (rootless or fullscreen) or other \
> >>+display servers."
> >>+HOMEPAGE = "http://wayland.freedesktop.org"
> >>+LICENSE = "MIT"
> >>+LIC_FILES_CHKSUM = "file://COPYING;md5=1d4476a7d98dd5691c53d4d43a510c72 \
> >>+                    file://src/wayland-server.c;endline=21;md5=079ae21dbf98ada52ec23744851b0a5c"
> >>+
> >>+SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz"
> >>+SRC_URI[md5sum] = "d16d27081e0871de82d08840c2f133fc"
> >>+SRC_URI[sha256sum] = "2e817685f68a26acd19964d69ddbc4549ba5412114ad95e1a9f5934cce470d6e"
> >>+
> >>+SRC_URI_append_class-native = " file://just-scanner.patch"
> >>+
> >>+inherit autotools pkgconfig
> >>+
> >>+# We need wayland-native for the wayland-scanner utility
> >>+BBCLASSEXTEND = "native"
> >>+
> >>+DEPENDS_virtclass-native = "expat-native libffi-native"
> >>+DEPENDS = "expat libffi wayland-native"
> >>+
> >>+EXTRA_OECONF_virtclass-native = "--disable-documentation"
> >>+EXTRA_OECONF = "--disable-documentation --disable-scanner"
> >>+
> >>+# Wayland installs a M4 macro for other projects to use, which uses the target
> >>+# pkg-config to find files.  Replace pkg-config with pkg-config-native.
> >>+do_install_append_class-native() {
> >>+  sed -e 's,PKG_CHECK_MODULES(.*),,g' \
> >>+      -e 's,$PKG_CONFIG,pkg-config-native,g' \
> >>+      -i ${D}/${datadir}/aclocal/wayland-scanner.m4
> >>+}
> >>--
> >>2.0.1
> >>
> >>_______________________________________________
> >>meta-arago mailing list
> >>meta-arago@arago-project.org
> >>http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
> >>
> 

Re: [for master] [PATCH v2 3/4] wayland: add support for version 1.3.0 for drm backend

[Denys Dmytriyenko]

On Tue, Sep 30, 2014 at 04:52:03PM +0530, Karthik Ramanan wrote:
> On 27-Sep-14 12:19 AM, Denys Dmytriyenko wrote:
> >On Fri, Sep 05, 2014 at 08:22:46PM +0530, Karthik Ramanan wrote:
> >>For DRM based devices, it is desired to stick with version 1.3.0
> >>due to some known issues and limitations with omapdrm and other
> >>dependent foundation software
> >>
> >>Signed-off-by: Karthik Ramanan <a0393906@ti.com>
> >>---
> >>  .../recipes-graphics/wayland/wayland.inc           |  5 ++++
> >>  .../recipes-graphics/wayland/wayland_1.3.0.bb      | 32 ++++++++++------------
> >>  2 files changed, 20 insertions(+), 17 deletions(-)
> >>  create mode 100644 meta-arago-extras/recipes-graphics/wayland/wayland.inc
> >>
> >>diff --git a/meta-arago-extras/recipes-graphics/wayland/wayland.inc b/meta-arago-extras/recipes-graphics/wayland/wayland.inc
> >>new file mode 100644
> >>index 0000000..8eb445d
> >>--- /dev/null
> >>+++ b/meta-arago-extras/recipes-graphics/wayland/wayland.inc
> >>@@ -0,0 +1,5 @@
> >>+HOMEPAGE = "http://wayland.freedesktop.org/"
> >>+LICENSE = "MIT"
> >>+LIC_FILES_CHKSUM = "file://COPYING;md5=1d4476a7d98dd5691c53d4d43a510c72"
> >>+
> >>+inherit autotools pkgconfig
> >>diff --git a/meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb b/meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb
> >>index 212e08a..f40a98b 100644
> >>--- a/meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb
> >>+++ b/meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb
> >>@@ -1,20 +1,4 @@
> >>-SUMMARY = "Wayland, a protocol between a compositor and clients"
> >>-DESCRIPTION = "Wayland is a protocol for a compositor to talk to its clients \
> >>-as well as a C library implementation of that protocol. The compositor can be \
> >>-a standalone display server running on Linux kernel modesetting and evdev \
> >>-input devices, an X application, or a wayland client itself. The clients can \
> >>-be traditional applications, X servers (rootless or fullscreen) or other \
> >>-display servers."
> >>-HOMEPAGE = "http://wayland.freedesktop.org"
> >>-LICENSE = "MIT"
> >>-LIC_FILES_CHKSUM = "file://COPYING;md5=1d4476a7d98dd5691c53d4d43a510c72 \
> >>-                    file://src/wayland-server.c;endline=21;md5=079ae21dbf98ada52ec23744851b0a5c"
> >>-
> >>-SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz"
> >>-SRC_URI[md5sum] = "d16d27081e0871de82d08840c2f133fc"
> >>-SRC_URI[sha256sum] = "2e817685f68a26acd19964d69ddbc4549ba5412114ad95e1a9f5934cce470d6e"
> >>-
> >>-SRC_URI_append_class-native = " file://just-scanner.patch"
> >>+require wayland.inc
> >>
> >>  inherit autotools pkgconfig
> >>
> >>@@ -27,6 +11,19 @@ DEPENDS = "expat libffi wayland-native"
> >>  EXTRA_OECONF_virtclass-native = "--disable-documentation"
> >>  EXTRA_OECONF = "--disable-documentation --disable-scanner"
> >>
> >>+PR = "r3"
> >>+
> >>+COMPATIBLE_MACHINE = "dra7xx-evm"
> >
> >So, the only thing you do here is set COMPATIBLE_MACHINE and switch from
> >release tarball to a specific git commit. What's the point of creating a .inc
> >file, as I don't see it being used outside of this one recipe...
> 
> 1. Yes, the COMPATIBLE_MACHINE was incorporated because of the
> comment from V1 patch.
> 
> 2. We are using the git versions because it allows us to revert some
> patches easily during the active development (I mean reverting some
> already existing commits in the upstream).

Ok, switching to git is fine - we used it ourselves to pick up the latest 
snapshot of 1.5...


> 3. In the past GLSDK supported 1.0.6 and 1.3.0 version. Both the
> recipes had a common portion. The reason of creating the .inc file
> was to include the common portions of the wayland recipe and only
> have the non common portions in the actual recipe. The inc file
> could evolve as per the need, but I can rework and submit a single
> file if you think the inc file would not be necessary. If you look
> at the difference between 1.3.0 and 1.5.0, there are lots of
> similarities in the common portion which can go into the inc file.

Yeah, I was thinking about that - we about to switch from 1.5-snapshot to 
1.6.0 release. And as soon as that version gets accepted upstream to oe-core, 
I'm planning on removing it from meta-arago. If it gets entangled with .inc 
and sharing common code with 1.3, it would be harder to remove it later on.


> >>+SRC_URI = "git://anongit.freedesktop.org/wayland/wayland;protocol=git"
> >>+SRC_URI_append_class-native = " file://just-scanner.patch"
> >>+
> >>+S = "${WORKDIR}/git"
> >>+
> >>+FILESEXTRAPATHS_prepend := "${THISDIR}:"
> >>+
> >>+SRCREV = "2c3dbb89031f120fb191492634e53a583f99d57d"
> >>+
> >>  # Wayland installs a M4 macro for other projects to use, which uses the target
> >>  # pkg-config to find files.  Replace pkg-config with pkg-config-native.
> >>  do_install_append_class-native() {
> >>@@ -34,3 +31,4 @@ do_install_append_class-native() {
> >>        -e 's,$PKG_CONFIG,pkg-config-native,g' \
> >>        -i ${D}/${datadir}/aclocal/wayland-scanner.m4
> >>  }
> >>+
> >>--
> >>2.0.1
> >>
> >>_______________________________________________
> >>meta-arago mailing list
> >>meta-arago@arago-project.org
> >>http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
> 

Re: [for master] [PATCH v2 3/4] wayland: add support for version 1.3.0 for drm backend

[Karthik Ramanan]

On 01-Oct-14 3:26 AM, Denys Dmytriyenko wrote:
> On Tue, Sep 30, 2014 at 04:52:03PM +0530, Karthik Ramanan wrote:
>> On 27-Sep-14 12:19 AM, Denys Dmytriyenko wrote:
>>> On Fri, Sep 05, 2014 at 08:22:46PM +0530, Karthik Ramanan wrote:
>>>> For DRM based devices, it is desired to stick with version 1.3.0
>>>> due to some known issues and limitations with omapdrm and other
>>>> dependent foundation software
>>>>
>>>> Signed-off-by: Karthik Ramanan <a0393906@ti.com>
>>>> ---
>>>>   .../recipes-graphics/wayland/wayland.inc           |  5 ++++
>>>>   .../recipes-graphics/wayland/wayland_1.3.0.bb      | 32 ++++++++++------------
>>>>   2 files changed, 20 insertions(+), 17 deletions(-)
>>>>   create mode 100644 meta-arago-extras/recipes-graphics/wayland/wayland.inc
>>>>
>>>> diff --git a/meta-arago-extras/recipes-graphics/wayland/wayland.inc b/meta-arago-extras/recipes-graphics/wayland/wayland.inc
>>>> new file mode 100644
>>>> index 0000000..8eb445d
>>>> --- /dev/null
>>>> +++ b/meta-arago-extras/recipes-graphics/wayland/wayland.inc
>>>> @@ -0,0 +1,5 @@
>>>> +HOMEPAGE = "http://wayland.freedesktop.org/"
>>>> +LICENSE = "MIT"
>>>> +LIC_FILES_CHKSUM = "file://COPYING;md5=1d4476a7d98dd5691c53d4d43a510c72"
>>>> +
>>>> +inherit autotools pkgconfig
>>>> diff --git a/meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb b/meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb
>>>> index 212e08a..f40a98b 100644
>>>> --- a/meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb
>>>> +++ b/meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb
>>>> @@ -1,20 +1,4 @@
>>>> -SUMMARY = "Wayland, a protocol between a compositor and clients"
>>>> -DESCRIPTION = "Wayland is a protocol for a compositor to talk to its clients \
>>>> -as well as a C library implementation of that protocol. The compositor can be \
>>>> -a standalone display server running on Linux kernel modesetting and evdev \
>>>> -input devices, an X application, or a wayland client itself. The clients can \
>>>> -be traditional applications, X servers (rootless or fullscreen) or other \
>>>> -display servers."
>>>> -HOMEPAGE = "http://wayland.freedesktop.org"
>>>> -LICENSE = "MIT"
>>>> -LIC_FILES_CHKSUM = "file://COPYING;md5=1d4476a7d98dd5691c53d4d43a510c72 \
>>>> -                    file://src/wayland-server.c;endline=21;md5=079ae21dbf98ada52ec23744851b0a5c"
>>>> -
>>>> -SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz"
>>>> -SRC_URI[md5sum] = "d16d27081e0871de82d08840c2f133fc"
>>>> -SRC_URI[sha256sum] = "2e817685f68a26acd19964d69ddbc4549ba5412114ad95e1a9f5934cce470d6e"
>>>> -
>>>> -SRC_URI_append_class-native = " file://just-scanner.patch"
>>>> +require wayland.inc
>>>>
>>>>   inherit autotools pkgconfig
>>>>
>>>> @@ -27,6 +11,19 @@ DEPENDS = "expat libffi wayland-native"
>>>>   EXTRA_OECONF_virtclass-native = "--disable-documentation"
>>>>   EXTRA_OECONF = "--disable-documentation --disable-scanner"
>>>>
>>>> +PR = "r3"
>>>> +
>>>> +COMPATIBLE_MACHINE = "dra7xx-evm"
>>>
>>> So, the only thing you do here is set COMPATIBLE_MACHINE and switch from
>>> release tarball to a specific git commit. What's the point of creating a .inc
>>> file, as I don't see it being used outside of this one recipe...
>>
>> 1. Yes, the COMPATIBLE_MACHINE was incorporated because of the
>> comment from V1 patch.
>>
>> 2. We are using the git versions because it allows us to revert some
>> patches easily during the active development (I mean reverting some
>> already existing commits in the upstream).
>
> Ok, switching to git is fine - we used it ourselves to pick up the latest
> snapshot of 1.5...
>
>
>> 3. In the past GLSDK supported 1.0.6 and 1.3.0 version. Both the
>> recipes had a common portion. The reason of creating the .inc file
>> was to include the common portions of the wayland recipe and only
>> have the non common portions in the actual recipe. The inc file
>> could evolve as per the need, but I can rework and submit a single
>> file if you think the inc file would not be necessary. If you look
>> at the difference between 1.3.0 and 1.5.0, there are lots of
>> similarities in the common portion which can go into the inc file.
>
> Yeah, I was thinking about that - we about to switch from 1.5-snapshot to
> 1.6.0 release. And as soon as that version gets accepted upstream to oe-core,
> I'm planning on removing it from meta-arago. If it gets entangled with .inc
> and sharing common code with 1.3, it would be harder to remove it later on.
>
>
>>>> +SRC_URI = "git://anongit.freedesktop.org/wayland/wayland;protocol=git"
>>>> +SRC_URI_append_class-native = " file://just-scanner.patch"
>>>> +
>>>> +S = "${WORKDIR}/git"
>>>> +
>>>> +FILESEXTRAPATHS_prepend := "${THISDIR}:"
>>>> +
>>>> +SRCREV = "2c3dbb89031f120fb191492634e53a583f99d57d"
>>>> +
>>>>   # Wayland installs a M4 macro for other projects to use, which uses the target
>>>>   # pkg-config to find files.  Replace pkg-config with pkg-config-native.
>>>>   do_install_append_class-native() {
>>>> @@ -34,3 +31,4 @@ do_install_append_class-native() {
>>>>         -e 's,$PKG_CONFIG,pkg-config-native,g' \
>>>>         -i ${D}/${datadir}/aclocal/wayland-scanner.m4
>>>>   }
>>>> +
>>>> --
>>>> 2.0.1
>>>>
>>>> _______________________________________________
>>>> meta-arago mailing list
>>>> meta-arago@arago-project.org
>>>> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
>>

Denys,

I will submit a new patch set for both the Wayland and Weston 
incorporating all these comments.

Will need sometime to test out the recipes before pushing it out.
I will abandon these patches on the patchwork.

Regards
Karthik