[OE-core] [PATCH 3/3] Prepare mesa-dri for weston compatibility

[Martin Jansa]

On Thu, Dec 20, 2012 at 06:48:38PM +0200, Alex DAMIAN wrote:
> From: Alexandru DAMIAN <alexandru.damian at intel.com>
> 
> This patch enables mesa-git to build wayland-compatible
> packages for usage with weston.
> 
> It adds wayland platform support, packs the wayland-egl
> files, and sets the -git version as preffered provider.
> 
> Signed-off-by: Alexandru DAMIAN <alexandru.damian at intel.com>
> ---
>  meta/recipes-graphics/mesa/mesa-common.inc |    5 ++++-
>  meta/recipes-graphics/mesa/mesa-dri.inc    |    1 +
>  meta/recipes-graphics/mesa/mesa-dri_git.bb |    3 ++-
>  3 files changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
> index 70957eb..db1bec4 100644
> --- a/meta/recipes-graphics/mesa/mesa-common.inc
> +++ b/meta/recipes-graphics/mesa/mesa-common.inc
> @@ -18,7 +18,7 @@ PE = "2"
>  DEPENDS = "libxml2-native makedepend-native flex-native bison-native"
>  
>  PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl"
> -
> +PROVIDES += "wayland-egl libgbm libglapi"
>  # for mesa-dri and mesa-xlib
>  FILESEXTRAPATHS_append := "${THISDIR}/mesa:"
>  
> @@ -49,6 +49,7 @@ PACKAGES =+ "libegl-mesa libegl-mesa-dev \
>               libgles1-mesa libgles1-mesa-dev \
>               libgles2-mesa libgles2-mesa-dev \
>               libgles3-mesa libgles3-mesa-dev \
> +             wayland-egl wayland-egl-dev \
>              "
>  
>  do_install_append () {
> @@ -90,8 +91,10 @@ FILES_libgles2-mesa = "${libdir}/libGLESv2.so.*"
>  FILES_libgl-mesa = "${libdir}/libGL.so.*"
>  FILES_libglapi = "${libdir}/libglapi.so.*"
>  FILES_libosmesa = "${libdir}/libOSMesa.so.*"
> +FILES_wayland-egl = "${libdir}/libwayland-egl.so.*"
>  
>  FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc"
> +FILES_wayland-egl-dev = "${libdir}/pkgconfig/wayland-egl.pc ${libdir}/libwayland-egl.*"
>  FILES_libdricore-dev = "${libdir}/libdricore*.*"
>  FILES_libegl-mesa-dev = "${libdir}/libEGL.* ${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc"
>  FILES_libgbm-dev = "${libdir}/libgbm.* ${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h"
> diff --git a/meta/recipes-graphics/mesa/mesa-dri.inc b/meta/recipes-graphics/mesa/mesa-dri.inc
> index 07544ab..1f6ec78 100644
> --- a/meta/recipes-graphics/mesa/mesa-dri.inc
> +++ b/meta/recipes-graphics/mesa/mesa-dri.inc
> @@ -13,6 +13,7 @@ PACKAGECONFIG[gles] = "--enable-gles1 --enable-gles2, --disable-gles1 --disable-
>  
>  EGL_PLATFORMS  = "drm"
>  EGL_PLATFORMS .="${@base_contains('DISTRO_FEATURES', 'x11', ',x11', '', d)}"
> +EGL_PLATFORMS .="${@base_contains('DISTRO_FEATURES', 'wayland', ',wayland', '', d)}"
>  PACKAGECONFIG[egl] = "--enable-egl --with-egl-platforms=${EGL_PLATFORMS}, --disable-egl"
>  
>  python populate_packages_prepend() {
> diff --git a/meta/recipes-graphics/mesa/mesa-dri_git.bb b/meta/recipes-graphics/mesa/mesa-dri_git.bb
> index 69a433e..7fd0d39 100644
> --- a/meta/recipes-graphics/mesa/mesa-dri_git.bb
> +++ b/meta/recipes-graphics/mesa/mesa-dri_git.bb
> @@ -3,6 +3,7 @@ require mesa-git.inc
>  require mesa-dri.inc
>  
>  # this needs to be lower than -1 because all mesa-dri have -1 and git version has highest PV, but shouldn't be default
> -DEFAULT_PREFERENCE = "-2"
> +# adamian - switch to git version
> +DEFAULT_PREFERENCE = "1"

Isn't default preference 0 good enough? as meta-dri_git also has highest
PV?

>  
>  PR = "${INC_PR}.0"
> -- 
> 1.7.10.4
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20121220/d2c11283/attachment-0002.sig>