Patchwork [0/4] Mesa and Wayland updates

login
register
mail settings
Submitter Ross Burton
Date May 30, 2013, 2 p.m.
Message ID <cover.1369922325.git.ross.burton@intel.com>
Download mbox
Permalink /patch/50871/
State New
Headers show

Pull-request

git://git.yoctoproject.org/poky-contrib ross/wayland

Comments

Ross Burton - May 30, 2013, 2 p.m.
Hi,

A short series that updates our Mesa and Wayland to the latest upstream
releases, adds a very rudimentary init script to start Weston, and a basic image
that boots directly into Weston on DRM.

This image recipe effectively depends on the GTK+ branch I just sent as
otherwise GTK+ doesn't have a Wayland backend.

Ross

The following changes since commit d0861b7a12113c6626c6206faf3a9389fb8ef5cb:

  bitbake: bitbake: xmlrpc remote server (2013-05-30 10:44:00 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib ross/wayland

for you to fetch changes up to 6792689a9b2c5269b2e9e2c6fc21a52dca1cef9d:

  core-image-weston: basic image that boots directly to Weston (2013-05-30 14:57:54 +0100)

----------------------------------------------------------------
Ross Burton (4):
      mesa: upgrade to 9.1.2
      wayland: update to 1.1.0
      weston-init: basic init script to start Weston on KMS/DRM
      core-image-weston: basic image that boots directly to Weston

 meta/recipes-graphics/images/core-image-weston.bb  |    9 +
 meta/recipes-graphics/mesa/mesa-9.0.2.inc          |   13 -
 .../mesa/mesa/0002-cross-compile.patch             |   94 ---
 ...ate-NativeDisplayType-depending-on-config.patch |  358 +++++++++++
 meta/recipes-graphics/mesa/mesa/cross-glsl.patch   |  632 --------------------
 .../mesa/dont-fail-if-libX11-isnt-installed.patch  |   36 --
 .../fix-egl-compilation-without-x11-headers.patch  |   32 -
 .../mesa/mesa/fix-glsl-cross.patch                 |   43 ++
 meta/recipes-graphics/mesa/mesa_9.0.2.bb           |    4 -
 meta/recipes-graphics/mesa/mesa_9.1.2.bb           |   14 +
 .../wayland/{wayland_1.0.6.bb => wayland_1.1.0.bb} |    6 +-
 meta/recipes-graphics/wayland/weston-init.bb       |   17 +
 meta/recipes-graphics/wayland/weston-init/init     |   56 ++
 13 files changed, 499 insertions(+), 815 deletions(-)
 create mode 100644 meta/recipes-graphics/images/core-image-weston.bb
 delete mode 100644 meta/recipes-graphics/mesa/mesa-9.0.2.inc
 delete mode 100644 meta/recipes-graphics/mesa/mesa/0002-cross-compile.patch
 create mode 100644 meta/recipes-graphics/mesa/mesa/EGL-Mutate-NativeDisplayType-depending-on-config.patch
 delete mode 100644 meta/recipes-graphics/mesa/mesa/cross-glsl.patch
 delete mode 100644 meta/recipes-graphics/mesa/mesa/dont-fail-if-libX11-isnt-installed.patch
 delete mode 100644 meta/recipes-graphics/mesa/mesa/fix-egl-compilation-without-x11-headers.patch
 create mode 100644 meta/recipes-graphics/mesa/mesa/fix-glsl-cross.patch
 delete mode 100644 meta/recipes-graphics/mesa/mesa_9.0.2.bb
 create mode 100644 meta/recipes-graphics/mesa/mesa_9.1.2.bb
 rename meta/recipes-graphics/wayland/{wayland_1.0.6.bb => wayland_1.1.0.bb} (91%)
 create mode 100644 meta/recipes-graphics/wayland/weston-init.bb
 create mode 100644 meta/recipes-graphics/wayland/weston-init/init

Ross Burton (4):
  mesa: upgrade to 9.1.2
  wayland: update to 1.1.0
  weston-init: basic init script to start Weston on KMS/DRM
  core-image-weston: basic image that boots directly to Weston

 meta/recipes-graphics/images/core-image-weston.bb  |    9 +
 meta/recipes-graphics/mesa/mesa-9.0.2.inc          |   13 -
 .../mesa/mesa/0002-cross-compile.patch             |   94 ---
 ...ate-NativeDisplayType-depending-on-config.patch |  358 +++++++++++
 meta/recipes-graphics/mesa/mesa/cross-glsl.patch   |  632 --------------------
 .../mesa/dont-fail-if-libX11-isnt-installed.patch  |   36 --
 .../fix-egl-compilation-without-x11-headers.patch  |   32 -
 .../mesa/mesa/fix-glsl-cross.patch                 |   43 ++
 meta/recipes-graphics/mesa/mesa_9.0.2.bb           |    4 -
 meta/recipes-graphics/mesa/mesa_9.1.2.bb           |   14 +
 .../wayland/{wayland_1.0.6.bb => wayland_1.1.0.bb} |    6 +-
 meta/recipes-graphics/wayland/weston-init.bb       |   17 +
 meta/recipes-graphics/wayland/weston-init/init     |   56 ++
 13 files changed, 499 insertions(+), 815 deletions(-)
 create mode 100644 meta/recipes-graphics/images/core-image-weston.bb
 delete mode 100644 meta/recipes-graphics/mesa/mesa-9.0.2.inc
 delete mode 100644 meta/recipes-graphics/mesa/mesa/0002-cross-compile.patch
 create mode 100644 meta/recipes-graphics/mesa/mesa/EGL-Mutate-NativeDisplayType-depending-on-config.patch
 delete mode 100644 meta/recipes-graphics/mesa/mesa/cross-glsl.patch
 delete mode 100644 meta/recipes-graphics/mesa/mesa/dont-fail-if-libX11-isnt-installed.patch
 delete mode 100644 meta/recipes-graphics/mesa/mesa/fix-egl-compilation-without-x11-headers.patch
 create mode 100644 meta/recipes-graphics/mesa/mesa/fix-glsl-cross.patch
 delete mode 100644 meta/recipes-graphics/mesa/mesa_9.0.2.bb
 create mode 100644 meta/recipes-graphics/mesa/mesa_9.1.2.bb
 rename meta/recipes-graphics/wayland/{wayland_1.0.6.bb => wayland_1.1.0.bb} (91%)
 create mode 100644 meta/recipes-graphics/wayland/weston-init.bb
 create mode 100644 meta/recipes-graphics/wayland/weston-init/init
Koen Kooi - May 31, 2013, 7:18 a.m.
Op 30 mei 2013, om 16:00 heeft Ross Burton <ross.burton@intel.com> het volgende geschreven:

> Hi,
> 
> A short series that updates our Mesa and Wayland to the latest upstream
> releases, adds a very rudimentary init script to start Weston, and a basic image
> that boots directly into Weston on DRM.

We talked about weston off-list a few weeks ago and this seems a good time to bring it back on list :)

