diff options
Diffstat (limited to 'meta')
-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 3a4bd335f7..b164b77f75 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" | |||
135 | PREFERRED_VERSION_xtrans-nativesdk ?= "1.2.6" | 135 | PREFERRED_VERSION_xtrans-nativesdk ?= "1.2.6" |
136 | PREFERRED_VERSION_xvinfo ?= "1.1.1" | 136 | PREFERRED_VERSION_xvinfo ?= "1.1.1" |
137 | PREFERRED_VERSION_xwininfo ?= "1.1.1" | 137 | PREFERRED_VERSION_xwininfo ?= "1.1.1" |
138 | PREFERRED_VERSION_mesa-dri ?= "7.8.2" | 138 | PREFERRED_VERSION_mesa-dri ?= "7.10" |
139 | PREFERRED_VERSION_libdrm ?= "2.4.23" | 139 | PREFERRED_VERSION_libdrm ?= "2.4.23" |
140 | PREFERRED_VERSION_xcb-proto ?= "1.6" | 140 | PREFERRED_VERSION_xcb-proto ?= "1.6" |
141 | PREFERRED_VERSION_libxcb ?= "1.7" | 141 | 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 1984ff6a54..cca1cc9678 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 | |||
8 | 8 | ||
9 | DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" | 9 | DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" |
10 | 10 | ||
11 | PR = "r1" | 11 | PR = "r2" |
12 | 12 | ||
13 | SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \ | 13 | SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \ |
14 | file://talloc-removal.patch \ | 14 | file://talloc-removal.patch \ |
@@ -20,6 +20,9 @@ SRC_URI[sha256sum] = "bcf28f43f39c28da271c0f5857fb32898d4ade3e035e80a0ceece1c2df | |||
20 | # most of our targets do not have DRI so will use mesa-xlib | 20 | # most of our targets do not have DRI so will use mesa-xlib |
21 | DEFAULT_PREFERENCE = "-1" | 21 | DEFAULT_PREFERENCE = "-1" |
22 | 22 | ||
23 | # Atom PCs have DRI support so use mesa-dri by default | ||
24 | DEFAULT_PREFERENCE_atom-pc = "1" | ||
25 | |||
23 | LEAD_SONAME = "libGL.so.1" | 26 | LEAD_SONAME = "libGL.so.1" |
24 | 27 | ||
25 | EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium" | 28 | 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 60edddf641..1b4606d43e 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" | |||
7 | 7 | ||
8 | DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} mesa-dri-glsl-native" | 8 | DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} mesa-dri-glsl-native" |
9 | 9 | ||
10 | PR = "r2" | 10 | PR = "r3" |
11 | 11 | ||
12 | SRC_URI += "file://crossfix.patch" | 12 | SRC_URI += "file://crossfix.patch" |
13 | 13 | ||
@@ -20,9 +20,6 @@ SRC_URI[mesademos.sha256sum] = "ea7b9ebfb7a80de2b275c0c9124c8a505382ec48411a2794 | |||
20 | # most of our targets do not have DRI so will use mesa-xlib | 20 | # most of our targets do not have DRI so will use mesa-xlib |
21 | DEFAULT_PREFERENCE = "-1" | 21 | DEFAULT_PREFERENCE = "-1" |
22 | 22 | ||
23 | # Atom PCs have DRI support so use mesa-dri by default | ||
24 | DEFAULT_PREFERENCE_atom-pc = "1" | ||
25 | |||
26 | LEAD_SONAME = "libGL.so.1" | 23 | LEAD_SONAME = "libGL.so.1" |
27 | 24 | ||
28 | EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium" | 25 | EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium" |