From c53616df8e642f8ca991a761f62184f8621bd180 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Wed, 12 Oct 2011 22:52:36 +0100
Subject: 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>
---
 .../xorg-driver/xf86-video-intel/buildfix.patch    | 22 ++++++++++++++++++
 .../xorg-driver/xf86-video-intel_2.15.0.bb         | 25 --------------------
 .../xorg-driver/xf86-video-intel_2.16.0.bb         | 27 ++++++++++++++++++++++
 3 files changed, 49 insertions(+), 25 deletions(-)
 create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-intel/buildfix.patch
 delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-intel_2.15.0.bb
 create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-intel_2.16.0.bb

(limited to 'meta/recipes-graphics')

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 @@
+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.15.0.bb
deleted file mode 100644
index caa8a4032b..0000000000
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.15.0.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-require xorg-driver-video.inc
-
-SUMMARY = "X.Org X server -- Intel integrated graphics chipsets driver"
-
-DESCRIPTION = "intel is an Xorg driver for Intel integrated graphics \
-chipsets. The driver supports depths 8, 15, 16 and 24. On some chipsets, \
-the driver supports hardware accelerated 3D via the Direct Rendering \
-Infrastructure (DRI)."
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=8730ad58d11c7bbad9a7066d69f7808e"
-
-PR = "${INC_PR}.0"
-
-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[md5sum] = "ba56ae395a9769ada1fef2014468bee9"
-SRC_URI[sha256sum] = "c377e1e9ab8b846d7e039acc9105479d5dce6a03f1ddccccf01c8474259c1720"
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.16.0.bb
new file mode 100644
index 0000000000..89bc2c5c31
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.16.0.bb
@@ -0,0 +1,27 @@
+require xorg-driver-video.inc
+
+SUMMARY = "X.Org X server -- Intel integrated graphics chipsets driver"
+
+DESCRIPTION = "intel is an Xorg driver for Intel integrated graphics \
+chipsets. The driver supports depths 8, 15, 16 and 24. On some chipsets, \
+the driver supports hardware accelerated 3D via the Direct Rendering \
+Infrastructure (DRI)."
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=8730ad58d11c7bbad9a7066d69f7808e"
+
+PR = "${INC_PR}.0"
+
+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"
-- 
cgit v1.2.3-54-g00ecf