I'd like to get the framebuffer backend supported, so I upgraded weston to 1.0.90 and added:

+                 --enable-fbdev-compositor \

+# Needed for weston-launch
+WESTONBACKEND ??= "fbdev-backend.so"
+
+export WESTON_NATIVE_BACKEND = "${WESTONBACKEND}"
 
At the time of writing that weston didn't support runtime detection or config files entries for selecting the backend, only commandline arguments. So whatever is getting picked at build time, you're stuck with that. Does 1.1.x address that situation?

regards,

Koen
Ross Burton - May 31, 2013, 9:30 a.m.
On 31 May 2013 08:18, Koen Kooi <koen@dominion.thruhere.net> wrote:
> We talked about weston off-list a few weeks ago and this seems a good time to bring it back on list :)
>
> I'd like to get the framebuffer backend supported, so I upgraded weston to 1.0.90 and added:
>
> +                 --enable-fbdev-compositor \
>
> +# Needed for weston-launch
> +WESTONBACKEND ??= "fbdev-backend.so"
> +
> +export WESTON_NATIVE_BACKEND = "${WESTONBACKEND}"
>
> At the time of writing that weston didn't support runtime detection or config files entries for selecting the backend, only commandline arguments. So whatever is getting picked at build time, you're stuck with that. Does 1.1.x address that situation?

