From d97dbdd9de21a0419ea8744cf701c9461d312919 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 16 Jan 2009 15:58:22 +0000 Subject: xf86-video-intel: 2.4.2 -> 2.6.0 --- meta/packages/xorg-driver/xf86-video-intel-dri2_git.bb | 2 ++ meta/packages/xorg-driver/xf86-video-intel_2.4.2.bb | 7 ------- meta/packages/xorg-driver/xf86-video-intel_2.6.0.bb | 7 +++++++ meta/packages/xorg-driver/xf86-video-intel_git.bb | 5 +++-- 4 files changed, 12 insertions(+), 9 deletions(-) delete mode 100644 meta/packages/xorg-driver/xf86-video-intel_2.4.2.bb create mode 100644 meta/packages/xorg-driver/xf86-video-intel_2.6.0.bb (limited to 'meta/packages/xorg-driver') diff --git a/meta/packages/xorg-driver/xf86-video-intel-dri2_git.bb b/meta/packages/xorg-driver/xf86-video-intel-dri2_git.bb index 2ac57cc4ec..ca9334625c 100644 --- a/meta/packages/xorg-driver/xf86-video-intel-dri2_git.bb +++ b/meta/packages/xorg-driver/xf86-video-intel-dri2_git.bb @@ -5,6 +5,8 @@ DEPENDS += "virtual/libx11 libxvmc drm dri2proto glproto \ virtual/libgl xineramaproto libpciaccess" PROVIDES = "xf86-video-intel" +DEFAULT_PREFERENCE = "-1" + PE = "1" PR = "r2" PV = "2.4.97.0+git${SRCREV}" diff --git a/meta/packages/xorg-driver/xf86-video-intel_2.4.2.bb b/meta/packages/xorg-driver/xf86-video-intel_2.4.2.bb deleted file mode 100644 index 30e713538d..0000000000 --- a/meta/packages/xorg-driver/xf86-video-intel_2.4.2.bb +++ /dev/null @@ -1,7 +0,0 @@ -require xf86-video-common.inc - -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.6.0.bb b/meta/packages/xorg-driver/xf86-video-intel_2.6.0.bb new file mode 100644 index 0000000000..30e713538d --- /dev/null +++ b/meta/packages/xorg-driver/xf86-video-intel_2.6.0.bb @@ -0,0 +1,7 @@ +require xf86-video-common.inc + +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_git.bb b/meta/packages/xorg-driver/xf86-video-intel_git.bb index d51c4e8b1e..7abf0677e1 100644 --- a/meta/packages/xorg-driver/xf86-video-intel_git.bb +++ b/meta/packages/xorg-driver/xf86-video-intel_git.bb @@ -3,10 +3,11 @@ require xf86-video-common.inc DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver" DEPENDS += "virtual/libx11 libxvmc drm dri2proto glproto \ virtual/libgl xineramaproto libpciaccess" -PROVIDES = "xf86-video-intel" PR = "r1" -PV = "2.4.97.0+git${SRCREV}" +PV = "2.4.98.0+git${SRCREV}" + +DEFAULT_PREFERENCE = "-1" #TODO: Investigate the fact that these patches fail to apply to git master a.t.m #file://002_avoid_duplicate_SaveHWState.patch;patch=1 -- cgit v1.2.3-54-g00ecf