Fix building against xorg-server-1.14

Package-Manager: portage-2.1.11.52/cvs/Linux x86_64

5 files changed, 61 insertions, 26 deletions

diff --git a/x11-drivers/xf86-video-i128/ChangeLog b/x11-drivers/xf86-video-i128/ChangeLog
index 816ea0e9afee..95d4280c8abf 100644
--- a/x11-drivers/xf86-video-i128/ChangeLog
+++ b/x11-drivers/xf86-video-i128/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/xf86-video-i128
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i128/ChangeLog,v 1.54 2012/12/28 11:15:10 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i128/ChangeLog,v 1.55 2013/03/12 16:36:02 chithanh Exp $
+
+*xf86-video-i128-1.3.6-r1 (12 Mar 2013)
+
+  12 Mar 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/xf86-video-i128-1.3.6-remove-mibstore_h.patch,
+  +xf86-video-i128-1.3.6-r1.ebuild, -xf86-video-i128-1.3.4.ebuild:
+  Fix building against xorg-server-1.14
 
   28 Dec 2012; Agostino Sarubbo <ago@gentoo.org> xf86-video-i128-1.3.6.ebuild:
   Stable for ia64, wrt bug #440872
diff --git a/x11-drivers/xf86-video-i128/Manifest b/x11-drivers/xf86-video-i128/Manifest
index a07046f47237..7c8aa6cf7850 100644
--- a/x11-drivers/xf86-video-i128/Manifest
+++ b/x11-drivers/xf86-video-i128/Manifest
@@ -1,8 +1,8 @@
-DIST xf86-video-i128-1.3.4.tar.bz2 292046 SHA256 b69b13a7fd69f5ad35119b6f8efb3243bfea05ae9aa5a067d0e754de5d248bcf
+AUX xf86-video-i128-1.3.6-remove-mibstore_h.patch 809 SHA256 a33da9fb125697fa9c3178bfa11f40f88f69947cd0934ac37139ba1c1a950d52 SHA512 3cfe390f1f812250ed3abde0dc8bd699419bf71d6642328d69163012b813906b995acf942c31febe6fc6909109181436e1c7dfcb74d08feae6c9b7434ea63df9 WHIRLPOOL 66e28c4cca647c928f99dd72a3185874e08fe167105c4bb3bb9cfcc4072fa8554c61affb9e50197f4cdf4f76aeae6fb0d2a45216ee614fd6cbcf06a0d272a9a2
 DIST xf86-video-i128-1.3.5.tar.bz2 306803 SHA256 3eedeb1e575e96b2ebebdf894c515e8543900aa3f9f85d10120b8240264333ea
 DIST xf86-video-i128-1.3.6.tar.bz2 324894 SHA256 f8827e4c988f90cf5a677554b30d61f0a07eb86d872478751cdc94dc17452b9c SHA512 688956107fe473941da9d22914dc1aa1889b8a1bb75678692d40630396eca5426a4506bb0a536c48b6ed7a2b580a80af5b8b5d3199e2b04d8f24c404f60d3c34 WHIRLPOOL 95e2803b688c3ca7f1f44c4314b10a22d68c7dd8424b1817c9341da1378e47e208cef7243d473910a33ae0f3aab12fcf1f1d83b4560ebe01ae250ba0d13a968b
-EBUILD xf86-video-i128-1.3.4.ebuild 539 SHA256 be8c1f8f5a0d76ce0d9b6d4f10f17709f03293e68c8c70d4e692e85ab2c37055 SHA512 b6a1908e0f30de524538666ec3da034661ac69ab3e673e43e532a689c77d9121643e0f814ddfb655bd9e2c4a7cf74e6e232225f8df92cc84ada78e49c2da66ef WHIRLPOOL 9199bfc255c9c9ce7046ffbeffed1af14a53982e73ef0ed365b8d42cd4f7e49d9ae198e86b4ce9281889ab5ce478a84e34e3a01d2693a505caa37158fe9fc88a
 EBUILD xf86-video-i128-1.3.5.ebuild 423 SHA256 54d933a3435f98410659f6a0a25e3e4086273258ac7854b693737a6aaa16c5c8 SHA512 2e38e4944280e197aba07ff0216acc511b92272ae1aa64bd75dd4391247c1684e0a11c153762250bb30247814b06864a58e461ee546310ba98793ff9c4c48586 WHIRLPOOL f272901f7cb4f11bb715dd4266f6850c3ac7446a0123b917e8c08e02404d16fcb7dcc3bc17fff03e0be6a12841130ae52685da5a5a6e921b24ec57344c1ea2f7
