[PATCHv2 0/9] Upgrade mesa, wayland

[PATCHv2 0/9] Upgrade mesa, wayland

[Jussi Kukkonen]

Changes since V1:
* wayland: Added Khems musl build fix patch
* weston: Added a musl build fix patch
* mesa-demos (new patch): require X11 distro feature

Issues:
* gbm fails to load drivers with musl: "Error relocating
  /lib/libgcc_s.so.1: __cpu_indicator_init: symbol not found"


Original cover letter follows:

Major releases of wayland components and especially mesa. The X
upgrades are all fairly small ones.

Mesa has been tested with piglit (looks pretty good). I did not have
a modern test device at hand so have not verified the OpenGL 4.3
support. Wayland was just smoke tested: seems to work fine.

Jussi

The following changes since commit 627d01997fcf6a0581d88047735769ffb2592b82:

  useradd-staticids: use map() instead of imap() (2016-07-12 23:12:00 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib jku/graphics
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/graphics

Jussi Kukkonen (9):
  mesa-demos: Require X11 distro feature
  mesa: Upgrade 11.2.2 -> 12.0.1
  wayland-protocols: Upgrade 1.3 -> 1.4
  wayland: Upgrade 1.10.0 -> 1.11.0
  weston: Upgrade 1.10.0 -> 1.11.0
  libxfixes: Upgrade 5.0.1 -> 5.0.2
  xkeyboard-config: Upgrade 2.17 -> 2.18
  xf86-input-evdev: Upgrade 2.10.2 -> 2.10.3
  xf86-input-libinput: Upgrade 0.16.0 -> 0.19.0

 meta/recipes-graphics/mesa/mesa-demos_8.3.0.bb     |  4 +-
 .../mesa/{mesa-gl_11.2.2.bb => mesa-gl_12.0.1.bb}  |  0
 meta/recipes-graphics/mesa/mesa.inc                |  2 +-
 .../mesa/{mesa_11.2.2.bb => mesa_12.0.1.bb}        |  4 +-
 .../wayland-protocols/dont-use-AC_CANONICAL.patch  | 29 ---------
 ...d-protocols_1.3.bb => wayland-protocols_1.4.bb} |  6 +-
 ...0001-scanner-Use-unit32_t-instead-of-uint.patch | 30 ++++++++++
 .../{wayland_1.10.0.bb => wayland_1.11.0.bb}       |  8 ++-
 ...1-configure.ac-Fix-wayland-protocols-path.patch |  4 +-
 .../0001-shared-include-stdint.h-for-int32_t.patch | 28 +++++++++
 ...ch-Provide-a-default-version-that-doesn-t.patch | 68 +++++++++++-----------
 .../make-libwebp-explicitly-configurable.patch     | 37 ------------
 .../wayland/{weston_1.10.0.bb => weston_1.11.0.bb} |  8 +--
 ...-evdev_2.10.2.bb => xf86-input-evdev_2.10.3.bb} |  4 +-
 ...put_0.16.0.bb => xf86-input-libinput_0.19.0.bb} |  4 +-
 .../{libxfixes_5.0.1.bb => libxfixes_5.0.2.bb}     |  4 +-
 ...ard-config_2.17.bb => xkeyboard-config_2.18.bb} |  4 +-
 17 files changed, 120 insertions(+), 124 deletions(-)
 rename meta/recipes-graphics/mesa/{mesa-gl_11.2.2.bb => mesa-gl_12.0.1.bb} (100%)
 rename meta/recipes-graphics/mesa/{mesa_11.2.2.bb => mesa_12.0.1.bb} (80%)
 delete mode 100644 meta/recipes-graphics/wayland/wayland-protocols/dont-use-AC_CANONICAL.patch
 rename meta/recipes-graphics/wayland/{wayland-protocols_1.3.bb => wayland-protocols_1.4.bb} (80%)
 create mode 100644 meta/recipes-graphics/wayland/wayland/0001-scanner-Use-unit32_t-instead-of-uint.patch
 rename meta/recipes-graphics/wayland/{wayland_1.10.0.bb => wayland_1.11.0.bb} (87%)
 create mode 100644 meta/recipes-graphics/wayland/weston/0001-shared-include-stdint.h-for-int32_t.patch
 delete mode 100644 meta/recipes-graphics/wayland/weston/make-libwebp-explicitly-configurable.patch
 rename meta/recipes-graphics/wayland/{weston_1.10.0.bb => weston_1.11.0.bb} (95%)
 rename meta/recipes-graphics/xorg-driver/{xf86-input-evdev_2.10.2.bb => xf86-input-evdev_2.10.3.bb} (83%)
 rename meta/recipes-graphics/xorg-driver/{xf86-input-libinput_0.16.0.bb => xf86-input-libinput_0.19.0.bb} (63%)
 rename meta/recipes-graphics/xorg-lib/{libxfixes_5.0.1.bb => libxfixes_5.0.2.bb} (79%)
 rename meta/recipes-graphics/xorg-lib/{xkeyboard-config_2.17.bb => xkeyboard-config_2.18.bb} (88%)

-- 
2.1.4

[PATCHv2 1/9] mesa-demos: Require X11 distro feature

