xf86-video-intel: 2.4.2 -> 2.6.0

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 2ac57cc4ecd64539378c8cc05fb0ccdc5b8c734b..ca9334625ce62c0658560649c9a8588a391295fe 100644 (file)
--- 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.6.0.bb
similarity index 100%
rename from meta/packages/xorg-driver/xf86-video-intel_2.4.2.bb
rename to meta/packages/xorg-driver/xf86-video-intel_2.6.0.bb

diff --git a/meta/packages/xorg-driver/xf86-video-intel_git.bb b/meta/packages/xorg-driver/xf86-video-intel_git.bb
index d51c4e8b1ee2514683075070348ec8e5986eddc6..7abf0677e1e2b50223d16cd2525377c4589d7ac2 100644 (file)
--- 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