diff options
-rw-r--r-- | meta/conf/distro/include/preferred-xorg-versions.inc | 2 | ||||
-rw-r--r-- | meta/recipes-graphics/mesa/mesa-dri_7.10.bb | 5 | ||||
-rw-r--r-- | meta/recipes-graphics/mesa/mesa-dri_7.8.2.bb | 5 |
3 files changed, 6 insertions, 6 deletions
diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc index 3a4bd335f..b164b77f7 100644 --- a/meta/conf/distro/include/preferred-xorg-versions.inc +++ b/meta/conf/distro/include/preferred-xorg-versions.inc @@ -135,7 +135,7 @@ PREFERRED_VERSION_xtrans-native ?= "1.2.6" PREFERRED_VERSION_xtrans-nativesdk ?= "1.2.6" PREFERRED_VERSION_xvinfo ?= "1.1.1" PREFERRED_VERSION_xwininfo ?= "1.1.1" -PREFERRED_VERSION_mesa-dri ?= "7.8.2" +PREFERRED_VERSION_mesa-dri ?= "7.10" PREFERRED_VERSION_libdrm ?= "2.4.23" PREFERRED_VERSION_xcb-proto ?= "1.6" PREFERRED_VERSION_libxcb ?= "1.7" 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" |