Upgrades around graphics stack
cover Upgrades around graphics stack
Upgrades around X, Wayland and Mesa. Mostly point upgrades but the Wayland upgrade is a fairly major one: their next release is also around the corner so if there are problems you can drop wayland- related bits and I can fix things in time for 1.11.
These have been sanity tested with sato and weston images. piglit results are in line with previous mesa releases (~98% pass rate for non-skipped tests on a NUC with Intel HD 5000).
Please take a look at the wayland-protocols patch: the recipe produces a -dev package only, I wasn't sure if that's a thing I can/should do?
Thanks,
Jussi
The following changes since commit 7ca60ec8bff7656b4e52f5a4d238913e851da089:
test-empty-image: Fix LIC_FILES_CHKSUM typo (2016-05-06 10:48:06 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib jku/gfx-upgrades
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/gfx-upgrades
Jussi Kukkonen (13):
xserver-xorg: Upgrade 1.18.0 -> 1.18.3
xrandr: Upgrade to 1.5.0
xkeyboard-config: Upgrade to 2.17
libinput: Upgrade 1.1.4 -> 1.3.0
xf86-input-evdev: Upgrade 2.10.1 -> 2.10.2
videoproto: Upgrade 2.3.2 -> 2.3.3
libxkbcommon: Upgrade 0.5.0 -> 0.6.1
libdrm: Upgrade 2.4.67 -> 2.4.68
mesa: Upgrade 11.1.1 -> 11.2.2
pixman: Upgrade 0.32.8 -> 0.34.0
wayland: Upgrade 1.9.0 -> 1.10.0
wayland-protocols: Add recipe
weston: Upgrade 1.9.0 -> 1.10.0
.../drm/{libdrm_2.4.67.bb => libdrm_2.4.68.bb} | 4 +-
.../mesa/{mesa-gl_11.1.1.bb => mesa-gl_11.2.2.bb} | 0
.../mesa/{mesa_11.1.1.bb => mesa_11.2.2.bb} | 4 +-
.../{libinput_1.1.4.bb => libinput_1.3.0.bb} | 5 +-
.../wayland-protocols/dont-use-AC_CANONICAL.patch | 29 +++++++++
.../wayland/wayland-protocols_1.3.bb | 19 ++++++
.../{wayland_1.9.0.bb => wayland_1.10.0.bb} | 6 +-
...c-Use-PKG_CONFIG_SYSROOT_DIR-for-protocol.patch | 30 ++++++++++
.../weston/explicit-enable-disable-systemd.patch | 70 ----------------------
.../wayland/weston/libsystemd.patch | 53 ----------------
.../weston/make-lcms-explicitly-configurable.patch | 43 -------------
.../wayland/{weston_1.9.0.bb => weston_1.10.0.bb} | 10 ++--
.../xorg-app/{xrandr_1.4.3.bb => xrandr_1.5.0.bb} | 4 +-
...-evdev_2.10.1.bb => xf86-input-evdev_2.10.2.bb} | 4 +-
...libxkbcommon_0.5.0.bb => libxkbcommon_0.6.1.bb} | 6 +-
...0001-v3-test-add-a-check-for-FE_DIVBYZERO.patch | 65 --------------------
.../xorg-lib/pixman/mips-export-revert.patch | 22 -------
.../{pixman_0.32.8.bb => pixman_0.34.0.bb} | 6 +-
...ard-config_2.16.bb => xkeyboard-config_2.17.bb} | 4 +-
.../{videoproto_2.3.2.bb => videoproto_2.3.3.bb} | 4 +-
....ac-Use-libsystemd-in-REQUIRED_LIBS-check.patch | 50 ----------------
.../modesetting_libdrm_requirements.patch | 30 ----------
...erver-xorg_1.18.0.bb => xserver-xorg_1.18.3.bb} | 8 +--
23 files changed, 108 insertions(+), 368 deletions(-)
rename meta/recipes-graphics/drm/{libdrm_2.4.67.bb => libdrm_2.4.68.bb} (92%)
rename meta/recipes-graphics/mesa/{mesa-gl_11.1.1.bb => mesa-gl_11.2.2.bb} (100%)
rename meta/recipes-graphics/mesa/{mesa_11.1.1.bb => mesa_11.2.2.bb} (80%)
rename meta/recipes-graphics/wayland/{libinput_1.1.4.bb => libinput_1.3.0.bb} (75%)
create mode 100644 meta/recipes-graphics/wayland/wayland-protocols/dont-use-AC_CANONICAL.patch
create mode 100644 meta/recipes-graphics/wayland/wayland-protocols_1.3.bb
rename meta/recipes-graphics/wayland/{wayland_1.9.0.bb => wayland_1.10.0.bb} (89%)
create mode 100644 meta/recipes-graphics/wayland/weston/0001-configure.ac-Use-PKG_CONFIG_SYSROOT_DIR-for-protocol.patch
delete mode 100644 meta/recipes-graphics/wayland/weston/explicit-enable-disable-systemd.patch
delete mode 100644 meta/recipes-graphics/wayland/weston/libsystemd.patch
delete mode 100644 meta/recipes-graphics/wayland/weston/make-lcms-explicitly-configurable.patch
rename meta/recipes-graphics/wayland/{weston_1.9.0.bb => weston_1.10.0.bb} (92%)
rename meta/recipes-graphics/xorg-app/{xrandr_1.4.3.bb => xrandr_1.5.0.bb} (72%)
rename meta/recipes-graphics/xorg-driver/{xf86-input-evdev_2.10.1.bb => xf86-input-evdev_2.10.2.bb} (83%)
rename meta/recipes-graphics/xorg-lib/{libxkbcommon_0.5.0.bb => libxkbcommon_0.6.1.bb} (75%)
delete mode 100644 meta/recipes-graphics/xorg-lib/pixman/0001-v3-test-add-a-check-for-FE_DIVBYZERO.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/pixman/mips-export-revert.patch
rename meta/recipes-graphics/xorg-lib/{pixman_0.32.8.bb => pixman_0.34.0.bb} (85%)
rename meta/recipes-graphics/xorg-lib/{xkeyboard-config_2.16.bb => xkeyboard-config_2.17.bb} (88%)
rename meta/recipes-graphics/xorg-proto/{videoproto_2.3.2.bb => videoproto_2.3.3.bb} (69%)
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/configure.ac-Use-libsystemd-in-REQUIRED_LIBS-check.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/modesetting_libdrm_requirements.patch
rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_1.18.0.bb => xserver-xorg_1.18.3.bb} (72%)Signature · 1 line
2.1.4
PATCH 1/13 xserver-xorg: Upgrade 1.18.0 -> 1.18.3
Remove two patches that are now upstream.
---
....ac-Use-libsystemd-in-REQUIRED_LIBS-check.patch | 50 ----------------------
.../modesetting_libdrm_requirements.patch | 30 -------------
...erver-xorg_1.18.0.bb => xserver-xorg_1.18.3.bb} | 8 ++--
3 files changed, 3 insertions(+), 85 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/configure.ac-Use-libsystemd-in-REQUIRED_LIBS-check.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/modesetting_libdrm_requirements.patch
rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_1.18.0.bb => xserver-xorg_1.18.3.bb} (72%)meta/recipes-graphics/xorg-xserver/xserver-xorg/configure.ac-Use-libsystemd-in-REQUIRED_LIBS-check.patch deleted +0 -50
@@ -1,50 +0,0 @@ -From 0c2153d468229f56e6fef71d2f002e0cae14aa55 Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen <[email protected]> -Date: Mon, 16 Nov 2015 16:18:40 +0200 -Subject: [PATCH] configure.ac: Use libsystemd in REQUIRED_LIBS check - -REQUIRED_LIBS needs to be set to the correct systemd library, -otherwise the later check will either fail or use the wrong -pc file. - -Upstream-Status: Submitted [[email protected]] -Signed-off-by: Jussi Kukkonen <[email protected]> ---- - configure.ac | 13 ++++++++++--- - 1 file changed, 10 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 96c0242..f63eca1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -837,9 +837,16 @@ AC_ARG_WITH([systemd-daemon], - [support systemd socket activation (default: auto)]), - [WITH_SYSTEMD_DAEMON=$withval], [WITH_SYSTEMD_DAEMON=auto]) - PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd-daemon], -- [HAVE_SYSTEMD_DAEMON=yes], -+ [REQUIRED_SYSTEMD_DAEMON=libsystemd-daemon], - [PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd], -- [HAVE_SYSTEMD_DAEMON=yes], [HAVE_SYSTEMD_DAEMON=no])]) -+ [REQUIRED_SYSTEMD_DAEMON=libsystemd], -+ [REQUIRED_SYSTEMD_DAEMON=])]) -+if test "x$REQUIRED_SYSTEMD_DAEMON" = x; then -+ HAVE_SYSTEMD_DAEMON=no -+else -+ HAVE_SYSTEMD_DAEMON=yes -+fi -+ - if test "x$WITH_SYSTEMD_DAEMON" = xauto; then - WITH_SYSTEMD_DAEMON="$HAVE_SYSTEMD_DAEMON" - fi -@@ -848,7 +855,7 @@ if test "x$WITH_SYSTEMD_DAEMON" = xyes; then - AC_MSG_ERROR([systemd support requested but no library has been found]) - fi - AC_DEFINE(HAVE_SYSTEMD_DAEMON, 1, [Define to 1 if libsystemd-daemon is available]) -- REQUIRED_LIBS="$REQUIRED_LIBS libsystemd-daemon" -+ REQUIRED_LIBS="$REQUIRED_LIBS $REQUIRED_SYSTEMD_DAEMON" - fi - AM_CONDITIONAL([HAVE_SYSTEMD_DAEMON], [test "x$HAVE_SYSTEMD_DAEMON" = "xyes"]) - --- -2.1.4 -
meta/recipes-graphics/xorg-xserver/xserver-xorg/modesetting_libdrm_requirements.patch deleted +0 -30
@@ -1,30 +0,0 @@ -From bf23db42a4e5943129501223a47b48884cdeb62f Mon Sep 17 00:00:00 2001 -From: Adam Jackson <[email protected]> -Date: Wed, 27 Jan 2016 11:50:13 -0500 -Subject: modesetting: Require sufficiently new libdrm - -Bugzilla: https://bugs.freedesktop.org/93883 -Signed-off-by: Adam Jackson <[email protected]> -Reviewed-by: Alex Deucher <[email protected]> -Reviewed-by: Julien Cristau <[email protected]> - -Upstream-Status: Backport -Signed-off-by: Johannes Pointner <[email protected]> - -diff --git a/configure.ac b/configure.ac -index ac3bb64..312fc69 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2035,8 +2035,7 @@ if test "x$XORG" = xyes; then - - if test "x$DRM" = xyes; then - dnl 2.4.46 is required for cursor hotspot support. -- PKG_CHECK_EXISTS(libdrm >= 2.4.46) -- XORG_DRIVER_MODESETTING=yes -+ PKG_CHECK_EXISTS(libdrm >= 2.4.46, XORG_DRIVER_MODESETTING=yes, XORG_DRIVER_MODESETTING=no) - fi - - AC_SUBST([XORG_LIBS]) --- -cgit v0.10.2 -
meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.3.bb renamed from meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.0.bb +3 -5
@@ -1,11 +1,9 @@ require xserver-xorg.inc -SRC_URI += "file://configure.ac-Use-libsystemd-in-REQUIRED_LIBS-check.patch \ - file://musl-arm-inb-outb.patch \ - file://modesetting_libdrm_requirements.patch \ +SRC_URI += "file://musl-arm-inb-outb.patch \ " -SRC_URI[md5sum] = "3c1c1057d3ad27380d8dd87ffcc182cd" -SRC_URI[sha256sum] = "195670819695d9cedd8dde95fbe069be0d0f488a77797a2d409f9f702daf312e" +SRC_URI[md5sum] = "043d720bf2472a65bb8f0daa97f83dfa" +SRC_URI[sha256sum] = "ea739c22517cdbe2b5f7c0a5fd05fe8a10ac0629003e71c0c7862f4bb60142cd" # These extensions are now integrated into the server, so declare the migration # path for in-place upgrades.
Signature · 1 line
2.1.4
PATCH 2/13 xrandr: Upgrade to 1.5.0
---
meta/recipes-graphics/xorg-app/{xrandr_1.4.3.bb => xrandr_1.5.0.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-app/{xrandr_1.4.3.bb => xrandr_1.5.0.bb} (72%)meta/recipes-graphics/xorg-app/xrandr_1.5.0.bb renamed from meta/recipes-graphics/xorg-app/xrandr_1.4.3.bb +2 -2
@@ -11,5 +11,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fe1608bdb33cf8c62a4438f7d34679b3" DEPENDS += "libxrandr libxrender" PE = "1" -SRC_URI[md5sum] = "441fdb98d2abc6051108b7075d948fc7" -SRC_URI[sha256sum] = "7154ac3486b86923692f2d6cdb2991a2ee72bc32af2c4379a6f1c068f204be1b" +SRC_URI[md5sum] = "ebffac98021b8f1dc71da0c1918e9b57" +SRC_URI[sha256sum] = "c1cfd4e1d4d708c031d60801e527abc9b6d34b85f2ffa2cadd21f75ff38151cd"
Signature · 1 line
2.1.4
PATCH 3/13 xkeyboard-config: Upgrade to 2.17
In reply to Jussi Kukkonen---
.../xorg-lib/{xkeyboard-config_2.16.bb => xkeyboard-config_2.17.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-lib/{xkeyboard-config_2.16.bb => xkeyboard-config_2.17.bb} (88%)meta/recipes-graphics/xorg-lib/xkeyboard-config_2.17.bb renamed from meta/recipes-graphics/xorg-lib/xkeyboard-config_2.16.bb +2 -2
@@ -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] = "bf6aa31195584cfce01b2194c3e5ea26" -SRC_URI[sha256sum] = "1e8a1f212c96b7f71ca0b05da361cac1816d27baae1d8e03e7b53049b58d1d58" +SRC_URI[md5sum] = "15034bb74deebde54161dface62abbce" +SRC_URI[sha256sum] = "dec6be44bd31775cdc1ab95bfd75d5f2c0055613eeca8b4e9c6480b183430701" SECTION = "x11/libs" DEPENDS = "intltool-native virtual/gettext util-macros libxslt-native"
Signature · 1 line
2.1.4
PATCH 4/13 libinput: Upgrade 1.1.4 -> 1.3.0
In reply to Jussi KukkonenAdd PACKAGECONFIG for libwacom (which we currently do not have in oe-core) as the default is --enable-libwacom.
---
.../wayland/{libinput_1.1.4.bb => libinput_1.3.0.bb} | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/wayland/{libinput_1.1.4.bb => libinput_1.3.0.bb} (75%)meta/recipes-graphics/wayland/libinput_1.3.0.bb renamed from meta/recipes-graphics/wayland/libinput_1.1.4.bb +3 -2
@@ -10,13 +10,14 @@ DEPENDS = "libevdev udev mtdev" SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \ file://touchpad-serial-synaptics-need-to-fake-new-touches-on-TRIPLETAP.patch \ " -SRC_URI[md5sum] = "0945318141c1a9f52857bbf65d175f32" -SRC_URI[sha256sum] = "302cb76209b9c57a5a318e178f9bc446eede8ea79386103b5291cbfaa5fab5b6" +SRC_URI[md5sum] = "5f8bc2c746bfbc9454143f78e5b477a9" +SRC_URI[sha256sum] = "998a75fb261d161efaa7da44411cdc9a32a953280e4ffc6322ca19f057d0c1ea" inherit autotools pkgconfig PACKAGECONFIG ??= "" PACKAGECONFIG[libunwind] = "--with-libunwind,--without-libunwind,libunwind" +PACKAGECONFIG[libwacom] = "--enable-libwacom,--disable-libwacom,libwacom" PACKAGECONFIG[gui] = "--enable-event-gui,--disable-event-gui,cairo gtk+3" FILES_${PN} += "${libdir}/udev/"
Signature · 1 line
2.1.4
PATCH 5/13 xf86-input-evdev: Upgrade 2.10.1 -> 2.10.2
In reply to Jussi Kukkonen---
.../{xf86-input-evdev_2.10.1.bb => xf86-input-evdev_2.10.2.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-driver/{xf86-input-evdev_2.10.1.bb => xf86-input-evdev_2.10.2.bb} (83%)meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.10.2.bb renamed from meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.10.1.bb +2 -2
@@ -16,5 +16,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fefe33b1cf0cacba0e72e3b0fa0f0e16" DEPENDS += "mtdev libevdev" -SRC_URI[md5sum] = "96d89d9406a02f5e36bdaa4edd9a243a" -SRC_URI[sha256sum] = "af9c2b47f5b272ae56b45da6bd84610fc9a3d80a4b32c8215842a39d862de017" +SRC_URI[md5sum] = "452bcc3bcce712b59af363eea94e3392" +SRC_URI[sha256sum] = "a73a630d41ab90708d929f357e922bfbdb63d553491c5a30ab3e8fb1e35dfe1d"
Signature · 1 line
2.1.4
PATCH 6/13 videoproto: Upgrade 2.3.2 -> 2.3.3
In reply to Jussi Kukkonen---
.../xorg-proto/{videoproto_2.3.2.bb => videoproto_2.3.3.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-proto/{videoproto_2.3.2.bb => videoproto_2.3.3.bb} (69%)meta/recipes-graphics/xorg-proto/videoproto_2.3.3.bb renamed from meta/recipes-graphics/xorg-proto/videoproto_2.3.2.bb +2 -2
@@ -10,5 +10,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ce3472a119a864085fa4155cb0979a7b" PE = "1" -SRC_URI[md5sum] = "e658641595327d3990eab70fdb55ca8b" -SRC_URI[sha256sum] = "8dae168cb820fcd32f564879afb3f24d27c176300d9af66819a18265539bd4b6" +SRC_URI[md5sum] = "fe86de8ea3eb53b5a8f52956c5cd3174" +SRC_URI[sha256sum] = "c7803889fd08e6fcaf7b68cc394fb038b2325d1f315e571a6954577e07cca702"
Signature · 1 line
2.1.4
PATCH 7/13 libxkbcommon: Upgrade 0.5.0 -> 0.6.1
In reply to Jussi KukkonenLicense file was renamed, content is the same.
---
.../xorg-lib/{libxkbcommon_0.5.0.bb => libxkbcommon_0.6.1.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-graphics/xorg-lib/{libxkbcommon_0.5.0.bb => libxkbcommon_0.6.1.bb} (75%)meta/recipes-graphics/xorg-lib/libxkbcommon_0.6.1.bb renamed from meta/recipes-graphics/xorg-lib/libxkbcommon_0.5.0.bb +3 -3
@@ -2,15 +2,15 @@ SUMMARY = "Generic XKB keymap library" DESCRIPTION = "libxkbcommon is a keymap compiler and support library which \ processes a reduced subset of keymaps as defined by the XKB specification." HOMEPAGE = "http://www.xkbcommon.org" -LIC_FILES_CHKSUM = "file://COPYING;md5=09457b156e3155972abebcaaaa0cb434" +LIC_FILES_CHKSUM = "file://LICENSE;md5=09457b156e3155972abebcaaaa0cb434" LICENSE = "MIT & MIT-style" DEPENDS = "util-macros flex-native bison-native" SRC_URI = "http://xkbcommon.org/download/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "2e1faeafcc609c30af3a561a91e84158" -SRC_URI[sha256sum] = "90bd7824742b9a6f52a6cf80e2cadd6f5349cf600a358d08260772615b89d19c" +SRC_URI[md5sum] = "67a8f322b5fa32352272e811bb90dd73" +SRC_URI[sha256sum] = "5b0887b080b42169096a61106661f8d35bae783f8b6c58f97ebcd3af83ea8760" UPSTREAM_CHECK_URI = "http://xkbcommon.org/"
Signature · 1 line
2.1.4
PATCH 8/13 libdrm: Upgrade 2.4.67 -> 2.4.68
In reply to Jussi Kukkonen---
meta/recipes-graphics/drm/{libdrm_2.4.67.bb => libdrm_2.4.68.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/drm/{libdrm_2.4.67.bb => libdrm_2.4.68.bb} (92%)meta/recipes-graphics/drm/libdrm_2.4.68.bb renamed from meta/recipes-graphics/drm/libdrm_2.4.67.bb +2 -2
@@ -15,8 +15,8 @@ SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.bz2 \ file://fix_O_CLOEXEC_undeclared.patch \ " -SRC_URI[md5sum] = "b844c6af34e613ebf52f80b3cd8d7055" -SRC_URI[sha256sum] = "ee5b71e1113be37544d0752681c12f040c01f782e2933df7d7bc21fd0d10cebe" +SRC_URI[md5sum] = "bcc96848d969cecf28223f668eeff354" +SRC_URI[sha256sum] = "5b4bd9a5922929bc716411cb74061fbf31b06ba36feb89bc1358a91a8d0ca9df" inherit autotools pkgconfig
Signature · 1 line
2.1.4
PATCH 9/13 mesa: Upgrade 11.1.1 -> 11.2.2
In reply to Jussi Kukkonen---
meta/recipes-graphics/mesa/{mesa-gl_11.1.1.bb => mesa-gl_11.2.2.bb} | 0
meta/recipes-graphics/mesa/{mesa_11.1.1.bb => mesa_11.2.2.bb} | 4 ++--
2 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/mesa/{mesa-gl_11.1.1.bb => mesa-gl_11.2.2.bb} (100%)
rename meta/recipes-graphics/mesa/{mesa_11.1.1.bb => mesa_11.2.2.bb} (80%)meta/recipes-graphics/mesa/mesa-gl_11.2.2.bb renamed from meta/recipes-graphics/mesa/mesa-gl_11.1.1.bb +0 -0
meta/recipes-graphics/mesa/mesa_11.2.2.bb renamed from meta/recipes-graphics/mesa/mesa_11.1.1.bb +2 -2
@@ -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] = "1043dfb907beecb2a761272455960427" -SRC_URI[sha256sum] = "64db074fc514136b5fb3890111f0d50604db52f0b1e94ba3fcb0fe8668a7fd20" +SRC_URI[md5sum] = "e0ec73f7273662a74366f0d76dd19ac3" +SRC_URI[sha256sum] = "40e148812388ec7c6d7b6657d5a16e2e8dabba8b97ddfceea5197947647bdfb4" #because we cannot rely on the fact that all apps will use pkgconfig, #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
Signature · 1 line
2.1.4
PATCH 10/13 pixman: Upgrade 0.32.8 -> 0.34.0
In reply to Jussi KukkonenRemove two patches that are no longer needed.
---
...0001-v3-test-add-a-check-for-FE_DIVBYZERO.patch | 65 ----------------------
.../xorg-lib/pixman/mips-export-revert.patch | 22 --------
.../{pixman_0.32.8.bb => pixman_0.34.0.bb} | 6 +-
3 files changed, 2 insertions(+), 91 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-lib/pixman/0001-v3-test-add-a-check-for-FE_DIVBYZERO.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/pixman/mips-export-revert.patch
rename meta/recipes-graphics/xorg-lib/{pixman_0.32.8.bb => pixman_0.34.0.bb} (85%)meta/recipes-graphics/xorg-lib/pixman/0001-v3-test-add-a-check-for-FE_DIVBYZERO.patch deleted +0 -65
@@ -1,65 +0,0 @@ -From fcd5eb9bd0e8674a6f4987a8fce7dc1ba8f9320c Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni <[email protected]> -Date: Thu, 17 Sep 2015 03:08:36 +0200 -Subject: [PATCH] [v3] test: add a check for FE_DIVBYZERO - -Some architectures, such as Microblaze and Nios2, currently do not -implement FE_DIVBYZERO, even though they have <fenv.h> and -feenableexcept(). This commit adds a configure.ac check to verify -whether FE_DIVBYZERO is defined or not, and if not, disables the -problematic code in test/utils.c. - -Signed-off-by: Thomas Petazzoni <[email protected]> -Signed-off-by: Marek Vasut <[email protected]> -Upstream-Status: Backport [commit 4297e9058] ---- -Changes v1 -> v2: - - * Use the ac_cv_have_decl_FE_DIVBYZERO variable, which is - automatically set by AC_CHECK_DECL, to decide whether or not - HAVE_FEDIVBYZERO should be defined. - -Changes v2 -> v3: - - * Use action-if-yes of AC_CHECK_DECL as suggested in - http://lists.freedesktop.org/archives/pixman/2014-February/003176.html ---- - configure.ac | 5 +++++ - test/utils.c | 2 ++ - 2 files changed, 7 insertions(+) - -diff --git a/configure.ac b/configure.ac -index f93cc30..424bfd3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -891,6 +891,11 @@ if test x$have_feenableexcept = xyes; then - AC_DEFINE(HAVE_FEENABLEEXCEPT, 1, [Whether we have feenableexcept()]) - fi - -+AC_CHECK_DECL([FE_DIVBYZERO], -+ [AC_DEFINE(HAVE_FEDIVBYZERO, 1, [Whether we have FE_DIVBYZERO])], -+ [], -+ [[#include <fenv.h>]]) -+ - AC_CHECK_FUNC(gettimeofday, have_gettimeofday=yes, have_gettimeofday=no) - AC_CHECK_HEADER(sys/time.h, have_sys_time_h=yes, have_sys_time_h=no) - if test x$have_gettimeofday = xyes && test x$have_sys_time_h = xyes; then -diff --git a/test/utils.c b/test/utils.c -index 222d4d5..8657966 100644 ---- a/test/utils.c -+++ b/test/utils.c -@@ -966,9 +966,11 @@ enable_divbyzero_exceptions (void) - { - #ifdef HAVE_FENV_H - #ifdef HAVE_FEENABLEEXCEPT -+#ifdef HAVE_FEDIVBYZERO - feenableexcept (FE_DIVBYZERO); -+#endif - #endif - #endif - } - - void --- -2.1.4 -
meta/recipes-graphics/xorg-lib/pixman/mips-export-revert.patch deleted +0 -22
@@ -1,22 +0,0 @@ -Revert a commit in pixman 0.32.6 which breaks compliation on MIPS machines with -errors such as: - -pixman-0.32.6/pixman/pixman-mips-dspr2-asm.S:4267: -Error: invalid operands `mflo $14,$ac3' - -Upstream-Status: Pending -Signed-off-by: Ross Burton <[email protected]> - ---- b/pixman/pixman-mips-dspr2-asm.h -+++ a/pixman/pixman-mips-dspr2-asm.h -@@ -72,10 +72,7 @@ - #define LEAF_MIPS32R2(symbol) \ - .globl symbol; \ - .align 2; \ --#ifdef __ELF__ -- .hidden symbol; \ - .type symbol, @function; \ --#endif - .ent symbol, 0; \ - symbol: .frame sp, 0, ra; \ - .set push; \
meta/recipes-graphics/xorg-lib/pixman_0.34.0.bb renamed from meta/recipes-graphics/xorg-lib/pixman_0.32.8.bb +2 -4
@@ -31,12 +31,10 @@ EXTRA_OECONF_class-nativesdk = "--disable-gtk" SRC_URI += "\ file://0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch \ - file://mips-export-revert.patch \ file://asm_include.patch \ - file://0001-v3-test-add-a-check-for-FE_DIVBYZERO.patch \ " -SRC_URI[md5sum] = "18d6b62abdb7bc0f8e6b0ddf48986b2c" -SRC_URI[sha256sum] = "5c63dbb3523fc4d86ed4186677815918a941b7cb390d5eec4f55cb5d66b59fb1" +SRC_URI[md5sum] = "002a4fcb644ddfcb4b0e4191576a0d59" +SRC_URI[sha256sum] = "39ba3438f3d17c464b0cb8be006dacbca0ab5aee97ebde69fec7ecdbf85794a0" REQUIRED_DISTRO_FEATURES = ""
Signature · 1 line
2.1.4
PATCH 11/13 wayland: Upgrade 1.9.0 -> 1.10.0
In reply to Jussi KukkonenYes, Wayland now depends on another xml parser (just for build time dtd validation).
---
.../wayland/{wayland_1.9.0.bb => wayland_1.10.0.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-graphics/wayland/{wayland_1.9.0.bb => wayland_1.10.0.bb} (89%)meta/recipes-graphics/wayland/wayland_1.10.0.bb renamed from meta/recipes-graphics/wayland/wayland_1.9.0.bb +3 -3
@@ -11,8 +11,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \ file://src/wayland-server.c;endline=24;md5=b8e046164a766bb1ede8ba38e9dcd7ce" SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "5e141b3f2a7005d6c89d6f233c87c317" -SRC_URI[sha256sum] = "9c8770720aa0034479735f58a4dc4ca9b172ecfede28f5134312e135b7301efa" +SRC_URI[md5sum] = "e7751c38807c231afaba9d6b68f2a2b7" +SRC_URI[sha256sum] = "4bf6e790aa6f50ab3825676282ecd75850ec9c4767af96ecb7127b1f3c3d60dc" EXTRA_OECONF_class-native = "--disable-documentation --disable-libraries"
@@ -20,7 +20,7 @@ inherit autotools pkgconfig BBCLASSEXTEND = "native nativesdk" -DEPENDS = "expat libffi wayland-native" +DEPENDS = "expat libxml2 libffi wayland-native" EXTRA_OECONF = "--disable-documentation --with-host-scanner"
Signature · 1 line
2.1.4
PATCH 12/13 wayland-protocols: Add recipe
In reply to Jussi Kukkonenwayland-protocols is a collection of Wayland protocols split out from weston. It is a build dependency for Weston 1.10.
Added a patch to enable allarch build.
--- .../wayland-protocols/dont-use-AC_CANONICAL.patch | 29 ++++++++++++++++++++++ .../wayland/wayland-protocols_1.3.bb | 19 ++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 meta/recipes-graphics/wayland/wayland-protocols/dont-use-AC_CANONICAL.patch create mode 100644 meta/recipes-graphics/wayland/wayland-protocols_1.3.bb
meta/recipes-graphics/wayland/wayland-protocols/dont-use-AC_CANONICAL.patch new file +29 -0
@@ -0,0 +1,29 @@ +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 <[email protected]> +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 +
meta/recipes-graphics/wayland/wayland-protocols_1.3.bb new file +19 -0
@@ -0,0 +1,19 @@ +SUMMARY = "Collection of additional Wayland protocols" +DESCRIPTION = "Wayland protocols that add functionality not \ +available in the Wayland core protocol. Such protocols either add \ +completely new functionality, or extend the functionality of some other \ +protocol either in Wayland core, or some other protocol in \ +wayland-protocols." +HOMEPAGE = "http://wayland.freedesktop.org" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \ + file://stable/presentation-time/presentation-time.xml;endline=26;md5=4646cd7d9edc9fa55db941f2d3a7dc53" + +SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ + file://dont-use-AC_CANONICAL.patch" +SRC_URI[md5sum] = "88b5e3dce52908c7e74fad3e2cf8abb0" +SRC_URI[sha256sum] = "6bcd0633fdf9225ef1c7d2831f542e947f7d79811c79fc37f57b2e5375ded82f" + +inherit allarch autotools pkgconfig + +FILES_${PN}-dev += "${datadir}/wayland-protocols"
Signature · 1 line
2.1.4
Re: [PATCH 12/13] wayland-protocols: Add recipe
Quoted 3 lines · Jussi Kukkonen
wayland-protocols is a collection of Wayland protocols split out from weston. It is a build dependency for Weston 1.10.
* satisfy_dependencies_for: Cannot satisfy the following dependencies for weston-dev:
* wayland-protocols (= 1.3-r0) *
* opkg_install: Cannot install package weston-dev.
Ross
Re: [PATCH 12/13] wayland-protocols: Add recipe
Quoted 7 lines · Ross
Quoted 3 lines · Jussi Kukkonen
wayland-protocols is a collection of Wayland protocols split out from weston. It is a build dependency for Weston 1.10.
Quoted 6 lines
*
satisfy_dependencies_for: Cannot satisfy the following dependencies for weston-dev:* wayland-protocols (= 1.3-r0) *
*
opkg_install: Cannot install package weston-dev.
Thanks. So having a lonely -dev package does require some tricks: I think I'll just avoid doing that in V2.
RP also pointed out a problem with multilib weston: the logic for finding the protocol directory in weston configure.ac doesn't work (because the allarch wayland-protocols ends up in the non-multilib sysroot).
As I said, feel free to drop wayland & weston upgrades for now if you want to move on.
Jussi
PATCH 13/13 weston: Upgrade 1.9.0 -> 1.10.0
In reply to Jussi KukkonenSupport for multiple new protocols, many new features:
https://lists.freedesktop.org/archives/wayland-devel/2016-February/027039.html
Weston now depends on wayland-protocols (which is protocol collection split off from weston).
Remove upstreamed patches, add a patch to fix the wayland-protocols path used during build.
---
...c-Use-PKG_CONFIG_SYSROOT_DIR-for-protocol.patch | 30 ++++++++++
.../weston/explicit-enable-disable-systemd.patch | 70 ----------------------
.../wayland/weston/libsystemd.patch | 53 ----------------
.../weston/make-lcms-explicitly-configurable.patch | 43 -------------
.../wayland/{weston_1.9.0.bb => weston_1.10.0.bb} | 10 ++--
5 files changed, 34 insertions(+), 172 deletions(-)
create mode 100644 meta/recipes-graphics/wayland/weston/0001-configure.ac-Use-PKG_CONFIG_SYSROOT_DIR-for-protocol.patch
delete mode 100644 meta/recipes-graphics/wayland/weston/explicit-enable-disable-systemd.patch
delete mode 100644 meta/recipes-graphics/wayland/weston/libsystemd.patch
delete mode 100644 meta/recipes-graphics/wayland/weston/make-lcms-explicitly-configurable.patch
rename meta/recipes-graphics/wayland/{weston_1.9.0.bb => weston_1.10.0.bb} (92%)meta/recipes-graphics/wayland/weston/0001-configure.ac-Use-PKG_CONFIG_SYSROOT_DIR-for-protocol.patch new file +30 -0
@@ -0,0 +1,30 @@ +From 1cfc1434a5d385a74de593ec7601674dba39e2fe Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <[email protected]> +Date: Wed, 11 May 2016 16:16:30 +0300 +Subject: [PATCH] configure.ac: Use PKG_CONFIG_SYSROOT_DIR for protocols path + +The wayland-protocols directory is used during build: +make sure the one in sysroot is used. + +Signed-off-by: Jussi Kukkonen <[email protected]> +Upstream-Status: Inappropriate [embedded specific] +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +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]) + PKG_CHECK_MODULES(COMPOSITOR, [$COMPOSITOR_MODULES]) + + PKG_CHECK_MODULES(WAYLAND_PROTOCOLS, [wayland-protocols >= 1.0], +- [ac_wayland_protocols_pkgdatadir=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`]) ++ [ac_wayland_protocols_pkgdatadir=${PKG_CONFIG_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`]) + AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, $ac_wayland_protocols_pkgdatadir) + + AC_ARG_ENABLE(wayland-compositor, [ --enable-wayland-compositor],, +-- +2.1.4 +
meta/recipes-graphics/wayland/weston/explicit-enable-disable-systemd.patch deleted +0 -70
70 lines not on this page · raw message
meta/recipes-graphics/wayland/weston/libsystemd.patch deleted +0 -53
53 lines not on this page · raw message
meta/recipes-graphics/wayland/weston/make-lcms-explicitly-configurable.patch deleted +0 -43
43 lines not on this page · raw message
meta/recipes-graphics/wayland/weston_1.10.0.bb renamed from meta/recipes-graphics/wayland/weston_1.9.0.bb +4 -6
@@ -8,21 +8,19 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \ SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ file://weston.png \ file://weston.desktop \ - file://make-lcms-explicitly-configurable.patch \ file://make-libwebp-explicitly-configurable.patch \ file://0001-make-error-portable.patch \ - file://libsystemd.patch \ - file://explicit-enable-disable-systemd.patch \ + file://0001-configure.ac-Use-PKG_CONFIG_SYSROOT_DIR-for-protocol.patch \ " -SRC_URI[md5sum] = "66bbba12f546570b4d97f676bc79a28e" -SRC_URI[sha256sum] = "9c1b03f3184fa0b0dfdf67e215048085156e1a2ca344af6613fed36794ac48cf" +SRC_URI[md5sum] = "1cd17c54ecac6d9a3cd90bf12eaa3e20" +SRC_URI[sha256sum] = "e0b2004d00d8293ddf7903ca283c1746afa9ccb5919ab50fd04397ff472aa5c1" inherit autotools pkgconfig useradd distro_features_check # depends on virtual/egl REQUIRED_DISTRO_FEATURES = "opengl" DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 jpeg" -DEPENDS += "wayland libinput virtual/egl pango wayland-native" +DEPENDS += "wayland wayland-protocols libinput virtual/egl pango wayland-native" EXTRA_OECONF = "--enable-setuid-install \ --enable-simple-clients \
Signature · 1 line
2.1.4
Re: [PATCH 13/13] weston: Upgrade 1.9.0 -> 1.10.0
Quoted 10 lines · Jussi Kukkonen
Support for multiple new protocols, many new features:
https://lists.freedesktop.org/archives/wayland-devel/2016-February/027039.htmlWeston now depends on wayland-protocols (which is protocol collection split off from weston).
Remove upstreamed patches, add a patch to fix the wayland-protocols path used during build.
Signed-off-by Jussi Kukkonen <[email protected]>
I am working on rework the weston recipes and it seems Weston 1.11 is close of release. I think instead of adding 1.10 we could use 1.10.91 and upgrade it to 1.11.0 when it is out (end of May). This avoids another cycle of rebase of patches during 2.2 development cycle.
What do you think?
Signature · 3 lines
Otavio Salvador O.S. Systems http://www.ossystems.com.br http://code.ossystems.com.br Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
Re: [PATCH 13/13] weston: Upgrade 1.9.0 -> 1.10.0
Quoted 11 lines · Otavio Salvador
Quoted 9 lines · Jussi Kukkonen
Support for multiple new protocols, many new features:
https://lists.freedesktop.org/archives/wayland-devel/2016-February/027039.htmlWeston now depends on wayland-protocols (which is protocol collection split off from weston).
Remove upstreamed patches, add a patch to fix the wayland-protocols path used during build.
Quoted 8 lines
Quoted 1 line
Signed-off-by Jussi Kukkonen <[email protected]>I am working on rework the weston recipes and it seems Weston 1.11 is close of release. I think instead of adding 1.10 we could use 1.10.91 and upgrade it to 1.11.0 when it is out (end of May). This avoids another cycle of rebase of patches during 2.2 development cycle.
What do you think?
I don't have a burning need to get 1.10 in at all (I almost didn't send these in the first place because of 1.11 being just two weeks away). If you'd rather avoid the churn I'm fine with doing other things and looking at this again after 1.11 release. I'm also totally happy to keep my paws off this completely if your rework is going to include the 1.9 -> 1.11 upgrade in it.
Here's my current 1.10 branch in case it's useful (the important change is the WAYLAND_PROTOCOLS_SYSROOT_DIR hack to get multilib working with allarch wayland-protocols):
git://git.yoctoproject.org/poky-contrib jku/wayland-1.10
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/wayland-1.10
Just to be clear: Based on this discussion I don't currently plan to send a V2 to list unless there's demand for it.
Thanks,
Jussi
Re: [PATCH 13/13] weston: Upgrade 1.9.0 -> 1.10.0
Quoted 29 lines · Jussi Kukkonen
Quoted 11 lines · Otavio Salvador
Quoted 9 lines · Jussi Kukkonen
Support for multiple new protocols, many new features:
https://lists.freedesktop.org/archives/wayland-devel/2016-February/027039.htmlWeston now depends on wayland-protocols (which is protocol collection split off from weston).
Remove upstreamed patches, add a patch to fix the wayland-protocols path used during build.
Quoted 8 lines
Quoted 1 line
Signed-off-by Jussi Kukkonen <[email protected]>I am working on rework the weston recipes and it seems Weston 1.11 is close of release. I think instead of adding 1.10 we could use 1.10.91 and upgrade it to 1.11.0 when it is out (end of May). This avoids another cycle of rebase of patches during 2.2 development cycle.
What do you think?
I don't have a burning need to get 1.10 in at all (I almost didn't send these in the first place because of 1.11 being just two weeks away). If you'd rather avoid the churn I'm fine with doing other things and looking at this again after 1.11 release. I'm also totally happy to keep my paws off this completely if your rework is going to include the 1.9 -> 1.11 upgrade in it.
Quoted 8 lines
Here's my current 1.10 branch in case it's useful (the important change is the
WAYLAND_PROTOCOLS_SYSROOT_DIRhack to get multilib working with allarch wayland-protocols):
git://git.yoctoproject.org/poky-contribjku/wayland-1.10
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/wayland-1.10Just to be clear: Based on this discussion I don't currently plan to send a V2 to list unless there's demand for it.
As I said, I would work on 1.10.91 as it is close of 1.11 and easy the upgrade. But all my patches are based on 1.10 now so it is fine with me as well so please send the v2.
Signature · 3 lines
Otavio Salvador O.S. Systems http://www.ossystems.com.br http://code.ossystems.com.br Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
Re: [PATCH 13/13] weston: Upgrade 1.9.0 -> 1.10.0
Quoted 40 lines · Otavio Salvador
Quoted 35 lines · Jussi Kukkonen
Quoted 11 lines · Otavio Salvador
Quoted 9 lines · Jussi Kukkonen
Support for multiple new protocols, many new features:
https://lists.freedesktop.org/archives/wayland-devel/2016-February/027039.htmlWeston now depends on wayland-protocols (which is protocol collection split off from weston).
Remove upstreamed patches, add a patch to fix the wayland-protocols path used during build.
Quoted 8 lines
Quoted 1 line
Signed-off-by Jussi Kukkonen <[email protected]>I am working on rework the weston recipes and it seems Weston 1.11 is close of release. I think instead of adding 1.10 we could use 1.10.91 and upgrade it to 1.11.0 when it is out (end of May). This avoids another cycle of rebase of patches during 2.2 development cycle.
What do you think?
I don't have a burning need to get 1.10 in at all (I almost didn't send these in the first place because of 1.11 being just two weeks away). If you'd rather avoid the churn I'm fine with doing other things and looking at this again after 1.11 release. I'm also totally happy to keep my paws off this completely if your rework is going to include the 1.9 -> 1.11 upgrade in it.
Here's my current 1.10 branch in case it's useful (the important change is the
WAYLAND_PROTOCOLS_SYSROOT_DIRhack to get multilib working with allarch wayland-protocols):
git://git.yoctoproject.org/poky-contribjku/wayland-1.10
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/wayland-1.10
Quoted 6 lines
Quoted 2 lines
Just to be clear: Based on this discussion I don't currently plan to send a V2 to list unless there's demand for it.
As I said, I would work on 1.10.91 as it is close of 1.11 and easy the upgrade. But all my patches are based on 1.10 now so it is fine with me as well so please send the v2.
If 1.11 is around the corner then why not work on 1.11 ( pre-release ) itself
Re: [PATCH 13/13] weston: Upgrade 1.9.0 -> 1.10.0
Quoted 40 lines · Khem Raj
Quoted 40 lines · Otavio Salvador
Quoted 35 lines · Jussi Kukkonen
Quoted 11 lines · Otavio Salvador
Quoted 9 lines · Jussi Kukkonen
Support for multiple new protocols, many new features:
https://lists.freedesktop.org/archives/wayland-devel/2016-February/027039.htmlWeston now depends on wayland-protocols (which is protocol collection split off from weston).
Remove upstreamed patches, add a patch to fix the wayland-protocols path used during build.
Quoted 8 lines
Quoted 1 line
Signed-off-by Jussi Kukkonen <[email protected]>I am working on rework the weston recipes and it seems Weston 1.11 is close of release. I think instead of adding 1.10 we could use 1.10.91 and upgrade it to 1.11.0 when it is out (end of May). This avoids another cycle of rebase of patches during 2.2 development cycle.
What do you think?
I don't have a burning need to get 1.10 in at all (I almost didn't send these in the first place because of 1.11 being just two weeks away). If you'd rather avoid the churn I'm fine with doing other things and looking at this again after 1.11 release. I'm also totally happy to keep my paws off this completely if your rework is going to include the 1.9 -> 1.11 upgrade in it.
Here's my current 1.10 branch in case it's useful (the important change is the
WAYLAND_PROTOCOLS_SYSROOT_DIRhack to get multilib working with allarch wayland-protocols):
git://git.yoctoproject.org/poky-contribjku/wayland-1.10
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/wayland-1.10
Quoted 8 lines
Quoted 6 lines
Quoted 2 lines
Just to be clear: Based on this discussion I don't currently plan to send a V2 to list unless there's demand for it.
As I said, I would work on 1.10.91 as it is close of 1.11 and easy the upgrade. But all my patches are based on 1.10 now so it is fine with me as well so please send the v2.
If 1.11 is around the corner then why not work on 1.11 ( pre-release ) itself
This was my proposal; to get the 1.10.91 merged.
Signature · 3 lines
Otavio Salvador O.S. Systems http://www.ossystems.com.br http://code.ossystems.com.br Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
Re: [PATCH 13/13] weston: Upgrade 1.9.0 -> 1.10.0
In reply to Khem RajQuoted 5 lines · Khem Raj
Quoted 3 lines
As I said, I would work on 1.10.91 as it is close of 1.11 and easy the upgrade. But all my patches are based on 1.10 now so it is fine with me as well so please send the v2.
If 1.11 is around the corner then why not work on 1.11 ( pre-release ) itself
There's not much to work on as far as I can tell: 1.11 should be a simple upgrade with trivial patch changes.
As I said, I'm totally fine with waiting a couple of weeks until 1.11. On the other hand I haven't seen any reasons to start packaging a pre-release -- why this one if we normally don't do it?
Jussi
Re: [PATCH 13/13] weston: Upgrade 1.9.0 -> 1.10.0
Quoted 6 lines · Jussi Kukkonen
There's not much to work on as far as I can tell: 1.11 should be a simple upgrade with trivial patch changes.
As I said, I'm totally fine with waiting a couple of weeks until 1.11. On the other hand I haven't seen any reasons to start packaging a pre-release -- why this one if we normally don't do it?
Agreed, if we want an upgrade now then 1.10 is good, otherwise wait for 1.11. There's no urgent need for a prerelease is there?
Ross
Re: [PATCH 13/13] weston: Upgrade 1.9.0 -> 1.10.0
Quoted 10 lines · Ross
Quoted 6 lines · Jussi Kukkonen
There's not much to work on as far as I can tell: 1.11 should be a simple upgrade with trivial patch changes.
As I said, I'm totally fine with waiting a couple of weeks until 1.11. On the other hand I haven't seen any reasons to start packaging a pre-release -- why this one if we normally don't do it?
Quoted 2 lines
Agreed, if we want an upgrade now then 1.10 is good, otherwise wait for 1.11. There's no urgent need for a prerelease is there?
So please do 1.10 now, as the XWayland rework was done basing on that ... we can handle 1.11 upgrade once it happens.
Signature · 3 lines
Otavio Salvador O.S. Systems http://www.ossystems.com.br http://code.ossystems.com.br Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
Re: [PATCH 13/13] weston: Upgrade 1.9.0 -> 1.10.0
Quoted 15 lines · Otavio Salvador
Quoted 13 lines · Ross
Quoted 8 lines · Jussi Kukkonen
There's not much to work on as far as I can tell: 1.11 should be a
simple upgrade with trivial patch changes.
As I said, I'm totally fine with waiting a couple of weeks until 1.11.
On the other hand I haven't seen any reasons to start packaging a pre-release -- why this one if we normally don't do it?
Quoted 6 lines
Quoted 3 lines
Agreed, if we want an upgrade now then 1.10 is good, otherwise wait for
1.11. There's no urgent need for a prerelease is there?So please do 1.10 now, as the XWayland rework was done basing on that ... we can handle 1.11 upgrade once it happens.
I fixed up the selftest failure the original patch as proposed caused and have merged that. Anything further can be based on that...
Cheers,
Richard
Re: [PATCH 13/13] weston: Upgrade 1.9.0 -> 1.10.0
Quoted 20 lines · Richard Purdie
Quoted 19 lines · Otavio Salvador
Quoted 16 lines · Ross
Quoted 8 lines · Jussi Kukkonen
There's not much to work on as far as I can tell: 1.11 should be a
simple upgrade with trivial patch changes.
As I said, I'm totally fine with waiting a couple of weeks until 1.11.
On the other hand I haven't seen any reasons to start packaging a pre-release -- why this one if we normally don't do it?Agreed, if we want an upgrade now then 1.10 is good, otherwise wait for
1.11. There's no urgent need for a prerelease is there?
Quoted 5 lines
Quoted 2 lines
So please do 1.10 now, as the XWayland rework was done basing on that ... we can handle 1.11 upgrade once it happens.
I fixed up the selftest failure the original patch as proposed caused and have merged that. Anything further can be based on that...
Thanks RP.
Explanation for anyone coming to this thread wondering why the weston recipe does what it does:
* wayland-protocols is allarch because it's just xml files
* weston needs to add WAYLAND_PROTOCOLS_SYSROOT_DIR=${STAGING_DIR}/${MACHINE} to EXTRA_OECONF to find the xml files as PKGCONFIG_SYSROOT_DIR would
point to the wrong
place when weston is multilib -- allarch files are in machine
sysroot, not multilib sysroot
* this leads test_sstate_sametune_samesigs test to fail, which RP silenced by adding
EXTRA_OECONF[vardepsexclude] = "MACHINE"
Simples!
Any other wayland compositor recipe will have to do similar things.
- Jussi
Re: [PATCH 13/13] weston: Upgrade 1.9.0 -> 1.10.0
In reply to Jussi KukkonenQuoted 5 lines · Jussi Kukkonen
Quoted 4 lines · Khem Raj
Quoted 3 lines
As I said, I would work on 1.10.91 as it is close of 1.11 and easy the upgrade. But all my patches are based on 1.10 now so it is fine with me as well so please send the v2.
Quoted 7 lines
Quoted 1 line
If 1.11 is around the corner then why not work on 1.11 ( pre-release ) itself
There's not much to work on as far as I can tell: 1.11 should be a simple upgrade with trivial patch changes.
As I said, I'm totally fine with waiting a couple of weeks until 1.11. On the other hand I haven't seen any reasons to start packaging a pre-release -- why this one if we normally don't do it?
There has been 1.11 release done for quite a while, are you working on sending an upgrade for it ?
Quoted 2 lines
Jussi
Re: [PATCH 13/13] weston: Upgrade 1.9.0 -> 1.10.0
Quoted 10 lines · Khem Raj
Quoted 6 lines · Jussi Kukkonen
Quoted 5 lines · Khem Raj
Quoted 3 lines
As I said, I would work on 1.10.91 as it is close of 1.11 and easy the upgrade. But all my patches are based on 1.10 now so it is fine with me as well so please send the v2.
If 1.11 is around the corner then why not work on 1.11 ( pre-release )
itself
Quoted 1 line
Quoted 9 lines
Quoted 5 lines
There's not much to work on as far as I can tell: 1.11 should be a simple upgrade with trivial patch changes.
As I said, I'm totally fine with waiting a couple of weeks until 1.11. On the other hand I haven't seen any reasons to start packaging a pre-release -- why this one if we normally don't do it?There has been 1.11 release done for quite a while, are you working on sending an upgrade for it ?
I intend to do that this week, yes.
Jussi
Re: [PATCH 13/13] weston: Upgrade 1.9.0 -> 1.10.0
In reply to Otavio SalvadorQuoted 11 lines · Otavio Salvador
Quoted 9 lines · Jussi Kukkonen
Support for multiple new protocols, many new features:
https://lists.freedesktop.org/archives/wayland-devel/2016-February/027039.htmlWeston now depends on wayland-protocols (which is protocol collection split off from weston).
Remove upstreamed patches, add a patch to fix the wayland-protocols path used during build.
Quoted 8 lines
Quoted 1 line
Signed-off-by Jussi Kukkonen <[email protected]>I am working on rework the weston recipes and it seems Weston 1.11 is close of release. I think instead of adding 1.10 we could use 1.10.91 and upgrade it to 1.11.0 when it is out (end of May). This avoids another cycle of rebase of patches during 2.2 development cycle.
What do you think?
This wayland upgrade breaks libsdl2
http://errors.yoctoproject.org/Errors/Details/68336/
libsdl2 needs fix from here:
https://hg.libsdl.org/SDL/rev/330f500d5815
Quoted 10 lines
Signature · 9 lines
-- Otavio Salvador O.S. Systems http://www.ossystems.com.br http://code.ossystems.com.br Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Re: [PATCH 13/13] weston: Upgrade 1.9.0 -> 1.10.0
Quoted 7 lines · Martin Jansa
This wayland upgrade breaks libsdl2
http://errors.yoctoproject.org/Errors/Details/68336/
libsdl2 needs fix from here:
https://hg.libsdl.org/SDL/rev/330f500d5815
And literally nothing in oe-core uses libsdl2. Does anyone who knows SDL have an opinion on whether we should switch qemu and ffmpeg to use libsdl2, or keep on libsdl and move libsdl2 to meta-oe?
Ross
Re: [PATCH 13/13] weston: Upgrade 1.9.0 -> 1.10.0
Quoted 4 lines · Ross
And literally nothing in oe-core uses libsdl2. Does anyone who knows SDL have an opinion on whether we should switch qemu and ffmpeg to use libsdl2, or keep on libsdl and move libsdl2 to meta-oe?
It appears that qemu supports both but defaults to 1.2, which suggests that it's the better supported option for qemu.
Ross
PATCH 1/1 libsdl2: Fix build with wayland 1.10
In reply to Martin Jansa--- ...ideo-make-it-compatible-with-wayland-1.10.patch | 57 ++++++++++++++++++++++ meta/recipes-graphics/libsdl2/libsdl2_2.0.4.bb | 4 +- 2 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-graphics/libsdl2/libsdl2/0001-src-video-make-it-compatible-with-wayland-1.10.patch
meta/recipes-graphics/libsdl2/libsdl2/0001-src-video-make-it-compatible-with-wayland-1.10.patch new file +57 -0
@@ -0,0 +1,57 @@ +From b1ed3533433501ec52c8289a5b3a294e57e7f798 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <[email protected]> +Date: Thu, 26 May 2016 11:31:52 +0000 +Subject: [PATCH] src/video: make it compatible with wayland 1.10 + +| build/.libs/SDL_waylandevents.o: In function `wl_registry_bind': +| /usr/include/wayland-client-protocol.h:305: undefined reference to `wl_proxy_marshal_constructor_versioned' +| /usr/include/wayland-client-protocol.h:305: undefined reference to `wl_proxy_marshal_constructor_versioned' +| build/.libs/SDL_waylandkeyboard.o: In function `wl_registry_bind': +| /usr/include/wayland-client-protocol.h:305: undefined reference to `wl_proxy_marshal_constructor_versioned' +| /usr/include/wayland-client-protocol.h:305: undefined reference to `wl_proxy_marshal_constructor_versioned' +| build/.libs/SDL_waylandvideo.o: In function `wl_registry_bind': +| /usr/include/wayland-client-protocol.h:305: undefined reference to `wl_proxy_marshal_constructor_versioned' +| collect2: error: ld returned 1 exit status +| make: *** [build/libSDL2.la] Error 1 +| ERROR: oe_runmake failed + +Upstream-Status: Pending +Signed-off-by: Martin Jansa <[email protected]> + +--- + src/video/wayland/SDL_waylanddyn.h | 1 + + src/video/wayland/SDL_waylandsym.h | 4 ++++ + src/video/webos/SDL_waylanddyn.h | 1 + + src/video/webos/SDL_waylandsym.h | 4 ++++ + 4 files changed, 10 insertions(+) + +diff --git a/src/video/wayland/SDL_waylanddyn.h b/src/video/wayland/SDL_waylanddyn.h +index 8d9313a..c7b0157 100644 +--- a/src/video/wayland/SDL_waylanddyn.h ++++ b/src/video/wayland/SDL_waylanddyn.h +@@ -79,6 +79,7 @@ void SDL_WAYLAND_UnloadSymbols(void); + #define wl_proxy_get_user_data (*WAYLAND_wl_proxy_get_user_data) + #define wl_proxy_add_listener (*WAYLAND_wl_proxy_add_listener) + #define wl_proxy_marshal_constructor (*WAYLAND_wl_proxy_marshal_constructor) ++#define wl_proxy_marshal_constructor_versioned (*WAYLAND_wl_proxy_marshal_constructor_versioned) + + #define wl_seat_interface (*WAYLAND_wl_seat_interface) + #define wl_surface_interface (*WAYLAND_wl_surface_interface) +diff --git a/src/video/wayland/SDL_waylandsym.h b/src/video/wayland/SDL_waylandsym.h +index c3b4fa5..b9a0d97 100644 +--- a/src/video/wayland/SDL_waylandsym.h ++++ b/src/video/wayland/SDL_waylandsym.h +@@ -55,6 +55,10 @@ SDL_WAYLAND_SYM(void, wl_list_insert_list, (struct wl_list *, struct wl_list *)) + SDL_WAYLAND_MODULE(WAYLAND_CLIENT_1_4) + SDL_WAYLAND_SYM(struct wl_proxy *, wl_proxy_marshal_constructor, (struct wl_proxy *, uint32_t opcode, const struct wl_interface *interface, ...)) + ++/* These functions are available in Wayland >= 1.10 */ ++SDL_WAYLAND_MODULE(WAYLAND_CLIENT_1_10) ++SDL_WAYLAND_SYM(struct wl_proxy *, wl_proxy_marshal_constructor_versioned, (struct wl_proxy *proxy, uint32_t opcode, const struct wl_interface *interface, uint32_t version, ...)) ++ + SDL_WAYLAND_INTERFACE(wl_seat_interface) + SDL_WAYLAND_INTERFACE(wl_surface_interface) + SDL_WAYLAND_INTERFACE(wl_shm_pool_interface) +-- +1.9.1 +
meta/recipes-graphics/libsdl2/libsdl2_2.0.4.bb +3 -1
@@ -15,7 +15,9 @@ PROVIDES = "virtual/libsdl2" DEPENDS_class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender nativesdk-libxext', '', d)}" SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz \ - file://linkage.patch" + file://linkage.patch \ + file://0001-src-video-make-it-compatible-with-wayland-1.10.patch \ +" S = "${WORKDIR}/SDL2-${PV}"
Signature · 1 line
2.8.3
It seems I wasn't working on top of current master HEAD, apologies:
The xorg upgrade was already done by Andreas, other changes are still valid.
I'll do a quick smoketest and push the rebased branch with same name, dropping xserver-xorg patch. I'm not resending the patches as they are otherwise identical.
- Jussi
Quoted 90 lines · Jussi Kukkonen
Upgrades around X, Wayland and Mesa. Mostly point upgrades but the Wayland upgrade is a fairly major one: their next release is also around the corner so if there are problems you can drop wayland- related bits and I can fix things in time for 1.11.
These have been sanity tested with sato and weston images. piglit results are in line with previous mesa releases (~98% pass rate for non-skipped tests on a NUC with Intel HD 5000).
Please take a look at the wayland-protocols patch: the recipe produces a -dev package only, I wasn't sure if that's a thing I can/should do?
Thanks,
JussiThe following changes since commit
7ca60ec8bff7656b4e52f5a4d238913e851da089:test-empty-image: Fix
LIC_FILES_CHKSUMtypo (2016-05-06 10:48:06 +0100)are available in the git repository at:
git://git.yoctoproject.org/poky-contribjku/gfx-upgrades
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/gfx-upgradesJussi Kukkonen (13):
xserver-xorg: Upgrade 1.18.0 -> 1.18.3
xrandr: Upgrade to 1.5.0
xkeyboard-config: Upgrade to 2.17
libinput: Upgrade 1.1.4 -> 1.3.0
xf86-input-evdev: Upgrade 2.10.1 -> 2.10.2
videoproto: Upgrade 2.3.2 -> 2.3.3
libxkbcommon: Upgrade 0.5.0 -> 0.6.1
libdrm: Upgrade 2.4.67 -> 2.4.68
mesa: Upgrade 11.1.1 -> 11.2.2
pixman: Upgrade 0.32.8 -> 0.34.0
wayland: Upgrade 1.9.0 -> 1.10.0
wayland-protocols: Add recipe
weston: Upgrade 1.9.0 -> 1.10.0.../drm/{libdrm_2.4.67.bb => libdrm_2.4.68.bb} | 4 +- .../mesa/{mesa-gl_11.1.1.bb => mesa-gl_11.2.2.bb} | 0 .../mesa/{mesa_11.1.1.bb => mesa_11.2.2.bb} | 4 +- .../{libinput_1.1.4.bb => libinput_1.3.0.bb} | 5 +- .../wayland-protocols/dont-use-AC_CANONICAL.patch | 29 +++++++++ .../wayland/wayland-protocols_1.3.bb | 19 ++++++ .../{wayland_1.9.0.bb => wayland_1.10.0.bb} | 6 +- ...c-Use-PKG_CONFIG_SYSROOT_DIR-for-protocol.patch | 30 ++++++++++ .../weston/explicit-enable-disable-systemd.patch | 70 ---------------------- .../wayland/weston/libsystemd.patch | 53 ---------------- .../weston/make-lcms-explicitly-configurable.patch | 43 ------------- .../wayland/{weston_1.9.0.bb => weston_1.10.0.bb} | 10 ++-- .../xorg-app/{xrandr_1.4.3.bb => xrandr_1.5.0.bb} | 4 +- ...-evdev_2.10.1.bb => xf86-input-evdev_2.10.2.bb} | 4 +- ...libxkbcommon_0.5.0.bb => libxkbcommon_0.6.1.bb} | 6 +- ...0001-v3-test-add-a-check-for-FE_DIVBYZERO.patch | 65 -------------------- .../xorg-lib/pixman/mips-export-revert.patch | 22 ------- .../{pixman_0.32.8.bb => pixman_0.34.0.bb} | 6 +- ...ard-config_2.16.bb => xkeyboard-config_2.17.bb} | 4 +- .../{videoproto_2.3.2.bb => videoproto_2.3.3.bb} | 4 +- ....ac-Use-libsystemd-in-REQUIRED_LIBS-check.patch | 50 ---------------- .../modesetting_libdrm_requirements.patch | 30 ---------- ...erver-xorg_1.18.0.bb => xserver-xorg_1.18.3.bb} | 8 +-- 23 files changed, 108 insertions(+), 368 deletions(-) rename meta/recipes-graphics/drm/{libdrm_2.4.67.bb => libdrm_2.4.68.bb} (92%) rename meta/recipes-graphics/mesa/{mesa-gl_11.1.1.bb => mesa-gl_11.2.2.bb} (100%) rename meta/recipes-graphics/mesa/{mesa_11.1.1.bb => mesa_11.2.2.bb} (80%) rename meta/recipes-graphics/wayland/{libinput_1.1.4.bb => libinput_1.3.0.bb} (75%) create mode 100644 meta/recipes-graphics/wayland/wayland-protocols/dont-use-AC_CANONICAL.patch create mode 100644 meta/recipes-graphics/wayland/wayland-protocols_1.3.bb rename meta/recipes-graphics/wayland/{wayland_1.9.0.bb => wayland_1.10.0.bb} (89%) create mode 100644 meta/recipes-graphics/wayland/weston/0001-configure.ac-Use-PKG_CONFIG_SYSROOT_DIR-for-protocol.patch delete mode 100644 meta/recipes-graphics/wayland/weston/explicit-enable-disable-systemd.patch delete mode 100644 meta/recipes-graphics/wayland/weston/libsystemd.patch delete mode 100644 meta/recipes-graphics/wayland/weston/make-lcms-explicitly-configurable.patch rename meta/recipes-graphics/wayland/{weston_1.9.0.bb => weston_1.10.0.bb} (92%) rename meta/recipes-graphics/xorg-app/{xrandr_1.4.3.bb => xrandr_1.5.0.bb} (72%) rename meta/recipes-graphics/xorg-driver/{xf86-input-evdev_2.10.1.bb => xf86-input-evdev_2.10.2.bb} (83%) rename meta/recipes-graphics/xorg-lib/{libxkbcommon_0.5.0.bb => libxkbcommon_0.6.1.bb} (75%) delete mode 100644 meta/recipes-graphics/xorg-lib/pixman/0001-v3-test-add-a-check-for-FE_DIVBYZERO.patch delete mode 100644 meta/recipes-graphics/xorg-lib/pixman/mips-export-revert.patch rename meta/recipes-graphics/xorg-lib/{pixman_0.32.8.bb => pixman_0.34.0.bb} (85%) rename meta/recipes-graphics/xorg-lib/{xkeyboard-config_2.16.bb => xkeyboard-config_2.17.bb} (88%) rename meta/recipes-graphics/xorg-proto/{videoproto_2.3.2.bb => videoproto_2.3.3.bb} (69%) delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/configure.ac-Use-libsystemd-in-REQUIRED_LIBS-check.patch delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/modesetting_libdrm_requirements.patch rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_1.18.0.bb => xserver-xorg_1.18.3.bb} (72%)--
2.1.4