diff options
author | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2013-11-28 18:36:53 +0000 |
---|---|---|
committer | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2013-11-28 18:36:53 +0000 |
commit | 8ca3e7c350ef9a901a44042e2d854572b2f3a7bb (patch) | |
tree | 073e811711ea5c69800d663ad75afcee27388c75 | |
parent | Version bumps. Ebuilds by Arfrever. (diff) | |
download | gentoo-2-8ca3e7c350ef9a901a44042e2d854572b2f3a7bb.tar.gz gentoo-2-8ca3e7c350ef9a901a44042e2d854572b2f3a7bb.tar.bz2 gentoo-2-8ca3e7c350ef9a901a44042e2d854572b2f3a7bb.zip |
Add patch to build against recent xorg-server. Drop old.
(Portage version: 2.2.7/cvs/Linux x86_64, unsigned Manifest commit)
5 files changed, 50 insertions, 39 deletions
diff --git a/x11-drivers/xf86-video-ark/ChangeLog b/x11-drivers/xf86-video-ark/ChangeLog index 52091a668a19..d0c40b927b6f 100644 --- a/x11-drivers/xf86-video-ark/ChangeLog +++ b/x11-drivers/xf86-video-ark/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-drivers/xf86-video-ark -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ark/ChangeLog,v 1.53 2012/12/28 11:08:43 ago Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ark/ChangeLog,v 1.54 2013/11/28 18:36:53 chithanh Exp $ + + 28 Nov 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + +files/xf86-video-ark-0.7.5-remove-mibstore_h.patch, + -xf86-video-ark-0.7.3.ebuild, -xf86-video-ark-0.7.4.ebuild, + xf86-video-ark-0.7.5.ebuild: + Add patch to build against recent xorg-server. Drop old. 28 Dec 2012; Agostino Sarubbo <ago@gentoo.org> xf86-video-ark-0.7.5.ebuild: Stable for ia64, wrt bug #440872 diff --git a/x11-drivers/xf86-video-ark/files/xf86-video-ark-0.7.5-remove-mibstore_h.patch b/x11-drivers/xf86-video-ark/files/xf86-video-ark-0.7.5-remove-mibstore_h.patch new file mode 100644 index 000000000000..1acea99c45b1 --- /dev/null +++ b/x11-drivers/xf86-video-ark/files/xf86-video-ark-0.7.5-remove-mibstore_h.patch @@ -0,0 +1,35 @@ +From 3a3eb72baec46f48e6cf15a834271c3d3386deac Mon Sep 17 00:00:00 2001 +From: Gaetan Nadon <memsize@videotron.ca> +Date: Tue, 17 Sep 2013 19:55:37 +0000 +Subject: Remove usage of mibstore.h (removed from server) + +The module had a compile error for this missing header file. + +Changes similar to vmware commit +23d87c92b7211cc5249eefe4ab3a2c7f370e279e + +Reviewed-by: Alex Deucher <alexander.deucher@amd.com> +Signed-off-by: Gaetan Nadon <memsize@videotron.ca> +--- +diff --git a/src/ark_driver.c b/src/ark_driver.c +index b7c287c..65cfe84 100644 +--- a/src/ark_driver.c ++++ b/src/ark_driver.c +@@ -39,7 +39,6 @@ + #include "compiler.h" + #include "mipointer.h" + #include "micmap.h" +-#include "mibstore.h" + #include "fb.h" + #include "ark.h" + +@@ -538,7 +537,6 @@ static Bool ARKScreenInit(SCREEN_INIT_ARGS_DECL) + + fbPictureInit (pScreen, 0, 0); + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + + if (!pARK->NoAccel) { +-- +cgit v0.9.0.2-2-gbebe diff --git a/x11-drivers/xf86-video-ark/xf86-video-ark-0.7.3.ebuild b/x11-drivers/xf86-video-ark/xf86-video-ark-0.7.3.ebuild deleted file mode 100644 index aa77df544a90..000000000000 --- a/x11-drivers/xf86-video-ark/xf86-video-ark-0.7.3.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ark/xf86-video-ark-0.7.3.ebuild,v 1.4 2011/02/12 19:01:52 armin76 Exp $ - -EAPI=3 - -inherit xorg-2 - -DESCRIPTION="X.Org driver for ark cards" -KEYWORDS="amd64 ia64 x86 ~x86-fbsd" -IUSE="" - -RDEPEND=">=x11-base/xorg-server-1.0.99" -DEPEND="${RDEPEND} - x11-proto/fontsproto - x11-proto/randrproto - x11-proto/renderproto - x11-proto/xextproto - x11-proto/xproto" diff --git a/x11-drivers/xf86-video-ark/xf86-video-ark-0.7.4.ebuild b/x11-drivers/xf86-video-ark/xf86-video-ark-0.7.4.ebuild deleted file mode 100644 index 06a4f8c02de5..000000000000 --- a/x11-drivers/xf86-video-ark/xf86-video-ark-0.7.4.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ark/xf86-video-ark-0.7.4.ebuild,v 1.6 2012/08/26 19:53:24 armin76 Exp $ - -EAPI=4 - -inherit xorg-2 - -DESCRIPTION="X.Org driver for ark cards" -KEYWORDS="amd64 ia64 x86 ~amd64-fbsd ~x86-fbsd" -IUSE="" - -RDEPEND=">=x11-base/xorg-server-1.0.99" -DEPEND="${RDEPEND} - >=x11-libs/libpciaccess-0.12.901" diff --git a/x11-drivers/xf86-video-ark/xf86-video-ark-0.7.5.ebuild b/x11-drivers/xf86-video-ark/xf86-video-ark-0.7.5.ebuild index acfd418bb9e3..70810948c498 100644 --- a/x11-drivers/xf86-video-ark/xf86-video-ark-0.7.5.ebuild +++ b/x11-drivers/xf86-video-ark/xf86-video-ark-0.7.5.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2012 Gentoo Foundation +# 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-ark/xf86-video-ark-0.7.5.ebuild,v 1.4 2012/12/28 11:08:43 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ark/xf86-video-ark-0.7.5.ebuild,v 1.5 2013/11/28 18:36:53 chithanh Exp $ -EAPI=4 +EAPI=5 inherit xorg-2 @@ -13,3 +13,7 @@ IUSE="" RDEPEND=">=x11-base/xorg-server-1.0.99" DEPEND="${RDEPEND} >=x11-libs/libpciaccess-0.12.901" + +PATCHES=( + "${FILESDIR}"/${P}-remove-mibstore_h.patch +) |