summaryrefslogtreecommitdiffstats
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 13:18:09 +0100
commit77fa7e113b9be222c902ecab8bf3d25de991d1c8 (patch)
tree4f99da21d3a275b01c773e4eb9b11b5299ea74be
parent462f77aa3a6a9b055f4435b10eb24013bec1b374 (diff)
downloadpoky-77fa7e113b9be222c902ecab8bf3d25de991d1c8.tar.gz
mesa: move common patches which could be used in both mesa-dri and mesa-xlib from mesa-dri to mesa
(From OE-Core rev: 76f4be998f6608799b66821a334f1ca7ddc2aba2) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 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}"
18 18
19PROVIDES = "virtual/libgl" 19PROVIDES = "virtual/libgl"
20 20
21# for mesa-dri and mesa-xlib
22FILESEXTRAPATHS_append := "${THISDIR}/mesa:"
23
21inherit autotools pkgconfig 24inherit autotools pkgconfig
22 25
23EXTRA_OECONF = "--enable-glu \ 26EXTRA_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 @@
1include mesa-common.inc 1include mesa-common.inc
2 2
3FILESPATH =. "${FILE_DIRNAME}/mesa-dri:"
4
5SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \ 3SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
6 file://uclibc.patch \ 4 file://uclibc.patch \
7 " 5 "
diff --git a/meta/recipes-graphics/mesa/mesa-dri/cross2.patch b/meta/recipes-graphics/mesa/mesa/cross2.patch
index 264c153087..264c153087 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 d300e2f1b3..d300e2f1b3 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 98d2188e75..98d2188e75 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 49d0234ece..49d0234ece 100644
--- a/meta/recipes-graphics/mesa/mesa-dri/uclibc.patch
+++ b/meta/recipes-graphics/mesa/mesa/uclibc.patch