summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-driver
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-12 22:52:36 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-12 23:05:04 +0100
commitc53616df8e642f8ca991a761f62184f8621bd180 (patch)
treefc22e51febd49bffc977fabc51310e32139e45c5 /meta/recipes-graphics/xorg-driver
parent7a97bf7976666bbcfd81052ff8c90d1f52901910 (diff)
downloadpoky-c53616df8e642f8ca991a761f62184f8621bd180.tar.gz
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>
Diffstat (limited to 'meta/recipes-graphics/xorg-driver')
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-intel/buildfix.patch22
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-intel_2.16.0.bb (renamed from meta/recipes-graphics/xorg-driver/xf86-video-intel_2.15.0.bb)6
2 files changed, 26 insertions, 2 deletions
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
index 0000000000..3f961c89e4
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel/buildfix.patch
@@ -0,0 +1,22 @@
1Newer mesa doesn't provide dri support, just dri2. The intel driver
2hasn't quite caught up and whilst the configure checks work, the
3global includes have not and need manually tweaking.
4
5RP 2011/10/12
6
7Upstream Status: Superceeded
8
9Index: src/intel.h
10===================================================================
11--- src.orig/intel.h 2011-10-12 20:36:18.587187994 +0100
12+++ src/intel.h 2011-10-12 20:36:30.717188011 +0100
13@@ -65,9 +65,7 @@
14 #include <pciaccess.h>
15
16 #include "xf86drm.h"
17-#include "sarea.h"
18 #define _XF86DRI_SERVER_
19-#include "dri.h"
20 #include "dri2.h"
21 #include "intel_bufmgr.h"
22 #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
index caa8a4032b..89bc2c5c31 100644
--- 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 \
21 21
22COMPATIBLE_HOST = '(i.86|x86_64).*-linux' 22COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
23 23
24SRC_URI[md5sum] = "ba56ae395a9769ada1fef2014468bee9" 24SRC_URI += "file://buildfix.patch"
25SRC_URI[sha256sum] = "c377e1e9ab8b846d7e039acc9105479d5dce6a03f1ddccccf01c8474259c1720" 25
26SRC_URI[md5sum] = "e0406c50a747c358654b93cb23bf7375"
27SRC_URI[sha256sum] = "77482bcd1e30a57b68ba0d6a1862b4ff3c55fa23bf0109ec2af318a3e066ebfe"