mesa: merge mesa-git.inc to mesa_git.bb

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-graphics/mesa/mesa-git.inc b/meta/recipes-graphics/mesa/mesa-git.inc
deleted file mode 100644 (file)
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 241261c76c5fe554854da42d031e255eb4b707e6..ef0bec407f3fd4bafd98090a63d03ef765258d58 100644 (file)
--- 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"