[OE-core] [oe-core 07/20] mesa-common: MesaDemos is now separate recipes, bump PE, introduce INC_PR

[Martin Jansa]

On Thu, Oct 13, 2011 at 04:45:06PM -0700, Khem Raj wrote:
> On Thu, Oct 13, 2011 at 4:30 AM, Martin Jansa <martin.jansa at gmail.com> wrote:
> > Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
> > ---
> >  meta/recipes-graphics/mesa/mesa-common.inc   |    5 +++--
> >  meta/recipes-graphics/mesa/mesa-dri_7.11.bb  |    2 +-
> >  meta/recipes-graphics/mesa/mesa-dri_git.bb   |    2 +-
> >  meta/recipes-graphics/mesa/mesa-xlib_7.11.bb |    3 +--
> >  4 files changed, 6 insertions(+), 6 deletions(-)
> >
> > diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
> > index fb9a216..ee359ba 100644
> > --- a/meta/recipes-graphics/mesa/mesa-common.inc
> > +++ b/meta/recipes-graphics/mesa/mesa-common.inc
> > @@ -12,9 +12,10 @@ SECTION = "x11"
> >  LICENSE = "MIT"
> >  LIC_FILES_CHKSUM = "file://docs/license.html;md5=7a3373c039b6b925c427755a4f779c1d"
> >
> > -SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2;name=mesalib \
> > -           ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaDemos-${PV}.tar.bz2;name=mesademos "
> > +INC_PR = "r12"
> > +PE = "2"
> 
> Do u really need PE ?

Yes because I wanted upgrade path for meta-oe users.. (same with PE
bumping patches for xserver-xorg and xorg-drivers..)

> 
> >
> > +SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2"
> >  S = "${WORKDIR}/Mesa-${PV}"
> >
> >  PROVIDES = "virtual/libgl"
> > diff --git a/meta/recipes-graphics/mesa/mesa-dri_7.11.bb b/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
> > index 5f15091..5f14346 100644
> > --- a/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
> > +++ b/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
> > @@ -7,7 +7,7 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat
> >  DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS} makedepend-native python-native"
> >  DEPENDS += "mesa-dri-glsl-native"
> >
> > -PR = "r5"
> > +PR = "${INC_PR}.0"
> >
> >  SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
> >            file://crossfix.patch \
> > diff --git a/meta/recipes-graphics/mesa/mesa-dri_git.bb b/meta/recipes-graphics/mesa/mesa-dri_git.bb
> > index 9e32d0a..c50ba15 100644
> > --- a/meta/recipes-graphics/mesa/mesa-dri_git.bb
> > +++ b/meta/recipes-graphics/mesa/mesa-dri_git.bb
> > @@ -13,7 +13,7 @@ DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
> >
> >  SRCREV = "1bf94d419805538ac23a4d0b04d31ac5e4487aca"
> >  PV = "7.7+git${SRCPV}"
> > -PR = "r2"
> > +PR = "${INC_PR}.0"
> >
> >  # most of our targets do not have DRI so will use mesa-xlib
> >  DEFAULT_PREFERENCE = "-1"
> > diff --git a/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb b/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
> > index 8b83378..1e0d821 100644
> > --- a/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
> > +++ b/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
> > @@ -12,8 +12,7 @@ LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes libxml2-nativ
> >
> >  DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS} makedepend-native"
> >
> > -PE = "1"
> > -PR = "r1"
> > +PR = "${INC_PR}.0"
> >
> >  EXTRA_OECONF += "--with-driver=xlib --without-gallium-drivers"
> >
> > --
> > 1.7.7
> >
> >
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core at lists.openembedded.org
> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
> >
> 
> _______________________________________________
> 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/20111014/2658f06b/attachment-0002.sig>