debian/changelog | 10 ++++++++++
src/compat-api.h | 4 ++++
2 files changed, 14 insertions(+)
New commits:
commit 8b89b0ab833d2752731e0862364d47ee72e411af
Author: Julien Cristau <jcris...@debian.org>
Date: Tue Feb 4 15:24:41 2014 +0100
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index e598318..99d82ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xserver-xorg-video-intel (2:2.21.15-2) unstable; urgency=medium
+
+ [ Michael Stapelberg ]
+ * Revert back to 1.0 source format.
+
+ [ Julien Cristau ]
+ * Cherry-pick upstream build fix for xserver 1.15 (closes: #736980).
+
+ -- Julien Cristau <jcris...@debian.org> Tue, 04 Feb 2014 15:24:32 +0100
+
xserver-xorg-video-intel (2:2.21.15-1) unstable; urgency=low
* New upstream release.
commit 9fe518d9f4d866a8cca91bf47730379ba5541713
Author: Chris Wilson <ch...@chris-wilson.co.uk>
Date: Sat Oct 5 18:42:24 2013 +0100
compat-api: Map changes of DamageUnregister API in 1.14.99.2
Reported-by: Emmanuel Benisty <benist...@gmail.com>
Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
(cherry picked from commit 524a45da56e2a052ffafa3887891caa90ba39f76)
diff --git a/src/compat-api.h b/src/compat-api.h
index d80b7fe..271c7d6 100644
--- a/src/compat-api.h
+++ b/src/compat-api.h
@@ -158,4 +158,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
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1wahgv-0007uf...@moszumanska.debian.org
