From 97e288ff7fe14872c263f0ef088c3339a4355b5a Mon Sep 17 00:00:00 2001 From: Yu Ke Date: Wed, 9 Feb 2011 19:15:52 +0800 Subject: mesa-7.10: set mesa 7.10 as default instead of 7.8.2 originally mesa 7.8.2 is set as default because 7.10 has depency of GPLv3 talloc. since mesa 7.10 has resolved the GPLv3 talloc dependency issue, it is safe to set 7.10 as default Signed-off-by: Yu Ke --- meta/recipes-graphics/mesa/mesa-dri_7.10.bb | 5 ++++- meta/recipes-graphics/mesa/mesa-dri_7.8.2.bb | 5 +---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'meta/recipes-graphics/mesa') diff --git a/meta/recipes-graphics/mesa/mesa-dri_7.10.bb b/meta/recipes-graphics/mesa/mesa-dri_7.10.bb index 1984ff6a5..cca1cc967 100644 --- a/meta/recipes-graphics/mesa/mesa-dri_7.10.bb +++ b/meta/recipes-graphics/mesa/mesa-dri_7.10.bb @@ -8,7 +8,7 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" -PR = "r1" +PR = "r2" SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \ file://talloc-removal.patch \ @@ -20,6 +20,9 @@ SRC_URI[sha256sum] = "bcf28f43f39c28da271c0f5857fb32898d4ade3e035e80a0ceece1c2df # most of our targets do not have DRI so will use mesa-xlib DEFAULT_PREFERENCE = "-1" +# Atom PCs have DRI support so use mesa-dri by default +DEFAULT_PREFERENCE_atom-pc = "1" + LEAD_SONAME = "libGL.so.1" EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium" diff --git a/meta/recipes-graphics/mesa/mesa-dri_7.8.2.bb b/meta/recipes-graphics/mesa/mesa-dri_7.8.2.bb index 60edddf64..1b4606d43 100644 --- a/meta/recipes-graphics/mesa/mesa-dri_7.8.2.bb +++ b/meta/recipes-graphics/mesa/mesa-dri_7.8.2.bb @@ -7,7 +7,7 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat" DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} mesa-dri-glsl-native" -PR = "r2" +PR = "r3" SRC_URI += "file://crossfix.patch" @@ -20,9 +20,6 @@ SRC_URI[mesademos.sha256sum] = "ea7b9ebfb7a80de2b275c0c9124c8a505382ec48411a2794 # most of our targets do not have DRI so will use mesa-xlib DEFAULT_PREFERENCE = "-1" -# Atom PCs have DRI support so use mesa-dri by default -DEFAULT_PREFERENCE_atom-pc = "1" - LEAD_SONAME = "libGL.so.1" EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium" -- cgit v1.2.3