[PATCH 0/4] Wayland 1.8 upgrade

[PATCH 0/4] Wayland 1.8 upgrade

[Khem Raj]

This brings in wayland 1.8 component upgrade
runqemu change is required to let emulators keep working with wayland's shift to libinput backend
lsof,libpam issues fixes as exposed when compiled for musl

Khem Raj (4):
  wayland/weston/libinput: Upgrade to 1.6.0 -> 1.8.0
  runqemu-internal: Replace wacom-tablet with tablet for usbdevice
  libpam: Fix wrong crypt library detection
  lsof: Remove LSOF_OS

 meta/recipes-extended/lsof/lsof_4.88.bb            |  5 +-
 .../pam/libpam/crypt_configure.patch               | 31 +++++++++
 meta/recipes-extended/pam/libpam_1.1.6.bb          |  6 +-
 .../wayland/{libinput_0.7.0.bb => libinput_git.bb} | 15 ++--
 .../wayland/{wayland_1.6.0.bb => wayland_1.8.0.bb} |  9 ++-
 .../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}   | 25 ++++---
 scripts/runqemu-internal                           |  4 +-
 9 files changed, 162 insertions(+), 33 deletions(-)
 create mode 100644 meta/recipes-extended/pam/libpam/crypt_configure.patch
 rename meta/recipes-graphics/wayland/{libinput_0.7.0.bb => libinput_git.bb} (42%)
 rename meta/recipes-graphics/wayland/{wayland_1.6.0.bb => wayland_1.8.0.bb} (87%)
 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%)

-- 
2.1.4

[PATCH 1/4] wayland/weston/libinput: Upgrade to 1.6.0 -> 1.8.0

[Khem Raj]

Use git for repo for SRC_URI

copyright year changed for weston compositor.c

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

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.

upgrade libinput to > 0.8.0 (0.16.0) which is needed for 1.7.0+ wayland
For x86 emulators use fbdev backend

Change-Id: I49c12853699a3a764d86869ec4d43b10ecda3379
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../wayland/{libinput_0.7.0.bb => libinput_git.bb} | 15 ++--
 .../wayland/{wayland_1.6.0.bb => wayland_1.8.0.bb} |  9 ++-
 .../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}   | 25 ++++---
 5 files changed, 124 insertions(+), 25 deletions(-)
 rename meta/recipes-graphics/wayland/{libinput_0.7.0.bb => libinput_git.bb} (42%)
 rename meta/recipes-graphics/wayland/{wayland_1.6.0.bb => wayland_1.8.0.bb} (87%)
 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/libinput_0.7.0.bb b/meta/recipes-graphics/wayland/libinput_git.bb
similarity index 42%
rename from meta/recipes-graphics/wayland/libinput_0.7.0.bb
rename to meta/recipes-graphics/wayland/libinput_git.bb
index 98d2942..dcaf7d3 100644
--- a/meta/recipes-graphics/wayland/libinput_0.7.0.bb
+++ b/meta/recipes-graphics/wayland/libinput_git.bb
@@ -3,12 +3,19 @@ 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=277a6eaa986f26fa040fc3cfa4ae44b3"
 
 DEPENDS = "libevdev udev mtdev"
 
-SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz"
-SRC_URI[md5sum] = "381b61396de28c12716ef7a5475fea50"
-SRC_URI[sha256sum] = "129f485afe5e4a9394641293991c97cb99f5f3338340d0d65b704ff463d1579e"
+SRCREV = "078421808179baa22af5cd35ad5e0aee86dffb41"
+PV = "0.16.0+git${SRCPV}"
+
+SRC_URI = "git://anongit.freedesktop.org/wayland/libinput \
+"
+
+S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
+
+FILES_${PN} += "${libdir}/udev/"
+FILES_${PN}-dbg += "${libdir}/udev/.debug"
diff --git a/meta/recipes-graphics/wayland/wayland_1.6.0.bb b/meta/recipes-graphics/wayland/wayland_1.8.0.bb
similarity index 87%
rename from meta/recipes-graphics/wayland/wayland_1.6.0.bb
rename to meta/recipes-graphics/wayland/wayland_1.8.0.bb
index 00713bf..b468277 100644
--- a/meta/recipes-graphics/wayland/wayland_1.6.0.bb
+++ b/meta/recipes-graphics/wayland/wayland_1.8.0.bb
@@ -10,9 +10,12 @@ 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] = "d34c141c975084e4fb668e77b38f840e"
-SRC_URI[sha256sum] = "a7d5102dcf53d08c059d24bc62de491d7cd482070abeb6737a20d0d86ba6fc7f"
+SRCREV = "60024af597b68974c451c89f960a7c11de11c33a"
+
+SRC_URI = "git://anongit.freedesktop.org/wayland/wayland"
+
+S = "${WORKDIR}/git"
+
 SRC_URI_append_class-native = " \
     file://disable-macro-checks-not-used-for-scanner.patch \
     "
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 d30e48b..732dca4 100644
--- a/meta/recipes-graphics/wayland/weston_1.6.0.bb
+++ b/meta/recipes-graphics/wayland/weston_1.8.0.bb
@@ -3,34 +3,39 @@ 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 \
+SRCREV = "2567c93f81309c91c7c9b247ea04122563f34de1"
+SRC_URI = "git://anongit.freedesktop.org/wayland/weston \
            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"
+
+S = "${WORKDIR}/git"
 
 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 +65,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 2/4] 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 bc2a355..5282572 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"
         if [ $MACHINE = 'qemuarm64' ]; then
             QEMU_UI_OPTIONS="-nographic"
         fi
-- 
2.1.4

[PATCH 3/4] libpam: Fix wrong crypt library detection

[Khem Raj]

Surfaced when building with musl This details are in patch headers
Enabel innetgr.patch for musl as well

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../pam/libpam/crypt_configure.patch               | 31 ++++++++++++++++++++++
 meta/recipes-extended/pam/libpam_1.1.6.bb          |  6 +++--
 2 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-extended/pam/libpam/crypt_configure.patch

