Fix building against xorg-server-1.14

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

5 files changed, 67 insertions, 6 deletions

diff --git a/x11-drivers/xf86-video-rendition/ChangeLog b/x11-drivers/xf86-video-rendition/ChangeLog
index 6455fe7d3053..0ad444f95431 100644
--- a/x11-drivers/xf86-video-rendition/ChangeLog
+++ b/x11-drivers/xf86-video-rendition/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/xf86-video-rendition
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-rendition/ChangeLog,v 1.61 2012/12/30 14:49:41 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-rendition/ChangeLog,v 1.62 2013/03/12 16:36:45 chithanh Exp $
+
+*xf86-video-rendition-4.2.5-r1 (12 Mar 2013)
+
+  12 Mar 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/xf86-video-rendition-4.2.5-remove-mibstore_h.patch,
+  +xf86-video-rendition-4.2.5-r1.ebuild, xf86-video-rendition-4.2.5.ebuild:
+  Fix building against xorg-server-1.14
 
   30 Dec 2012; Agostino Sarubbo <ago@gentoo.org>
   xf86-video-rendition-4.2.5.ebuild:
diff --git a/x11-drivers/xf86-video-rendition/Manifest b/x11-drivers/xf86-video-rendition/Manifest
index d420f73f6fd4..d8ea1fa391cd 100644
--- a/x11-drivers/xf86-video-rendition/Manifest
+++ b/x11-drivers/xf86-video-rendition/Manifest
@@ -1,6 +1,8 @@
+AUX xf86-video-rendition-4.2.5-remove-mibstore_h.patch 1076 SHA256 93a59e9deed98af201c8bb231fdf3214fcd02dae8ef2f880b044b4fd100cdb4c SHA512 f05cfc55def69453152d2f45d50cadb5641601cd7f7f8a197482a7ea6cfbec271c5872cdfff3fc3c9dea9a878990a4a943685c383095d925e17641a3c4a2acba WHIRLPOOL d34c8d58cb685ba40f145f379b7c2859c5d06373a1fab0e5281cdc32cd9e8d96e64816388e72f9fe36a6e807ab42a622862515dd7d8fff3827ad76336111e685
 DIST xf86-video-rendition-4.2.4.tar.bz2 320573 SHA256 3b9b8e6709c3a7c00904e9a6cb63d7805b5f5f33dc96254f438c1f8d5fb72aa9
 DIST xf86-video-rendition-4.2.5.tar.bz2 356351 SHA256 39b5569338237de6e17b2a2c6be73ac6c405ee596079c41a7028cfd6e54134cb SHA512 203529e2a9c917362ac7c9b4247a9a0a4a7e1911bd022a26b00f467ec4cfd9ce742465aba29618cbfaa5ac5ff0b43e5a54f651e45e81aa950776685e4f74ba72 WHIRLPOOL f617c3ea75537fab46f1d7aaf11d7d0b2291d341a57cf15ca3e992abfa1ab280c5354b04f2cd3791d46a9e8e67c09345d02b3a039e864d6eff8ab99efeac79c0
 EBUILD xf86-video-rendition-4.2.4.ebuild 527 SHA256 950a2bc600c08eface630df126347fad086ec5df27283a420218a9840d2408bf SHA512 5dde0061d4fedc4eba9f1091794e01cfcc181bc57002611484fdcbae126c9ec8226da0e0b480d5b36ececcd7f134b419579855c9ecc492c070fa008579e9253d WHIRLPOOL 8849b4db3b5aeac52390ee471f2b29dd9e8a01c078ff7e63dc2b25d11667d7d2697347228d0a28043f8d18563494a73aff575885c8c65e9b4dbff7519b8e31dc
