[PATCH 0/6] wayland/weston 1.8 upgrade

[PATCH 0/6] wayland/weston 1.8 upgrade

[Khem Raj]

Addresses comments on wayland upgrade to use tarballs
runqemu patch is needed for wayland/weston to work
libpicaccess and gdb patches make musl support better

Khem Raj (6):
  libinput: Upgrade 0.7.0 -> 0.18.0
  wayland: Upgrade 1.6.0 -> 1.8.1
  weston: Upgrade weston_1.6.0.bb -> weston_1.8.0.bb
  runqemu-internal: Replace wacom-tablet with tablet for usbdevice
  libpciaccess: Upgrade to 0.13.4
  gdb: Disable lttng support for musl

 meta/recipes-devtools/gdb/gdb-common.inc           |   1 +
 .../{libinput_0.7.0.bb => libinput_0.18.0.bb}      |   9 +-
 .../wayland/{wayland_1.6.0.bb => wayland_1.8.1.bb} |   5 +-
 .../wayland/weston/0001-make-error-portable.patch  |  80 +++++++++
 .../weston/disable-wayland-scanner-pkg-check.patch |  20 ++-
 .../wayland/{weston_1.6.0.bb => weston_1.8.0.bb}   |  22 ++-
 ...clude-config.h-before-anything-else-in-.c.patch | 187 +++++++++++++++++++++
 .../libpciaccess/0002-Fix-quoting-issue.patch      |  34 ++++
 ...nux_sysfs.c-Include-limits.h-for-PATH_MAX.patch |  32 ++++
 .../0004-Don-t-include-sys-io.h-on-arm.patch       |  28 +++
 .../xorg-lib/libpciaccess/limits.patch             |  17 --
 ...bpciaccess_0.13.3.bb => libpciaccess_0.13.4.bb} |  13 +-
 scripts/runqemu-internal                           |   4 +-
 13 files changed, 407 insertions(+), 45 deletions(-)
 rename meta/recipes-graphics/wayland/{libinput_0.7.0.bb => libinput_0.18.0.bb} (50%)
 rename meta/recipes-graphics/wayland/{wayland_1.6.0.bb => wayland_1.8.1.bb} (92%)
 create mode 100644 meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
 rename meta/recipes-graphics/wayland/{weston_1.6.0.bb => weston_1.8.0.bb} (84%)
 create mode 100644 meta/recipes-graphics/xorg-lib/libpciaccess/0001-Include-config.h-before-anything-else-in-.c.patch
 create mode 100644 meta/recipes-graphics/xorg-lib/libpciaccess/0002-Fix-quoting-issue.patch
 create mode 100644 meta/recipes-graphics/xorg-lib/libpciaccess/0003-linux_sysfs.c-Include-limits.h-for-PATH_MAX.patch
 create mode 100644 meta/recipes-graphics/xorg-lib/libpciaccess/0004-Don-t-include-sys-io.h-on-arm.patch
 delete mode 100644 meta/recipes-graphics/xorg-lib/libpciaccess/limits.patch
 rename meta/recipes-graphics/xorg-lib/{libpciaccess_0.13.3.bb => libpciaccess_0.13.4.bb} (44%)

-- 
2.1.4

[PATCH 1/6] libinput: Upgrade 0.7.0 -> 0.18.0

[Khem Raj]

Upgrade is also required for wayland/weston 1.8.x

libinput license changes are
- COPYING: note that having linux/input.h in the tree does not make libinput GPL
- Updated to 2015 where appropriate, added where missing.
- filter: add Simon's copyright
  This code was largely lifted from the X server in
  bb25b2ad297891430606c367bfabc but didn't take the copyright messages
  that applied to that code.

- Change MIT X11 to MIT Expat license

  see

  http://cgit.freedesktop.org/wayland/libinput/commit/?id=bc9f16b40e23a1d25c105a4207b97d65253f0d98

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../wayland/{libinput_0.7.0.bb => libinput_0.18.0.bb}            | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
 rename meta/recipes-graphics/wayland/{libinput_0.7.0.bb => libinput_0.18.0.bb} (50%)

diff --git a/meta/recipes-graphics/wayland/libinput_0.7.0.bb b/meta/recipes-graphics/wayland/libinput_0.18.0.bb
similarity index 50%
rename from meta/recipes-graphics/wayland/libinput_0.7.0.bb
rename to meta/recipes-graphics/wayland/libinput_0.18.0.bb
index 98d2942..0fe1c6c 100644
--- a/meta/recipes-graphics/wayland/libinput_0.7.0.bb
+++ b/meta/recipes-graphics/wayland/libinput_0.18.0.bb
@@ -3,12 +3,15 @@ HOMEPAGE = "http://www.freedesktop.org/wiki/Software/libinput/"
 SECTION = "libs"
 
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=673e626420c7f859fbe2be3a9c13632d"
+LIC_FILES_CHKSUM = "file://COPYING;md5=2184aef38ff137ed33ce9a63b9d1eb8f"
 
 DEPENDS = "libevdev udev mtdev"
 
 SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz"