diff --git a/meta/recipes-extended/pam/libpam/crypt_configure.patch b/meta/recipes-extended/pam/libpam/crypt_configure.patch
new file mode 100644
index 0000000..efa82fb
--- /dev/null
+++ b/meta/recipes-extended/pam/libpam/crypt_configure.patch
@@ -0,0 +1,31 @@
+This patch fixes a case where it find crypt defined in libc (musl) but
+not in specified libraries then it ends up assigning
+
+LIBCRYPT="-l" which then goes into makefile cause all sort of problems
+e.g.
+
+ld: cannot find -l-m32
+| collect2: error: ld returned 1 exit status
+
+The reason is that -l appears on commandline with out any library and
+compiler treats the next argument as library name whatever it is.
+
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Index: Linux-PAM-1.1.6/configure.in
+===================================================================
+--- Linux-PAM-1.1.6.org/configure.in
++++ Linux-PAM-1.1.6/configure.in
+@@ -400,7 +400,9 @@ AS_IF([test "x$ac_cv_header_xcrypt_h" =
+   [crypt_libs="crypt"])
+ 
+ BACKUP_LIBS=$LIBS
+-AC_SEARCH_LIBS([crypt],[$crypt_libs], LIBCRYPT="-l$ac_lib", LIBCRYPT="")
++AC_SEARCH_LIBS([crypt],[$crypt_libs],
++	       [test "$ac_cv_search_crypt" = "none required" ||
++		LIBCRYPT="$ac_cv_search_crypt"])
+ AC_CHECK_FUNCS(crypt_r crypt_gensalt_r)
+ LIBS=$BACKUP_LIBS
+ AC_SUBST(LIBCRYPT)
diff --git a/meta/recipes-extended/pam/libpam_1.1.6.bb b/meta/recipes-extended/pam/libpam_1.1.6.bb
index b3b39da..d347bdc 100644
--- a/meta/recipes-extended/pam/libpam_1.1.6.bb
+++ b/meta/recipes-extended/pam/libpam_1.1.6.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "https://fedorahosted.org/linux-pam/"
 BUGTRACKER = "https://fedorahosted.org/linux-pam/newticket"
 SECTION = "base"
 # PAM is dual licensed under GPL and BSD.
-# /etc/pam.d comes from Debian libpam-runtime in 2009-11 (at that time 
+# /etc/pam.d comes from Debian libpam-runtime in 2009-11 (at that time
 # libpam-runtime-1.0.1 is GPLv2+), by openembedded
 LICENSE = "GPLv2+ | BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=7eb5c1bf854e8881005d673599ee74d3"
@@ -27,11 +27,13 @@ SRC_URI = "http://linux-pam.org/library/Linux-PAM-${PV}.tar.bz2 \
            file://pam-unix-nullok-secure.patch \
            file://pam_timestamp-fix-potential-directory-traversal-issu.patch \
            file://libpam-xtests-remove-bash-dependency.patch \
+           file://crypt_configure.patch \
           "
 SRC_URI[md5sum] = "7b73e58b7ce79ffa321d408de06db2c4"
 SRC_URI[sha256sum] = "bab887d6280f47fc3963df3b95735a27a16f0f663636163ddf3acab5f1149fc2"
 
 SRC_URI_append_libc-uclibc = " file://pam-no-innetgr.patch"
+SRC_URI_append_libc-musl = " file://pam-no-innetgr.patch"
 
 DEPENDS = "bison flex flex-native cracklib"
 
@@ -145,7 +147,7 @@ do_install() {
 	install -d ${D}${sysconfdir}/default/volatiles
 	install -m 0644 ${WORKDIR}/99_pam ${D}${sysconfdir}/default/volatiles
 
-	install -d ${D}${sysconfdir}/pam.d/     
+	install -d ${D}${sysconfdir}/pam.d/
 	install -m 0644 ${WORKDIR}/pam.d/* ${D}${sysconfdir}/pam.d/
 
 	# The lsb requires unix_chkpwd has setuid permission
-- 
2.1.4

[PATCH 4/4] lsof: Remove LSOF_OS

[Khem Raj]

This is not needed since its target recipe and we always
need to pass 'linux' for OS

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-extended/lsof/lsof_4.88.bb | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/meta/recipes-extended/lsof/lsof_4.88.bb b/meta/recipes-extended/lsof/lsof_4.88.bb
index 0e49f92..bc8774f 100644
--- a/meta/recipes-extended/lsof/lsof_4.88.bb
+++ b/meta/recipes-extended/lsof/lsof_4.88.bb
@@ -29,9 +29,6 @@ python do_unpack () {
     d.setVar('SRC_URI', src_uri)
 }
 
-export LSOF_OS = "${TARGET_OS}"
-LSOF_OS_libc-uclibc = "linux"
-LSOF_OS_libc-glibc = "linux"
 export LSOF_INCLUDE = "${STAGING_INCDIR}"
 
 do_configure () {
@@ -42,7 +39,7 @@ do_configure () {
                 LINUX_CLIB="-DGLIBCV=${LINUX_CLIB}"
                 export LINUX_CLIB
         fi
-	yes | ./Configure ${LSOF_OS}
+	yes | ./Configure linux
 }
 
 export I = "${STAGING_INCDIR}"
-- 
2.1.4

Re: [PATCH 1/4] wayland/weston/libinput: Upgrade to 1.6.0 -> 1.8.0

[Burton, Ross]

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

On 3 June 2015 at 17:41, Khem Raj <raj.khem@gmail.com> wrote:

> Use git for repo for SRC_URI
>
> copyright year changed for weston compositor.c
>
> - * Copyright © 2012 Collabora, Ltd.
> + * Copyright © 2012-2014 Collabora, Ltd.
>
> 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.
>
> upgrade libinput to > 0.8.0 (0.16.0) which is needed for 1.7.0+ wayland
> For x86 emulators use fbdev backend
>
> Change-Id: I49c12853699a3a764d86869ec4d43b10ecda3379
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>

Please split this into three patches.

Ross

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

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

[Burton, Ross]

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

On 3 June 2015 at 17:42, Khem Raj <raj.khem@gmail.com> wrote:

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

Presumably you verified that X still works as before with this change?

Ross

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

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

[Khem Raj]

On Wed, Jun 3, 2015 at 10:12 AM, Burton, Ross <ross.burton@intel.com> wrote:
>
> On 3 June 2015 at 17:42, Khem Raj <raj.khem@gmail.com> wrote:
>>
>> When booting weston-core-image with latest wayland/weston/libinput
>> mouse/touchpad would not work on qemux86, this fixes the issue
>
>
> Presumably you verified that X still works as before with this change?
>

On qemuarm, I did boot sato image with musl yes. but more the merrier
since everyone has different setup
there could be something I did not catch

> Ross

Re: [PATCH 1/4] wayland/weston/libinput: Upgrade to 1.6.0 -> 1.8.0

[Khem Raj]

On Wed, Jun 3, 2015 at 10:09 AM, Burton, Ross <ross.burton@intel.com> wrote:
>
> On 3 June 2015 at 17:41, Khem Raj <raj.khem@gmail.com> wrote:
>>
>> Use git for repo for SRC_URI
>>
>> copyright year changed for weston compositor.c
>>
>> - * Copyright © 2012 Collabora, Ltd.
>> + * Copyright © 2012-2014 Collabora, Ltd.
>>
>> 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.
>>
>> upgrade libinput to > 0.8.0 (0.16.0) which is needed for 1.7.0+ wayland
>> For x86 emulators use fbdev backend
>>
>> Change-Id: I49c12853699a3a764d86869ec4d43b10ecda3379
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>
>
> Please split this into three patches.

They are interdependent thats why they are together. Splitting wont
get us anything moreover it will break git bisect

>
> Ross

Re: [PATCH 1/4] wayland/weston/libinput: Upgrade to 1.6.0 -> 1.8.0

[Burton, Ross]

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

On 3 June 2015 at 19:07, Khem Raj <raj.khem@gmail.com> wrote:

> They are interdependent thats why they are together. Splitting wont
> get us anything moreover it will break git bisect
>

Upgrading the Wayland protocol is independent from upgrading Weston.
 libinput can be upgraded independently of Weston.  They have an implied
ordering (wayland before weston, libinput before weston) but they're not
single unit.

Ross

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

Re: [PATCH 1/4] wayland/weston/libinput: Upgrade to 1.6.0 -> 1.8.0

[Khem Raj]

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


> On Jun 3, 2015, at 11:56 AM, Burton, Ross <ross.burton@intel.com> wrote:
> 
> Upgrading the Wayland protocol is independent from upgrading Weston.  libinput can be upgraded independently of Weston.  They have an implied ordering (wayland before weston, libinput before weston) but they're not single unit.
> 

I will send it that way, however, I am thinking from bisecting purpose at meta level.

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

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

Re: [PATCH 1/4] wayland/weston/libinput: Upgrade to 1.6.0 -> 1.8.0

[Khem Raj]

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


> On Jun 3, 2015, at 11:56 AM, Burton, Ross <ross.burton@intel.com> wrote:
> 
> 
> On 3 June 2015 at 19:07, Khem Raj <raj.khem@gmail.com <mailto:raj.khem@gmail.com>> wrote:
> They are interdependent thats why they are together. Splitting wont
> get us anything moreover it will break git bisect
> 
> Upgrading the Wayland protocol is independent from upgrading Weston.  libinput can be upgraded independently of Weston.  They have an implied ordering (wayland before weston, libinput before weston) but they're not single unit.
> 

I have updates the pull branch. Thanks for your feedback


> Ross


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

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

Re: [PATCH 1/4] wayland/weston/libinput: Upgrade to 1.6.0 -> 1.8.0

[Jussi Kukkonen]

On 3 June 2015 at 19:41, Khem Raj <raj.khem@gmail.com> wrote:
> Use git for repo for SRC_URI

Can you explain why? The revision looks like 0.16.0 release.

> copyright year changed for weston compositor.c
>
> - * Copyright © 2012 Collabora, Ltd.
> + * Copyright © 2012-2014 Collabora, Ltd.
>
> 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.
>
> upgrade libinput to > 0.8.0 (0.16.0) which is needed for 1.7.0+ wayland
> For x86 emulators use fbdev backend
>
> Change-Id: I49c12853699a3a764d86869ec4d43b10ecda3379
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  .../wayland/{libinput_0.7.0.bb => libinput_git.bb} | 15 ++--
>  .../wayland/{wayland_1.6.0.bb => wayland_1.8.0.bb} |  9 ++-
>  .../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}   | 25 ++++---
>  5 files changed, 124 insertions(+), 25 deletions(-)
>  rename meta/recipes-graphics/wayland/{libinput_0.7.0.bb => libinput_git.bb} (42%)
>  rename meta/recipes-graphics/wayland/{wayland_1.6.0.bb => wayland_1.8.0.bb} (87%)
>  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/libinput_0.7.0.bb b/meta/recipes-graphics/wayland/libinput_git.bb
> similarity index 42%
> rename from meta/recipes-graphics/wayland/libinput_0.7.0.bb
> rename to meta/recipes-graphics/wayland/libinput_git.bb
> index 98d2942..dcaf7d3 100644
> --- a/meta/recipes-graphics/wayland/libinput_0.7.0.bb
> +++ b/meta/recipes-graphics/wayland/libinput_git.bb
> @@ -3,12 +3,19 @@ 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=277a6eaa986f26fa040fc3cfa4ae44b3"
>
>  DEPENDS = "libevdev udev mtdev"
>
> -SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz"
> -SRC_URI[md5sum] = "381b61396de28c12716ef7a5475fea50"
> -SRC_URI[sha256sum] = "129f485afe5e4a9394641293991c97cb99f5f3338340d0d65b704ff463d1579e"
> +SRCREV = "078421808179baa22af5cd35ad5e0aee86dffb41"
> +PV = "0.16.0+git${SRCPV}"
> +
> +SRC_URI = "git://anongit.freedesktop.org/wayland/libinput \
> +"
> +
> +S = "${WORKDIR}/git"
>
>  inherit autotools pkgconfig
> +
> +FILES_${PN} += "${libdir}/udev/"
> +FILES_${PN}-dbg += "${libdir}/udev/.debug"
> diff --git a/meta/recipes-graphics/wayland/wayland_1.6.0.bb b/meta/recipes-graphics/wayland/wayland_1.8.0.bb
> similarity index 87%
> rename from meta/recipes-graphics/wayland/wayland_1.6.0.bb
> rename to meta/recipes-graphics/wayland/wayland_1.8.0.bb
> index 00713bf..b468277 100644
> --- a/meta/recipes-graphics/wayland/wayland_1.6.0.bb
> +++ b/meta/recipes-graphics/wayland/wayland_1.8.0.bb
> @@ -10,9 +10,12 @@ 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] = "d34c141c975084e4fb668e77b38f840e"
> -SRC_URI[sha256sum] = "a7d5102dcf53d08c059d24bc62de491d7cd482070abeb6737a20d0d86ba6fc7f"
> +SRCREV = "60024af597b68974c451c89f960a7c11de11c33a"
> +
> +SRC_URI = "git://anongit.freedesktop.org/wayland/wayland"
> +
> +S = "${WORKDIR}/git"
> +
>  SRC_URI_append_class-native = " \
>      file://disable-macro-checks-not-used-for-scanner.patch \
>      "
> 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 d30e48b..732dca4 100644
> --- a/meta/recipes-graphics/wayland/weston_1.6.0.bb
> +++ b/meta/recipes-graphics/wayland/weston_1.8.0.bb
> @@ -3,34 +3,39 @@ 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 \
> +SRCREV = "2567c93f81309c91c7c9b247ea04122563f34de1"
> +SRC_URI = "git://anongit.freedesktop.org/wayland/weston \
>             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"
> +
> +S = "${WORKDIR}/git"
>
>  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 +65,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
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core


On 3 June 2015 at 19:41, Khem Raj <raj.khem@gmail.com> wrote:
> Use git for repo for SRC_URI
>
> copyright year changed for weston compositor.c
>
> - * Copyright © 2012 Collabora, Ltd.
> + * Copyright © 2012-2014 Collabora, Ltd.
>
> 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.
>
> upgrade libinput to > 0.8.0 (0.16.0) which is needed for 1.7.0+ wayland
> For x86 emulators use fbdev backend
>
> Change-Id: I49c12853699a3a764d86869ec4d43b10ecda3379
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  .../wayland/{libinput_0.7.0.bb => libinput_git.bb} | 15 ++--
>  .../wayland/{wayland_1.6.0.bb => wayland_1.8.0.bb} |  9 ++-
>  .../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}   | 25 ++++---
>  5 files changed, 124 insertions(+), 25 deletions(-)
>  rename meta/recipes-graphics/wayland/{libinput_0.7.0.bb => libinput_git.bb} (42%)
>  rename meta/recipes-graphics/wayland/{wayland_1.6.0.bb => wayland_1.8.0.bb} (87%)
>  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/libinput_0.7.0.bb b/meta/recipes-graphics/wayland/libinput_git.bb
> similarity index 42%
> rename from meta/recipes-graphics/wayland/libinput_0.7.0.bb
> rename to meta/recipes-graphics/wayland/libinput_git.bb
> index 98d2942..dcaf7d3 100644
> --- a/meta/recipes-graphics/wayland/libinput_0.7.0.bb
> +++ b/meta/recipes-graphics/wayland/libinput_git.bb
> @@ -3,12 +3,19 @@ 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=277a6eaa986f26fa040fc3cfa4ae44b3"
>
>  DEPENDS = "libevdev udev mtdev"
>
> -SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz"
> -SRC_URI[md5sum] = "381b61396de28c12716ef7a5475fea50"
> -SRC_URI[sha256sum] = "129f485afe5e4a9394641293991c97cb99f5f3338340d0d65b704ff463d1579e"
> +SRCREV = "078421808179baa22af5cd35ad5e0aee86dffb41"
> +PV = "0.16.0+git${SRCPV}"
> +
> +SRC_URI = "git://anongit.freedesktop.org/wayland/libinput \
> +"
> +
> +S = "${WORKDIR}/git"
>
>  inherit autotools pkgconfig
> +
> +FILES_${PN} += "${libdir}/udev/"
> +FILES_${PN}-dbg += "${libdir}/udev/.debug"
> diff --git a/meta/recipes-graphics/wayland/wayland_1.6.0.bb b/meta/recipes-graphics/wayland/wayland_1.8.0.bb
> similarity index 87%
> rename from meta/recipes-graphics/wayland/wayland_1.6.0.bb
> rename to meta/recipes-graphics/wayland/wayland_1.8.0.bb
> index 00713bf..b468277 100644
> --- a/meta/recipes-graphics/wayland/wayland_1.6.0.bb
> +++ b/meta/recipes-graphics/wayland/wayland_1.8.0.bb
> @@ -10,9 +10,12 @@ 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] = "d34c141c975084e4fb668e77b38f840e"
> -SRC_URI[sha256sum] = "a7d5102dcf53d08c059d24bc62de491d7cd482070abeb6737a20d0d86ba6fc7f"
> +SRCREV = "60024af597b68974c451c89f960a7c11de11c33a"
> +
> +SRC_URI = "git://anongit.freedesktop.org/wayland/wayland"
> +
> +S = "${WORKDIR}/git"
> +
>  SRC_URI_append_class-native = " \
>      file://disable-macro-checks-not-used-for-scanner.patch \
>      "
> 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 d30e48b..732dca4 100644
> --- a/meta/recipes-graphics/wayland/weston_1.6.0.bb
> +++ b/meta/recipes-graphics/wayland/weston_1.8.0.bb
> @@ -3,34 +3,39 @@ 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 \
> +SRCREV = "2567c93f81309c91c7c9b247ea04122563f34de1"
> +SRC_URI = "git://anongit.freedesktop.org/wayland/weston \
>             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"
> +
> +S = "${WORKDIR}/git"
>
>  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 +65,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
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [PATCH 1/4] wayland/weston/libinput: Upgrade to 1.6.0 -> 1.8.0

[Khem Raj]

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


> On Jun 3, 2015, at 1:18 PM, Jussi Kukkonen <jussi.kukkonen@intel.com> wrote:
> 
>> Use git for repo for SRC_URI
> 
> Can you explain why? The revision looks like 0.16.0 release.

its easy to develop libinput and prepare/test upstream patches since all upstreams want the patches against their latest master and its easy to switch to AUTOREV locally and do it.

yes its pointing to 0.16.0 release

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

Re: [PATCH 1/4] wayland/weston/libinput: Upgrade to 1.6.0 -> 1.8.0

[Burton, Ross]

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

On 3 June 2015 at 22:21, Khem Raj <raj.khem@gmail.com> wrote:

> > Can you explain why? The revision looks like 0.16.0 release.
>
> its easy to develop libinput and prepare/test upstream patches since all
> upstreams want the patches against their latest master and its easy to
> switch to AUTOREV locally and do it.


That's not a great reason and I'm against using git fetches when there's
perfectly good tarballs available.

Ross

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

Re: [PATCH 1/4] wayland/weston/libinput: Upgrade to 1.6.0 -> 1.8.0

[Khem Raj]

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


> On Jun 26, 2015, at 7:47 AM, Burton, Ross <ross.burton@intel.com> wrote:
> 
> 
> On 3 June 2015 at 22:21, Khem Raj <raj.khem@gmail.com <mailto:raj.khem@gmail.com>> wrote:
> > Can you explain why? The revision looks like 0.16.0 release.
> 
> its easy to develop libinput and prepare/test upstream patches since all upstreams want the patches against their latest master and its easy to switch to AUTOREV locally and do it.
> 
> That's not a great reason and I'm against using git fetches when there's perfectly good tarballs available.
> 

From a system integrators point of view, I agree with your sentiments. From a developers point of view not so much. We already have many recipes already fetching from git and more and more switching to use it see qt5 lately, there are perfectly fine tarballs released for QT5 too, just because its simpler to developer and integrate packages.


> Ross


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

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

Re: [PATCH 1/4] wayland/weston/libinput: Upgrade to 1.6.0 -> 1.8.0

[Burton, Ross]

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

On 26 June 2015 at 16:19, Khem Raj <raj.khem@gmail.com> wrote:

> From a system integrators point of view, I agree with your sentiments.
> From a developers point of view not so much. We already have many recipes
> already fetching from git and more and more switching to use it see qt5
> lately, there are perfectly fine tarballs released for QT5 too, just
> because its simpler to developer and integrate packages.
>

But oe-core is a system for integrating software...  If you're doing lots
of work against weston, then a bbappend to change the SRC_URI to a git
repository isn't exactly hard work.

Tarballs give us much smaller downloads, the security of checksums, and the
general assurance that you're building what the maintainer expects you to
build.

Ross

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

Re: [PATCH 1/4] wayland/weston/libinput: Upgrade to 1.6.0 -> 1.8.0

[Khem Raj]

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


> On Jun 26, 2015, at 9:59 AM, Burton, Ross <ross.burton@intel.com> wrote:
> 
> On 26 June 2015 at 16:19, Khem Raj <raj.khem@gmail.com <mailto:raj.khem@gmail.com>> wrote:
> From a system integrators point of view, I agree with your sentiments. From a developers point of view not so much. We already have many recipes already fetching from git and more and more switching to use it see qt5 lately, there are perfectly fine tarballs released for QT5 too, just because its simpler to developer and integrate packages.
> 
> But oe-core is a system for integrating software...  If you're doing lots of work against weston, then a bbappend to change the SRC_URI to a git repository isn't exactly hard work.

yes and its done like that and what you are saying is that we limit OE to not help there. Its fine. We are now in a phase where we should be upstreaming the patches we are hosting in meta data for OE or elsewhere and git based workflow makes it easy for such work atleast for components which use git upstream. Preparing in same sandbox and test them out becomes simpler.

> 
> Tarballs give us much smaller downloads, the security of checksums, and the general assurance that you're building what the maintainer expects you to build.

then we patch it on top of tarballs maintainer doesn’t want you to do that as well isnt it ?
its lot easier to maintain using a SCM when we have patches and usually there are patches in OE. In any case, I will post a tarball version, and override the SRC_URI internally its not an issue its just another one thing to maintain on top of others. if thats what community wants, but I will need more folks to also express there usecase and opinion moving forward this is applicable to many components.

> 
> Ross


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

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

Re: [PATCH 1/4] wayland/weston/libinput: Upgrade to 1.6.0 -> 1.8.0

[Martin Jansa]

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

On Fri, Jun 26, 2015 at 08:19:58AM -0700, Khem Raj wrote:
> 
> > On Jun 26, 2015, at 7:47 AM, Burton, Ross <ross.burton@intel.com> wrote:
> > 
> > 
> > On 3 June 2015 at 22:21, Khem Raj <raj.khem@gmail.com <mailto:raj.khem@gmail.com>> wrote:
> > > Can you explain why? The revision looks like 0.16.0 release.
> > 
> > its easy to develop libinput and prepare/test upstream patches since all upstreams want the patches against their latest master and its easy to switch to AUTOREV locally and do it.
> > 
> > That's not a great reason and I'm against using git fetches when there's perfectly good tarballs available.
> > 
> 
> From a system integrators point of view, I agree with your sentiments. From a developers point of view not so much. We already have many recipes already fetching from git and more and more switching to use it see qt5 lately, there are perfectly fine tarballs released for QT5 too, just because its simpler to developer and integrate packages.

I partially agree, but qt5 example is a bit different, because we have
many local patches for qt5 (qtbase, qtdeclarative) even more in various
deployment layers and we had 2 sets of recipes and patches (for tarballs
and for git recipes) - from that I choose less evil option of git
recipes to make the maintenance/testing a bit easier.

So for simple projects with only a few or no patches in metadata I don't
mind using git fetches, but also don't see huge benefit of using them.

Regards,

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

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

Re: [PATCH 1/4] wayland/weston/libinput: Upgrade to 1.6.0 -> 1.8.0

[Martin Jansa]

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

On Fri, Jun 26, 2015 at 10:37:57AM -0700, Khem Raj wrote:
> 
> > On Jun 26, 2015, at 9:59 AM, Burton, Ross <ross.burton@intel.com> wrote:
> > 
> > On 26 June 2015 at 16:19, Khem Raj <raj.khem@gmail.com <mailto:raj.khem@gmail.com>> wrote:
> > From a system integrators point of view, I agree with your sentiments. From a developers point of view not so much. We already have many recipes already fetching from git and more and more switching to use it see qt5 lately, there are perfectly fine tarballs released for QT5 too, just because its simpler to developer and integrate packages.
> > 
> > But oe-core is a system for integrating software...  If you're doing lots of work against weston, then a bbappend to change the SRC_URI to a git repository isn't exactly hard work.
> 
> yes and its done like that and what you are saying is that we limit OE to not help there. Its fine. We are now in a phase where we should be upstreaming the patches we are hosting in meta data for OE or elsewhere and git based workflow makes it easy for such work atleast for components which use git upstream. Preparing in same sandbox and test them out becomes simpler.
> 
> > 
> > Tarballs give us much smaller downloads, the security of checksums, and the general assurance that you're building what the maintainer expects you to build.
> 
> then we patch it on top of tarballs maintainer doesn’t want you to do that as well isnt it ?
> its lot easier to maintain using a SCM when we have patches and usually there are patches in OE. In any case, I will post a tarball version, and override the SRC_URI internally its not an issue its just another one thing to maintain on top of others. if thats what community wants, but I will need more folks to also express there usecase and opinion moving forward this is applicable to many components.

We did this in few cases earlier and I hate it, mostly because the
foo_1.2.3.bbappend changes SRC_URI and git and usually also sets PV to
something newer, so

foo_1.2.3.bb + foo_1.2.3.bbappend is building version 2.0+git which is
at least a bit confusing.

Other option of foo.bb in our layer with:
  require meta/recipes-bar/foo/foo_1.2.3.bb
  PV = "2.0+gitr${SRCPV}"
  ....
is also a bit annoying e.g. when upgrading oe-core and parsing failing
because foo_1.2.3.bb was upgraded to foo_1.2.4.bb by uprev script in
oe-core.

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

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