Patchwork [14/26] xf86-video-intel: Update to 2.17.0

login
register
mail settings
Submitter Saul Wold
Date Nov. 29, 2011, 11 p.m.
Message ID <356645a0891624a037c004e35569dc8bea4db334.1322607016.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/15695/
State New
Headers show

Comments

Saul Wold - Nov. 29, 2011, 11 p.m.
* Remove patch for issue fixed upstream

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../xorg-driver/xf86-video-intel/buildfix.patch    |   22 --------------------
 ...-intel_2.16.0.bb => xf86-video-intel_2.17.0.bb} |   14 +++++-------
 2 files changed, 6 insertions(+), 30 deletions(-)
 delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-intel/buildfix.patch
 rename meta/recipes-graphics/xorg-driver/{xf86-video-intel_2.16.0.bb => xf86-video-intel_2.17.0.bb} (81%)

Patch

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 ea5ce79..0000000
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel/buildfix.patch
+++ /dev/null
@@ -1,22 +0,0 @@ 
-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: xf86-video-intel-2.16.0/src/intel.h
-===================================================================
---- xf86-video-intel-2.16.0.orig/src/intel.h	2011-10-12 20:36:18.587187994 +0100
-+++ xf86-video-intel-2.16.0/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.16.0.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.17.0.bb
similarity index 81%
rename from meta/recipes-graphics/xorg-driver/xf86-video-intel_2.16.0.bb
rename to meta/recipes-graphics/xorg-driver/xf86-video-intel_2.17.0.bb
index 89bc2c5..ca90be2 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"
 
 PR = "${INC_PR}.0"
 
+DEPENDS += "virtual/libx11 libxvmc drm xf86driproto glproto \
+	    virtual/libgl xineramaproto xf86driproto libpciaccess"
+
+SRC_URI[md5sum] = "6d7b1f199dba5820f250888b136186ff"
+SRC_URI[sha256sum] = "8b8450f2a2cc52ef31a83414e2f290e748a956690e11b41759d5650aaedc4387"
+
 EXTRA_OECONF += "--disable-xvmc"
 
 # --enable-kms-only option is required by ROOTLESS_X
 EXTRA_OECONF += '${@base_conditional( "ROOTLESS_X", "1", " --enable-kms-only", "", d )}'
 
-DEPENDS += "virtual/libx11 libxvmc drm xf86driproto glproto \
-	    virtual/libgl xineramaproto xf86driproto libpciaccess"
-
 COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
-
-SRC_URI += "file://buildfix.patch"
-
-SRC_URI[md5sum] = "e0406c50a747c358654b93cb23bf7375"
-SRC_URI[sha256sum] = "77482bcd1e30a57b68ba0d6a1862b4ff3c55fa23bf0109ec2af318a3e066ebfe"