summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2011-10-13 09:20:43 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-14 12:18:21 +0100
commit76f4be998f6608799b66821a334f1ca7ddc2aba2 (patch)
tree1846de40e0ee976b1f9dc5dfbf87cf151d982e8d
parentbf9a7f66cb6f7fbdea1afe61ed6c9ef7dd349b4b (diff)
downloadopenembedded-core-76f4be998f6608799b66821a334f1ca7ddc2aba2.tar.gz
openembedded-core-76f4be998f6608799b66821a334f1ca7ddc2aba2.tar.bz2
openembedded-core-76f4be998f6608799b66821a334f1ca7ddc2aba2.tar.xz
openembedded-core-76f4be998f6608799b66821a334f1ca7ddc2aba2.zip
mesa: move common patches which could be used in both mesa-dri and mesa-xlib from mesa-dri to mesa
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta/recipes-graphics/mesa/mesa-common.inc3
-rw-r--r--meta/recipes-graphics/mesa/mesa-xlib_7.11.bb2
-rw-r--r--meta/recipes-graphics/mesa/mesa/cross2.patch (renamed from meta/recipes-graphics/mesa/mesa-dri/cross2.patch)0
-rw-r--r--meta/recipes-graphics/mesa/mesa/crossfix.patch (renamed from meta/recipes-graphics/mesa/mesa-dri/crossfix.patch)0
-rw-r--r--meta/recipes-graphics/mesa/mesa/i586/matypes.h (renamed from meta/recipes-graphics/mesa/mesa-dri/i586/matypes.h)0
-rw-r--r--meta/recipes-graphics/mesa/mesa/uclibc.patch (renamed from meta/recipes-graphics/mesa/mesa-dri/uclibc.patch)0
6 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
index d8e800ee1..b3d1c8fbf 100644
--- a/meta/recipes-graphics/mesa/mesa-common.inc
+++ b/meta/recipes-graphics/mesa/mesa-common.inc
@@ -18,6 +18,9 @@ S = "${WORKDIR}/Mesa-${PV}"
PROVIDES = "virtual/libgl"
+# for mesa-dri and mesa-xlib
+FILESEXTRAPATHS_append := "${THISDIR}/mesa:"
+
inherit autotools pkgconfig
EXTRA_OECONF = "--enable-glu \
diff --git a/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb b/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
index ea4acc629..1e0d95efd 100644
--- a/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
+++ b/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
@@ -1,7 +1,5 @@
include mesa-common.inc
-FILESPATH =. "${FILE_DIRNAME}/mesa-dri:"
-
SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
file://uclibc.patch \
"
diff --git a/meta/recipes-graphics/mesa/mesa-dri/cross2.patch b/meta/recipes-graphics/mesa/mesa/cross2.patch
index 264c15308..264c15308 100644
--- a/meta/recipes-graphics/mesa/mesa-dri/cross2.patch
+++ b/meta/recipes-graphics/mesa/mesa/cross2.patch
diff --git a/meta/recipes-graphics/mesa/mesa-dri/crossfix.patch b/meta/recipes-graphics/mesa/mesa/crossfix.patch
index d300e2f1b..d300e2f1b 100644
--- a/meta/recipes-graphics/mesa/mesa-dri/crossfix.patch
+++ b/meta/recipes-graphics/mesa/mesa/crossfix.patch
diff --git a/meta/recipes-graphics/mesa/mesa-dri/i586/matypes.h b/meta/recipes-graphics/mesa/mesa/i586/matypes.h
index 98d2188e7..98d2188e7 100644
--- a/meta/recipes-graphics/mesa/mesa-dri/i586/matypes.h
+++ b/meta/recipes-graphics/mesa/mesa/i586/matypes.h
diff --git a/meta/recipes-graphics/mesa/mesa-dri/uclibc.patch b/meta/recipes-graphics/mesa/mesa/uclibc.patch
index 49d0234ec..49d0234ec 100644
--- a/meta/recipes-graphics/mesa/mesa-dri/uclibc.patch
+++ b/meta/recipes-graphics/mesa/mesa/uclibc.patch