From da46e7f70546c14ddd8efc0f64371b637092293d Mon Sep 17 00:00:00 2001 From: Yu Ke Date: Thu, 8 Jul 2010 12:33:46 +0800 Subject: xf86-intel-video: upgrade to 2.12.0 Signed-off-by: Yu Ke --- meta-moblin/conf/distro/include/moblin-2.0-fixed-revisions.inc | 2 +- meta-moblin/conf/distro/include/moblin-fixed-revisions.inc | 4 ++-- meta/conf/distro/include/preferred-xorg-versions.inc | 2 +- meta/packages/xorg-driver/xf86-video-intel_2.10.0.bb | 9 --------- meta/packages/xorg-driver/xf86-video-intel_2.12.0.bb | 10 ++++++++++ 5 files changed, 14 insertions(+), 13 deletions(-) delete mode 100644 meta/packages/xorg-driver/xf86-video-intel_2.10.0.bb create mode 100644 meta/packages/xorg-driver/xf86-video-intel_2.12.0.bb diff --git a/meta-moblin/conf/distro/include/moblin-2.0-fixed-revisions.inc b/meta-moblin/conf/distro/include/moblin-2.0-fixed-revisions.inc index e765b1df90..5992ed91ce 100644 --- a/meta-moblin/conf/distro/include/moblin-2.0-fixed-revisions.inc +++ b/meta-moblin/conf/distro/include/moblin-2.0-fixed-revisions.inc @@ -9,7 +9,7 @@ PREFERRED_VERSION_gtk+ ?= "2.16.4" PREFERRED_VERSION_udev ?= "145" PREFERRED_VERSION_mesa-dri ?= "7.5" -PREFERRED_VERSION_xf86-video-intel ?= "2.7.1" +PREFERRED_VERSION_xf86-video-intel ?= "2.12.0" PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.6.0" PREFERRED_VERSION_libxcb ?= "1.3" PREFERRED_VERSION_xcb-proto ?= "1.5" diff --git a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc index a96bd47ac0..55ba546d67 100644 --- a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc +++ b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc @@ -9,8 +9,8 @@ PREFERRED_VERSION_gtk+ ?= "2.18.5" PREFERRED_VERSION_pango = "1.26.0" PREFERRED_VERSION_udev ?= "145" -PREFERRED_VERSION_mesa-dri ?= "7.7" -PREFERRED_VERSION_xf86-video-intel ?= "2.10.0" +PREFERRED_VERSION_mesa-dri ?= "7.8.2" +PREFERRED_VERSION_xf86-video-intel ?= "2.12.0" PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.7.99.2" PREFERRED_VERSION_libxcb ?= "1.3" PREFERRED_VERSION_xcb-proto ?= "1.5" 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" PREFERRED_VERSION_xf86-input-mouse ?= "1.5.0" PREFERRED_VERSION_xf86-input-keyboard ?= "1.4.0" PREFERRED_VERSION_xf86-input-synaptics ?= "1.2.1" -PREFERRED_VERSION_xf86-video-intel ?= "2.10.0" +PREFERRED_VERSION_xf86-video-intel ?= "2.12.0" diff --git a/meta/packages/xorg-driver/xf86-video-intel_2.10.0.bb b/meta/packages/xorg-driver/xf86-video-intel_2.10.0.bb deleted file mode 100644 index f60bdd2697..0000000000 --- a/meta/packages/xorg-driver/xf86-video-intel_2.10.0.bb +++ /dev/null @@ -1,9 +0,0 @@ -require xf86-video-common.inc - -EXTRA_OECONF += "--disable-xvmc" - -DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver" -DEPENDS += "virtual/libx11 libxvmc drm xf86driproto glproto \ - virtual/libgl xineramaproto xf86driproto libpciaccess" - -COMPATIBLE_HOST = '(i.86.*-linux)' diff --git a/meta/packages/xorg-driver/xf86-video-intel_2.12.0.bb b/meta/packages/xorg-driver/xf86-video-intel_2.12.0.bb new file mode 100644 index 0000000000..c04c7bd0ee --- /dev/null +++ b/meta/packages/xorg-driver/xf86-video-intel_2.12.0.bb @@ -0,0 +1,10 @@ +require xf86-video-common.inc + +DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver" + +EXTRA_OECONF += "--disable-xvmc" + +DEPENDS += "virtual/libx11 libxvmc drm xf86driproto glproto \ + virtual/libgl xineramaproto xf86driproto libpciaccess" + +COMPATIBLE_HOST = '(i.86.*-linux)' -- cgit v1.2.3