diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2011-10-13 10:04:56 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-10-14 12:18:21 +0100 |
commit | e7b825ab541e97c6c34ec829c26e9e706c7143ec (patch) | |
tree | b29d8ce258d45eb193a8b35357f9ee5e4e11001f /meta/recipes-graphics/mesa | |
parent | 6f48f557c0234faf02bc3da2807c450e47afb594 (diff) | |
download | openembedded-core-contrib-e7b825ab541e97c6c34ec829c26e9e706c7143ec.tar.gz |
mesa: move shared PROTO_DEPS, LIB_DEPS and DEPENDS to common .inc
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta/recipes-graphics/mesa')
-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 ee359ba03e1..06ebb7508c0 100644 --- a/meta/recipes-graphics/mesa/mesa-common.inc +++ b/meta/recipes-graphics/mesa/mesa-common.inc @@ -18,6 +18,11 @@ PE = "2" SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2" S = "${WORKDIR}/Mesa-${PV}" +PROTO_DEPS = "xf86driproto glproto" +LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes libxml2-native" + +DEPENDS = "makedepend-native python-native ${PROTO_DEPS} ${LIB_DEPS}" + PROVIDES = "virtual/libgl" # 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 90873aab481..8ab1941a366 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 @@ include mesa-common.inc include mesa-${PV}.inc -PROTO_DEPS = "xf86driproto glproto dri2proto" -LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat \ - libxml2-native" - -DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} makedepend-native python-native" +PROTO_DEPS += "dri2proto" +LIB_DEPS += "libdrm expat" PR = "${INC_PR}.0" diff --git a/meta/recipes-graphics/mesa/mesa-dri_git.bb b/meta/recipes-graphics/mesa/mesa-dri_git.bb index c50ba15f53a..10ebd1c7ade 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 \ # file://mesa-DRI2Swapbuffer.patch " S = "${WORKDIR}/git" -PROTO_DEPS = "xf86driproto glproto dri2proto" -LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat" - -DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" +PROTO_DEPS += "dri2proto" +LIB_DEPS += "libdrm expat" SRCREV = "1bf94d419805538ac23a4d0b04d31ac5e4487aca" 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 44719a081e0..08277ac526e 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 @@ include mesa-common.inc include mesa-${PV}.inc -PROTO_DEPS = "xf86driproto glproto" -LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes libxml2-native" - -DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} makedepend-native" - PR = "${INC_PR}.0" EXTRA_OECONF += "--with-driver=xlib --without-gallium-drivers" |