Patchwork [3/3] Initial commit for wayland/weston 1.0.3

login
register
mail settings
Submitter Alexandru DAMIAN
Date Dec. 24, 2012, 9:57 a.m.
Message ID <b81c825c2737a2042ed7a99796752d12b1576725.1356342794.git.alexandru.damian@intel.com>
Download mbox | patch
Permalink /patch/41651/
State New
Headers show

Comments

Alexandru DAMIAN - Dec. 24, 2012, 9:57 a.m.
From: Alexandru DAMIAN <alexandru.damian@intel.com>

This patch adds the Weston reference compositing
manager from Wayland.

We add version 1.0.3 which is the latest stable release
in Dec 2012. See the upstream at:

http://wayland.freedesktop.org/releases.html

Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
---
 meta/recipes-graphics/wayland/weston.inc      |   23 +++++++++++++++++++++++
 meta/recipes-graphics/wayland/weston_1.0.3.bb |    9 +++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 meta/recipes-graphics/wayland/weston.inc
 create mode 100644 meta/recipes-graphics/wayland/weston_1.0.3.bb
Ross Burton - Jan. 4, 2013, 11:04 a.m.
On 24 December 2012 09:57, Alex DAMIAN <alexandru.damian@intel.com> wrote:
> +PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm libgbm libglapi udev wayland-egl libpam"

"libgbm libglapi wayland-egl" aren't valid source recipes, just use "mesa-dri".

Ross
Ross Burton - Jan. 4, 2013, 3:21 p.m.
On 4 January 2013 11:04, Burton, Ross <ross.burton@intel.com> wrote:
> On 24 December 2012 09:57, Alex DAMIAN <alexandru.damian@intel.com> wrote:
>> +PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm libgbm libglapi udev wayland-egl libpam"
>
> "libgbm libglapi wayland-egl" aren't valid source recipes, just use "mesa-dri".

Ignore that.  They're still not valid source recipes, but I've dug
into how Wayland on the PandaBoard works and we should enable that to
work in meta-ti without much effort.

Their binary blob has it's own wayland-egl- and libgbm-compatible
libraries.  Let's create a new virtual provider virtual/wayland-egl
which mesa-dri (and the TI drivers) can PROVIDE and weston can DEPEND
on.

Ross
Saul Wold - Jan. 4, 2013, 5:49 p.m.
On 12/24/2012 01:57 AM, Alex DAMIAN wrote:
> From: Alexandru DAMIAN <alexandru.damian@intel.com>
>
> This patch adds the Weston reference compositing
> manager from Wayland.
>
> We add version 1.0.3 which is the latest stable release
> in Dec 2012. See the upstream at:
>
> http://wayland.freedesktop.org/releases.html
>
> Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
> ---
>   meta/recipes-graphics/wayland/weston.inc      |   23 +++++++++++++++++++++++
>   meta/recipes-graphics/wayland/weston_1.0.3.bb |    9 +++++++++
>   2 files changed, 32 insertions(+)
>   create mode 100644 meta/recipes-graphics/wayland/weston.inc
>   create mode 100644 meta/recipes-graphics/wayland/weston_1.0.3.bb
>
> diff --git a/meta/recipes-graphics/wayland/weston.inc b/meta/recipes-graphics/wayland/weston.inc
> new file mode 100644
> index 0000000..7d26f7f
> --- /dev/null
> +++ b/meta/recipes-graphics/wayland/weston.inc
> @@ -0,0 +1,23 @@
> +inherit autotools pkgconfig
> +
> +SUMMARY = "Weston, a Wayland compositor"
> +DESCRIPTION = "Weston is the reference implementation of a Wayland compositor"
> +HOMEPAGE = "http://wayland.freedesktop.org"
> +SECTION = "wayland/base"
> +LICENSE = "MIT"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=275efac2559a224527bd4fd593d38466"
> +
> +DEPENDS = "wayland libxkbcommon gdk-pixbuf pixman cairo glib-2.0 mtdev jpeg"
> +DEPENDS += "virtual/egl"
> +

