xf86-video-intel: Update 2.15.0 -> 2.16.0

Include a build fix which means otherwise this wouldn't build

(From OE-Core rev: 5ad1ca59dea6d5045f252ed7b786ad193faced64)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel/buildfix.patch b/meta/recipes-graphics/xorg-driver/xf86-video-intel/buildfix.patch
new file mode 100644 (file)
index 0000000..3f961c8
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel/buildfix.patch
@@ -0,0 +1,22 @@
+Newer mesa doesn't provide dri support, just dri2. The intel driver
+hasn't quite caught up and whilst the configure checks work, the
+global includes have not and need manually tweaking.
+
+RP 2011/10/12
+
+Upstream Status: Superceeded
+
+Index: src/intel.h
+===================================================================
+--- src.orig/intel.h   2011-10-12 20:36:18.587187994 +0100
++++ src/intel.h        2011-10-12 20:36:30.717188011 +0100
+@@ -65,9 +65,7 @@
+ #include <pciaccess.h>
+ 
+ #include "xf86drm.h"
+-#include "sarea.h"
+ #define _XF86DRI_SERVER_
+-#include "dri.h"
+ #include "dri2.h"
+ #include "intel_bufmgr.h"
+ #include "i915_drm.h"

diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.15.0.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.16.0.bb
similarity index 81%
rename from meta/recipes-graphics/xorg-driver/xf86-video-intel_2.15.0.bb
rename to meta/recipes-graphics/xorg-driver/xf86-video-intel_2.16.0.bb
index caa8a40..89bc2c5 100644 (file)
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.15.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.16.0.bb
@@ -21,5 +21,7 @@ DEPENDS += "virtual/libx11 libxvmc drm xf86driproto glproto \
 
 COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
 
-SRC_URI[md5sum] = "ba56ae395a9769ada1fef2014468bee9"
-SRC_URI[sha256sum] = "c377e1e9ab8b846d7e039acc9105479d5dce6a03f1ddccccf01c8474259c1720"
+SRC_URI += "file://buildfix.patch"
+
+SRC_URI[md5sum] = "e0406c50a747c358654b93cb23bf7375"
+SRC_URI[sha256sum] = "77482bcd1e30a57b68ba0d6a1862b4ff3c55fa23bf0109ec2af318a3e066ebfe"