From 157d9c9f272d42807435086571e5a8b2e72ab4d9 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 13 Jun 2013 01:19:57 +0200 Subject: [PATCH] mesa: merge mesa-git.inc to mesa_git.bb (From OE-Core rev: fb595d8a1181f30daa1c80938a335f9d249de913) Signed-off-by: Richard Purdie --- meta/recipes-graphics/mesa/mesa-git.inc | 10 ---------- meta/recipes-graphics/mesa/mesa_git.bb | 13 +++++++++++-- 2 files changed, 11 insertions(+), 12 deletions(-) delete mode 100644 meta/recipes-graphics/mesa/mesa-git.inc diff --git a/meta/recipes-graphics/mesa/mesa-git.inc b/meta/recipes-graphics/mesa/mesa-git.inc deleted file mode 100644 index cf07155..0000000 --- a/meta/recipes-graphics/mesa/mesa-git.inc +++ /dev/null @@ -1,10 +0,0 @@ -# 9.1.3 commit -SRCREV = "f32ec82a8cfcabc5b7596796f36afe7986651f02" -PV = "9.1.3+git${SRCPV}" - -SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git \ - file://EGL-Mutate-NativeDisplayType-depending-on-config.patch \ - file://fix-glsl-cross.patch \ - " - -S = "${WORKDIR}/git" diff --git a/meta/recipes-graphics/mesa/mesa_git.bb b/meta/recipes-graphics/mesa/mesa_git.bb index 241261c..ef0bec4 100644 --- a/meta/recipes-graphics/mesa/mesa_git.bb +++ b/meta/recipes-graphics/mesa/mesa_git.bb @@ -1,6 +1,15 @@ -require mesa-git.inc -require mesa.inc +require ${BPN}.inc DEFAULT_PREFERENCE = "-1" PR = "${INC_PR}.0" +# 9.1.3 commit +SRCREV = "f32ec82a8cfcabc5b7596796f36afe7986651f02" +PV = "9.1.3+git${SRCPV}" + +SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git \ + file://EGL-Mutate-NativeDisplayType-depending-on-config.patch \ + file://fix-glsl-cross.patch \ + " + +S = "${WORKDIR}/git" -- 2.7.4