summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/preferred-xorg-versions.inc2
-rw-r--r--meta/packages/xorg-driver/xf86-video-intel_2.12.0.bb (renamed from meta/packages/xorg-driver/xf86-video-intel_2.10.0.bb)3
2 files changed, 3 insertions, 2 deletions
diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index 66a473b668..1085c6309b 100644
--- a/meta/conf/distro/include/preferred-xorg-versions.inc
+++ b/meta/conf/distro/include/preferred-xorg-versions.inc
@@ -146,6 +146,6 @@ PREFERRED_VERSION_xf86-input-evdev ?= "2.4.0"
146PREFERRED_VERSION_xf86-input-mouse ?= "1.5.0" 146PREFERRED_VERSION_xf86-input-mouse ?= "1.5.0"
147PREFERRED_VERSION_xf86-input-keyboard ?= "1.4.0" 147PREFERRED_VERSION_xf86-input-keyboard ?= "1.4.0"
148PREFERRED_VERSION_xf86-input-synaptics ?= "1.2.1" 148PREFERRED_VERSION_xf86-input-synaptics ?= "1.2.1"
149PREFERRED_VERSION_xf86-video-intel ?= "2.10.0" 149PREFERRED_VERSION_xf86-video-intel ?= "2.12.0"
150 150
151 151
diff --git a/meta/packages/xorg-driver/xf86-video-intel_2.10.0.bb b/meta/packages/xorg-driver/xf86-video-intel_2.12.0.bb
index f60bdd2697..c04c7bd0ee 100644
--- a/meta/packages/xorg-driver/xf86-video-intel_2.10.0.bb
+++ b/meta/packages/xorg-driver/xf86-video-intel_2.12.0.bb
@@ -1,8 +1,9 @@
1require xf86-video-common.inc 1require xf86-video-common.inc
2 2
3DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver"
4
3EXTRA_OECONF += "--disable-xvmc" 5EXTRA_OECONF += "--disable-xvmc"
4 6
5DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver"
6DEPENDS += "virtual/libx11 libxvmc drm xf86driproto glproto \ 7DEPENDS += "virtual/libx11 libxvmc drm xf86driproto glproto \
7 virtual/libgl xineramaproto xf86driproto libpciaccess" 8 virtual/libgl xineramaproto xf86driproto libpciaccess"
8 9