diff options
| author |   Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2013-12-04 01:17:59 +0000 |
|---|---|---|
| committer | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2013-12-04 01:17:59 +0000 |
| commit | d81e3d7d0b4dc2b978e92692715a0e319cc961ea (patch) | |
| tree | 88cb90eee019f29fe7b81c322e149077817bf679 /x11-drivers | |
| parent | add herd (diff) | |
| download | gentoo-2-d81e3d7d0b4dc2b978e92692715a0e319cc961ea.tar.gz gentoo-2-d81e3d7d0b4dc2b978e92692715a0e319cc961ea.tar.bz2 gentoo-2-d81e3d7d0b4dc2b978e92692715a0e319cc961ea.zip | |
Add patch to fix building against xorg-server-1.14.99.903
(Portage version: 2.2.7/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'x11-drivers')
3 files changed, 49 insertions, 2 deletions
diff --git a/x11-drivers/xf86-video-vmware/ChangeLog b/x11-drivers/xf86-video-vmware/ChangeLog index b9c7c093a932..966d0c561b41 100644 --- a/x11-drivers/xf86-video-vmware/ChangeLog +++ b/x11-drivers/xf86-video-vmware/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-drivers/xf86-video-vmware # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-vmware/ChangeLog,v 1.75 2013/10/08 05:07:00 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-vmware/ChangeLog,v 1.76 2013/12/04 01:17:59 chithanh Exp $ + + 04 Dec 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + +files/xf86-video-vmware-13.0.1-damageunregister.patch, + xf86-video-vmware-13.0.1.ebuild: + Add patch to fix building against xorg-server-1.14.99.903 08 Oct 2013; Agostino Sarubbo <ago@gentoo.org> xf86-video-vmware-13.0.1.ebuild: diff --git a/x11-drivers/xf86-video-vmware/files/xf86-video-vmware-13.0.1-damageunregister.patch b/x11-drivers/xf86-video-vmware/files/xf86-video-vmware-13.0.1-damageunregister.patch new file mode 100644 index 000000000000..0b2a8e6869b3 --- /dev/null +++ b/x11-drivers/xf86-video-vmware/files/xf86-video-vmware-13.0.1-damageunregister.patch @@ -0,0 +1,38 @@ +From e26dec8f5278df74a102493bf6d2d8444dab5d6d Mon Sep 17 00:00:00 2001 +From: Gaetan Nadon <memsize@videotron.ca> +Date: Mon, 28 Oct 2013 22:21:29 +0000 +Subject: vmwgfx: handle changes of DamageUnregister API in 1.14.99.2 + +Fix is inspired from the intel driver. + +Reviewed-by: Jakob Bornecrantz <jakob@vmware.com> +Signed-off-by: Gaetan Nadon <memsize@videotron.ca> +Signed-off-by: Jakob Bornecrantz <jakob@vmware.com> +--- +diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c +index fd80682..346e7f4 100644 +--- a/vmwgfx/vmwgfx_saa.c ++++ b/vmwgfx/vmwgfx_saa.c +@@ -26,6 +26,7 @@ + */ + + #include <xorg-server.h> ++#include <xorgVersion.h> + #include <mi.h> + #include <fb.h> + #include <xf86drmMode.h> +@@ -76,7 +77,12 @@ vmwgfx_pixmap_remove_damage(PixmapPtr pixmap) + if (!spix->damage || vpix->hw || vpix->gmr || vpix->malloc) + return; + ++#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,14,99,2,0) ++ DamageUnregister(spix->damage); ++#else + DamageUnregister(&pixmap->drawable, spix->damage); ++#endif ++ + DamageDestroy(spix->damage); + spix->damage = NULL; + } +-- +cgit v0.9.0.2-2-gbebe diff --git a/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.0.1.ebuild b/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.0.1.ebuild index cb359f7a52ed..acd4f12ab809 100644 --- a/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.0.1.ebuild +++ b/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.0.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.0.1.ebuild,v 1.3 2013/10/08 05:07:00 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.0.1.ebuild,v 1.4 2013/12/04 01:17:58 chithanh Exp $ EAPI=5 @@ -14,3 +14,7 @@ IUSE="" RDEPEND="x11-libs/libdrm[libkms,video_cards_vmware] media-libs/mesa[xa]" DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-damageunregister.patch +) |