-SRC_URI[md5sum] = "381b61396de28c12716ef7a5475fea50"
-SRC_URI[sha256sum] = "129f485afe5e4a9394641293991c97cb99f5f3338340d0d65b704ff463d1579e"
+SRC_URI[md5sum] = "0ddbb0d53d58dec0a86de6791560011a"
+SRC_URI[sha256sum] = "64a70f96bab17a22eaf2fd7af17cf83def3388374096c7623be9448f62808cda"
 
 inherit autotools pkgconfig
+
+FILES_${PN} += "${libdir}/udev/"
+FILES_${PN}-dbg += "${libdir}/udev/.debug"
-- 
2.1.4

[PATCH 2/6] wayland: Upgrade 1.6.0 -> 1.8.1

[Khem Raj]

Fetch from git, at same release revision SHA

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-graphics/wayland/{wayland_1.6.0.bb => wayland_1.8.1.bb} | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/wayland/{wayland_1.6.0.bb => wayland_1.8.1.bb} (92%)

diff --git a/meta/recipes-graphics/wayland/wayland_1.6.0.bb b/meta/recipes-graphics/wayland/wayland_1.8.1.bb
similarity index 92%
rename from meta/recipes-graphics/wayland/wayland_1.6.0.bb
rename to meta/recipes-graphics/wayland/wayland_1.8.1.bb
index 6413a0a..5b36745 100644
--- a/meta/recipes-graphics/wayland/wayland_1.6.0.bb
+++ b/meta/recipes-graphics/wayland/wayland_1.8.1.bb
@@ -11,8 +11,9 @@ 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] = "d34c141c975084e4fb668e77b38f840e"
-SRC_URI[sha256sum] = "a7d5102dcf53d08c059d24bc62de491d7cd482070abeb6737a20d0d86ba6fc7f"
+SRC_URI[md5sum] = "6e877877c3e04cfb865cfcd0733c9ab1"
+SRC_URI[sha256sum] = "f17c938d1c24fd0a10f650a623a2775d329db3168b5732e498b08388ec776fc8"
+
 SRC_URI_append_class-native = " \
     file://disable-macro-checks-not-used-for-scanner.patch \
     "
-- 
2.1.4

[PATCH 3/6] weston: Upgrade weston_1.6.0.bb -> weston_1.8.0.bb

[Khem Raj]

Make error() portable, Fix build on musl

Use git for repo for SRC_URI

copyright year changed for weston compositor.c

- * Copyright © 2012 Collabora, Ltd.
+ * Copyright © 2012-2015 Collabora, Ltd.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../wayland/weston/0001-make-error-portable.patch  | 80 ++++++++++++++++++++++
 .../weston/disable-wayland-scanner-pkg-check.patch | 20 +++---
 .../wayland/{weston_1.6.0.bb => weston_1.8.0.bb}   | 22 +++---
 3 files changed, 105 insertions(+), 17 deletions(-)
 create mode 100644 meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
 rename meta/recipes-graphics/wayland/{weston_1.6.0.bb => weston_1.8.0.bb} (84%)