[Jussi Kukkonen]

Mesa-demos theoretically does not require X11 (apart from xdemos/)
but reality is that every other binary requires glut. So:
 * 'non-glut' part of mesa-demos requires X11
 * current freeglut recipe also depends on X11

There is apparently wayland support in freeglut now: This recipe
should be modified when meta-oe freeglut recipe has that feature.

The change became necessary now because mesa no longer mistakenly
installs GL files when X11 is disabled (and mesa-demos configure
currently requires GL).

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 meta/recipes-graphics/mesa/mesa-demos_8.3.0.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-graphics/mesa/mesa-demos_8.3.0.bb b/meta/recipes-graphics/mesa/mesa-demos_8.3.0.bb
index ee0bb02..fab0bdb 100644
--- a/meta/recipes-graphics/mesa/mesa-demos_8.3.0.bb
+++ b/meta/recipes-graphics/mesa/mesa-demos_8.3.0.bb
@@ -24,10 +24,10 @@ SRC_URI[sha256sum] = "c173154bbd0d5fb53d732471984def42fb1b14ac85fcb834138fb9518b
 
 inherit autotools pkgconfig distro_features_check
 # depends on virtual/egl, virtual/libgl ...
-REQUIRED_DISTRO_FEATURES = "opengl"
+REQUIRED_DISTRO_FEATURES = "opengl x11"
 
 PACKAGECONFIG ?= "drm osmesa freetype2 gbm egl gles1 gles2 \
-                  ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 glew glu glx', '', d)}"
+                  x11 glew glu glx"
 
 # The Wayland code doesn't work with Wayland 1.0, so disable it for now
 #${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}"
-- 
2.1.4

[PATCHv2 2/9] mesa: Upgrade 11.2.2 -> 12.0.1

[Jussi Kukkonen]

Massive mesa upgrade (OpenGL 4.3, GLVND support, vulkan driver
for intel etc), although many new things are disabled by default.

License file change does not change the actual licenses.

piglit results (with piglit update on ML) on an old NUC with Intel
HD5000 for reference:
       pass:   33972
       fail:     306
      crash:       2
       skip:   30857
       warn:       7
      total:   65144

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 meta/recipes-graphics/mesa/{mesa-gl_11.2.2.bb => mesa-gl_12.0.1.bb} | 0
 meta/recipes-graphics/mesa/mesa.inc                                 | 2 +-
 meta/recipes-graphics/mesa/{mesa_11.2.2.bb => mesa_12.0.1.bb}       | 4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-graphics/mesa/{mesa-gl_11.2.2.bb => mesa-gl_12.0.1.bb} (100%)
 rename meta/recipes-graphics/mesa/{mesa_11.2.2.bb => mesa_12.0.1.bb} (80%)

diff --git a/meta/recipes-graphics/mesa/mesa-gl_11.2.2.bb b/meta/recipes-graphics/mesa/mesa-gl_12.0.1.bb
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa-gl_11.2.2.bb
rename to meta/recipes-graphics/mesa/mesa-gl_12.0.1.bb
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 1d084c0..e4880ff 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -10,7 +10,7 @@ HOMEPAGE = "http://mesa3d.org"
 BUGTRACKER = "https://bugs.freedesktop.org"
 SECTION = "x11"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://docs/license.html;md5=6a23445982a7a972ac198e93cc1cb3de"
+LIC_FILES_CHKSUM = "file://docs/license.html;md5=899fbe7e42d494c7c8c159c7001693d5"
 
 PE = "2"
 
diff --git a/meta/recipes-graphics/mesa/mesa_11.2.2.bb b/meta/recipes-graphics/mesa/mesa_12.0.1.bb
similarity index 80%
rename from meta/recipes-graphics/mesa/mesa_11.2.2.bb
rename to meta/recipes-graphics/mesa/mesa_12.0.1.bb
index a864b54..ad872b3 100644
--- a/meta/recipes-graphics/mesa/mesa_11.2.2.bb
+++ b/meta/recipes-graphics/mesa/mesa_12.0.1.bb
@@ -4,8 +4,8 @@ SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/mesa-${PV}.tar.xz \
            file://replace_glibc_check_with_linux.patch \
 "
 
-SRC_URI[md5sum] = "e0ec73f7273662a74366f0d76dd19ac3"
-SRC_URI[sha256sum] = "40e148812388ec7c6d7b6657d5a16e2e8dabba8b97ddfceea5197947647bdfb4"
+SRC_URI[md5sum] = "972fd5ad5a63aeabf173fb9adefc6522"
+SRC_URI[sha256sum] = "bab24fb79f78c876073527f515ed871fc9c81d816f66c8a0b051d8d653896389"
 
 #because we cannot rely on the fact that all apps will use pkgconfig,
 #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
-- 
2.1.4

[PATCHv2 3/9] wayland-protocols: Upgrade 1.3 -> 1.4

[Jussi Kukkonen]

