Merge commit 'origin/martin_jansa/xorg-7.5' into shr/merge

Conflicts:
	conf/distro/include/angstrom-2008-preferred-versions.inc

4 files changed, 6 insertions, 10 deletions

diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index a001d5cfa5..03ba67f2f2 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -20,10 +20,6 @@ PREFERRED_VERSION_libtool 	= "2.2.6a"
 PREFERRED_VERSION_libtool-native = "2.2.6a"
 PREFERRED_VERSION_libtool-cross	= "2.2.6a"
 PREFERRED_VERSION_libtool-sdk	= "2.2.6a"
-PREFERRED_VERSION_libx11 = "1.2"
-PREFERRED_VERSION_mesa = "7.4"
-PREFERRED_VERSION_mesa-dri = "7.4"
-PREFERRED_VERSION_mesa-xlib = "7.4"
 PREFERRED_VERSION_pango 	= "1.24.4"
 #PREFERRED_VERSION_pixman	= "0.13.2"
 PREFERRED_VERSION_pkgconfig	= "0.23"
diff --git a/conf/machine/om-gta01.conf b/conf/machine/om-gta01.conf
index 1e1c8612f8..e1c5127072 100644
--- a/conf/machine/om-gta01.conf
+++ b/conf/machine/om-gta01.conf
@@ -12,7 +12,7 @@ PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-2.6.24"
 PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-shr-devel"
 PREFERRED_PROVIDER_virtual/xserver_shr = "xserver-xorg"
 PREFERRED_PROVIDER_xf86-video-fbdev_shr = "xf86-video-fbdev"
-PREFERRED_PROVIDER_virtual/libgl_shr = "mesa-dri"
+PREFERRED_PROVIDER_virtual/libgl = "mesa"
 XSERVER_shr = "xserver-xorg xf86-video-fbdev xf86-input-evdev xf86-input-keyboard"
 
 UBOOT_ENTRYPOINT = "30008000"
diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf
index 5fc96ec4ed..8e8355ba6f 100644
--- a/conf/machine/om-gta02.conf
+++ b/conf/machine/om-gta02.conf
@@ -15,8 +15,8 @@ PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-shr-devel"
 #PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-2.6.31"
 
 PREFERRED_PROVIDER_virtual/xserver_shr = "xserver-xorg"
-PREFERRED_PROVIDER_virtual/libgl_shr = "mesa-dri"
-MACHINE_DRI_MODULES_shr = "glamo"
+PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
+MACHINE_DRI_MODULES = "glamo"
 
 XSERVER_shr = "xserver-xorg xf86-video-glamo xf86-input-evdev xf86-input-keyboard xf86-input-mouse"
 
diff --git a/recipes/mesa/mesa-dri_git.bb b/recipes/mesa/mesa-dri_git.bb
index 732e2ae197..ceea1227c1 100644
--- a/recipes/mesa/mesa-dri_git.bb
+++ b/recipes/mesa/mesa-dri_git.bb
@@ -5,8 +5,9 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat"
 
 DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
 
-PV = "7.6.1+gitr${SRCPV}"
+PV = "7.6.1+gitr${SRCREV}"
 PR = "${INC_PR}.3"
+PE = "1"
 
 DEFAULT_PREFERENCE = "-2"
 DEFAULT_PREFERENCE_om-gta02 = "2"
@@ -23,5 +24,4 @@ FILES_${PN} += "${libdir}/dri/*.so"
 FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
 FILES_mesa-utils = "${bindir}/*"
 
-EXTRA_OECONF += "--with-driver=dri --with-dri-drivers=swrast,${MACHINE_DRI_MODULES}"
-EXTRA_OECONF_append_om-gta02 = " --disable-glx-tls --disable-gallium-intel "
+EXTRA_OECONF += "--with-driver=dri --disable-glx-tls --disable-gallium-intel --with-dri-drivers=swrast,${MACHINE_DRI_MODULES}"