diff options
| author |   Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2013-03-11 15:43:07 +0000 |
|---|---|---|
| committer | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2013-03-11 15:43:07 +0000 |
| commit | e4b88ba647fa2e348702dee78882281a2fbe6738 (patch) | |
| tree | ed5f7d6f7546c3499537bfcd2bfacb9b6f717513 /x11-drivers/xf86-video-chips | |
| parent | sci-biology/kalign: Drop Andrey as maintainer so that bugs get assigned to sc... (diff) | |
| download | historical-e4b88ba647fa2e348702dee78882281a2fbe6738.tar.gz historical-e4b88ba647fa2e348702dee78882281a2fbe6738.tar.bz2 historical-e4b88ba647fa2e348702dee78882281a2fbe6738.zip | |
Fix building against xorg-server-1.14, bug #461236.
Package-Manager: portage-2.1.11.52/cvs/Linux x86_64
Diffstat (limited to 'x11-drivers/xf86-video-chips')
4 files changed, 67 insertions, 3 deletions
diff --git a/x11-drivers/xf86-video-chips/ChangeLog b/x11-drivers/xf86-video-chips/ChangeLog index a00547a0544b..3384a4e7b23e 100644 --- a/x11-drivers/xf86-video-chips/ChangeLog +++ b/x11-drivers/xf86-video-chips/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-drivers/xf86-video-chips -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-chips/ChangeLog,v 1.59 2012/12/28 11:10:46 ago Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-chips/ChangeLog,v 1.60 2013/03/11 15:43:03 chithanh Exp $ + +*xf86-video-chips-1.2.5-r1 (11 Mar 2013) + + 11 Mar 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + +files/xf86-video-chips-1.2.5-remove-mibstore_h.patch, + +xf86-video-chips-1.2.5-r1.ebuild: + Fix building against xorg-server-1.14, bug #461236. 28 Dec 2012; Agostino Sarubbo <ago@gentoo.org> xf86-video-chips-1.2.5.ebuild: Stable for ia64, wrt bug #440872 diff --git a/x11-drivers/xf86-video-chips/Manifest b/x11-drivers/xf86-video-chips/Manifest index c08ba75119d7..44ba237f1136 100644 --- a/x11-drivers/xf86-video-chips/Manifest +++ b/x11-drivers/xf86-video-chips/Manifest @@ -1,6 +1,8 @@ +AUX xf86-video-chips-1.2.5-remove-mibstore_h.patch 1067 SHA256 36165ebc70926ab5a8fe4331c5ce88c7f5f2e6979170b849ac1c2c99b3d1a804 SHA512 b2ef8a538fd5764d072a1310f80bd1f7f7886adf5ffcacf1f2dcc58b054e91ad88a9aad262e8c5494ee4d29471d0e771bd8792f4760680efa16f6d177a932f44 WHIRLPOOL 344b5cab3c77f181c844f3bb81b602f0ccaee4c57b7047b90feaf60ebba1be0acd16ad8e0372d41b239f5186bf59e2e504e781c0ed0266ff3149f15cd2886c5d DIST xf86-video-chips-1.2.4.tar.bz2 365618 SHA256 fb6dc34a8d7db82dc6d555cebe6f95c2269dda4872118978345f6e1215ab4d25 SHA512 e10e175caf280d158f94fcd10bc16c98b9df46eaaae58a524faca5c91248213ecb9ee0b630ec0c70d0faf3fcc710e6a3360aed212d1c824c82c32d1a077f91cb WHIRLPOOL 0339f4c1b4e26644c70d27fce72b5fac9d92f3e8eab35e53ee13c9309a2c661628f98d019f941132c5ed06a47ba1985fb610064813d926a48db335535eb8bef1 DIST xf86-video-chips-1.2.5.tar.bz2 398804 SHA256 8d3c744d035b3d769049647bb8022ec24500d31b1b224cd0ea4efe61f86bfed2 SHA512 3468d453fb3bc01b115d0a4a9f10bebe43b89c9cd997e2991d459a40a2f8a0e3ed2cb40bfcb2b80fae853af8c9ea6a94c82d73d16a27fe9612c8a1f2a6fbd3d4 WHIRLPOOL e776be36cc09cd43165d8798a1327bd7a35bd990fc76c320d550137b726601369bc8baa9d0deec649e6cd170eb04ab7b8570bb8d7483ff3a919d27a7ca277eb8 EBUILD xf86-video-chips-1.2.4.ebuild 365 SHA256 2d79359ded2564983766865113e122f6e5122e6d2ccc4260d297ac676fd8c758 SHA512 1bf3df4a09e9681b3298baff15a4cbc945a5f40e0bbe4a18f3578c39d5fdd696912304755f0dcca4f56f6e764f9f2aafcb8e83d786e89553d8179c4f9deb58cb WHIRLPOOL 1addb7bf591824423b7a2a859a954c43455203b516c5ef96cbb51ebbbc0972eeb12a31033384b8402aab8c2c44b1111ead2eb6bed7c1fbdd03b2ab7bd47dd053 +EBUILD xf86-video-chips-1.2.5-r1.ebuild 442 SHA256 9b2181131d75c4d3e9f7171317d7ff7fe36d147b6e94f9b9fddd97bf75d90ab9 SHA512 50faa9d552eaad6abd73bae6c158edf9a9660a8e11949d01a8dffee7824e4c794cdc19387125843a7162406a67bc8771b8415116ae10059295cf74251f5a1cb5 WHIRLPOOL 386fad43a65ff077eddf62741ddc2d9740506b98255fd007c8472dac16836a53d5d76be0352bf15d6a3bfd2366ff36d151cb06492c403ce8f86c2defefd475b6 EBUILD xf86-video-chips-1.2.5.ebuild 373 SHA256 709b13777f8ba3994e434ecf578ce397c6ba482ce5b35d8a54daf6aca4c4d0f3 SHA512 8e6cb80854a54cb27d8ba1f6e8e96055e23213ef75f9afa54e5bc4b3fdaad7a3aec719f8800af18ba2579adcf7570192f73cd6b80647e19a9bb335612ee237ad WHIRLPOOL 15685269b5bde63bd8a8545ff30b2bf707ca50868e7022644ff3c0e7a06234f037471dab1b21f531b75b5b6c3d561b81d93083351c14fb5d0b191fd3e39d56e1 -MISC ChangeLog 7626 SHA256 4477fcb6a51d3bb1fe3f2a84936e3c667e8d838a6e39ce3a57bbd2e15576b2ff SHA512 56da78af006bf351a9106315d43a513b968952b6fc8362d99bfb118aeb7c6df40546d2ab053b99f9096cd07d770db9a00a78af0964f70b322e8ab7148ca97121 WHIRLPOOL 9b91d8ce35aecb576f4e9293d175d4d439dbcb7103f76cf2c72b0815abaa15fb55dbe9ce30826f0257a1c2c598cb220f15947908567d9e1f053cc67cc9e7c264 +MISC ChangeLog 7891 SHA256 085465b6569dbdea2a3dd30c9e1129dfbaa959461af8a5f122caa3914a72cfb8 SHA512 d501dfdb62f1b6c1361b3a96f93e21ec2eec4a7e5f18d1048e880ccfa5fe820f0f6ba822948a303f3854f238d339c5d300bddddf40e2428c7d08960f22a492e7 WHIRLPOOL e8c1c4a3e257673ddd19fd4a97fee99d33475b755daef27681c0e0ddf0d957f10272a156dfe876409bca7904e8427b1653a55686207929f8d0416540060d72c0 MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93 diff --git a/x11-drivers/xf86-video-chips/files/xf86-video-chips-1.2.5-remove-mibstore_h.patch b/x11-drivers/xf86-video-chips/files/xf86-video-chips-1.2.5-remove-mibstore_h.patch new file mode 100644 index 000000000000..bfd94181e9f8 --- /dev/null +++ b/x11-drivers/xf86-video-chips/files/xf86-video-chips-1.2.5-remove-mibstore_h.patch @@ -0,0 +1,39 @@ +From 151a1ec855a9ada44907cb6bef06a71e9080504b Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Tue, 25 Sep 2012 12:54:34 +0000 +Subject: Remove mibstore.h + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- +diff --git a/src/ct_driver.c b/src/ct_driver.c +index 6f3a5d4..effbc60 100644 +--- a/src/ct_driver.c ++++ b/src/ct_driver.c +@@ -96,9 +96,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 banking wrapper need this */ + #ifdef HAVE_ISA + #include "mibank.h" +@@ -4145,7 +4142,6 @@ CHIPSScreenInit(SCREEN_INIT_ARGS_DECL) + pBankInfo = NULL; + return FALSE; + } +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + + /* Initialise cursor functions */ +@@ -4296,7 +4292,6 @@ CHIPSScreenInit(SCREEN_INIT_ARGS_DECL) + } + } + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + #ifdef ENABLE_SILKEN_MOUSE + xf86SetSilkenMouse(pScreen); +-- +cgit v0.9.0.2-2-gbebe diff --git a/x11-drivers/xf86-video-chips/xf86-video-chips-1.2.5-r1.ebuild b/x11-drivers/xf86-video-chips/xf86-video-chips-1.2.5-r1.ebuild new file mode 100644 index 000000000000..3b1704d17b14 --- /dev/null +++ b/x11-drivers/xf86-video-chips/xf86-video-chips-1.2.5-r1.ebuild @@ -0,0 +1,16 @@ +# 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-chips/xf86-video-chips-1.2.5-r1.ebuild,v 1.1 2013/03/11 15:43:03 chithanh Exp $ + +EAPI=5 + +inherit xorg-2 + +DESCRIPTION="Chips and Technologies video driver" + +KEYWORDS="~amd64 ~ia64 ~ppc ~x86 ~amd64-fbsd ~x86-fbsd" +IUSE="" + +PATCHES=( + "${FILESDIR}"/${P}-remove-mibstore_h.patch +) |