From 73e6612573c8fe843f98162861b44646d09c7a03 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Thu, 13 Oct 2011 10:04:56 +0200
Subject: mesa: move shared PROTO_DEPS, LIB_DEPS and DEPENDS to common .inc

(From OE-Core rev: e7b825ab541e97c6c34ec829c26e9e706c7143ec)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-graphics/mesa/mesa-common.inc   | 5 +++++
 meta/recipes-graphics/mesa/mesa-dri_7.11.bb  | 7 ++-----
 meta/recipes-graphics/mesa/mesa-dri_git.bb   | 6 ++----
 meta/recipes-graphics/mesa/mesa-xlib_7.11.bb | 5 -----
 4 files changed, 9 insertions(+), 14 deletions(-)

(limited to 'meta/recipes-graphics/mesa')

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"
 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 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 @@
 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 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 \
 #           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 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 @@
 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"
-- 
cgit v1.2.3-54-g00ecf