mesa-dri, libdrm: use distro override to force same PV for om-gta01 and om-gta02

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

diff --git a/recipes/dri/libdrm_git.bb b/recipes/dri/libdrm_git.bb
index 305f952..641f740 100644 (file)
--- a/recipes/dri/libdrm_git.bb
+++ b/recipes/dri/libdrm_git.bb
@@ -1,7 +1,7 @@
 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"
+SRC_URI_shr = "git://git.bitwiz.org.uk/libdrm.git;protocol=git;branch=glamo"
 
 PROVIDES = "drm"
 DEPENDS = "libpthread-stubs virtual/kernel"
@@ -11,14 +11,15 @@ PV = "2.4.18+gitr${SRCREV}"
 PR = "r0"
 
 SRCREV_pn-libdrm ?= "a5c8f55397377994ceeb76ed0ff148ff89eb3a1b"
-SRCREV_pn-libdrm_om-gta02 ?= "b5aec2bd3df736216e86eae28e278172d3ba3362"
+SRCREV_pn-libdrm_shr ?= "b5aec2bd3df736216e86eae28e278172d3ba3362"
 
 DEFAULT_PREFERENCE = "-1"
-DEFAULT_PREFERENCE_om-gta02 = "1"
+DEFAULT_PREFERENCE_shr = "1"
 
 S = "${WORKDIR}/git"
 
 EXTRA_OECONF_append_om-gta02 = " --enable-glamo-experimental-api --disable-radeon --disable-intel"
+EXTRA_OECONF_append_om-gta01 = " --disable-radeon --disable-intel"
 
 inherit autotools pkgconfig
 

diff --git a/recipes/mesa/mesa-dri_git.bb b/recipes/mesa/mesa-dri_git.bb
index 1626326..295938b 100644 (file)
--- a/recipes/mesa/mesa-dri_git.bb
+++ b/recipes/mesa/mesa-dri_git.bb
@@ -11,13 +11,13 @@ PR_append = "+gitr${SRCREV}"
 PE = "1"
 
 DEFAULT_PREFERENCE = "-2"
-DEFAULT_PREFERENCE_om-gta02 = "2"
+DEFAULT_PREFERENCE_shr = "2"
 
 SRCREV_pn-mesa-dri ?= "196214bf2b677a83653d49f79d03752f29df44ec"
-SRCREV_pn-mesa-dri_om-gta02 ?= "1ac166895fef47806c9e9286d2a6356b4db8398d"
+SRCREV_pn-mesa-dri_shr ?= "1ac166895fef47806c9e9286d2a6356b4db8398d"
 
 SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git"
-SRC_URI_om-gta02 = "git://git.bitwiz.org.uk/mesa.git;protocol=git;branch=glamo"
+SRC_URI_shr = "git://git.bitwiz.org.uk/mesa.git;protocol=git;branch=glamo"
 S = "${WORKDIR}/git"
 
 PACKAGES =+ " mesa-utils "