diff --git a/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch b/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
new file mode 100644
index 0000000..148848d
--- /dev/null
+++ b/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
@@ -0,0 +1,80 @@
+From c22e90365d89346258394833cbcad03ff32b2e27 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 29 May 2015 20:56:00 -0700
+Subject: [PATCH weston] make error() portable
+
+error() is not posix but gnu extension so may not be available on all
+kind of systemsi e.g. musl.
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+Upstream-Status: Submitted
+
+ configure.ac        |  2 ++
+ src/weston-error.h  | 20 ++++++++++++++++++++
+ src/weston-launch.c |  2 +-
+ 3 files changed, 23 insertions(+), 1 deletion(-)
+ create mode 100644 src/weston-error.h
+
+diff --git a/configure.ac b/configure.ac
+index 263fc22..f52cd62 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -57,6 +57,8 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[],
+ 	      [[#include <time.h>]])
+ AC_CHECK_HEADERS([execinfo.h])
+ 
++AC_CHECK_HEADERS([error.h])
++
+ AC_CHECK_FUNCS([mkostemp strchrnul initgroups posix_fallocate])
+ 
+ COMPOSITOR_MODULES="wayland-server >= 1.7.93 pixman-1 >= 0.25.2"
+diff --git a/src/weston-error.h b/src/weston-error.h
+new file mode 100644
+index 0000000..2089d02
+--- /dev/null
++++ b/src/weston-error.h
+@@ -0,0 +1,20 @@
++#ifndef _WESTON_ERROR_H
++#define _WESTON_ERROR_H
++
++#if defined(HAVE_ERROR_H)
++#include <error.h>
++#else
++#include <err.h>
++#include <string.h>
++#define _weston_error(S, E, F, ...) do { \
++	if (E) \
++		err(S, F ": %s", ##__VA_ARGS__, strerror(E)); \
++	else \
++		err(S, F, ##__VA_ARGS__); \
++} while(0)
++
++#define error _weston_error
++#endif
++
++#endif
++
+diff --git a/src/weston-launch.c b/src/weston-launch.c
+index 10c66de..3e6d30a 100644
+--- a/src/weston-launch.c
++++ b/src/weston-launch.c
+@@ -30,7 +30,6 @@
+ #include <poll.h>
+ #include <errno.h>
+ 
+-#include <error.h>
+ #include <getopt.h>
+ 
+ #include <sys/types.h>
+@@ -56,6 +55,7 @@
+ #endif
+ 
+ #include "weston-launch.h"
++#include "weston-error.h"
+ 
+ #define DRM_MAJOR 226
+ 
+-- 
+2.1.4
+
diff --git a/meta/recipes-graphics/wayland/weston/disable-wayland-scanner-pkg-check.patch b/meta/recipes-graphics/wayland/weston/disable-wayland-scanner-pkg-check.patch
index 062da5c..68ba38b 100644
--- a/meta/recipes-graphics/wayland/weston/disable-wayland-scanner-pkg-check.patch
+++ b/meta/recipes-graphics/wayland/weston/disable-wayland-scanner-pkg-check.patch
@@ -1,13 +1,17 @@
-Index: weston-1.5.0/configure.ac
+Index: git/configure.ac
 ===================================================================
---- weston-1.5.0.orig/configure.ac
-+++ weston-1.5.0/configure.ac
-@@ -503,7 +503,7 @@ if test x$wayland_scanner = x; then
- 	AC_MSG_ERROR([wayland-scanner is needed to compile weston])
+--- git.orig/configure.ac
++++ git/configure.ac
+@@ -501,12 +501,6 @@ if test "x$have_lcms" = xyes; then
  fi
+ AM_CONDITIONAL(HAVE_LCMS, [test "x$have_lcms" = xyes])
  
--PKG_CHECK_MODULES(WAYLAND_SCANNER, wayland-scanner)
-+#PKG_CHECK_MODULES(WAYLAND_SCANNER, wayland-scanner)
- 
+-AC_PATH_PROG([wayland_scanner], [wayland-scanner])
+-if test x$wayland_scanner = x; then
+-	PKG_CHECK_MODULES(WAYLAND_SCANNER, [wayland-scanner])
+-	wayland_scanner=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`
+-fi
+-
  AC_CONFIG_FILES([Makefile src/version.h src/weston.pc])
  
+ AM_CONDITIONAL([HAVE_GIT_REPO], [test -f $srcdir/.git/logs/HEAD])
diff --git a/meta/recipes-graphics/wayland/weston_1.6.0.bb b/meta/recipes-graphics/wayland/weston_1.8.0.bb
similarity index 84%
rename from meta/recipes-graphics/wayland/weston_1.6.0.bb
rename to meta/recipes-graphics/wayland/weston_1.8.0.bb
index 74ad816..ac6bd97 100644
--- a/meta/recipes-graphics/wayland/weston_1.6.0.bb
+++ b/meta/recipes-graphics/wayland/weston_1.8.0.bb
@@ -3,34 +3,38 @@ 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"
+                    file://src/compositor.c;endline=23;md5=a9793f1edc8d1a4c344ca8ae252352fb"
 
 SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
            file://weston.png \
            file://weston.desktop \
-           file://disable-wayland-scanner-pkg-check.patch \
            file://make-lcms-explicitly-configurable.patch \
            file://make-libwebp-explicitly-configurable.patch \
+           file://0001-make-error-portable.patch \
 "
-SRC_URI[md5sum] = "c60ce9dde99a089db0539d8f6b557827"
-SRC_URI[sha256sum] = "dc3ea5d13bbf025fabc006216c5ddc0d80d5f4ebe778912b8c4d1d4acaaa614d"
+SRC_URI[md5sum] = "24cb8a7ed0535b4fc3642643988dab36"
+SRC_URI[sha256sum] = "8963e69f328e815cec42c58046c4af721476c7541bb7d9edc71740fada5ad312"
 
 inherit autotools pkgconfig useradd
 
 DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 jpeg"
-DEPENDS += "wayland virtual/egl pango"
+DEPENDS += "wayland libinput virtual/egl pango"
 
 EXTRA_OECONF = "--enable-setuid-install \
                 --disable-xwayland \
                 --enable-simple-clients \
                 --enable-clients \
                 --enable-demo-clients-install \
-                --disable-libunwind \
                 --disable-rpi-compositor \
                 --disable-rdp-compositor \
                 "
 
-
+EXTRA_OECONF_append_qemux86 = "\
+		WESTON_NATIVE_BACKEND=fbdev-backend.so \
+		"
+EXTRA_OECONF_append_qemux86-64 = "\
+		WESTON_NATIVE_BACKEND=fbdev-backend.so \
+		"
 PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'launch', '', d)} \
@@ -60,8 +64,8 @@ PACKAGECONFIG[cairo-glesv2] = "--with-cairo-glesv2,--with-cairo=image,cairo"
 PACKAGECONFIG[lcms] = "--enable-lcms,--disable-lcms,lcms"
 # Weston with webp support
 PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp"
-# Weston with libinput backend
-PACKAGECONFIG[libinput] = "--enable-libinput-backend,--disable-libinput-backend,libinput"
+# Weston with unwinding support
+PACKAGECONFIG[libunwind] = "--enable-libunwind,--disable-libunwind,libunwind"
 
 do_install_append() {
 	# Weston doesn't need the .la files to load modules, so wipe them
-- 
2.1.4

[PATCH 4/6] runqemu-internal: Replace wacom-tablet with tablet for usbdevice

[Khem Raj]

When booting weston-core-image with latest wayland/weston/libinput
mouse/touchpad would not work on qemux86, this fixes the issue

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 scripts/runqemu-internal | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index 694815f..8f3d792 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -119,7 +119,7 @@ ORIG_STTY=$(stty -g)
 if [ "$SLIRP_ENABLED" = "yes" ]; then
     KERNEL_NETWORK_CMD="ip=dhcp"
     QEMU_TAP_CMD=""
-    QEMU_UI_OPTIONS="-show-cursor -usb -usbdevice wacom-tablet"
+    QEMU_UI_OPTIONS="-show-cursor -usb -usbdevice tablet"
     if [ "$KVM_ACTIVE" = "yes" ]; then
         QEMU_NETWORK_CMD=""
         DROOT="/dev/vda"
@@ -274,7 +274,7 @@ else
         fi
 
         KERNCMDLINE="mem=$QEMU_MEMORY"
-        QEMU_UI_OPTIONS="-show-cursor -usb -usbdevice wacom-tablet"
+        QEMU_UI_OPTIONS="-show-cursor -usb -usbdevice tablet"
 
         NFS_INSTANCE=`echo $TAP | sed 's/tap//'`
         export NFS_INSTANCE
-- 
2.1.4

[PATCH 5/6] libpciaccess: Upgrade to 0.13.4

[Khem Raj]

Drop upstreamed patch
backport portablility fixes from upstream
Add a fix to not use io function on ARM they dont work

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...clude-config.h-before-anything-else-in-.c.patch | 187 +++++++++++++++++++++
 .../libpciaccess/0002-Fix-quoting-issue.patch      |  34 ++++
 ...nux_sysfs.c-Include-limits.h-for-PATH_MAX.patch |  32 ++++
 .../0004-Don-t-include-sys-io.h-on-arm.patch       |  28 +++
 .../xorg-lib/libpciaccess/limits.patch             |  17 --
 ...bpciaccess_0.13.3.bb => libpciaccess_0.13.4.bb} |  13 +-
 6 files changed, 290 insertions(+), 21 deletions(-)
 create mode 100644 meta/recipes-graphics/xorg-lib/libpciaccess/0001-Include-config.h-before-anything-else-in-.c.patch
 create mode 100644 meta/recipes-graphics/xorg-lib/libpciaccess/0002-Fix-quoting-issue.patch
 create mode 100644 meta/recipes-graphics/xorg-lib/libpciaccess/0003-linux_sysfs.c-Include-limits.h-for-PATH_MAX.patch
 create mode 100644 meta/recipes-graphics/xorg-lib/libpciaccess/0004-Don-t-include-sys-io.h-on-arm.patch
 delete mode 100644 meta/recipes-graphics/xorg-lib/libpciaccess/limits.patch
 rename meta/recipes-graphics/xorg-lib/{libpciaccess_0.13.3.bb => libpciaccess_0.13.4.bb} (44%)

diff --git a/meta/recipes-graphics/xorg-lib/libpciaccess/0001-Include-config.h-before-anything-else-in-.c.patch b/meta/recipes-graphics/xorg-lib/libpciaccess/0001-Include-config.h-before-anything-else-in-.c.patch
new file mode 100644
index 0000000..e92fc0d
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libpciaccess/0001-Include-config.h-before-anything-else-in-.c.patch
@@ -0,0 +1,187 @@
+From b14696a55796e739624bbda4f772427032efff2a Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau@debian.org>
+Date: Sun, 26 Apr 2015 15:20:57 +0200
+Subject: [PATCH 1/4] Include config.h before anything else in *.c
+
+Debian bug#749008 <https://bugs.debian.org/749008>
+
+Reported-by: Michael Tautschnig <mt@debian.org>
+Signed-off-by: Julien Cristau <jcristau@debian.org>
+Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+---
+Upstream-Status: Backport
+
+ src/common_capability.c  | 3 +++
+ src/common_init.c        | 3 +++
+ src/common_interface.c   | 3 +++
+ src/common_io.c          | 3 +++
+ src/common_iterator.c    | 3 +++
+ src/common_map.c         | 3 +++
+ src/common_vgaarb_stub.c | 3 +++
+ src/linux_devmem.c       | 5 +++--
+ src/openbsd_pci.c        | 3 +++
+ src/solx_devfs.c         | 3 +++
+ src/x86_pci.c            | 4 +++-
+ 11 files changed, 33 insertions(+), 3 deletions(-)
+
+diff --git a/src/common_capability.c b/src/common_capability.c
+index 488743d..15d395d 100644
+--- a/src/common_capability.c
++++ b/src/common_capability.c
+@@ -31,6 +31,9 @@
+  *
+  * \author Ian Romanick <idr@us.ibm.com>
+  */
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
+ 
+ #include <stdlib.h>
+ #include <stdio.h>
+diff --git a/src/common_init.c b/src/common_init.c
+index b1c0c3e..f7b59bd 100644
+--- a/src/common_init.c
++++ b/src/common_init.c
+@@ -28,6 +28,9 @@
+  *
+  * \author Ian Romanick <idr@us.ibm.com>
+  */
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
+ 
+ #include <stdlib.h>
+ #include <errno.h>
+diff --git a/src/common_interface.c b/src/common_interface.c
+index 59778cf..cb95e90 100644
+--- a/src/common_interface.c
++++ b/src/common_interface.c
+@@ -28,6 +28,9 @@
+  *
+  * \author Ian Romanick <idr@us.ibm.com>
+  */
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
+ 
+ #include <stdlib.h>
+ #include <string.h>
+diff --git a/src/common_io.c b/src/common_io.c
+index f5c9e45..e9586ad 100644
+--- a/src/common_io.c
++++ b/src/common_io.c
+@@ -22,6 +22,9 @@
+  * Author:
+  *	Adam Jackson <ajax@redhat.com>
+  */
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
+ 
+ #include <stdlib.h>
+ #include <string.h>
+diff --git a/src/common_iterator.c b/src/common_iterator.c
+index ccf656d..2beb180 100644
+--- a/src/common_iterator.c
++++ b/src/common_iterator.c
+@@ -28,6 +28,9 @@
+  *
+  * \author Ian Romanick <idr@us.ibm.com>
+  */
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
+ 
+ #include <stdlib.h>
+ #include <string.h>
+diff --git a/src/common_map.c b/src/common_map.c
+index 8757151..f1854bb 100644
+--- a/src/common_map.c
++++ b/src/common_map.c
+@@ -21,6 +21,9 @@
+  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+  * DEALINGS IN THE SOFTWARE.
+  */
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
+ 
+ #include <sys/types.h>
+ #include <sys/mman.h>
+diff --git a/src/common_vgaarb_stub.c b/src/common_vgaarb_stub.c
+index 9394273..c1708f6 100644
+--- a/src/common_vgaarb_stub.c
++++ b/src/common_vgaarb_stub.c
+@@ -23,6 +23,9 @@
+  * OTHER DEALINGS IN THE SOFTWARE.
+  *
+  */
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
+ 
+ #include <stdio.h>
+ #include "pciaccess.h"
+diff --git a/src/linux_devmem.c b/src/linux_devmem.c
+index 10e3bde..0d0567c 100644
+--- a/src/linux_devmem.c
++++ b/src/linux_devmem.c
+@@ -32,8 +32,9 @@
+  *
+  * \author Ian Romanick <idr@us.ibm.com>
+  */
+-
+-#define _GNU_SOURCE
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
+ 
+ #include <stdlib.h>
+ #include <string.h>
+diff --git a/src/openbsd_pci.c b/src/openbsd_pci.c
+index 4d1b5cd..b8ce318 100644
+--- a/src/openbsd_pci.c
++++ b/src/openbsd_pci.c
+@@ -13,6 +13,9 @@
+  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  */
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
+ 
+ #include <sys/param.h>
+ #include <sys/ioctl.h>
+diff --git a/src/solx_devfs.c b/src/solx_devfs.c
+index f572393..cf96467 100644
+--- a/src/solx_devfs.c
++++ b/src/solx_devfs.c
+@@ -25,6 +25,9 @@
+ /*
+  * Solaris devfs interfaces
+  */
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
+ 
+ #include <stdlib.h>
+ #include <strings.h>
+diff --git a/src/x86_pci.c b/src/x86_pci.c
+index 49c1cab..32daa04 100644
+--- a/src/x86_pci.c
++++ b/src/x86_pci.c
+@@ -18,8 +18,10 @@
+  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  */
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
+ 
+-#define _GNU_SOURCE
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+-- 
+2.1.4
+
diff --git a/meta/recipes-graphics/xorg-lib/libpciaccess/0002-Fix-quoting-issue.patch b/meta/recipes-graphics/xorg-lib/libpciaccess/0002-Fix-quoting-issue.patch
new file mode 100644
index 0000000..16d69a8
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libpciaccess/0002-Fix-quoting-issue.patch
@@ -0,0 +1,34 @@
+From 765e0a38cb8c40f8865af5cb356ffe6039ffb08f Mon Sep 17 00:00:00 2001
+From: Thomas Klausner <wiz@NetBSD.org>
+Date: Sun, 22 Mar 2015 21:38:23 +0100
+Subject: [PATCH 2/4] Fix quoting issue.
+
+m4 has '[]' as quoting characters, so if we want '[]' to
+end up in the configure script, we need to quote them again.
+
+Reported by Greg Troxel <gdt@ir.bbn.com>.
+
+Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
+Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+---
+Upstream-Status: Backport
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index e67e9e1..888330b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -76,7 +76,7 @@ case $host_os in
+ 		;;
+ 	*netbsd*)
+ 		case $host in
+-		*i[3-9]86*)
++		*i[[3-9]]86*)
+ 			PCIACCESS_LIBS="$PCIACCESS_LIBS -li386"
+ 			;;
+ 		*x86_64*|*amd64*)
+-- 
+2.1.4
+
diff --git a/meta/recipes-graphics/xorg-lib/libpciaccess/0003-linux_sysfs.c-Include-limits.h-for-PATH_MAX.patch b/meta/recipes-graphics/xorg-lib/libpciaccess/0003-linux_sysfs.c-Include-limits.h-for-PATH_MAX.patch
new file mode 100644
index 0000000..f513c8e
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libpciaccess/0003-linux_sysfs.c-Include-limits.h-for-PATH_MAX.patch
@@ -0,0 +1,32 @@
+From 6bd2f7f92eae713663f4e13f6e2cb23526607b8c Mon Sep 17 00:00:00 2001
+From: Felix Janda <felix.janda@posteo.de>
+Date: Fri, 1 May 2015 16:36:50 +0200
+Subject: [PATCH 3/4] linux_sysfs.c: Include <limits.h> for PATH_MAX
+
+Fixes compilation with musl libc.
+
+Tested-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+Signed-off-by: Felix Janda <felix.janda@posteo.de>
+Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+---
+Upstream-Status: Backport
+
+ src/linux_sysfs.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/linux_sysfs.c b/src/linux_sysfs.c
+index 50d94cf..3f95e53 100644
+--- a/src/linux_sysfs.c
++++ b/src/linux_sysfs.c
+@@ -45,6 +45,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
++#include <limits.h>
+ #include <sys/mman.h>
+ #include <dirent.h>
+ #include <errno.h>
+-- 
+2.1.4
+
diff --git a/meta/recipes-graphics/xorg-lib/libpciaccess/0004-Don-t-include-sys-io.h-on-arm.patch b/meta/recipes-graphics/xorg-lib/libpciaccess/0004-Don-t-include-sys-io.h-on-arm.patch
new file mode 100644
index 0000000..f532858
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libpciaccess/0004-Don-t-include-sys-io.h-on-arm.patch
@@ -0,0 +1,28 @@
+From b6df5202306bd71158b482f25ca2e6919645d4dd Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 4 Jun 2015 20:55:06 -0700
+Subject: [PATCH 4/4] Don't include sys/io.h on arm
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+Upstream-Status: Pending
+
+ src/linux_sysfs.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/linux_sysfs.c b/src/linux_sysfs.c
+index 3f95e53..1e3aad3 100644
+--- a/src/linux_sysfs.c
++++ b/src/linux_sysfs.c
+@@ -50,7 +50,7 @@
+ #include <dirent.h>
+ #include <errno.h>
+ 
+-#if defined(__i386__) || defined(__x86_64__) || defined(__arm__)
++#if defined(__i386__) || defined(__x86_64__)
+ #include <sys/io.h>
+ #else
+ #define inb(x) -1
+-- 
+2.1.4
+
diff --git a/meta/recipes-graphics/xorg-lib/libpciaccess/limits.patch b/meta/recipes-graphics/xorg-lib/libpciaccess/limits.patch
deleted file mode 100644
index 498020e..0000000
--- a/meta/recipes-graphics/xorg-lib/libpciaccess/limits.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Add missing include file to get definition of PATH_MAX
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-Status: Pending
-
-Index: libpciaccess-0.13.3/src/linux_sysfs.c
-===================================================================
---- libpciaccess-0.13.3.orig/src/linux_sysfs.c
-+++ libpciaccess-0.13.3/src/linux_sysfs.c
-@@ -44,6 +44,7 @@
- #include <sys/mman.h>
- #include <dirent.h>
- #include <errno.h>
-+#include <limits.h>
- 
- #if defined(__i386__) || defined(__x86_64__) || defined(__arm__)
- #include <sys/io.h>
diff --git a/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.3.bb b/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.4.bb
similarity index 44%
rename from meta/recipes-graphics/xorg-lib/libpciaccess_0.13.3.bb
rename to meta/recipes-graphics/xorg-lib/libpciaccess_0.13.4.bb
index 4a832e8..ffa6a60 100644
--- a/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.3.bb
+++ b/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.4.bb
@@ -5,12 +5,17 @@ PCI bus and devices in a platform-independent way."
 
 require xorg-lib-common.inc
 
-SRC_URI += "file://limits.patch"
+SRC_URI += "\
+            file://0001-Include-config.h-before-anything-else-in-.c.patch \
+            file://0002-Fix-quoting-issue.patch \
+            file://0003-linux_sysfs.c-Include-limits.h-for-PATH_MAX.patch \
+            file://0004-Don-t-include-sys-io.h-on-arm.patch \
+"
+
+SRC_URI[md5sum] = "ace78aec799b1cf6dfaea55d3879ed9f"
+SRC_URI[sha256sum] = "07f864654561e4ac8629a0ef9c8f07fbc1f8592d1b6c418431593e9ba2cf2fcf"
 
 LICENSE = "MIT & MIT-style"
 LIC_FILES_CHKSUM = "file://COPYING;md5=277aada5222b9a22fbf3471ff3687068"
 
-SRC_URI[md5sum] = "1f65be5ffc55641c1846c2f41d180d00"
-SRC_URI[sha256sum] = "6cd76ccae4e06eee47d3ead84a118740e9406e2a9b7adc9b08e92c69ce89c2e3"
-
 REQUIRED_DISTRO_FEATURES = ""
-- 
2.1.4

[PATCH 6/6] gdb: Disable lttng support for musl

[Khem Raj]

lttng-ust is too much dependent on glibc dlfcn code
disable it for musl

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-devtools/gdb/gdb-common.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-devtools/gdb/gdb-common.inc b/meta/recipes-devtools/gdb/gdb-common.inc
index 81af42f..166ba8e 100644
--- a/meta/recipes-devtools/gdb/gdb-common.inc
+++ b/meta/recipes-devtools/gdb/gdb-common.inc
@@ -14,6 +14,7 @@ LTTNGUST_mips64el = ""
 LTTNGUST_mips64n32 = ""
 LTTNGUST_mips64eln32 = ""
 LTTNGUST_sh4 = ""
+LTTNGUST_libc-musl = ""
 
 INC_PR = "r0"
 
-- 
2.1.4

Re: [PATCH 2/6] wayland: Upgrade 1.6.0 -> 1.8.1

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1821 bytes --]

On Wed, Jul 01, 2015 at 11:24:53AM -0700, Khem Raj wrote:
> Fetch from git, at same release revision SHA

This doesn't match with the change anymore.
> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  meta/recipes-graphics/wayland/{wayland_1.6.0.bb => wayland_1.8.1.bb} | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
>  rename meta/recipes-graphics/wayland/{wayland_1.6.0.bb => wayland_1.8.1.bb} (92%)
> 
> diff --git a/meta/recipes-graphics/wayland/wayland_1.6.0.bb b/meta/recipes-graphics/wayland/wayland_1.8.1.bb
> similarity index 92%
> rename from meta/recipes-graphics/wayland/wayland_1.6.0.bb
> rename to meta/recipes-graphics/wayland/wayland_1.8.1.bb
> index 6413a0a..5b36745 100644
> --- a/meta/recipes-graphics/wayland/wayland_1.6.0.bb
> +++ b/meta/recipes-graphics/wayland/wayland_1.8.1.bb
> @@ -11,8 +11,9 @@ 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] = "d34c141c975084e4fb668e77b38f840e"
> -SRC_URI[sha256sum] = "a7d5102dcf53d08c059d24bc62de491d7cd482070abeb6737a20d0d86ba6fc7f"
> +SRC_URI[md5sum] = "6e877877c3e04cfb865cfcd0733c9ab1"
> +SRC_URI[sha256sum] = "f17c938d1c24fd0a10f650a623a2775d329db3168b5732e498b08388ec776fc8"
> +
>  SRC_URI_append_class-native = " \
>      file://disable-macro-checks-not-used-for-scanner.patch \
>      "
> -- 
> 2.1.4
> 
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

Re: [PATCH 2/6] wayland: Upgrade 1.6.0 -> 1.8.1

[Khem Raj]

On Wed, Jul 1, 2015 at 11:48 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Wed, Jul 01, 2015 at 11:24:53AM -0700, Khem Raj wrote:
>> Fetch from git, at same release revision SHA
>
> This doesn't match with the change anymore.

amended both weston and wayland commit messages on pull branch.

thx


>>
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> ---
>>  meta/recipes-graphics/wayland/{wayland_1.6.0.bb => wayland_1.8.1.bb} | 5 +++--
>>  1 file changed, 3 insertions(+), 2 deletions(-)
>>  rename meta/recipes-graphics/wayland/{wayland_1.6.0.bb => wayland_1.8.1.bb} (92%)
>>
>> diff --git a/meta/recipes-graphics/wayland/wayland_1.6.0.bb b/meta/recipes-graphics/wayland/wayland_1.8.1.bb
>> similarity index 92%
>> rename from meta/recipes-graphics/wayland/wayland_1.6.0.bb
>> rename to meta/recipes-graphics/wayland/wayland_1.8.1.bb
>> index 6413a0a..5b36745 100644
>> --- a/meta/recipes-graphics/wayland/wayland_1.6.0.bb
>> +++ b/meta/recipes-graphics/wayland/wayland_1.8.1.bb
>> @@ -11,8 +11,9 @@ 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] = "d34c141c975084e4fb668e77b38f840e"
>> -SRC_URI[sha256sum] = "a7d5102dcf53d08c059d24bc62de491d7cd482070abeb6737a20d0d86ba6fc7f"
>> +SRC_URI[md5sum] = "6e877877c3e04cfb865cfcd0733c9ab1"
>> +SRC_URI[sha256sum] = "f17c938d1c24fd0a10f650a623a2775d329db3168b5732e498b08388ec776fc8"
>> +
>>  SRC_URI_append_class-native = " \
>>      file://disable-macro-checks-not-used-for-scanner.patch \
>>      "
>> --
>> 2.1.4
>>
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
> --
> Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

Re: [PATCH 2/6] wayland: Upgrade 1.6.0 -> 1.8.1

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 178 bytes --]

On 1 July 2015 at 21:25, Khem Raj <raj.khem@gmail.com> wrote:

> amended both weston and wayland commit messages on pull branch.
>

This is kraj/for-master, right?

Ross

[-- Attachment #2: Type: text/html, Size: 561 bytes --]

Re: [PATCH 3/6] weston: Upgrade weston_1.6.0.bb -> weston_1.8.0.bb

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 410 bytes --]

On 1 July 2015 at 19:24, Khem Raj <raj.khem@gmail.com> wrote:
> +EXTRA_OECONF_append_qemux86 = "\
> +               WESTON_NATIVE_BACKEND=fbdev-backend.so \
> +               "
> +EXTRA_OECONF_append_qemux86-64 = "\
> +               WESTON_NATIVE_BACKEND=fbdev-backend.so \
> +               "

There's a qemuall override you can use here if you think that all qemu
machines will need this.

Ross

[-- Attachment #2: Type: text/html, Size: 599 bytes --]

Re: [PATCH 3/6] weston: Upgrade weston_1.6.0.bb -> weston_1.8.0.bb

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 316 bytes --]

On 1 July 2015 at 19:24, Khem Raj <raj.khem@gmail.com> wrote:

> Make error() portable, Fix build on musl
>

Upstream points out that theres lots of other GNU-specific bits in Weston
(such as gnu-specific printf formats).  Does musl support those or is this
a token step towards being musl-friendly?

Ross

[-- Attachment #2: Type: text/html, Size: 720 bytes --]

Re: [PATCH 2/6] wayland: Upgrade 1.6.0 -> 1.8.1

[Khem Raj]

[-- Attachment #1.1: Type: text/plain, Size: 307 bytes --]


> On Jul 1, 2015, at 1:37 PM, Burton, Ross <ross.burton@intel.com> wrote:
> 
> 
> On 1 July 2015 at 21:25, Khem Raj <raj.khem@gmail.com <mailto:raj.khem@gmail.com>> wrote:
> amended both weston and wayland commit messages on pull branch.
> 
> This is kraj/for-master, right?

yes

> 
> Ross


[-- Attachment #1.2: Type: text/html, Size: 1292 bytes --]

[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 211 bytes --]

Re: [PATCH 3/6] weston: Upgrade weston_1.6.0.bb -> weston_1.8.0.bb

[Khem Raj]

[-- Attachment #1.1: Type: text/plain, Size: 884 bytes --]


> On Jul 1, 2015, at 3:07 PM, Burton, Ross <ross.burton@intel.com> wrote:
> 
> 
> On 1 July 2015 at 19:24, Khem Raj <raj.khem@gmail.com <mailto:raj.khem@gmail.com>> wrote:
> Make error() portable, Fix build on musl
> 
> Upstream points out that theres lots of other GNU-specific bits in Weston (such as gnu-specific printf formats).  Does musl support those or is this a token step towards being musl-friendly?
> 

No, certain construct like %m which are used in weston are already part of musl. As of now it builds and boots fine with latest musl release and we will address any future issues
if they arise. moreover upstream wayland/weston is very receptive for musl changes. Now regarding this patch, I will redo it and submit it upstream to incorporate the feedback,
however the patch itself is ok its just the mechanics of it which needs to be changed.

> Ross


[-- Attachment #1.2: Type: text/html, Size: 1905 bytes --]

[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 211 bytes --]

Re: [PATCH 3/6] weston: Upgrade weston_1.6.0.bb -> weston_1.8.0.bb

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 574 bytes --]

On 2 July 2015 at 02:38, Khem Raj <raj.khem@gmail.com> wrote:

> No, certain construct like %m which are used in weston are already part of
> musl. As of now it builds and boots fine with latest musl release and we
> will address any future issues
> if they arise. moreover upstream wayland/weston is very receptive for musl
> changes. Now regarding this patch, I will redo it and submit it upstream to
> incorporate the feedback,
> however the patch itself is ok its just the mechanics of it which needs to
> be changed.
>

Excellent, glad to hear it.

Ross

[-- Attachment #2: Type: text/html, Size: 928 bytes --]