[OE-core] [oe-core 05/20] mesa: move common patches which could be used in both mesa-dri and mesa-xlib from mesa-dri to mesa
Martin Jansa
martin.jansa at gmail.com
Thu Oct 13 11:30:23 UTC 2011
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
meta/recipes-graphics/mesa/mesa-common.inc | 3 +++
meta/recipes-graphics/mesa/mesa-xlib_7.11.bb | 2 --
.../mesa/{mesa-dri => mesa}/cross2.patch | 0
.../mesa/{mesa-dri => mesa}/crossfix.patch | 0
.../mesa/{mesa-dri => mesa}/i586/matypes.h | 0
.../mesa/{mesa-dri => mesa}/uclibc.patch | 0
6 files changed, 3 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/mesa/{mesa-dri => mesa}/cross2.patch (100%)
rename meta/recipes-graphics/mesa/{mesa-dri => mesa}/crossfix.patch (100%)
rename meta/recipes-graphics/mesa/{mesa-dri => mesa}/i586/matypes.h (100%)
rename meta/recipes-graphics/mesa/{mesa-dri => mesa}/uclibc.patch (100%)
diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
index d8e800e..b3d1c8f 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 ea4acc6..1e0d95e 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
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa-dri/cross2.patch
rename to 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
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa-dri/crossfix.patch
rename to 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
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa-dri/i586/matypes.h
rename to 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
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa-dri/uclibc.patch
rename to meta/recipes-graphics/mesa/mesa/uclibc.patch
--
1.7.7
More information about the Openembedded-core
mailing list