summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYu Ke <ke.yu@intel.com>2011-02-09 19:15:52 +0800
committerRichard Purdie <rpurdie@linux.intel.com>2011-02-09 22:45:47 +0000
commit97e288ff7fe14872c263f0ef088c3339a4355b5a (patch)
treea77dc394c22cef1b7e190eecbc2fbfb58f091d60
parentd64460afde04d1aba6372e840e7e217e99e7bc4b (diff)
downloadpoky-97e288ff7fe14872c263f0ef088c3339a4355b5a.tar.gz
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 <ke.yu@intel.com>
-rw-r--r--meta/conf/distro/include/preferred-xorg-versions.inc2
-rw-r--r--meta/recipes-graphics/mesa/mesa-dri_7.10.bb5
-rw-r--r--meta/recipes-graphics/mesa/mesa-dri_7.8.2.bb5
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"
135PREFERRED_VERSION_xtrans-nativesdk ?= "1.2.6" 135PREFERRED_VERSION_xtrans-nativesdk ?= "1.2.6"
136PREFERRED_VERSION_xvinfo ?= "1.1.1" 136PREFERRED_VERSION_xvinfo ?= "1.1.1"
137PREFERRED_VERSION_xwininfo ?= "1.1.1" 137PREFERRED_VERSION_xwininfo ?= "1.1.1"
138PREFERRED_VERSION_mesa-dri ?= "7.8.2" 138PREFERRED_VERSION_mesa-dri ?= "7.10"
139PREFERRED_VERSION_libdrm ?= "2.4.23" 139PREFERRED_VERSION_libdrm ?= "2.4.23"
140PREFERRED_VERSION_xcb-proto ?= "1.6" 140PREFERRED_VERSION_xcb-proto ?= "1.6"
141PREFERRED_VERSION_libxcb ?= "1.7" 141PREFERRED_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
9DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" 9DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}"
10 10
11PR = "r1" 11PR = "r2"
12 12
13SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \ 13SRC_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
21DEFAULT_PREFERENCE = "-1" 21DEFAULT_PREFERENCE = "-1"
22 22
23# Atom PCs have DRI support so use mesa-dri by default
24DEFAULT_PREFERENCE_atom-pc = "1"
25
23LEAD_SONAME = "libGL.so.1" 26LEAD_SONAME = "libGL.so.1"
24 27
25EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium" 28EXTRA_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
8DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} mesa-dri-glsl-native" 8DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} mesa-dri-glsl-native"
9 9
10PR = "r2" 10PR = "r3"
11 11
12SRC_URI += "file://crossfix.patch" 12SRC_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
21DEFAULT_PREFERENCE = "-1" 21DEFAULT_PREFERENCE = "-1"
22 22
23# Atom PCs have DRI support so use mesa-dri by default
24DEFAULT_PREFERENCE_atom-pc = "1"
25
26LEAD_SONAME = "libGL.so.1" 23LEAD_SONAME = "libGL.so.1"
27 24
28EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium" 25EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium"