diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2011-10-13 09:49:47 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-10-14 12:18:21 +0100 |
| commit | cf41f89707521b3bff31944621f6202ec0f0b5df (patch) | |
| tree | e7f0d492b872bfd1d390eae1c64f93790e77ac57 /meta | |
| parent | 442f400a3188e1d8ad60c6c36d2c0e2a78404128 (diff) | |
| download | openembedded-core-cf41f89707521b3bff31944621f6202ec0f0b5df.tar.gz openembedded-core-cf41f89707521b3bff31944621f6202ec0f0b5df.tar.bz2 openembedded-core-cf41f89707521b3bff31944621f6202ec0f0b5df.zip | |
mesa-common: MesaDemos is now separate recipes, bump PE, introduce INC_PR
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-graphics/mesa/mesa-common.inc | 5 | ||||
| -rw-r--r-- | meta/recipes-graphics/mesa/mesa-dri_7.11.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-graphics/mesa/mesa-dri_git.bb | 2 | ||||
| -rw-r--r-- | 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 fb9a2162f7..ee359ba03e 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" +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 5f15091caf..5f14346ee1 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 9e32d0aeb0..c50ba15f53 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 8b8337853a..1e0d8211a4 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" |