Remove backported patch.

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 .../wayland-protocols/dont-use-AC_CANONICAL.patch  | 29 ----------------------
 ...d-protocols_1.3.bb => wayland-protocols_1.4.bb} |  6 ++---
 2 files changed, 3 insertions(+), 32 deletions(-)
 delete mode 100644 meta/recipes-graphics/wayland/wayland-protocols/dont-use-AC_CANONICAL.patch
 rename meta/recipes-graphics/wayland/{wayland-protocols_1.3.bb => wayland-protocols_1.4.bb} (80%)

diff --git a/meta/recipes-graphics/wayland/wayland-protocols/dont-use-AC_CANONICAL.patch b/meta/recipes-graphics/wayland/wayland-protocols/dont-use-AC_CANONICAL.patch
deleted file mode 100644
index 6cc0f3b..0000000
--- a/meta/recipes-graphics/wayland/wayland-protocols/dont-use-AC_CANONICAL.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Check autoconfs $cross_compiling instead as AC_CANONICAL_HOST call
-will fail if the host cpu is not recognised (which can happen when
-e.g. Yocto builds for "allarch").
-
-Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
-Upstream-Status: Backport [cc276dfa41]
-
-diff --git a/configure.ac b/configure.ac
-index 5b48b1a..3d45a4b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -15,13 +15,10 @@ AC_CONFIG_MACRO_DIR([m4])
- 
- AC_SUBST([WAYLAND_PROTOCOLS_VERSION], [wayland_protocols_version])
- 
--AC_CANONICAL_HOST
--AC_CANONICAL_BUILD
--
- AC_ARG_VAR([wayland_scanner], [The wayland-scanner executable])
- AC_PATH_PROG([wayland_scanner], [wayland-scanner])
- if test x$wayland_scanner = x; then
--        if test x$host = x$build; then
-+        if test "x$cross_compiling" != "xyes"; then
-                 PKG_CHECK_MODULES(WAYLAND_SCANNER, [wayland-scanner])
-                 wayland_scanner=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`
-         else
--- 
-cgit v0.10.2
-
diff --git a/meta/recipes-graphics/wayland/wayland-protocols_1.3.bb b/meta/recipes-graphics/wayland/wayland-protocols_1.4.bb
similarity index 80%
rename from meta/recipes-graphics/wayland/wayland-protocols_1.3.bb
rename to meta/recipes-graphics/wayland/wayland-protocols_1.4.bb
index 86e89b5..fcc156f 100644
--- a/meta/recipes-graphics/wayland/wayland-protocols_1.3.bb
+++ b/meta/recipes-graphics/wayland/wayland-protocols_1.4.bb
@@ -10,9 +10,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \
                     file://stable/presentation-time/presentation-time.xml;endline=26;md5=4646cd7d9edc9fa55db941f2d3a7dc53"
 
 SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
-           file://dont-use-AC_CANONICAL.patch"
-SRC_URI[md5sum] = "88b5e3dce52908c7e74fad3e2cf8abb0"
-SRC_URI[sha256sum] = "6bcd0633fdf9225ef1c7d2831f542e947f7d79811c79fc37f57b2e5375ded82f"
+           "
+SRC_URI[md5sum] = "fd8089abf13a1d04e4baa6509ee72baf"
+SRC_URI[sha256sum] = "014a9a23c21ed14f49b1005b3e8efa66d6337d4ceafc97f7b0d6707e7e3df572"
 
 inherit allarch autotools pkgconfig
 
-- 
2.1.4

[PATCHv2 4/9] wayland: Upgrade 1.10.0 -> 1.11.0

[Jussi Kukkonen]

Add a musl build fix patch.

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 ...0001-scanner-Use-unit32_t-instead-of-uint.patch | 30 ++++++++++++++++++++++
 .../{wayland_1.10.0.bb => wayland_1.11.0.bb}       |  8 +++---
 2 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-graphics/wayland/wayland/0001-scanner-Use-unit32_t-instead-of-uint.patch
 rename meta/recipes-graphics/wayland/{wayland_1.10.0.bb => wayland_1.11.0.bb} (87%)

diff --git a/meta/recipes-graphics/wayland/wayland/0001-scanner-Use-unit32_t-instead-of-uint.patch b/meta/recipes-graphics/wayland/wayland/0001-scanner-Use-unit32_t-instead-of-uint.patch
new file mode 100644
index 0000000..dece95c
--- /dev/null
+++ b/meta/recipes-graphics/wayland/wayland/0001-scanner-Use-unit32_t-instead-of-uint.patch
@@ -0,0 +1,30 @@
+From 5516d32e694badca35b6c71b02a3f08f650308bf Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 15 Jul 2016 16:23:48 -0700
+Subject: [PATCH] scanner: Use unit32_t instead of uint
+
+uint32_t is C99 defined stdint type
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Upstream-Status: Submitted
+---
+ src/scanner.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/scanner.c b/src/scanner.c
+index 5f06e8e..10a4023 100644
+--- a/src/scanner.c
++++ b/src/scanner.c
+@@ -808,7 +808,7 @@ find_enumeration(struct protocol *protocol,
+ 	struct interface *i;
+ 	struct enumeration *e;
+ 	char *enum_name;
+-	uint idx = 0, j;
++	uint32_t idx = 0, j;
+ 
+ 	for (j = 0; j + 1 < strlen(enum_attribute); j++) {
+ 		if (enum_attribute[j] == '.') {
+-- 
+2.1.4
+
diff --git a/meta/recipes-graphics/wayland/wayland_1.10.0.bb b/meta/recipes-graphics/wayland/wayland_1.11.0.bb
similarity index 87%
rename from meta/recipes-graphics/wayland/wayland_1.10.0.bb
rename to meta/recipes-graphics/wayland/wayland_1.11.0.bb
index 41d08b7..3413406 100644
--- a/meta/recipes-graphics/wayland/wayland_1.10.0.bb
+++ b/meta/recipes-graphics/wayland/wayland_1.11.0.bb
@@ -10,9 +10,11 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \
                     file://src/wayland-server.c;endline=24;md5=b8e046164a766bb1ede8ba38e9dcd7ce"
 
-SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz"
-SRC_URI[md5sum] = "e7751c38807c231afaba9d6b68f2a2b7"
-SRC_URI[sha256sum] = "4bf6e790aa6f50ab3825676282ecd75850ec9c4767af96ecb7127b1f3c3d60dc"
+SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
+           file://0001-scanner-Use-unit32_t-instead-of-uint.patch \
+           "
+SRC_URI[md5sum] = "fccf680be066e234729d5b69e0bd0fa9"
+SRC_URI[sha256sum] = "9540925f7928becfdf5e3b84c70757f6589bf1ceef09bea78784d8e4772c0db0"
 
 EXTRA_OECONF_class-native = "--disable-documentation --disable-libraries"
 
-- 
2.1.4

[PATCHv2 5/9] weston: Upgrade 1.10.0 -> 1.11.0

[Jussi Kukkonen]

Remove now unnecessary patch, rebase others.
Add musl build fix patch.

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 ...1-configure.ac-Fix-wayland-protocols-path.patch |  4 +-
 .../0001-shared-include-stdint.h-for-int32_t.patch | 28 +++++++++
 ...ch-Provide-a-default-version-that-doesn-t.patch | 68 +++++++++++-----------
 .../make-libwebp-explicitly-configurable.patch     | 37 ------------
 .../wayland/{weston_1.10.0.bb => weston_1.11.0.bb} |  8 +--
 5 files changed, 69 insertions(+), 76 deletions(-)
 create mode 100644 meta/recipes-graphics/wayland/weston/0001-shared-include-stdint.h-for-int32_t.patch
 delete mode 100644 meta/recipes-graphics/wayland/weston/make-libwebp-explicitly-configurable.patch
 rename meta/recipes-graphics/wayland/{weston_1.10.0.bb => weston_1.11.0.bb} (95%)

diff --git a/meta/recipes-graphics/wayland/weston/0001-configure.ac-Fix-wayland-protocols-path.patch b/meta/recipes-graphics/wayland/weston/0001-configure.ac-Fix-wayland-protocols-path.patch
index 7e00038..00118d7 100644
--- a/meta/recipes-graphics/wayland/weston/0001-configure.ac-Fix-wayland-protocols-path.patch
+++ b/meta/recipes-graphics/wayland/weston/0001-configure.ac-Fix-wayland-protocols-path.patch
@@ -20,10 +20,10 @@ diff --git a/configure.ac b/configure.ac
 index bc7c329..15a05d3 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -184,7 +184,7 @@ PKG_CHECK_MODULES(LIBINPUT_BACKEND, [libinput >= 0.8.0])
+@@ -187,7 +187,7 @@ PKG_CHECK_MODULES(LIBINPUT_BACKEND, [libinput >= 0.8.0])
  PKG_CHECK_MODULES(COMPOSITOR, [$COMPOSITOR_MODULES])
  
- PKG_CHECK_MODULES(WAYLAND_PROTOCOLS, [wayland-protocols >= 1.0],
+ PKG_CHECK_MODULES(WAYLAND_PROTOCOLS, [wayland-protocols >= 1.2],
 -		  [ac_wayland_protocols_pkgdatadir=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`])
 +		  [ac_wayland_protocols_pkgdatadir=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`])
  AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, $ac_wayland_protocols_pkgdatadir)
diff --git a/meta/recipes-graphics/wayland/weston/0001-shared-include-stdint.h-for-int32_t.patch b/meta/recipes-graphics/wayland/weston/0001-shared-include-stdint.h-for-int32_t.patch
new file mode 100644
index 0000000..91ef727
--- /dev/null
+++ b/meta/recipes-graphics/wayland/weston/0001-shared-include-stdint.h-for-int32_t.patch
@@ -0,0 +1,28 @@
+From ba02b8abe4e2afac2bfbf2559972d5059d75a041 Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Date: Sat, 16 Jul 2016 22:50:19 +0300
+Subject: [PATCH weston] shared: include stdint.h for int32_t
+
+This fixes build on musl.
+
+Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Upstream-Status: Submitted
+---
+ shared/xalloc.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/shared/xalloc.h b/shared/xalloc.h
+index 85fccb4..484de2d 100644
+--- a/shared/xalloc.h
++++ b/shared/xalloc.h
+@@ -30,6 +30,7 @@
+ extern "C" {
+ #endif
+ 
++#include <stdint.h>
+ #include <stdlib.h>
+ #include <string.h>
+ 
+-- 
+2.1.4
+
diff --git a/meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch b/meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
index 9a401ee..5542036 100644
--- a/meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
+++ b/meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
@@ -1,8 +1,8 @@
-From 228349e796e9baa86f2ba8232c730c18ac41283d Mon Sep 17 00:00:00 2001
+From d02226b3d5872b184c1d50c7f4706ac9467ffb81 Mon Sep 17 00:00:00 2001
 From: Tom Hochstein <tom.hochstein@nxp.com>
-Date: Fri, 13 May 2016 09:31:55 -0500
-Subject: [PATCH weston] weston-launch: Provide a default version that doesn't
- require PAM
+Date: Fri, 15 Jul 2016 11:00:15 +0300
+Subject: [PATCH] weston-launch: Provide a default version that doesn't require
+ PAM
 
 weston-launch requires PAM for starting weston as a non-root user.
 
@@ -14,18 +14,17 @@ Upstream-Status: Pending
 
 Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
 ---
- Makefile.am         |  3 ---
- configure.ac        | 12 +++++++-----
+ configure.ac        |  9 +++++++--
  src/weston-launch.c | 20 ++++++++++++++++++++
- 3 files changed, 27 insertions(+), 8 deletions(-)
+ 2 files changed, 27 insertions(+), 2 deletions(-)
 
-Index: weston-1.10.0/configure.ac
-===================================================================
---- weston-1.10.0.orig/configure.ac	2016-05-13 11:02:05.711817559 -0500
-+++ weston-1.10.0/configure.ac	2016-05-13 13:30:28.000000000 -0500
-@@ -445,13 +445,17 @@
- AS_IF([test "x$have_systemd_login_209" = "xyes"],
-       [AC_DEFINE([HAVE_SYSTEMD_LOGIN_209], [1], [Have systemd-login >= 209])])
+diff --git a/configure.ac b/configure.ac
+index 32fdde7..240966f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -416,13 +416,17 @@ AC_ARG_ENABLE(resize-optimization,
+ AS_IF([test "x$enable_resize_optimization" = "xyes"],
+       [AC_DEFINE([USE_RESIZE_POOL], [1], [Use resize memory pool as a performance optimization])])
  
 +AC_ARG_WITH(pam,
 +            AS_HELP_STRING([--with-pam], [Use PAM]),
@@ -34,16 +33,16 @@ Index: weston-1.10.0/configure.ac
  AM_CONDITIONAL(BUILD_WESTON_LAUNCH, test x$enable_weston_launch == xyes)
 -if test x$enable_weston_launch == xyes; then
 +if test x$enable_weston_launch = xyes -a x$use_pam = xyes; then
-   AC_CHECK_LIB([pam], [pam_open_session], [have_pam=yes], [have_pam=no])
+   WESTON_SEARCH_LIBS([PAM], [pam], [pam_open_session], [have_pam=yes], [have_pam=no])
    if test x$have_pam == xno; then
 -    AC_ERROR([weston-launch requires pam])
 +    AC_ERROR([PAM support is explicitly requested, but libpam couldn't be found])
    fi
 +  AC_DEFINE([HAVE_PAM], [1], [Define if PAM is available])
-   PAM_LIBS=-lpam
-   AC_SUBST(PAM_LIBS)
  fi
-@@ -667,6 +671,7 @@
+ 
+ AM_CONDITIONAL(HAVE_PANGO, test "x$have_pango" = "xyes")
+@@ -673,6 +677,7 @@ AC_MSG_RESULT([
  	Enable developer documentation	${enable_devdocs}
  
  	weston-launch utility		${enable_weston_launch}
@@ -51,10 +50,10 @@ Index: weston-1.10.0/configure.ac
  	systemd-login support		${have_systemd_login}
  	systemd notify support		${enable_systemd_notify}
  
-Index: weston-1.10.0/src/weston-launch.c
-===================================================================
---- weston-1.10.0.orig/src/weston-launch.c	2016-05-13 11:02:05.779817896 -0500
-+++ weston-1.10.0/src/weston-launch.c	2016-05-13 11:02:05.851818253 -0500
+diff --git a/src/weston-launch.c b/src/weston-launch.c
+index b8b2ba0..a865061 100644
+--- a/src/weston-launch.c
++++ b/src/weston-launch.c
 @@ -51,7 +51,9 @@
  
  #include <pwd.h>
@@ -65,7 +64,7 @@ Index: weston-1.10.0/src/weston-launch.c
  
  #ifdef HAVE_SYSTEMD_LOGIN
  #include <systemd/sd-login.h>
-@@ -93,8 +95,10 @@
+@@ -93,8 +95,10 @@ drmSetMaster(int drm_fd)
  #endif
  
  struct weston_launch {
@@ -76,7 +75,7 @@ Index: weston-1.10.0/src/weston-launch.c
  	int tty;
  	int ttynr;
  	int sock[2];
-@@ -181,6 +185,7 @@
+@@ -181,6 +185,7 @@ weston_launch_allowed(struct weston_launch *wl)
  	return false;
  }
  
@@ -84,7 +83,7 @@ Index: weston-1.10.0/src/weston-launch.c
  static int
  pam_conversation_fn(int msg_count,
  		    const struct pam_message **messages,
-@@ -221,6 +226,7 @@
+@@ -221,6 +226,7 @@ setup_pam(struct weston_launch *wl)
  
  	return 0;
  }
@@ -92,7 +91,7 @@ Index: weston-1.10.0/src/weston-launch.c
  
  static int
  setup_launcher_socket(struct weston_launch *wl)
-@@ -414,6 +420,7 @@
+@@ -414,6 +420,7 @@ quit(struct weston_launch *wl, int status)
  	close(wl->signalfd);
  	close(wl->sock[0]);
  
@@ -100,7 +99,7 @@ Index: weston-1.10.0/src/weston-launch.c
  	if (wl->new_user) {
  		err = pam_close_session(wl->ph, 0);
  		if (err)
-@@ -421,6 +428,7 @@
+@@ -421,6 +428,7 @@ quit(struct weston_launch *wl, int status)
  				err, pam_strerror(wl->ph, err));
  		pam_end(wl->ph, err);
  	}
@@ -108,7 +107,7 @@ Index: weston-1.10.0/src/weston-launch.c
  
  	if (ioctl(wl->tty, KDSKBMUTE, 0) &&
  	    ioctl(wl->tty, KDSKBMODE, wl->kb_mode))
-@@ -600,6 +608,7 @@
+@@ -600,6 +608,7 @@ setup_session(struct weston_launch *wl)
  	setenv("HOME", wl->pw->pw_dir, 1);
  	setenv("SHELL", wl->pw->pw_shell, 1);
  
@@ -116,7 +115,7 @@ Index: weston-1.10.0/src/weston-launch.c
  	env = pam_getenvlist(wl->ph);
  	if (env) {
  		for (i = 0; env[i]; ++i) {
-@@ -608,6 +617,7 @@
+@@ -608,6 +617,7 @@ setup_session(struct weston_launch *wl)
  		}
  		free(env);
  	}
@@ -124,7 +123,7 @@ Index: weston-1.10.0/src/weston-launch.c
  }
  
  static void
-@@ -665,7 +675,9 @@
+@@ -665,7 +675,9 @@ static void
  help(const char *name)
  {
  	fprintf(stderr, "Usage: %s [args...] [-- [weston args..]]\n", name);
@@ -134,7 +133,7 @@ Index: weston-1.10.0/src/weston-launch.c
  	fprintf(stderr, "  -t, --tty       Start session on alternative tty\n");
  	fprintf(stderr, "  -v, --verbose   Be verbose\n");
  	fprintf(stderr, "  -h, --help      Display this help message\n");
-@@ -678,7 +690,9 @@
+@@ -678,7 +690,9 @@ main(int argc, char *argv[])
  	int i, c;
  	char *tty = NULL;
  	struct option opts[] = {
@@ -144,7 +143,7 @@ Index: weston-1.10.0/src/weston-launch.c
  		{ "tty",     required_argument, NULL, 't' },
  		{ "verbose", no_argument,       NULL, 'v' },
  		{ "help",    no_argument,       NULL, 'h' },
-@@ -690,9 +704,13 @@
+@@ -690,9 +704,13 @@ main(int argc, char *argv[])
  	while ((c = getopt_long(argc, argv, "u:t::vh", opts, &i)) != -1) {
  		switch (c) {
  		case 'u':
@@ -158,7 +157,7 @@ Index: weston-1.10.0/src/weston-launch.c
  			break;
  		case 't':
  			tty = optarg;
-@@ -730,8 +748,10 @@
+@@ -730,8 +748,10 @@ main(int argc, char *argv[])
  	if (setup_tty(&wl, tty) < 0)
  		exit(EXIT_FAILURE);
  
@@ -169,3 +168,6 @@ Index: weston-1.10.0/src/weston-launch.c
  
  	if (setup_launcher_socket(&wl) < 0)
  		exit(EXIT_FAILURE);
+-- 
+2.1.4
+
diff --git a/meta/recipes-graphics/wayland/weston/make-libwebp-explicitly-configurable.patch b/meta/recipes-graphics/wayland/weston/make-libwebp-explicitly-configurable.patch
deleted file mode 100644
index ad07d4f..0000000
--- a/meta/recipes-graphics/wayland/weston/make-libwebp-explicitly-configurable.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-
-The libwebp package is outside of openembedded-core, so make it
-explicitly configurable. Make it deterministic, so that if libwebp 
-dependencies are missing, autoconf throws a fatal error.
-
-Upstream-Status: Pending
-
-Index: weston-1.5.0/configure.ac
-===================================================================
---- weston-1.5.0.orig/configure.ac
-+++ weston-1.5.0/configure.ac
-@@ -268,9 +268,22 @@ fi
- 
- PKG_CHECK_MODULES(PIXMAN, [pixman-1])
- PKG_CHECK_MODULES(PNG, [libpng])
--PKG_CHECK_MODULES(WEBP, [libwebp], [have_webp=yes], [have_webp=no])
--AS_IF([test "x$have_webp" = "xyes"],
--      [AC_DEFINE([HAVE_WEBP], [1], [Have webp])])
-+AC_ARG_ENABLE(webp,
-+              AS_HELP_STRING([--disable-webp],
-+                             [Disable libwebp support]),,
-+              enable_webp=auto)
-+AM_CONDITIONAL(HAVE_WEBP, [test "x$enable_webp" = xyes])
-+AS_IF([test "x$enable_webp" != "xno"],
-+    PKG_CHECK_MODULES(WEBP,
-+                     [libwebp],
-+                     [have_webp=yes],
-+                     [have_webp=no])
-+    AS_IF([test "x$have_webp" = "xno" -a "x$enable_webp" = "xyes"],
-+        AC_MSG_ERROR([libwebp support explicitly request, but lipwebp could not be found]))
-+    AS_IF([test "x$have_webp" = "xyes"],
-+        [enable_webp=yes]
-+        [AC_DEFINE([HAVE_WEBP], [1], [Have webp])])
-+)
- 
- AC_ARG_ENABLE(vaapi-recorder, [  --enable-vaapi-recorder],,
- 	      enable_vaapi_recorder=auto)
diff --git a/meta/recipes-graphics/wayland/weston_1.10.0.bb b/meta/recipes-graphics/wayland/weston_1.11.0.bb
similarity index 95%
rename from meta/recipes-graphics/wayland/weston_1.10.0.bb
rename to meta/recipes-graphics/wayland/weston_1.11.0.bb
index 6b934e2..3ad309d 100644
--- a/meta/recipes-graphics/wayland/weston_1.10.0.bb
+++ b/meta/recipes-graphics/wayland/weston_1.11.0.bb
@@ -8,15 +8,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \
 SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
            file://weston.png \
            file://weston.desktop \
-           file://make-libwebp-explicitly-configurable.patch \
            file://0001-make-error-portable.patch \
            file://0001-configure.ac-Fix-wayland-protocols-path.patch \
+           file://0001-shared-include-stdint.h-for-int32_t.patch \
            file://xwayland.weston-start \
            file://make-weston-launch-exit-for-unrecognized-option.patch \
            file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \
 "
-SRC_URI[md5sum] = "1cd17c54ecac6d9a3cd90bf12eaa3e20"
-SRC_URI[sha256sum] = "e0b2004d00d8293ddf7903ca283c1746afa9ccb5919ab50fd04397ff472aa5c1"
+SRC_URI[md5sum] = "bc6f90a2039163804aecfa663b69c4c2"
+SRC_URI[sha256sum] = "05e086e9f186a06843b9f7a5e1abf19347b1a6e4be26d7e74927abc17b6b7125"
 
 inherit autotools pkgconfig useradd distro_features_check
 # depends on virtual/egl
@@ -68,7 +68,7 @@ PACKAGECONFIG[cairo-glesv2] = "--with-cairo-glesv2,--with-cairo=image,cairo"
 # Weston with lcms support
 PACKAGECONFIG[lcms] = "--enable-lcms,--disable-lcms,lcms"
 # Weston with webp support
-PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp"
+PACKAGECONFIG[webp] = "--with-webp,--without-webp,libwebp"
 # Weston with unwinding support
 PACKAGECONFIG[libunwind] = "--enable-libunwind,--disable-libunwind,libunwind"
 # Weston with systemd-login support
-- 
2.1.4

[PATCHv2 6/9] libxfixes: Upgrade 5.0.1 -> 5.0.2

[Jussi Kukkonen]

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 .../xorg-lib/{libxfixes_5.0.1.bb => libxfixes_5.0.2.bb}               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-lib/{libxfixes_5.0.1.bb => libxfixes_5.0.2.bb} (79%)

diff --git a/meta/recipes-graphics/xorg-lib/libxfixes_5.0.1.bb b/meta/recipes-graphics/xorg-lib/libxfixes_5.0.2.bb
similarity index 79%
rename from meta/recipes-graphics/xorg-lib/libxfixes_5.0.1.bb
rename to meta/recipes-graphics/xorg-lib/libxfixes_5.0.2.bb
index 6e2740c..f078aed 100644
--- a/meta/recipes-graphics/xorg-lib/libxfixes_5.0.1.bb
+++ b/meta/recipes-graphics/xorg-lib/libxfixes_5.0.2.bb
@@ -18,5 +18,5 @@ XORG_PN = "libXfixes"
 
 BBCLASSEXTEND = "native nativesdk"
 
-SRC_URI[md5sum] = "b985b85f8b9386c85ddcfe1073906b4d"
-SRC_URI[sha256sum] = "63bec085084fa3caaee5180490dd871f1eb2020ba9e9b39a30f93693ffc34767"
+SRC_URI[md5sum] = "544d73df94e638ba7b64147be416e576"
+SRC_URI[sha256sum] = "9bd20edfec084a1bed481d48dd4815dee88139fffad091418cdda081129a9aea"
-- 
2.1.4

[PATCHv2 7/9] xkeyboard-config: Upgrade 2.17 -> 2.18

[Jussi Kukkonen]

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 .../xorg-lib/{xkeyboard-config_2.17.bb => xkeyboard-config_2.18.bb}   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-lib/{xkeyboard-config_2.17.bb => xkeyboard-config_2.18.bb} (88%)

diff --git a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.17.bb b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.18.bb
similarity index 88%
rename from meta/recipes-graphics/xorg-lib/xkeyboard-config_2.17.bb
rename to meta/recipes-graphics/xorg-lib/xkeyboard-config_2.18.bb
index ff9aa1d..79fcbd8 100644
--- a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.17.bb
+++ b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.18.bb
@@ -13,8 +13,8 @@ LICENSE = "MIT & MIT-style"
 LIC_FILES_CHKSUM = "file://COPYING;md5=0e7f21ca7db975c63467d2e7624a12f9"
 
 SRC_URI = "${XORG_MIRROR}/individual/data/xkeyboard-config/${BPN}-${PV}.tar.bz2"
-SRC_URI[md5sum] = "15034bb74deebde54161dface62abbce"
-SRC_URI[sha256sum] = "dec6be44bd31775cdc1ab95bfd75d5f2c0055613eeca8b4e9c6480b183430701"
+SRC_URI[md5sum] = "c28cf45616bfec276879360bc36c6b27"
+SRC_URI[sha256sum] = "c41d917d6c8a59feb7ccbda51c40a6ada824fdd1e9684b52dd48c9530617ddd0"
 
 SECTION = "x11/libs"
 DEPENDS = "intltool-native virtual/gettext util-macros libxslt-native"
-- 
2.1.4

[PATCHv2 8/9] xf86-input-evdev: Upgrade 2.10.2 -> 2.10.3

[Jussi Kukkonen]

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 .../{xf86-input-evdev_2.10.2.bb => xf86-input-evdev_2.10.3.bb}        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-driver/{xf86-input-evdev_2.10.2.bb => xf86-input-evdev_2.10.3.bb} (83%)

diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.10.2.bb b/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.10.3.bb
similarity index 83%
rename from meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.10.2.bb
rename to meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.10.3.bb
index 2ea4574..f81c3ec 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.10.2.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.10.3.bb
@@ -16,5 +16,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fefe33b1cf0cacba0e72e3b0fa0f0e16"
 
 DEPENDS += "mtdev libevdev"
 
-SRC_URI[md5sum] = "452bcc3bcce712b59af363eea94e3392"
-SRC_URI[sha256sum] = "a73a630d41ab90708d929f357e922bfbdb63d553491c5a30ab3e8fb1e35dfe1d"
+SRC_URI[md5sum] = "aa3363ce5061d0c4d1e7f7019b99716d"
+SRC_URI[sha256sum] = "5aa21ba4be8df927e5676a99c7f4f0343abc089f5451b7e73e39536f29b332a2"
-- 
2.1.4

[PATCHv2 9/9] xf86-input-libinput: Upgrade 0.16.0 -> 0.19.0

[Jussi Kukkonen]

Note that the xorg configuration file for input-libinput now sorts
lower than it used to (90 -> 60).

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 .../{xf86-input-libinput_0.16.0.bb => xf86-input-libinput_0.19.0.bb}  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-driver/{xf86-input-libinput_0.16.0.bb => xf86-input-libinput_0.19.0.bb} (63%)

diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-libinput_0.16.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-libinput_0.19.0.bb
similarity index 63%
rename from meta/recipes-graphics/xorg-driver/xf86-input-libinput_0.16.0.bb
rename to meta/recipes-graphics/xorg-driver/xf86-input-libinput_0.19.0.bb
index 0252baf..5e5c471 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-libinput_0.16.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-libinput_0.19.0.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5e6b20ea2ef94a998145f0ea3f788ee0"
 
 DEPENDS += "libinput"
 
-SRC_URI[md5sum] = "2c8cb520f88da7bafaceebc0b34ea1d4"
-SRC_URI[sha256sum] = "fdade531e91e79acf6dce8ac55fa4f65abe3f1358c5d3d777ae48dbc74b76f49"
+SRC_URI[md5sum] = "52c38b1369764243bfcf6ead1e4c6d32"
+SRC_URI[sha256sum] = "6c5d30dc7c8b8ae34261340e1dc9cbb8ef435078e084b8ef507527a8a21af477"
 
 FILES_${PN} += "${datadir}/X11/xorg.conf.d"
-- 
2.1.4

Re: [PATCHv2 2/9] mesa: Upgrade 11.2.2 -> 12.0.1

[Nicolas Dechesne]

On Mon, Jul 18, 2016 at 5:34 PM, Jussi Kukkonen
<jussi.kukkonen@intel.com> wrote:
> Massive mesa upgrade (OpenGL 4.3, GLVND support, vulkan driver
> for intel etc), although many new things are disabled by default.
>
> License file change does not change the actual licenses.
>
> piglit results (with piglit update on ML) on an old NUC with Intel
> HD5000 for reference:
>        pass:   33972
>        fail:     306
>       crash:       2
>        skip:   30857
>        warn:       7
>       total:   65144
>
> Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>

thanks for the upgrade.

I have tested the mesa upgrade with Gallium3d/freedreno on Qualcomm
based boards.. so far it seems to be working fine.