diff options
| author |   Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2014-01-26 18:03:06 +0000 |
|---|---|---|
| committer | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2014-01-26 18:03:06 +0000 |
| commit | a9968d078fb7c1efe375fc7ca1b0ab77e524e321 (patch) | |
| tree | 043f27cef7521d49212a8b9d060874098f726ceb | |
| parent | Cleanup. (diff) | |
| download | gentoo-2-a9968d078fb7c1efe375fc7ca1b0ab77e524e321.tar.gz gentoo-2-a9968d078fb7c1efe375fc7ca1b0ab77e524e321.tar.bz2 gentoo-2-a9968d078fb7c1efe375fc7ca1b0ab77e524e321.zip | |
Fix building against xorg-server-1.15, bug #496682.
(Portage version: 2.2.7/cvs/Linux x86_64, unsigned Manifest commit)
3 files changed, 34 insertions, 3 deletions
diff --git a/x11-drivers/xf86-video-intel/ChangeLog b/x11-drivers/xf86-video-intel/ChangeLog index 0f40dcb37f77..2574de1784a3 100644 --- a/x11-drivers/xf86-video-intel/ChangeLog +++ b/x11-drivers/xf86-video-intel/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-drivers/xf86-video-intel # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.153 2014/01/06 14:44:01 zx2c4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.154 2014/01/26 18:03:06 chithanh Exp $ + + 26 Jan 2014; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + +files/xf86-video-intel-2.21.15-handle-updates-to-DamageUnregister-API.patch, + xf86-video-intel-2.21.15.ebuild: + Fix building against xorg-server-1.15, bug #496682. *xf86-video-intel-2.99.907-r1 (06 Jan 2014) diff --git a/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.21.15-handle-updates-to-DamageUnregister-API.patch b/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.21.15-handle-updates-to-DamageUnregister-API.patch new file mode 100644 index 000000000000..1dc79baea57b --- /dev/null +++ b/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.21.15-handle-updates-to-DamageUnregister-API.patch @@ -0,0 +1,24 @@ +From 524a45da56e2a052ffafa3887891caa90ba39f76 Mon Sep 17 00:00:00 2001 +From: Chris Wilson <chris@chris-wilson.co.uk> +Date: Sat, 05 Oct 2013 17:42:24 +0000 +Subject: 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> +--- +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 +-- +cgit v0.9.0.2-2-gbebe + diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.21.15.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.21.15.ebuild index 90010c8515d7..4dcaf1a61177 100644 --- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.21.15.ebuild +++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.21.15.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.21.15.ebuild,v 1.4 2013/11/08 19:02:54 remi Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.21.15.ebuild,v 1.5 2014/01/26 18:03:06 chithanh Exp $ EAPI=5 @@ -41,6 +41,8 @@ src_prepare() { # wrong variable name, fix configure directly to avoid autoreconf # see bug #490342 sed -e "s/DRI_CFLAGS/DRI1_CFLAGS/g" -i configure + # see bug #496682 + epatch "${FILESDIR}/${PN}-2.21.15-handle-updates-to-DamageUnregister-API.patch" xorg-2_src_prepare } |