+EBUILD xf86-video-i128-1.3.6-r1.ebuild 487 SHA256 81797ec16160e4dba32a3c7318a0422591b6f254c12c5328d0cc21f41ff0307b SHA512 1865752efeebdf195598eff357d77f3a3fd013cf5f445e1dddc232fa9826be6f0b8ba0e7c4b314ec9553a34f6475fcd4ede23cf9ebd32736eee1bc3a20132314 WHIRLPOOL 5911bcbb06e42107dab7283a38da8582427ab0b6b946ad041cf4530b6c281c19c25550bc12fc7d81eb7a9c17870a70b0c9d7d67f87e662a4af768bab1a750cb5
 EBUILD xf86-video-i128-1.3.6.ebuild 419 SHA256 3c44d248c216f94e6ebffc57920688f41812e676c9a89fb28fda7c1abded4fed SHA512 1de78d62ec7b9c78aee79d236d6badf1643ffe393c0e716cfd6fd24238ce6dbc116aff07fe1e3a6bca81a086a78080ffdc219248ab9ce89cd13628eacdeb3515 WHIRLPOOL c3a518cf0ecff6ea922feb6bdc9611b2ffbe7d3d0f6d5f77b3f00763daa196923577364646c0883fd341ff8aaaa77b138c9fa56160d61062485704204ce72ac0
-MISC ChangeLog 7237 SHA256 736f7ca65260ae9a2edafd14306533d4bb772859b80208f0fc4454d4b97a3d1e SHA512 1aaccde7c90fd6cff9303dea11e31e43c39622baeff8362c225d918f03b950c8ffda0994cb1554b992c1b0db861e3047dde9eb993a47f57a9a75c13575038bf8 WHIRLPOOL 832805137bb30988cc0b4f6014d489b07904c1f0988c4a85553dfaabc13b476970d8e2421e0ecd8664cc6a8dba00d888968df44a1bbaeb9502b33cc352496cd9
+MISC ChangeLog 7516 SHA256 b126306c691464ade2df1dd5dcbc167ec1c499f4df85311f5cde1cb754055c54 SHA512 b65151b6e6edfa496f1b4d7fc73d5054960a87d7a7432fc4cb0fc76b2f96090e4e828d38c44617b3908da6f0fb85879e51fc5bd1dece452648a212594c9134d7 WHIRLPOOL 21c20cf8d6b1ddead28715b7340534539fe66584401acc2a100e50de55a920d6c3bfed552b8baadefb754a67a8b169c0ffee3b21f4e644366740e103722d649f
 MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93
diff --git a/x11-drivers/xf86-video-i128/files/xf86-video-i128-1.3.6-remove-mibstore_h.patch b/x11-drivers/xf86-video-i128/files/xf86-video-i128-1.3.6-remove-mibstore_h.patch
new file mode 100644
index 000000000000..b42a6c8f1f51
--- /dev/null
+++ b/x11-drivers/xf86-video-i128/files/xf86-video-i128-1.3.6-remove-mibstore_h.patch
@@ -0,0 +1,30 @@
+From c87753733a6e1f85d1d037dced0b47ce0cf41658 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 25 Sep 2012 12:54:40 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/i128_driver.c b/src/i128_driver.c
+index a0f08c0..51a4135 100644
+--- a/src/i128_driver.c
++++ b/src/i128_driver.c
+@@ -50,8 +50,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+ #include "micmap.h"
+ 
+ #include "xf86DDC.h"
+@@ -1556,7 +1554,6 @@ I128ScreenInit(SCREEN_INIT_ARGS_DECL)
+         return FALSE;
+     }
+     
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+ 
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-i128/xf86-video-i128-1.3.4.ebuild b/x11-drivers/xf86-video-i128/xf86-video-i128-1.3.4.ebuild
deleted file mode 100644
index 175ff42f46ce..000000000000
--- a/x11-drivers/xf86-video-i128/xf86-video-i128-1.3.4.ebuild
+++ /dev/null
@@ -1,21 +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-i128/xf86-video-i128-1.3.4.ebuild,v 1.4 2011/02/12 19:23:18 armin76 Exp $
-
-EAPI=3
-
-inherit xorg-2
-
-DESCRIPTION="Number 9 I128 video driver"
-
-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/videoproto
-	x11-proto/xextproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-i128/xf86-video-i128-1.3.6-r1.ebuild b/x11-drivers/xf86-video-i128/xf86-video-i128-1.3.6-r1.ebuild
new file mode 100644
index 000000000000..d35ff9f58750
--- /dev/null
+++ b/x11-drivers/xf86-video-i128/xf86-video-i128-1.3.6-r1.ebuild
@@ -0,0 +1,19 @@
+# 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-i128/xf86-video-i128-1.3.6-r1.ebuild,v 1.1 2013/03/12 16:36:02 chithanh Exp $
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="Number 9 I128 video driver"
+
+KEYWORDS="~amd64 ~ia64 ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-base/xorg-server-1.0.99"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-remove-mibstore_h.patch
+)