diff options
-rw-r--r-- | meta/recipes-graphics/mesa/mesa-common.inc | 5 | ||||
-rw-r--r-- | meta/recipes-graphics/mesa/mesa-dri_7.11.bb | 7 | ||||
-rw-r--r-- | meta/recipes-graphics/mesa/mesa-dri_git.bb | 6 | ||||
-rw-r--r-- | meta/recipes-graphics/mesa/mesa-xlib_7.11.bb | 5 |
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" | |||
18 | SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2" | 18 | SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2" |
19 | S = "${WORKDIR}/Mesa-${PV}" | 19 | S = "${WORKDIR}/Mesa-${PV}" |
20 | 20 | ||
21 | PROTO_DEPS = "xf86driproto glproto" | ||
22 | LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes libxml2-native" | ||
23 | |||
24 | DEPENDS = "makedepend-native python-native ${PROTO_DEPS} ${LIB_DEPS}" | ||
25 | |||
21 | PROVIDES = "virtual/libgl" | 26 | PROVIDES = "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 @@ | |||
1 | include mesa-common.inc | 1 | include mesa-common.inc |
2 | include mesa-${PV}.inc | 2 | include mesa-${PV}.inc |
3 | 3 | ||
4 | PROTO_DEPS = "xf86driproto glproto dri2proto" | 4 | PROTO_DEPS += "dri2proto" |
5 | LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat \ | 5 | LIB_DEPS += "libdrm expat" |
6 | libxml2-native" | ||
7 | |||
8 | DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} makedepend-native python-native" | ||
9 | 6 | ||
10 | PR = "${INC_PR}.0" | 7 | PR = "${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 " |
7 | S = "${WORKDIR}/git" | 7 | S = "${WORKDIR}/git" |
8 | 8 | ||
9 | PROTO_DEPS = "xf86driproto glproto dri2proto" | 9 | PROTO_DEPS += "dri2proto" |
10 | LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat" | 10 | LIB_DEPS += "libdrm expat" |
11 | |||
12 | DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" | ||
13 | 11 | ||
14 | SRCREV = "1bf94d419805538ac23a4d0b04d31ac5e4487aca" | 12 | SRCREV = "1bf94d419805538ac23a4d0b04d31ac5e4487aca" |
15 | PV = "7.7+git${SRCPV}" | 13 | PV = "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 @@ | |||
1 | include mesa-common.inc | 1 | include mesa-common.inc |
2 | include mesa-${PV}.inc | 2 | include mesa-${PV}.inc |
3 | 3 | ||
4 | PROTO_DEPS = "xf86driproto glproto" | ||
5 | LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes libxml2-native" | ||
6 | |||
7 | DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} makedepend-native" | ||
8 | |||
9 | PR = "${INC_PR}.0" | 4 | PR = "${INC_PR}.0" |
10 | 5 | ||
11 | EXTRA_OECONF += "--with-driver=xlib --without-gallium-drivers" | 6 | EXTRA_OECONF += "--with-driver=xlib --without-gallium-drivers" |