-EBUILD xf86-video-rendition-4.2.5.ebuild 429 SHA256 ddeeb855c01c81df0ad6021e60b9de21e9d7701c931bdb9f12dcc56690dbbf50 SHA512 4f16962f222ac4b4be1fd3ec956244c8bc832092ca53c915e59a9e64b580e062849784c30253ead49163a7b28bfc670bbe13e1ac0c7b16c5f990034143e1d2ca WHIRLPOOL e25a9da78ef9738525cc6a45ab413bea58353be0c2a7e06279673dc1bd269b88b5b1a42e3d89be37cbd86f5bfdfaf5662cc7da07a3e499a6bcc2646799161126
-MISC ChangeLog 8857 SHA256 1f6f700a8ade2c3ed9e3cbcf74238544b8255fc143d403c4179d996182a51066 SHA512 f10002a690366c6a8e78892cf5308af1bb302f9b3681044d0500b07596d5fdc36be75fa5a9d3d21352bac21a8dfcd6fec8b625bc4b516a2ac86e78173cffb9e0 WHIRLPOOL 24179a1a2915a8a79ada4c335b25cf90a5e5fd7eb0ae413cfeaaf585c396baa2953452adafacc83dd97fd9791b29cbfedaea56ccd2c1cd74561f077f9ab4d1af
+EBUILD xf86-video-rendition-4.2.5-r1.ebuild 498 SHA256 19e605c3c252ba6f12be1e3aaca8855aceee4ec6f98be167195b82e31a2936cf SHA512 2e307c128fc3d904b57b6dfa314c86ac9e6f511fce7ec4e4dd5914a462f2d8338384e64d08f879ad903d193c7b5892fc874c049eb239d9a80d965771cf1eb47b WHIRLPOOL b0dcd220fb407686ac9ae4b90ffd9d064627f98a2e5f21b0cfaba778d4e78d1a63267557549cdde44b26af66244a97f2bf9420d22f6ccf6f4336835ef1b32b3e
+EBUILD xf86-video-rendition-4.2.5.ebuild 434 SHA256 9eea8f2173b9c99e455c165ff93ed49a10b13740962b9503f393cc243f54d275 SHA512 981b522669ed920ef66008a517f671ac041c0492970e1f1fe370e3aaf264f3832cb0631b3360de41f4e7344b92766332631675722c99c7e459d5628ae78244d6 WHIRLPOOL 8e1ab3ca58c22e7a84c840ef16229bcb59aac008e46fc5868bac503fb3bfa8de02a8bb44ca3a3f5621a5d85c12d6ad397ce7a101ce49a6ab48d23f4dc6dee0e3
+MISC ChangeLog 9155 SHA256 7c1ec733d9a51274fc51e1cf95d3dcb57ea97f1ee1141e92ace2e376bb1b20cb SHA512 b8f681eba0ff65fcf45fa21f0e2180c7c51380be9075890e1e9024ecc2682a6290ac829d618cc86a8e296e031094761d7d55a24aa9f961662a896e65d0aff04a WHIRLPOOL 3f815325dd4410c5b7a90cd0125478a07fa5a42413c91ff9b4afec8bf5db1961c4e19ff61497c97f10169a37d5f3b3823ccef23b0bc1aadd01190635e1a0c9e3
 MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93
diff --git a/x11-drivers/xf86-video-rendition/files/xf86-video-rendition-4.2.5-remove-mibstore_h.patch b/x11-drivers/xf86-video-rendition/files/xf86-video-rendition-4.2.5-remove-mibstore_h.patch
new file mode 100644
index 000000000000..77c4d34dea0a
--- /dev/null
+++ b/x11-drivers/xf86-video-rendition/files/xf86-video-rendition-4.2.5-remove-mibstore_h.patch
@@ -0,0 +1,35 @@
+From 3a3ee1c45e54a808947cc26ca11f0a5299571053 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 25 Sep 2012 12:54:50 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/rendition.c b/src/rendition.c
+index 7c74f76..888bb4a 100644
+--- a/src/rendition.c
++++ b/src/rendition.c
+@@ -1173,7 +1173,6 @@ renditionScreenInit(SCREEN_INIT_ARGS_DECL)
+     fbPictureInit (pScreen, 0, 0);
+ 
+     xf86SetBlackWhitePixels(pScreen);
+-    miInitializeBackingStore(pScreen);
+    
+     /*********************************************************/
+     /* The actual setup of the driver-specific code          */
+diff --git a/src/rendition.h b/src/rendition.h
+index f7f13d4..297117e 100644
+--- a/src/rendition.h
++++ b/src/rendition.h
+@@ -28,9 +28,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+ /* All drivers using the mi colormap manipulation need this */
+ #include "micmap.h"
+ 
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-rendition/xf86-video-rendition-4.2.5-r1.ebuild b/x11-drivers/xf86-video-rendition/xf86-video-rendition-4.2.5-r1.ebuild
new file mode 100644
index 000000000000..3c9df5c1101a
--- /dev/null
+++ b/x11-drivers/xf86-video-rendition/xf86-video-rendition-4.2.5-r1.ebuild
@@ -0,0 +1,17 @@
+# 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-rendition/xf86-video-rendition-4.2.5-r1.ebuild,v 1.1 2013/03/12 16:36:45 chithanh Exp $
+
+EAPI=5
+inherit xorg-2
+
+DESCRIPTION="Rendition video driver"
+KEYWORDS="~alpha ~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
+)
diff --git a/x11-drivers/xf86-video-rendition/xf86-video-rendition-4.2.5.ebuild b/x11-drivers/xf86-video-rendition/xf86-video-rendition-4.2.5.ebuild
index 737155668c8e..835bcb7f8994 100644
--- a/x11-drivers/xf86-video-rendition/xf86-video-rendition-4.2.5.ebuild
+++ b/x11-drivers/xf86-video-rendition/xf86-video-rendition-4.2.5.ebuild
@@ -1,6 +1,6 @@
-# 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-rendition/xf86-video-rendition-4.2.5.ebuild,v 1.6 2012/12/30 14:49:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-rendition/xf86-video-rendition-4.2.5.ebuild,v 1.7 2013/03/12 16:36:45 chithanh Exp $
 
 EAPI=4
 inherit xorg-2