From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Thu, 13 Oct 2011 07:20:43 +0000 (+0200)
Subject: mesa: move common patches which could be used in both mesa-dri and mesa-xlib from... 
X-Git-Tag: 2015-4~13097
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=76f4be998f6608799b66821a334f1ca7ddc2aba2;p=openembedded-core.git

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>
---

diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
index d8e800ee11..b3d1c8fbf3 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 ea4acc6295..1e0d95efda 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