Sadly, not as far as I'm aware.  I have 1.1 in another branch but it
totally broke GTK+ 3 applications (which didn't repaint after the
initial creation), which is pretty sad.  Relevant developers harassed.
:)

Ross
Ross Burton - May 31, 2013, 9:52 a.m.
On 31 May 2013 10:30, Burton, Ross <ross.burton@intel.com> wrote:
>> At the time of writing that weston didn't support runtime detection or config files entries for selecting the backend, only commandline arguments. So whatever is getting picked at build time, you're stuck with that. Does 1.1.x address that situation?
>
> Sadly, not as far as I'm aware.  I have 1.1 in another branch but it
> totally broke GTK+ 3 applications (which didn't repaint after the
> initial creation), which is pretty sad.  Relevant developers harassed.

In a massive shock, the weston man page is actually useful.  Sadly
it's clear that the backend choice is either x11 if DISPLAY is set,
wayland-over-wayland if WAYLAND_DISPLAY is set, otherwise the command
line argument finally falling back to the "default" (drm out of the
box).

So if we want a single binary that supports both DRM and fbdev, then
we need to use command-line options.   I guess our startup script
should handle this and we can add another optional machine-specific
config file.

Ross
Martin Jansa - June 5, 2013, 1:51 p.m.
On Fri, May 31, 2013 at 10:52:07AM +0100, Burton, Ross wrote:
> On 31 May 2013 10:30, Burton, Ross <ross.burton@intel.com> wrote:
> >> At the time of writing that weston didn't support runtime detection or config files entries for selecting the backend, only commandline arguments. So whatever is getting picked at build time, you're stuck with that. Does 1.1.x address that situation?
> >
> > Sadly, not as far as I'm aware.  I have 1.1 in another branch but it
> > totally broke GTK+ 3 applications (which didn't repaint after the
> > initial creation), which is pretty sad.  Relevant developers harassed.
> 
> In a massive shock, the weston man page is actually useful.  Sadly
> it's clear that the backend choice is either x11 if DISPLAY is set,
> wayland-over-wayland if WAYLAND_DISPLAY is set, otherwise the command
> line argument finally falling back to the "default" (drm out of the
> box).
> 
> So if we want a single binary that supports both DRM and fbdev, then
> we need to use command-line options.   I guess our startup script
> should handle this and we can add another optional machine-specific
> config file.

Is x11 backend working for you (e.g. in qemux86-64)?

I'm testing it with core-image-weston and modified mesa (to allow
llvmpipe) and with -Bx11-backend.so added to /etc/init.d/weston:

root@qemux86-64:~# /etc/init.d/weston start
Date: 2013-06-05 UTC
[13:47:50.300] weston 1.1.0
               http://wayland.freedesktop.org/
               Bug reports to:
https://bugs.freedesktop.org/enter_bug.cgi?product=Wayland&component=weston&version=1.1.0
               Build:  
[13:47:50.308] OS: Linux, 3.8.13-yocto-standard, #1 SMP PREEMPT Tue Jun
4 22:29:53 CEST 2013, x86_64
[13:47:50.311] Loading module '/usr/lib/weston/x11-backend.so'
[13:47:50.317] initializing x11 backend
[13:47:50.318] fatal: failed to create compositor