summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2011-10-13 09:49:47 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-14 13:18:09 +0100
commit5b7f5b5264921115bfbc06c7b59279b829011110 (patch)
tree7ed9e3ad6f77d54eb4d5fe0709028632cdd31c19
parent183484c4d04b6bda3bb17ded853faf26b86fe497 (diff)
downloadpoky-5b7f5b5264921115bfbc06c7b59279b829011110.tar.gz
mesa-common: MesaDemos is now separate recipes, bump PE, introduce INC_PR
(From OE-Core rev: cf41f89707521b3bff31944621f6202ec0f0b5df) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/mesa/mesa-common.inc5
-rw-r--r--meta/recipes-graphics/mesa/mesa-dri_7.11.bb2
-rw-r--r--meta/recipes-graphics/mesa/mesa-dri_git.bb2
-rw-r--r--meta/recipes-graphics/mesa/mesa-xlib_7.11.bb3
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"
12LICENSE = "MIT" 12LICENSE = "MIT"
13LIC_FILES_CHKSUM = "file://docs/license.html;md5=7a3373c039b6b925c427755a4f779c1d" 13LIC_FILES_CHKSUM = "file://docs/license.html;md5=7a3373c039b6b925c427755a4f779c1d"
14 14
15SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2;name=mesalib \ 15INC_PR = "r12"
16 ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaDemos-${PV}.tar.bz2;name=mesademos " 16PE = "2"
17 17
18SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2"
18S = "${WORKDIR}/Mesa-${PV}" 19S = "${WORKDIR}/Mesa-${PV}"
19 20
20PROVIDES = "virtual/libgl" 21PROVIDES = "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
7DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} makedepend-native python-native" 7DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} makedepend-native python-native"
8DEPENDS += "mesa-dri-glsl-native" 8DEPENDS += "mesa-dri-glsl-native"
9 9
10PR = "r5" 10PR = "${INC_PR}.0"
11 11
12SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \ 12SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
13 file://crossfix.patch \ 13 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}"
13 13
14SRCREV = "1bf94d419805538ac23a4d0b04d31ac5e4487aca" 14SRCREV = "1bf94d419805538ac23a4d0b04d31ac5e4487aca"
15PV = "7.7+git${SRCPV}" 15PV = "7.7+git${SRCPV}"
16PR = "r2" 16PR = "${INC_PR}.0"
17 17
18# most of our targets do not have DRI so will use mesa-xlib 18# most of our targets do not have DRI so will use mesa-xlib
19DEFAULT_PREFERENCE = "-1" 19DEFAULT_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
12 12
13DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} makedepend-native" 13DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} makedepend-native"
14 14
15PE = "1" 15PR = "${INC_PR}.0"
16PR = "r1"
17 16
18EXTRA_OECONF += "--with-driver=xlib --without-gallium-drivers" 17EXTRA_OECONF += "--with-driver=xlib --without-gallium-drivers"
19 18