summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2013-06-13 01:19:57 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-06-14 12:44:35 +0100
commitcaf3df2d1b854c7d1c81cbf8ae6ba5727654cac9 (patch)
tree1909112e6662f9d8b7c6b766081d9230e4d88e73
parent1027f988e7e7a9010268f0e64caac937a2d74e33 (diff)
downloadpoky-caf3df2d1b854c7d1c81cbf8ae6ba5727654cac9.tar.gz
mesa: merge mesa-git.inc to mesa_git.bb
(From OE-Core rev: fb595d8a1181f30daa1c80938a335f9d249de913) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/mesa/mesa-git.inc10
-rw-r--r--meta/recipes-graphics/mesa/mesa_git.bb13
2 files changed, 11 insertions, 12 deletions
diff --git a/meta/recipes-graphics/mesa/mesa-git.inc b/meta/recipes-graphics/mesa/mesa-git.inc
deleted file mode 100644
index cf07155ecf..0000000000
--- a/meta/recipes-graphics/mesa/mesa-git.inc
+++ /dev/null
@@ -1,10 +0,0 @@
1# 9.1.3 commit
2SRCREV = "f32ec82a8cfcabc5b7596796f36afe7986651f02"
3PV = "9.1.3+git${SRCPV}"
4
5SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git \
6 file://EGL-Mutate-NativeDisplayType-depending-on-config.patch \
7 file://fix-glsl-cross.patch \
8 "
9
10S = "${WORKDIR}/git"
diff --git a/meta/recipes-graphics/mesa/mesa_git.bb b/meta/recipes-graphics/mesa/mesa_git.bb
index 241261c76c..ef0bec407f 100644
--- a/meta/recipes-graphics/mesa/mesa_git.bb
+++ b/meta/recipes-graphics/mesa/mesa_git.bb
@@ -1,6 +1,15 @@
1require mesa-git.inc 1require ${BPN}.inc
2require mesa.inc
3 2
4DEFAULT_PREFERENCE = "-1" 3DEFAULT_PREFERENCE = "-1"
5 4
6PR = "${INC_PR}.0" 5PR = "${INC_PR}.0"
6# 9.1.3 commit
7SRCREV = "f32ec82a8cfcabc5b7596796f36afe7986651f02"
8PV = "9.1.3+git${SRCPV}"
9
10SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git \
11 file://EGL-Mutate-NativeDisplayType-depending-on-config.patch \
12 file://fix-glsl-cross.patch \
13 "
14
15S = "${WORKDIR}/git"