diff options
author | Saul Wold <sgw@linux.intel.com> | 2011-11-29 11:41:21 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-30 15:15:05 +0000 |
commit | 7c5d4ded24dfdcedba23372e71db144f9e1e80f4 (patch) | |
tree | 788a2aa611cfe3838be3a97b2a15fe85d764b219 /meta/recipes-graphics | |
parent | c6f6b9322823cb127fcc5f827edb2aeb4ef07306 (diff) | |
download | poky-7c5d4ded24dfdcedba23372e71db144f9e1e80f4.tar.gz |
xf86-video-intel: Update to 2.17.0
* Remove patch for issue fixed upstream
(From OE-Core rev: 356645a0891624a037c004e35569dc8bea4db334)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r-- | meta/recipes-graphics/xorg-driver/xf86-video-intel/buildfix.patch | 22 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-driver/xf86-video-intel_2.17.0.bb (renamed from meta/recipes-graphics/xorg-driver/xf86-video-intel_2.16.0.bb) | 14 |
2 files changed, 6 insertions, 30 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 deleted file mode 100644 index ea5ce79657..0000000000 --- a/meta/recipes-graphics/xorg-driver/xf86-video-intel/buildfix.patch +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | Newer mesa doesn't provide dri support, just dri2. The intel driver | ||
2 | hasn't quite caught up and whilst the configure checks work, the | ||
3 | global includes have not and need manually tweaking. | ||
4 | |||
5 | RP 2011/10/12 | ||
6 | |||
7 | Upstream Status: Superceeded | ||
8 | |||
9 | Index: xf86-video-intel-2.16.0/src/intel.h | ||
10 | =================================================================== | ||
11 | --- xf86-video-intel-2.16.0.orig/src/intel.h 2011-10-12 20:36:18.587187994 +0100 | ||
12 | +++ xf86-video-intel-2.16.0/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.16.0.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.17.0.bb index 89bc2c5c31..ca90be2527 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.16.0.bb +++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.17.0.bb | |||
@@ -11,17 +11,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8730ad58d11c7bbad9a7066d69f7808e" | |||
11 | 11 | ||
12 | PR = "${INC_PR}.0" | 12 | PR = "${INC_PR}.0" |
13 | 13 | ||
14 | DEPENDS += "virtual/libx11 libxvmc drm xf86driproto glproto \ | ||
15 | virtual/libgl xineramaproto xf86driproto libpciaccess" | ||
16 | |||
17 | SRC_URI[md5sum] = "6d7b1f199dba5820f250888b136186ff" | ||
18 | SRC_URI[sha256sum] = "8b8450f2a2cc52ef31a83414e2f290e748a956690e11b41759d5650aaedc4387" | ||
19 | |||
14 | EXTRA_OECONF += "--disable-xvmc" | 20 | EXTRA_OECONF += "--disable-xvmc" |
15 | 21 | ||
16 | # --enable-kms-only option is required by ROOTLESS_X | 22 | # --enable-kms-only option is required by ROOTLESS_X |
17 | EXTRA_OECONF += '${@base_conditional( "ROOTLESS_X", "1", " --enable-kms-only", "", d )}' | 23 | EXTRA_OECONF += '${@base_conditional( "ROOTLESS_X", "1", " --enable-kms-only", "", d )}' |
18 | 24 | ||
19 | DEPENDS += "virtual/libx11 libxvmc drm xf86driproto glproto \ | ||
20 | virtual/libgl xineramaproto xf86driproto libpciaccess" | ||
21 | |||
22 | COMPATIBLE_HOST = '(i.86|x86_64).*-linux' | 25 | COMPATIBLE_HOST = '(i.86|x86_64).*-linux' |
23 | |||
24 | SRC_URI += "file://buildfix.patch" | ||
25 | |||
26 | SRC_URI[md5sum] = "e0406c50a747c358654b93cb23bf7375" | ||
27 | SRC_URI[sha256sum] = "77482bcd1e30a57b68ba0d6a1862b4ff3c55fa23bf0109ec2af318a3e066ebfe" | ||