summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-graphics/mesa/mesa-common.inc5
-rw-r--r--meta/recipes-graphics/mesa/mesa-dri_7.11.bb7
-rw-r--r--meta/recipes-graphics/mesa/mesa-dri_git.bb6
-rw-r--r--meta/recipes-graphics/mesa/mesa-xlib_7.11.bb5
4 files changed, 9 insertions, 14 deletions
diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
index ee359ba03e..06ebb7508c 100644
--- a/meta/recipes-graphics/mesa/mesa-common.inc
+++ b/meta/recipes-graphics/mesa/mesa-common.inc
@@ -18,6 +18,11 @@ PE = "2"
18SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2" 18SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2"
19S = "${WORKDIR}/Mesa-${PV}" 19S = "${WORKDIR}/Mesa-${PV}"
20 20
21PROTO_DEPS = "xf86driproto glproto"
22LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes libxml2-native"
23
24DEPENDS = "makedepend-native python-native ${PROTO_DEPS} ${LIB_DEPS}"
25
21PROVIDES = "virtual/libgl" 26PROVIDES = "virtual/libgl"
22 27
23# for mesa-dri and mesa-xlib 28# for mesa-dri and mesa-xlib
diff --git a/meta/recipes-graphics/mesa/mesa-dri_7.11.bb b/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
index 90873aab48..8ab1941a36 100644
--- a/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
@@ -1,11 +1,8 @@
1include mesa-common.inc 1include mesa-common.inc
2include mesa-${PV}.inc 2include mesa-${PV}.inc
3 3
4PROTO_DEPS = "xf86driproto glproto dri2proto" 4PROTO_DEPS += "dri2proto"
5LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat \ 5LIB_DEPS += "libdrm expat"
6 libxml2-native"
7
8DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} makedepend-native python-native"
9 6
10PR = "${INC_PR}.0" 7PR = "${INC_PR}.0"
11 8
diff --git a/meta/recipes-graphics/mesa/mesa-dri_git.bb b/meta/recipes-graphics/mesa/mesa-dri_git.bb
index c50ba15f53..10ebd1c7ad 100644
--- a/meta/recipes-graphics/mesa/mesa-dri_git.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri_git.bb
@@ -6,10 +6,8 @@ SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git \
6# file://mesa-DRI2Swapbuffer.patch " 6# file://mesa-DRI2Swapbuffer.patch "
7S = "${WORKDIR}/git" 7S = "${WORKDIR}/git"
8 8
9PROTO_DEPS = "xf86driproto glproto dri2proto" 9PROTO_DEPS += "dri2proto"
10LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat" 10LIB_DEPS += "libdrm expat"
11
12DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}"
13 11
14SRCREV = "1bf94d419805538ac23a4d0b04d31ac5e4487aca" 12SRCREV = "1bf94d419805538ac23a4d0b04d31ac5e4487aca"
15PV = "7.7+git${SRCPV}" 13PV = "7.7+git${SRCPV}"
diff --git a/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb b/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
index 44719a081e..08277ac526 100644
--- a/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
+++ b/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
@@ -1,11 +1,6 @@
1include mesa-common.inc 1include mesa-common.inc
2include mesa-${PV}.inc 2include mesa-${PV}.inc
3 3
4PROTO_DEPS = "xf86driproto glproto"
5LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes libxml2-native"
6
7DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} makedepend-native"
8
9PR = "${INC_PR}.0" 4PR = "${INC_PR}.0"
10 5
11EXTRA_OECONF += "--with-driver=xlib --without-gallium-drivers" 6EXTRA_OECONF += "--with-driver=xlib --without-gallium-drivers"