aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2009-12-16 09:28:42 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2009-12-16 09:28:42 +0100
commitfd265c020e524366c8db69fbedd2cf0bad471324 (patch)
tree290f32591a3ac0501061621238384e6da98bd09e
parent58884fc059504abafc9126613a7049464ba701e7 (diff)
parentfdb5cf6eed330eeaf173afd3f0101e01b0c2ede1 (diff)
downloadopenembedded-fd265c020e524366c8db69fbedd2cf0bad471324.zip
openembedded-fd265c020e524366c8db69fbedd2cf0bad471324.tar.gz
openembedded-fd265c020e524366c8db69fbedd2cf0bad471324.tar.bz2
Merge commit 'origin/org.openembedded.dev' into martin_jansa/xorg-7.5
Conflicts: conf/machine/om-gta01.conf recipes/mesa/mesa-dri_git.bb
-rw-r--r--conf/machine/om-gta01.conf2
-rw-r--r--conf/machine/om-gta02.conf4
-rw-r--r--recipes/mesa/mesa-dri_git.bb6
3 files changed, 6 insertions, 6 deletions
diff --git a/conf/machine/om-gta01.conf b/conf/machine/om-gta01.conf
index 1e1c861..e1c5127 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 5fc96ec..8e8355b 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 732e2ae..ceea122 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}"