Patchwork [11/13] xf86-video-intel: add compat patch for xorg >= 1.14.99.2

login
register
mail settings
Submitter Laurentiu Palcu
Date Feb. 6, 2014, 3:29 p.m.
Message ID <3cca063d7344f56d404bcb2d152ee2c88805d0a7.1391699953.git.laurentiu.palcu@intel.com>
Download mbox | patch
Permalink /patch/66403/
State Accepted
Commit a493de417875b62fdcf1718867ab15e8d8cc3f10
Headers show

Comments

Laurentiu Palcu - Feb. 6, 2014, 3:29 p.m.
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
 ...Map-changes-of-DamageUnregister-API-in-1..patch |   29 ++++++++++++++++++++
 .../xorg-driver/xf86-video-intel_2.21.15.bb        |    4 ++-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-intel/compat-api-Map-changes-of-DamageUnregister-API-in-1..patch

Patch

diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel/compat-api-Map-changes-of-DamageUnregister-API-in-1..patch b/meta/recipes-graphics/xorg-driver/xf86-video-intel/compat-api-Map-changes-of-DamageUnregister-API-in-1..patch
new file mode 100644
index 0000000..3a42d13
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel/compat-api-Map-changes-of-DamageUnregister-API-in-1..patch
@@ -0,0 +1,29 @@ 
+Upstream-Status: Backport
+
+From 524a45da56e2a052ffafa3887891caa90ba39f76 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat, 5 Oct 2013 18:42:24 +0100
+Subject: [PATCH] compat-api: Map changes of DamageUnregister API in 1.14.99.2
+
+Reported-by: Emmanuel Benisty <benisty.e@gmail.com>
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+---
+ src/compat-api.h |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/compat-api.h b/src/compat-api.h
+index 8eb46ef..244a486 100644
+--- a/src/compat-api.h
++++ b/src/compat-api.h
+@@ -162,4 +162,8 @@ static inline void FreePixmap(PixmapPtr pixmap)
+ 	if ((d)->pScreen->SourceValidate) (d)->pScreen->SourceValidate(d, x, y, w, h)
+ #endif
+ 
++#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,14,99,2,0)
++#define DamageUnregister(d, dd) DamageUnregister(dd)
++#endif
++
+ #endif
+-- 
+1.7.9.5
+
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.15.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.15.bb
index 828cae8..78edd5a 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.15.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.15.bb
@@ -11,7 +11,9 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=8730ad58d11c7bbad9a7066d69f7808e"
 
 DEPENDS += "virtual/libx11 drm libpciaccess pixman"
 
-SRC_URI += "file://disable-dri2-tests.patch"
+SRC_URI += "file://disable-dri2-tests.patch \
+            file://compat-api-Map-changes-of-DamageUnregister-API-in-1..patch \
+           "
 
 PACKAGECONFIG ??= "sna udev ${@base_contains('DISTRO_FEATURES', 'opengl', 'dri', '', d)}"