[meta-intel] [PATCH] mesa: update bbappend to 9.1.5

[Tom Zanussi]

Pulled into meta-intel/master.

Thanks,

Tom

On Wed, 2013-07-24 at 12:54 +0100, Ross Burton wrote:
> Signed-off-by: Ross Burton <ross.burton at intel.com>
> ---
>  common/recipes-graphics/mesa/mesa_9.1.3.bbappend |   24 ----------------------
>  common/recipes-graphics/mesa/mesa_9.1.5.bbappend |   24 ++++++++++++++++++++++
>  2 files changed, 24 insertions(+), 24 deletions(-)
>  delete mode 100644 common/recipes-graphics/mesa/mesa_9.1.3.bbappend
>  create mode 100644 common/recipes-graphics/mesa/mesa_9.1.5.bbappend
> 
> diff --git a/common/recipes-graphics/mesa/mesa_9.1.3.bbappend b/common/recipes-graphics/mesa/mesa_9.1.3.bbappend
> deleted file mode 100644
> index b92831d..0000000
> --- a/common/recipes-graphics/mesa/mesa_9.1.3.bbappend
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -
> -# The emgd binary driver also provides egl, gles1, gles2 library & headers.
> -# To avoid conflict disable egl, gles1, gles2 from meta-dri if the BSP image
> -# is bundling the emgd driver.
> -
> -python __anonymous () {
> -    import re
> -    xserver = d.getVar('XSERVER', True)
> -    if xserver and 'emgd-driver-bin' in xserver.split(' '):
> -        extra_oeconf = d.getVar('EXTRA_OECONF', True).split()
> -        take_out = ["--enable-egl", "--enable-gles1", "--enable-gles2"]
> -        put_in = ["--disable-egl", "--disable-gles1", "--disable-gles2"]
> -        pattern = re.compile("--with-egl-platforms")
> -        new_extra_oeconf = [ ]
> -        for i in extra_oeconf:
> -            if ( i not in take_out ) and ( not pattern.match(i)):
> -                new_extra_oeconf.append(i)
> -        for i in put_in:
> -            new_extra_oeconf.append(i)
> -
> -        d.setVar('EXTRA_OECONF', ' '.join(new_extra_oeconf))
> -        depends = d.getVar('DEPENDS', True)
> -        d.setVar('DEPENDS', depends + " emgd-driver-bin")
> -}
> diff --git a/common/recipes-graphics/mesa/mesa_9.1.5.bbappend b/common/recipes-graphics/mesa/mesa_9.1.5.bbappend
> new file mode 100644
> index 0000000..b92831d
> --- /dev/null
> +++ b/common/recipes-graphics/mesa/mesa_9.1.5.bbappend
> @@ -0,0 +1,24 @@
> +
> +# The emgd binary driver also provides egl, gles1, gles2 library & headers.
> +# To avoid conflict disable egl, gles1, gles2 from meta-dri if the BSP image
> +# is bundling the emgd driver.
> +
> +python __anonymous () {
> +    import re
> +    xserver = d.getVar('XSERVER', True)
> +    if xserver and 'emgd-driver-bin' in xserver.split(' '):
> +        extra_oeconf = d.getVar('EXTRA_OECONF', True).split()
> +        take_out = ["--enable-egl", "--enable-gles1", "--enable-gles2"]
> +        put_in = ["--disable-egl", "--disable-gles1", "--disable-gles2"]
> +        pattern = re.compile("--with-egl-platforms")
> +        new_extra_oeconf = [ ]
> +        for i in extra_oeconf:
> +            if ( i not in take_out ) and ( not pattern.match(i)):
> +                new_extra_oeconf.append(i)
> +        for i in put_in:
> +            new_extra_oeconf.append(i)
> +
> +        d.setVar('EXTRA_OECONF', ' '.join(new_extra_oeconf))
> +        depends = d.getVar('DEPENDS', True)
> +        d.setVar('DEPENDS', depends + " emgd-driver-bin")
> +}