[oe] [PATCH 1/2] Merge libdrm-glamo_git directly to libdrm_git.

[Martin.Jansa]

---
 conf/distro/include/sane-srcrevs.inc         |    1 +
 recipes/dri/libdrm-glamo_git.bb              |   17 -----------------
 recipes/dri/libdrm_git.bb                    |   19 +++++++++++++++++++
 4 files changed, 30 insertions(+), 19 deletions(-)
 delete mode 100644 recipes/dri/libdrm-glamo_git.bb
 create mode 100644 recipes/dri/libdrm_git.bb

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 7df13da..951ea3e 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -80,6 +80,7 @@ SRCREV_pn-intuition ?= "194"
 SRCREV_pn-kismet ?= "2285"
 SRCREV_pn-kismet-newcore ?= "2285"
 SRCREV_pn-libcalenabler2 ?= "1410"
+SRCREV_pn-libdrm ?= "	a107e5b12960f64722bff424502a4fc0ad33dc8f"
 SRCREV_pn-libefso ?= "194"
 SRCREV_pn-libexalt ?= "78"
 SRCREV_pn-libexalt-dbus ?= "76"
diff --git a/recipes/dri/libdrm-glamo_git.bb b/recipes/dri/libdrm-glamo_git.bb
deleted file mode 100644
index 337cca9..0000000
--- a/recipes/dri/libdrm-glamo_git.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-SECTION = "x11/base"
-LICENSE = "MIT"
-SRC_URI = "git://git.bitwiz.org.uk/libdrm.git;protocol=git;branch=glamo"
-PROVIDES = "drm"
-DEPENDS = "libpthread-stubs virtual/kernel"
-
-PV=2.4.4+gitr${SRCPV}
-
-DEFAULT_PREFERENCE = "-1"
-
-S = "${WORKDIR}/git"
-
-inherit autotools pkgconfig
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/recipes/dri/libdrm_git.bb b/recipes/dri/libdrm_git.bb
new file mode 100644
index 0000000..e9feeb2
--- /dev/null
+++ b/recipes/dri/libdrm_git.bb
@@ -0,0 +1,19 @@
+SECTION = "x11/base"
+LICENSE = "MIT"
+SRC_URI = "git://anongit.freedesktop.org/mesa/drm;protocol=git;branch=master"
+SRC_URI_om-gta02 = "git://git.bitwiz.org.uk/libdrm.git;protocol=git;branch=glamo"
+PROVIDES = "drm"
+DEPENDS = "libpthread-stubs virtual/kernel"
+
+PV=2.4.15+gitr${SRCREV}
+
+DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE_om-gta02 = "1"
+
+S = "${WORKDIR}/git"
+
+inherit autotools pkgconfig
+
+do_stage() {
+	autotools_stage_all
+}
-- 
1.6.5.rc2