[oe] [meta-oe][PATCH 2/2] mesa, xorg-xserver: include glx-use-tls.inc instead of inheriting glx-use-tls class

[Martin Jansa]

On Tue, Oct 11, 2011 at 06:57:27PM -0700, Khem Raj wrote:
> To match oe-core

Both should be removed completely
http://patches.openembedded.org/patch/12633/
http://patches.openembedded.org/patch/12627/

but needs the rest of Xorg patchset in oe-core
http://patches.openembedded.org/patch/12933/

> 
> Signed-off-by: Khem Raj <raj.khem at gmail.com>
> ---
>  meta-oe/recipes-graphics/mesa/mesa-common.inc      |    3 +--
>  .../xorg-xserver/xorg-xserver-common.inc           |    4 ++--
>  2 files changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/meta-oe/recipes-graphics/mesa/mesa-common.inc b/meta-oe/recipes-graphics/mesa/mesa-common.inc
> index 2e6b599..9b80ecd 100644
> --- a/meta-oe/recipes-graphics/mesa/mesa-common.inc
> +++ b/meta-oe/recipes-graphics/mesa/mesa-common.inc
> @@ -25,8 +25,7 @@ EXTRA_OECONF = "--enable-glu \
>                  --disable-glw \
>                  --disable-glut \
>  	       "
> -
> -inherit glx-use-tls
> +include recipes-graphics/mesa/glx-use-tls.inc
>  
>  PACKAGES =+ "libegl libegl-dev libegl-dbg libglu libglu-dev libosmesa libosmesa-dev libgl libgl-dev"
>  FILES_libegl = "${libdir}/libEGL.so.* ${libdir}/egl/*.so"
> diff --git a/meta-oe/recipes-graphics/xorg-xserver/xorg-xserver-common.inc b/meta-oe/recipes-graphics/xorg-xserver/xorg-xserver-common.inc
> index 0b4a854..13bfac7 100644
> --- a/meta-oe/recipes-graphics/xorg-xserver/xorg-xserver-common.inc
> +++ b/meta-oe/recipes-graphics/xorg-xserver/xorg-xserver-common.inc
> @@ -36,8 +36,8 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2"
>  
>  S = "${WORKDIR}/${XORG_PN}-${PV}"
>  
> -inherit autotools pkgconfig glx-use-tls
> -
> +inherit autotools pkgconfig
> +include recipes-graphics/mesa/glx-use-tls.inc
>  EXTRA_OECONF += " --enable-xcalibrate \
>                    --enable-kdrive \
>                    --enable-xephyr \
> -- 
> 1.7.5.4
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

-- 
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-devel/attachments/20111012/c3c9ff28/attachment-0002.sig>