The Weston Build fails with the WORLD build target, not sure if we need 
to disable weston for world or if there is some other issue that needs 
to be addressed.
> | configure:16321: $PKG_CONFIG --exists --print-errors "wayland-client wayland-egl"
> | Package wayland-egl was not found in the pkg-config search path.
> | Perhaps you should add the directory containing `wayland-egl.pc'
> | to the PKG_CONFIG_PATH environment variable
> | No package 'wayland-egl' found
> | configure:16324: $? = 1
> | configure:16337: result: no
> | No package 'wayland-egl' found
> | configure:16353: error: Package requirements (wayland-client wayland-egl) were not met:
> |
> | No package 'wayland-egl' found
> |
> | Consider adjusting the PKG_CONFIG_PATH environment variable if you
> | installed software in a non-standard prefix.
> |
> | Alternatively, you may set the environment variables WAYLAND_COMPOSITOR_CFLAGS
> | and WAYLAND_COMPOSITOR_LIBS to avoid the need to call pkg-config.
> | See the pkg-config man page for more details.
> |

Notice that it's the wayland-egl is not being found.

Sau!


> +EXTRA_OECONF  = "--enable-wayland-compositor --disable-android-compositor"
> +EXTRA_OECONF += "--enable-setuid-install --enable-simple-clients"
> +EXTRA_OECONF += "--enable-clients --disable-xwayland"
> +
> +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'kms', '', d)} \
> +                   ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
> +                   ${@base_contains('DISTRO_FEATURES', 'opengles2', 'gles', '', d)} \
> +                  "
> +PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm libgbm libglapi udev wayland-egl libpam"
> +PACKAGECONFIG[x11] = "--enable-x11-compositor,--disable-x11-compositor,virtual/libx11 libxcb libxcb libxcursor cairo"
> +PACKAGECONFIG[gles] = "--with-cairo-glesv2,,virtual/libgles2"
> diff --git a/meta/recipes-graphics/wayland/weston_1.0.3.bb b/meta/recipes-graphics/wayland/weston_1.0.3.bb
> new file mode 100644
> index 0000000..625965b
> --- /dev/null
> +++ b/meta/recipes-graphics/wayland/weston_1.0.3.bb
> @@ -0,0 +1,9 @@
> +require weston.inc
> +
> +SRC_URI = "http://wayland.freedesktop.org/releases/weston-1.0.3.tar.xz \
> +	  "
> +SRC_URI[md5sum] = "f82ac2e013e6b6a6303ac4ba7b64c7f2"
> +SRC_URI[sha256sum] = "3136a7d2f654ea3e946d4217f7e25321248ad2921f1f4e2504dda58968e04853"
> +
> +PR = "r0"
> +
>

Patch

diff --git a/meta/recipes-graphics/wayland/weston.inc b/meta/recipes-graphics/wayland/weston.inc
new file mode 100644
index 0000000..7d26f7f
--- /dev/null
+++ b/meta/recipes-graphics/wayland/weston.inc
@@ -0,0 +1,23 @@ 
+inherit autotools pkgconfig
+
+SUMMARY = "Weston, a Wayland compositor"
+DESCRIPTION = "Weston is the reference implementation of a Wayland compositor"
+HOMEPAGE = "http://wayland.freedesktop.org"
+SECTION = "wayland/base"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=275efac2559a224527bd4fd593d38466"
+
+DEPENDS = "wayland libxkbcommon gdk-pixbuf pixman cairo glib-2.0 mtdev jpeg"
+DEPENDS += "virtual/egl"
+
+EXTRA_OECONF  = "--enable-wayland-compositor --disable-android-compositor"
+EXTRA_OECONF += "--enable-setuid-install --enable-simple-clients"
+EXTRA_OECONF += "--enable-clients --disable-xwayland"
+
+PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'kms', '', d)} \
+                   ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
+                   ${@base_contains('DISTRO_FEATURES', 'opengles2', 'gles', '', d)} \
+                  "
+PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm libgbm libglapi udev wayland-egl libpam"
+PACKAGECONFIG[x11] = "--enable-x11-compositor,--disable-x11-compositor,virtual/libx11 libxcb libxcb libxcursor cairo"
+PACKAGECONFIG[gles] = "--with-cairo-glesv2,,virtual/libgles2"
diff --git a/meta/recipes-graphics/wayland/weston_1.0.3.bb b/meta/recipes-graphics/wayland/weston_1.0.3.bb
new file mode 100644
index 0000000..625965b
--- /dev/null
+++ b/meta/recipes-graphics/wayland/weston_1.0.3.bb
@@ -0,0 +1,9 @@ 
+require weston.inc
+
+SRC_URI = "http://wayland.freedesktop.org/releases/weston-1.0.3.tar.xz \
+	  "
+SRC_URI[md5sum] = "f82ac2e013e6b6a6303ac4ba7b64c7f2"
+SRC_URI[sha256sum] = "3136a7d2f654ea3e946d4217f7e25321248ad2921f1f4e2504dda58968e04853"
+
+PR = "r0"
+