diff options
69 files changed, 884 insertions, 879 deletions
diff --git a/x11-drivers/xf86-video-apm/ChangeLog b/x11-drivers/xf86-video-apm/ChangeLog index 9735110b5a8f..48e983c78b63 100644 --- a/x11-drivers/xf86-video-apm/ChangeLog +++ b/x11-drivers/xf86-video-apm/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-drivers/xf86-video-apm -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-apm/ChangeLog,v 1.50 2012/12/28 11:08:01 ago Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-apm/ChangeLog,v 1.51 2013/03/12 16:35:17 chithanh Exp $ + +*xf86-video-apm-1.2.5-r1 (12 Mar 2013) + + 12 Mar 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + +files/xf86-video-apm-1.2.5-remove-mibstore_h.patch, + +xf86-video-apm-1.2.5-r1.ebuild, -xf86-video-apm-1.2.3.ebuild: + Fix building against xorg-server-1.14 28 Dec 2012; Agostino Sarubbo <ago@gentoo.org> xf86-video-apm-1.2.5.ebuild: Stable for ia64, wrt bug #440872 diff --git a/x11-drivers/xf86-video-apm/Manifest b/x11-drivers/xf86-video-apm/Manifest index 45493dd5a875..d51aaacd4abd 100644 --- a/x11-drivers/xf86-video-apm/Manifest +++ b/x11-drivers/xf86-video-apm/Manifest @@ -1,8 +1,8 @@ -DIST xf86-video-apm-1.2.3.tar.bz2 295470 SHA256 4046ea18dbd76a9df5f68695025c2c411c20564af9198974506a041ebd4a30da +AUX xf86-video-apm-1.2.5-remove-mibstore_h.patch 581 SHA256 be06cce5eb0b8eb070321e293f5cd9b7aa947d920d23cc962f7121191ba4180b SHA512 f27a8f9f3206de54ce9f05596d78829832e7576b5d515d22b0052e39c70fef63e85f016c2c1dfad45aa6d09cb59582d101854552fc44970275f1b38688924d52 WHIRLPOOL 298a849ee9c16d27a8fccd3d0577f3a72a7d36c9480d8cf0b10a6a575877bc4f09020efe32b74cf27ab7106a02cc20f6b069b902e7124cb9fdc844bd37c90f92 DIST xf86-video-apm-1.2.4.tar.bz2 325979 SHA256 ae65982961fe884728497db9b805123d486d2aade2ba8e7bba9a3ee9dccf4302 SHA512 4b98614d8f2889d5330b50cb211f8b1f03ac9be30d531b7c14b117fa144b8a279b2f892370e19380a898711d95a6bfc11a116955c1caed65981798e3199211f1 WHIRLPOOL 07f2d1b17e8e63f6e34c4d8d335951552380649339df6d3fb87cb6b46bde3170312fce0498baccec5f2fea5b635693731c83f983186c3e3967a548176ff743e7 DIST xf86-video-apm-1.2.5.tar.bz2 325277 SHA256 953b04320117b14c5b7efb37de45cef45592409f639c2aa87b7e2d77dc8d3d0f SHA512 652307d5e21fcd0df890b941821f409cc0c9846133cf7e522799710d28ebf0d8ff2d8ead3235d8207169f416a6561bc14b4fedb1baaddb1bddf03007372af622 WHIRLPOOL 04f34982d8483eaf8a9b8fa8d92593635f6a1abe78ba904cf3ad88a605c03fd0283bc42c6f42c1c8e6c0d70298a0c98b3cde3fc16bda70e32c3fc2cde979223a -EBUILD xf86-video-apm-1.2.3.ebuild 567 SHA256 a27a6faf777df3ddea78ef268399d05dc468aac9acb7b0da4c988ffe5919ee20 SHA512 bb6e6987ab6bcc9fee70d49345e9900cb2f976dbeef48f300b61aa34be0d95c40746ffb36771f48a84643da67848fa7bb3dd754002430e7b4d3b89d771646217 WHIRLPOOL f038c8c6704d72a5773fb6470f83d49da8cddb072ac210a5b9a9ac40127f2cc6f300a46d353c79835d08ad75c8c5fd56952e2e305fb8adbd1bd11b60c71faac8 EBUILD xf86-video-apm-1.2.4.ebuild 426 SHA256 f756cf24c3c7c703d1252879616aa8f71fc113329d3386edd9d275472b72ad0f SHA512 778e084c2fe17124e440aa1c3d9e2784db91a02eaa290dff4bb97c9d5a4792e42243bc0e4bb341af5250a440b4a7dee76fc3e6595f2c76c3ea138ce70bfce624 WHIRLPOOL 64f182153d4ad61d8f66c687922959a288f5bc397ca97772c8c8e93ac2d52e24ad26afc3ba1babf1f56ea7198ca3fa22f7f9b6c7abc759160cb623c9622d095d +EBUILD xf86-video-apm-1.2.5-r1.ebuild 490 SHA256 e9da3163d474590962edd20c40425210182c24e9571effcd906a0b9e30832844 SHA512 8dbffd2d7273f9cf0202989c05f57bc9f01100ed746c9663ac261618d0e84f3165db308ae2a497a6f1a5c96b4f8d49f38518fed59b3d76363ef8d699eaac010f WHIRLPOOL 64f201dba0053e5d00b6fb675e66d00572fdee64297fe52cd760a078981cb8ba6774d8cc9036f5413f1fbb59231b8c769958367a6bf5c19bdcce53f15f299673 EBUILD xf86-video-apm-1.2.5.ebuild 422 SHA256 f329cbdfb95ec174ce847872b0dc14bf9614c2de8e102a33778ac7d4e3a61206 SHA512 b74c62c20e3e8ef97d89ccae0fd37cf8e385583fceeffcb29e3bdb710e53955ce7f283bd618c92c7079872d5088e314a06f8f561d4b853d8f150d6dce128402f WHIRLPOOL f20690dea0ab1307a280e49f9360d32913b5b343c716536cf6fd4c3ecd238d5b450c4154bcad65f69d15ce80f7ab0d3a838545878720f9b4f2d058c39972529a -MISC ChangeLog 6528 SHA256 a5a5f470e0f0d690a223b26f9d21792f0870915dd1db404e905d7869fe25aaf6 SHA512 0d02c281797a654de10834fc8cc544c0b10d29901215bb7ada36a78dacc1c0d0fa39c43c8a69b3f3df9105766771ce5b0931df1d815451ee5aa0325f2995ce2e WHIRLPOOL 586fba59c86b7200d8f85801753433d91cbe0c2aeb4a79c146a85bb6a929a4166c010057e27bee98577fc99a24039d2d77099541e80ee0515fda1bbbc58fc94b +MISC ChangeLog 6803 SHA256 774d980f8be3273df392ff94281fd57fc10f0e96c35f4202a179530fa4a476b3 SHA512 e85a2a8bc71207ffbce75717d6f013378229d6a98e26b55d68594f1eb0fdfc22ecb22ab29f75ccb1658d1fb250865442d64037802f85e07345cdcae02679e2fe WHIRLPOOL 8b73dad30045f7ae3aa6fb122ab6e93422ae3faaf0a0936324d8ef59ee011f4f71795172eee3078cfdf5c73da60a5a4a407346079ad96d4752cb0c8ef2f5e2a9 MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93 diff --git a/x11-drivers/xf86-video-apm/files/xf86-video-apm-1.2.5-remove-mibstore_h.patch b/x11-drivers/xf86-video-apm/files/xf86-video-apm-1.2.5-remove-mibstore_h.patch new file mode 100644 index 000000000000..e48d2c42d832 --- /dev/null +++ b/x11-drivers/xf86-video-apm/files/xf86-video-apm-1.2.5-remove-mibstore_h.patch @@ -0,0 +1,23 @@ +From 9f67408e4f078e907fbf4feb45cfdcfd0cdebcca Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Thu, 10 Jan 2013 03:03:29 +0000 +Subject: Remove #include "mibstore.h" + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- +diff --git a/src/apm.h b/src/apm.h +index a3c06f8..365e5e2 100644 +--- a/src/apm.h ++++ b/src/apm.h +@@ -33,9 +33,6 @@ + /* All drivers initialising the SW cursor need this */ + #include "mipointer.h" + +-/* All drivers implementing backing store need this */ +-#include "mibstore.h" +- + /* I2C support */ + #include "xf86i2c.h" + +-- +cgit v0.9.0.2-2-gbebe diff --git a/x11-drivers/xf86-video-apm/xf86-video-apm-1.2.3.ebuild b/x11-drivers/xf86-video-apm/xf86-video-apm-1.2.3.ebuild deleted file mode 100644 index 86041ce97818..000000000000 --- a/x11-drivers/xf86-video-apm/xf86-video-apm-1.2.3.ebuild +++ /dev/null @@ -1,22 +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-apm/xf86-video-apm-1.2.3.ebuild,v 1.4 2011/02/12 19:00:24 armin76 Exp $ - -EAPI=3 - -inherit xorg-2 - -DESCRIPTION="Alliance ProMotion video driver" - -KEYWORDS="amd64 ia64 x86 ~x86-fbsd" -IUSE="" - -RDEPEND=">=x11-base/xorg-server-1.0.99" -DEPEND="${RDEPEND} - x11-proto/fontsproto - x11-proto/videoproto - x11-proto/xextproto - x11-proto/xf86rushproto - x11-proto/randrproto - x11-proto/renderproto - x11-proto/xproto" diff --git a/x11-drivers/xf86-video-apm/xf86-video-apm-1.2.5-r1.ebuild b/x11-drivers/xf86-video-apm/xf86-video-apm-1.2.5-r1.ebuild new file mode 100644 index 000000000000..c5cbf306738d --- /dev/null +++ b/x11-drivers/xf86-video-apm/xf86-video-apm-1.2.5-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-apm/xf86-video-apm-1.2.5-r1.ebuild,v 1.1 2013/03/12 16:35:17 chithanh Exp $ + +EAPI=5 + +inherit xorg-2 + +DESCRIPTION="Alliance ProMotion 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 +) diff --git a/x11-drivers/xf86-video-ast/ChangeLog b/x11-drivers/xf86-video-ast/ChangeLog index a131c88b2847..c84f4ee3b008 100644 --- a/x11-drivers/xf86-video-ast/ChangeLog +++ b/x11-drivers/xf86-video-ast/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for x11-drivers/xf86-video-ast -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ast/ChangeLog,v 1.28 2012/11/18 12:12:51 ago Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ast/ChangeLog,v 1.29 2013/03/12 16:35:30 chithanh Exp $ + +*xf86-video-ast-0.97.0-r1 (12 Mar 2013) + + 12 Mar 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + +files/xf86-video-ast-0.97.0-remove-mibstore_h.patch, + +xf86-video-ast-0.97.0-r1.ebuild, -xf86-video-ast-0.93.10.ebuild, + -xf86-video-ast-0.95.0.ebuild: + Fix building against xorg-server-1.14 18 Nov 2012; Agostino Sarubbo <ago@gentoo.org> xf86-video-ast-0.97.0.ebuild: Stable for x86, wrt bug #440872 diff --git a/x11-drivers/xf86-video-ast/Manifest b/x11-drivers/xf86-video-ast/Manifest index c7d1c4a0158d..222c8e388ff6 100644 --- a/x11-drivers/xf86-video-ast/Manifest +++ b/x11-drivers/xf86-video-ast/Manifest @@ -1,10 +1,8 @@ -DIST xf86-video-ast-0.93.10.tar.bz2 316783 SHA256 c9d466fef391bdf960f79b82f1f776a1c1ab870e93475c3d1b3d028531fac4e0 -DIST xf86-video-ast-0.95.0.tar.bz2 330114 SHA256 eb5cbeceb887241534394d040856fee80cba6dd561f8dca921105c5b69fde973 +AUX xf86-video-ast-0.97.0-remove-mibstore_h.patch 2544 SHA256 f28cb96f3de6089880b7e04572f6fa6d6cfa149718569bfc2389090677af5e7c SHA512 5d7af51fa6939c062d0e5e21938a9df79c06e79bba7b7940d2dacc56c40c78819390004b704a30e21cd054a2590ae21274645e53ffbc2d0340f0a8e5b7aad5de WHIRLPOOL 6ad70a448cc5a3a60e2add691f79fa07a601ebc2a19b5aa1ae5587b77cba3f3382a0ca40f67279a94ee1282a3cd536e84c91dda3f80618a8e5bdf946367e16fe DIST xf86-video-ast-0.96.0.tar.bz2 329319 SHA256 73ac2bc3999add5a77c9d5d38d3651d5e50ab7bbac81d710912ab3125fc1ab3c SHA512 f9bca5d72e9eee8a394c3a803121f0c4650134f8bd2ad8cbe51f041848a350d4e6f65462ced4c174d966d06e587ff900991b1204610565f972eae89a61d0ad08 WHIRLPOOL 56bf23a29cb2c1adcd348216ec8a08c96ff7b2dfcf8bab44d2188a9d8f54d4a3228dc2d32e7e595140166d761bdd1a7087ba48fd2a23eb363048824e27b097cb DIST xf86-video-ast-0.97.0.tar.bz2 336424 SHA256 28fcd4781676485293f6dcd46e0797866f6219e22e1851c9796b037589998e76 SHA512 7eadb06c0159d460977b6e99183e6f1c4673f18b26072d9c28fc38518522fe9adade89531a42d83e277d545a3f157c37c6600b0330bb90327c1a17b5698fa22d WHIRLPOOL 4071241b698f88abb88b932aee7ad9743c967fb9ba0f19cba2fa8671543fb27beeae5747e7b0126810027bbcd766f3528bd74179faaa149a002180929e534d59 -EBUILD xf86-video-ast-0.93.10.ebuild 367 SHA256 1e7609bf99eb4698755599648fbba859305e6dcb465774e91126a4cb550f2e47 SHA512 8211d137e39157ad25c8eca21420e5f4c4351788658dddd22701f7dc2591fb6802c7e80fadd59669722381409d62a0bb39dc00e0144f12b2745bbb831175f04a WHIRLPOOL 1edbeec423f6c18dc663b996bd128fd766312a783b50c6b5bf9e2a31ef52ca0058d1510180d2f1e23c5ecf1678115329eab42b92727b466c17db3cf1c339d34a -EBUILD xf86-video-ast-0.95.0.ebuild 372 SHA256 649247a7cf387543bc3250babaa60d20145439e4df94951c77d773cfd7fd4bba SHA512 ed3eaadddca43ba5f5051564ab67a14b77d07c33f8fa4f0cadedebb1fdb75ad35e7e5c65a34d81eb29b0278b83b0b17117d7a83df299b465ff04c381198d9dec WHIRLPOOL d5c56f964929fef9b2cd562c97c4df3b932257ec2f4bd08d1c72b9a0363751f68636353843f6f7c7ae742f2e2d47d46bacf3e0ffb363e80546d5d2f7a6b8d0fd EBUILD xf86-video-ast-0.96.0.ebuild 379 SHA256 955efacaee0b1c25b1e8606fbabdaef4ad82cc9f2866cadaa3358b6c6d808d39 SHA512 ec76924c6af84a5cd8b6591f4308217828563fc5da4aef3655efcd8c722cbbb686b8cb01af8ff03050938453fcbd6e36b5ae7573525813e315f5e07fbea931ba WHIRLPOOL e8ada11450a3e360b255b765e002b3584004957fc83c310f31d02db34433bc92992677b535cba6fecba2a12c912e741ca5baf7ff132b31049cb4e1b079d63c66 +EBUILD xf86-video-ast-0.97.0-r1.ebuild 439 SHA256 3bb04d9ac2cb41c5cea7b31b20fe95e3b7a065fa381fc181e3c60b1adf73b7af SHA512 0a8d41f93d9b4babd5cca8d4903b3e2cd0205f7517172bc050f04daa3d7fe4dc8f6dc13a8c6d0fd67022bac8589b31913da2626debfa2098c520cc50cc491d22 WHIRLPOOL a7cf3a44e76e28eadceb59d5706a286f07b25d66ad943af62e00b5403e98053ec3680e4bfbb8ccb26647cec7d29108551cd798ac5ab786faa2600a734e354140 EBUILD xf86-video-ast-0.97.0.ebuild 372 SHA256 4abf9b8251eaa17e86d3f9f60aed2bd0c52cc934b39f28f3853ef15217818f61 SHA512 450cb2edbeb3a76bae3b4893679c5db8c85b6b48d42cc69c149dacdd0fb6a2fde28f8e7d1845640b91dfed1d2f6dd3bf92c9b4fa114fb71ed23002da22f7b8c9 WHIRLPOOL a21f7fd082c549053f70db2dc969c278e36ac09637b26bae95a197c7049eb1e56ba662c6384e0852c7626af524a802b311705316c97a8b4bdb9578a81dd20d1c -MISC ChangeLog 3981 SHA256 b64d8b82d7a74c75fa9c67f2faf274795a6b2e3032b022f21c672ad0e07568e9 SHA512 c4fe6cf052cfaf55659453ad4546ccae917b16231563c97aef6694ffeecdb44590a5a7c62a1f2d98d2638031923860e2ee0766a35613803f220dc325815aa04a WHIRLPOOL 360170fa362a0d2594dc668ab763749c0f75aaa6583a7316d73442ef1150d7f7b802f689f0bd3048a8af5d5a35151f5de95ddeda88c691471731cd64313a6203 +MISC ChangeLog 4294 SHA256 d985ac5085e4c2cc3b5434945737baa96e42b3b1a0f8316976b6cb1c3947d98c SHA512 a0dcac6ccf6a739c0e9b9fd4ac13e9fa34782a4959263791e42e5e6c67dcff21417fed09f6193aefd7ee177a1387a605f98d530dd0037cc8cc101ae41ed6de5f WHIRLPOOL b84063b29277489adcd936d7907d2b7088bc83873cc42854fa94cbf92b01fc09f3fe1d61df80b152f5cf0e63c38c4a49c850aa02a74811a4d3ac45e4ae4fdde8 MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93 diff --git a/x11-drivers/xf86-video-ast/files/xf86-video-ast-0.97.0-remove-mibstore_h.patch b/x11-drivers/xf86-video-ast/files/xf86-video-ast-0.97.0-remove-mibstore_h.patch new file mode 100644 index 000000000000..006daaa13530 --- /dev/null +++ b/x11-drivers/xf86-video-ast/files/xf86-video-ast-0.97.0-remove-mibstore_h.patch @@ -0,0 +1,101 @@ +From 0833e0086b9712b1c29571919899d5d17fea8382 Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Tue, 25 Sep 2012 12:54:33 +0000 +Subject: Remove mibstore.h + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- +diff --git a/src/ast_2dtool.c b/src/ast_2dtool.c +index 6be9a4f..684e400 100644 +--- a/src/ast_2dtool.c ++++ b/src/ast_2dtool.c +@@ -27,7 +27,6 @@ + #include "xf86_OSproc.h" + #include "xf86cmap.h" + #include "compiler.h" +-#include "mibstore.h" + #include "vgaHW.h" + #include "mipointer.h" + #include "micmap.h" +diff --git a/src/ast_accel.c b/src/ast_accel.c +index a789b21..0e7e5d3 100644 +--- a/src/ast_accel.c ++++ b/src/ast_accel.c +@@ -27,7 +27,6 @@ + #include "xf86_OSproc.h" + #include "xf86cmap.h" + #include "compiler.h" +-#include "mibstore.h" + #include "vgaHW.h" + #include "mipointer.h" + #include "micmap.h" +diff --git a/src/ast_cursor.c b/src/ast_cursor.c +index 47ea09d..c672564 100644 +--- a/src/ast_cursor.c ++++ b/src/ast_cursor.c +@@ -27,7 +27,6 @@ + #include "xf86_OSproc.h" + #include "xf86cmap.h" + #include "compiler.h" +-#include "mibstore.h" + #include "vgaHW.h" + #include "mipointer.h" + #include "micmap.h" +diff --git a/src/ast_driver.c b/src/ast_driver.c +index 5e6a26e..43fcdbc 100644 +--- a/src/ast_driver.c ++++ b/src/ast_driver.c +@@ -31,7 +31,6 @@ + #endif + #include "xf86cmap.h" + #include "compiler.h" +-#include "mibstore.h" + #include "vgaHW.h" + #include "mipointer.h" + #include "micmap.h" +@@ -888,7 +887,6 @@ ASTScreenInit(SCREEN_INIT_ARGS_DECL) + } + #endif /* end of Accel_2D */ + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + xf86SetSilkenMouse(pScreen); + +diff --git a/src/ast_mode.c b/src/ast_mode.c +index 50289f1..2e06062 100644 +--- a/src/ast_mode.c ++++ b/src/ast_mode.c +@@ -27,7 +27,6 @@ + #include "xf86_OSproc.h" + #include "xf86cmap.h" + #include "compiler.h" +-#include "mibstore.h" + #include "vgaHW.h" + #include "mipointer.h" + #include "micmap.h" +diff --git a/src/ast_tool.c b/src/ast_tool.c +index c701c1e..c2bfac6 100644 +--- a/src/ast_tool.c ++++ b/src/ast_tool.c +@@ -27,7 +27,6 @@ + #include "xf86_OSproc.h" + #include "xf86cmap.h" + #include "compiler.h" +-#include "mibstore.h" + #include "vgaHW.h" + #include "mipointer.h" + #include "micmap.h" +diff --git a/src/ast_vgatool.c b/src/ast_vgatool.c +index 42de52c..513cf7b 100644 +--- a/src/ast_vgatool.c ++++ b/src/ast_vgatool.c +@@ -27,7 +27,6 @@ + #include "xf86_OSproc.h" + #include "xf86cmap.h" + #include "compiler.h" +-#include "mibstore.h" + #include "vgaHW.h" + #include "mipointer.h" + #include "micmap.h" +-- +cgit v0.9.0.2-2-gbebe diff --git a/x11-drivers/xf86-video-ast/xf86-video-ast-0.93.10.ebuild b/x11-drivers/xf86-video-ast/xf86-video-ast-0.93.10.ebuild deleted file mode 100644 index eb1eb59bf5ad..000000000000 --- a/x11-drivers/xf86-video-ast/xf86-video-ast-0.93.10.ebuild +++ /dev/null @@ -1,12 +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-ast/xf86-video-ast-0.93.10.ebuild,v 1.2 2012/04/29 13:00:29 scarabeus Exp $ - -EAPI=4 - -inherit xorg-2 - -DESCRIPTION="X.Org driver for ASpeedTech cards" -KEYWORDS="amd64 x86 ~x86-fbsd" -LICENSE="MIT" -IUSE="" diff --git a/x11-drivers/xf86-video-ast/xf86-video-ast-0.95.0.ebuild b/x11-drivers/xf86-video-ast/xf86-video-ast-0.95.0.ebuild deleted file mode 100644 index d27daa98a492..000000000000 --- a/x11-drivers/xf86-video-ast/xf86-video-ast-0.95.0.ebuild +++ /dev/null @@ -1,12 +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-ast/xf86-video-ast-0.95.0.ebuild,v 1.4 2012/06/24 19:04:21 ago Exp $ - -EAPI=4 - -inherit xorg-2 - -DESCRIPTION="X.Org driver for ASpeedTech cards" -KEYWORDS="amd64 x86 ~amd64-fbsd ~x86-fbsd" -LICENSE="MIT" -IUSE="" diff --git a/x11-drivers/xf86-video-ast/xf86-video-ast-0.97.0-r1.ebuild b/x11-drivers/xf86-video-ast/xf86-video-ast-0.97.0-r1.ebuild new file mode 100644 index 000000000000..63326d652045 --- /dev/null +++ b/x11-drivers/xf86-video-ast/xf86-video-ast-0.97.0-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-ast/xf86-video-ast-0.97.0-r1.ebuild,v 1.1 2013/03/12 16:35:30 chithanh Exp $ + +EAPI=5 + +inherit xorg-2 + +DESCRIPTION="X.Org driver for ASpeedTech cards" +KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd" +LICENSE="MIT" +IUSE="" + +PATCHES=( + "${FILESDIR}"/${P}-remove-mibstore_h.patch +) diff --git a/x11-drivers/xf86-video-glint/ChangeLog b/x11-drivers/xf86-video-glint/ChangeLog index 3c3610f637da..101bebec1a76 100644 --- a/x11-drivers/xf86-video-glint/ChangeLog +++ b/x11-drivers/xf86-video-glint/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for x11-drivers/xf86-video-glint -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-glint/ChangeLog,v 1.69 2012/12/30 14:47:39 ago Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-glint/ChangeLog,v 1.70 2013/03/12 16:35:47 chithanh Exp $ + +*xf86-video-glint-1.2.8-r1 (12 Mar 2013) + + 12 Mar 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + +files/xf86-video-glint-1.2.8-remove-mibstore_h.patch, + +xf86-video-glint-1.2.8-r1.ebuild, -xf86-video-glint-1.2.5.ebuild, + -xf86-video-glint-1.2.6.ebuild, xf86-video-glint-1.2.8.ebuild: + Fix building against xorg-server-1.14 30 Dec 2012; Agostino Sarubbo <ago@gentoo.org> xf86-video-glint-1.2.8.ebuild: Stable for alpha, wrt bug #440872 diff --git a/x11-drivers/xf86-video-glint/Manifest b/x11-drivers/xf86-video-glint/Manifest index 320fa89429d6..2c409f3c2bb4 100644 --- a/x11-drivers/xf86-video-glint/Manifest +++ b/x11-drivers/xf86-video-glint/Manifest @@ -1,10 +1,8 @@ -DIST xf86-video-glint-1.2.5.tar.bz2 394136 SHA256 5675f2732ab7b099a568ef4e5c7bb0d0e1bb4b0eb4d19133dc1b2225fd9c814b SHA512 b4d3cead954f71482c18afcf2c1f7c02801dc955ae7503cb3bd1055319b97b0261657f5f5298757884871f5d563c2e020ae62de6bbbbce59e359f79379c4ced1 WHIRLPOOL 5c1ea7ac76ef0aaecd80437153a9032784fa3c74d6838120860de903fc213432326fddef84588c527330eb0266cd4e2bac49dd76c62dd4208693f3ee448b1443 -DIST xf86-video-glint-1.2.6.tar.bz2 393872 SHA256 d43350ed3c149576db1dbcacf5e9a30a3268a3f49742724c9151b6f1e4bd21a7 SHA512 a32c70134c0b9edc90f8df6f1de696919063e7c7f0bfae18ecfee2d8852ff7c70a88b39649ca5d3f67a2551a81d1076d19eb11b86431c76dc34f4126f21ad9a4 WHIRLPOOL cbea3d2fa8052ff149b4346c7f56b8ec2b6292f3a731d2328c89369088214327f2cbb20d7e3b7b48d1a5592c2de930b08c825e644a8b80db846d4951a11e6305 +AUX xf86-video-glint-1.2.8-remove-mibstore_h.patch 732 SHA256 8bf833751bea92543835c7f0c55b6a6ed7c4df62034372f5f6ae122b3ba8f231 SHA512 f482f2ee1ccf089250be3c1f9b80cde90253a482891e177595a3331acd0cac9f0faf1e58382dc3d03c4c02638096fae8d767d46a9b51c35b5adce40c6e6ce767 WHIRLPOOL 8533d9f254ec3cf5478f901ad578e5cd2b8fa81259fef60d69645f8700afa5305a6e725b03689ce74323fdc4d3fd442fbea4282f6676fff5b290359b6422fa44 DIST xf86-video-glint-1.2.7.tar.bz2 397381 SHA256 9aa9689436fc78a71145d4caeaf63b0e80f9abd54e9b4a3066f62ee5b334c359 SHA512 e005998ce9a33de9b0ebf009d7600fff576b6dc79933b99f2e105028b8266af8b8bd414688b5f467295226a26311c599a4f4ab12b0b821f43a1d72566ce569c2 WHIRLPOOL ccf30dab0923e397849538a91c03068529cafe9b9c1e4736abb5a9d4b661359175e83784871926481fab0f7b9344eb3309775eef76e2b715d3b2654de74de5b0 DIST xf86-video-glint-1.2.8.tar.bz2 395371 SHA256 657f883bb3a4e4278399eba73840862c3642706ae8b0a4798ec97a31b3524221 SHA512 ea8c566877a8ef6d7c08bec317da62f41ffa080ca76f06587a2bbb2a976966ca4138fae60ede757cf470222912c915f4361aa90513901c370eae335818f33468 WHIRLPOOL 28a6605a555fd317c9d18e0eef936051b305a37a5ad782a3ad550c9b324d15834c7742fcd7e34e76f383303a1c333044df43e9b3ef7f8451a462882bd23a405c -EBUILD xf86-video-glint-1.2.5.ebuild 721 SHA256 dad5edc4454b59e54ce06f1cec31599a2e5cc0e5fbd8bb7c6d47a26e016b3b81 SHA512 a923342bfff1a6b910ca663bdf0e9716f4da06e1255e15b7248748656818411a61349754da2bd10f7c2a9dc8c07be54218a187b6ed712150b36aafa8a90a83de WHIRLPOOL 5e7d8ddb62fa5535a26af60fd26b72e8a1f02c9b71cbaf8515ac29b25fba19560f5a8b2e3b334e1cd4218a5615766e9fe9bbaac823a6a262466cfc6d05dfe3eb -EBUILD xf86-video-glint-1.2.6.ebuild 515 SHA256 1305d7ac2aec2e443e1681091f790f9b69ba2d37e6fab6bb8f696167bfbbd903 SHA512 08e8fd8b7bc57908fe6021f9f9a88ae2ef8137ad178b93ddd9b53310e0d9f30920f49d8f2230ba81709ca61d0590b0a390e6ff5d782599d7fdda59ded7be10a2 WHIRLPOOL fc65c7012eabf03c599f5955bf8c7aff695a959572108d2784779fb4ca49b2188b0ef0070ee3ade1e6cfeb182c7085f2edaccf9eba4165baff4aea9bd5bf1780 EBUILD xf86-video-glint-1.2.7.ebuild 527 SHA256 19fdd96ca936f3159a54cab14306007934ba03d034ffd7763d56355b900c75da SHA512 b1f8a4a66ab26959f1489edf50627be6da7981b9c984dc9a4137398f5d4cc0841696c87ed7336fe23b27daa604f6d00a3c1f2e297af9554e84f5380364903304 WHIRLPOOL 2597d01b790ce7d8b74439f120b72f988be3d7719ef278594cb6c41947e2de12879c81d335c254ceff5e149f5b6eaa689805ca56f6d935ef4e2c6367448d6374 -EBUILD xf86-video-glint-1.2.8.ebuild 523 SHA256 914243f0512771b4a28a2118823a5db792caad2d02dd0efe02a7b36212352ee1 SHA512 18f6ae4ac6000c69014571f66ee4e478cb11c53dd3da63a2c81b029f4fc2f01bfcb58f0f180cb924a7897b93a743a9796c19d6b051e396a111682ba93a7dfdfb WHIRLPOOL 3c39c3e06212d67f7debbc7043da01eeb9b2722c08aa2bcb04898ed186a7ad2aca2da555f5ffa3999d3daa83998c80f973f5e85866d9741c6887e548bdf1a3e1 -MISC ChangeLog 9440 SHA256 b4c2398539529e0c556f2c0baa391db5df51f4144d966af3f57bdf2cc62858e1 SHA512 3bc743041f31f9afe0192075771bbf1db8698a1894482c72451510293ab09a653bdebdc7b4103dcf29567c7ea049ddf563f84064d54a5fedd2cc34332bc70248 WHIRLPOOL c8c260fc76bc2f49bda149ee519cc64b1d641bec206b8a2d0e5e5b77dc76fd1646da0b9a2a904a646cb4fb8f84a5cee0272180f29f1544851b4ec17d141b061f +EBUILD xf86-video-glint-1.2.8-r1.ebuild 594 SHA256 be93364ce1069e1b42fad8c87d4e7bfb4b8d3979f707a56dd46fdd6b975b91fe SHA512 c750d259add29f349248d57957fecbe49abfea780d322777b6a72645ee9761864379c8ad1772d6de4a3509a53fe9593404191d8de4805ed1c6d9a69881c88c5e WHIRLPOOL 13bad1723379c1ec86931e36c4fceed443ea34f62487e2d05a8782b4df7563a85c0f7589767999d8090ecf34fc02ec7a6fdbd5737268467907d4ae11ac25c1c0 +EBUILD xf86-video-glint-1.2.8.ebuild 528 SHA256 1010075d82a0b408c5baa4ca35a25cc423a7c63376dfbb245fc7ea297291131a SHA512 f8a6f3e7db2564e3165d70914559383b5b672bfa25058b8d868be052a0c04f82e51cd6ba0c7adce21bac3c7386e987661f5fc8a76454127dcc795a8fa2f700ba WHIRLPOOL 1a2453d0b2d83b4139dd9a987487d26dc6e45e32549efdf4fd859a381b5bc7783e811c0c7b9795c5b43e62be38d16c5917cf5ac6d3329bee792c7771db09983c +MISC ChangeLog 9788 SHA256 63a571492e663798dbe1632ff608403eaab273198c439e4b8c3890c4839f5d02 SHA512 88128dc096a400a74084954de6ebfe4160711e59e162644946b7e959b85900e12c91719804145c3a44ab0e3db7fe5f27cb5dc64b29b9f404e8afe5d91ef9e155 WHIRLPOOL 9247c29f8fd97c6e7a2617cc4fd9b6ade857807b45e880f020b37be3ca54d5b4429deaffaa7d450f4d9fde113c8e29ca6ba040b0793ede1a5607c28b2ca71e65 MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93 diff --git a/x11-drivers/xf86-video-glint/files/xf86-video-glint-1.2.8-remove-mibstore_h.patch b/x11-drivers/xf86-video-glint/files/xf86-video-glint-1.2.8-remove-mibstore_h.patch new file mode 100644 index 000000000000..6bc5738c8023 --- /dev/null +++ b/x11-drivers/xf86-video-glint/files/xf86-video-glint-1.2.8-remove-mibstore_h.patch @@ -0,0 +1,30 @@ +From 073d5b0b392781bf4a6aa7f9e2dbe2ae51caed2c Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Tue, 25 Sep 2012 12:54:38 +0000 +Subject: Remove mibstore.h + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- +diff --git a/src/glint_driver.c b/src/glint_driver.c +index b6d20a9..aa78516 100644 +--- a/src/glint_driver.c ++++ b/src/glint_driver.c +@@ -52,8 +52,6 @@ + #include "compiler.h" + #include "mipointer.h" + +-#include "mibstore.h" +- + #include "pm3_regs.h" + #include "glint_regs.h" + #include "IBM.h" +@@ -2904,7 +2902,6 @@ GLINTScreenInit(SCREEN_INIT_ARGS_DECL) + } + } + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + xf86SetSilkenMouse(pScreen); + +-- +cgit v0.9.0.2-2-gbebe diff --git a/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.5.ebuild b/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.5.ebuild deleted file mode 100644 index 7cee2f418f93..000000000000 --- a/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.5.ebuild +++ /dev/null @@ -1,29 +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-glint/xf86-video-glint-1.2.5.ebuild,v 1.5 2011/02/14 23:56:23 xarthisius Exp $ - -EAPI=3 - -inherit xorg-2 - -DESCRIPTION="GLINT/Permedia video driver" - -KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~x86-fbsd" -IUSE="dri" - -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/xf86dgaproto - x11-proto/xproto - dri? ( x11-proto/xf86driproto - >=x11-libs/libdrm-2 - x11-proto/glproto )" - -pkg_setup() { - CONFIGURE_OPTIONS="$(use_enable dri)" -} diff --git a/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.6.ebuild b/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.8-r1.ebuild index 4f9002375527..40c24def376d 100644 --- a/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.6.ebuild +++ b/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.8-r1.ebuild @@ -1,14 +1,14 @@ -# 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-glint/xf86-video-glint-1.2.6.ebuild,v 1.5 2012/02/19 15:00:46 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.8-r1.ebuild,v 1.1 2013/03/12 16:35:47 chithanh Exp $ -EAPI=4 +EAPI=5 inherit xorg-2 DESCRIPTION="GLINT/Permedia video driver" -KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~x86-fbsd" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" IUSE="" RDEPEND=">=x11-base/xorg-server-1.0.99" @@ -17,3 +17,7 @@ DEPEND="${RDEPEND} x11-proto/xextproto x11-proto/xf86dgaproto x11-proto/xproto" + +PATCHES=( + "${FILESDIR}"/${P}-remove-mibstore_h.patch +) diff --git a/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.8.ebuild b/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.8.ebuild index 7b562bffcfad..a9062572c0e3 100644 --- a/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.8.ebuild +++ b/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.8.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-glint/xf86-video-glint-1.2.8.ebuild,v 1.7 2012/12/30 14:47:39 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.8.ebuild,v 1.8 2013/03/12 16:35:47 chithanh Exp $ EAPI=4 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 +) diff --git a/x11-drivers/xf86-video-i740/ChangeLog b/x11-drivers/xf86-video-i740/ChangeLog index 88b8f87204b6..a77985755bfa 100644 --- a/x11-drivers/xf86-video-i740/ChangeLog +++ b/x11-drivers/xf86-video-i740/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-drivers/xf86-video-i740 -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i740/ChangeLog,v 1.42 2012/12/28 11:15:52 ago Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i740/ChangeLog,v 1.43 2013/03/12 16:36:17 chithanh Exp $ + +*xf86-video-i740-1.3.4-r1 (12 Mar 2013) + + 12 Mar 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + +files/xf86-video-i740-1.3.4-remove-mibstore_h.patch, + +xf86-video-i740-1.3.4-r1.ebuild, -xf86-video-i740-1.3.2.ebuild: + Fix building against xorg-server-1.14 28 Dec 2012; Agostino Sarubbo <ago@gentoo.org> xf86-video-i740-1.3.4.ebuild: Stable for ia64, wrt bug #440872 diff --git a/x11-drivers/xf86-video-i740/Manifest b/x11-drivers/xf86-video-i740/Manifest index 7d64bcdd92a6..4604f2eb1034 100644 --- a/x11-drivers/xf86-video-i740/Manifest +++ b/x11-drivers/xf86-video-i740/Manifest @@ -1,8 +1,8 @@ -DIST xf86-video-i740-1.3.2.tar.bz2 273853 SHA256 48549c6a3d8c0a0d417fc486e77f3f7c6815df7e8ede04bb4c539666be2bf943 SHA512 8ec5b016456be78ac0ee0182a048eae2042230140507efdd8cf92294e51667e25a9b2ebf63ef503694cd054c75a181d707238fa706c69b2d7a512c89ae5a506e WHIRLPOOL 83b548a958a6c8043e88c0eb729404d16c59175b7f5698251a09f9aaa8d36d5da85f49de478545aa83458baa50525cf03bee42bdd0063947074cb23c8a889694 +AUX xf86-video-i740-1.3.4-remove-mibstore_h.patch 906 SHA256 2b004773fe8090dea727590a7fc0389c53a16d068537fd1968ae320b0f1e36ca SHA512 e2f179d7e86e7a90cd34bd0bd60061cedf493c2cdf23354a8550b952e15bfef987c61db86ab5c03e57a438cad2bbc02fb0089c86990a81c3928089319197b57c WHIRLPOOL ed4096700de9dd14b0cc4105c22584f53c46ee7c6af42009dfd8c19b17c4bc21d7be963e599f4f2770abc83575d328ad2ebd8c09ad65c33a189e7a1bf2f32953 DIST xf86-video-i740-1.3.3.tar.bz2 316716 SHA256 a39e8cf8e34816d07d33eae79dcb26fc2137f719156ae90fa4afff319e320dcc DIST xf86-video-i740-1.3.4.tar.bz2 316654 SHA256 1a24009bb2223b722fb41e1a2737a6e74bfecb0829e5583e270d267ee4ecca78 SHA512 0440bdb891af02fabf10b92c0c7a0013140aeee82c80d2daf42291fff8fda96824889dd2d36338d032db7ac5b8e0691bf86d64c7cef3f51fbdb7b344ffff997d WHIRLPOOL 3b989c586afec8f09c91284d758607f4ab1f207b0ea9caa49b4a9e3d0953bcd97fc2b415c53c8bdd8174f537af71fac975883656c509635cccfc9693fe1b402e -EBUILD xf86-video-i740-1.3.2.ebuild 585 SHA256 8a1a2e30a7c1190eb9620eb116e5a51972700ea79e66a50e859a8822e3cfc40d SHA512 b28a256bc4693bd264776afedae332de9a39055e99e15aee9c7d20222f7deb0d998c9a1eb77e8a72008a74ca1941572861c1e45403f89821bad51c690586539a WHIRLPOOL 687feb457cf7ff057868bc8fdbe8ee659beb9a4575aa5aca034a0b5bd0d61d98a203ba1e93ef14a93d07e360c4f016fa22d3e5ab7fd5f2626b211251bd6b220d EBUILD xf86-video-i740-1.3.3.ebuild 419 SHA256 4d5cc04034781843a818113ea044ba225e87ef12a81a44c06a837d6a686517ef SHA512 c3f5e54a6412633879b30a710bf70c6c4cce91e351567a769ebebd199fbd244f234d949b010a2b609a6dd714e37cb1d566b67faeb070fcda485de0eb457989ba WHIRLPOOL 2fe732dbc2f15690cd8a5747b956b6f9fe8df4e2f696bcd9dac7e8526d8e4e3ea4812790050bf48709c7a623f1d38647d4b7900cd6e0a4f81ef80bee7dcb0996 +EBUILD xf86-video-i740-1.3.4-r1.ebuild 483 SHA256 2a2a574dd6785edf3228793b27fb0dc3ed1c4f98eef8edaa1309062a7d5f4ed1 SHA512 5424891440b1db01a07cd44710793c95a5cfee4372edd6b76a8b401872b1f470305c96c32227b3084dda2225f88bdeb883c8ddd7f42297737609a318f31dbe41 WHIRLPOOL 9896be3ef408ebe8295a99178e1b90c72016455fba804f2e137a6935e3381f844faa6c804d7cb76772c79daeb92d4c498737873177c417bce7d7fd0a8dc7e376 EBUILD xf86-video-i740-1.3.4.ebuild 415 SHA256 2f451784c8002841d9cdd72ce672cdb4c152a323ee1664a5abe6ba8b3a525658 SHA512 46242996b6353ddd2e6a31921657440566de33ff4858afbeccc7a742ac87425c08973bd081bd5371bad9a73c92cc7f4c985c6871dd0fbccadc25b79e565c0893 WHIRLPOOL d611d6272a6c4ddd2a8077c21116b00355e54badae3fdfc78ba30f163203d546fe5cbed4dd71bb10fa2504e791a2155f6db68ef67f8599922af3e4e3125d365e -MISC ChangeLog 5627 SHA256 28d6f6066eb6e9031034ac22889722cbf552e4b9779da5c7529d72c39687ef9d SHA512 760018cda3967f538934349231407328e49d1a556176ced394e16a9856de63530f5957ee80c6031542733a9a52dec58d1a44e569e5b7abd08398b25123760e25 WHIRLPOOL 4dd451aae752e3167ca4cce466a345668140e3fcaca865433a82889e8f7c271a727fc84710a4db7d193dfc4dec975c78b212c157ff75d679278163efbe6b2fb4 +MISC ChangeLog 5906 SHA256 a0c64360496514e6796c92645d089ed7a9206bcf47593808913258615816f09d SHA512 9543681fe5dc50416a27d8d536427686fe74f932d53151df9c7862806cb1665cd5cd501e44c980a8600bc5dad2b22c7a529f705cd732a4172df6261e7a0fe8ef WHIRLPOOL 746847eb5af1c0faa65aedcd3ee5eb972421252932eeb8721a28e3ecb68e74b83320e765f17fcaa7587cae5e0b59703d124755e58688d38c425075945945f4e9 MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93 diff --git a/x11-drivers/xf86-video-i740/files/xf86-video-i740-1.3.4-remove-mibstore_h.patch b/x11-drivers/xf86-video-i740/files/xf86-video-i740-1.3.4-remove-mibstore_h.patch new file mode 100644 index 000000000000..a33dc7e3db67 --- /dev/null +++ b/x11-drivers/xf86-video-i740/files/xf86-video-i740-1.3.4-remove-mibstore_h.patch @@ -0,0 +1,32 @@ +From 084aa23643bf4245c917e3d672576bc9e5717017 Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Thu, 10 Jan 2013 03:21:52 +0000 +Subject: Remove mibstore.h + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- +diff --git a/src/i740_driver.c b/src/i740_driver.c +index 1c82198..7c1051d 100644 +--- a/src/i740_driver.c ++++ b/src/i740_driver.c +@@ -63,10 +63,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + #include "compiler.h" + +-/* Drivers using the mi implementation of backing store need: */ +- +-#include "mibstore.h" +- + /* All drivers using the vgahw module need this */ + /* This driver needs to be modified to not use vgaHW for multihead operation */ + #include "vgaHW.h" +@@ -1558,7 +1554,6 @@ I740ScreenInit(SCREEN_INIT_ARGS_DECL) { + } + } + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + xf86SetSilkenMouse(pScreen); + +-- +cgit v0.9.0.2-2-gbebe diff --git a/x11-drivers/xf86-video-i740/xf86-video-i740-1.3.2.ebuild b/x11-drivers/xf86-video-i740/xf86-video-i740-1.3.2.ebuild deleted file mode 100644 index 1be87c75b439..000000000000 --- a/x11-drivers/xf86-video-i740/xf86-video-i740-1.3.2.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i740/xf86-video-i740-1.3.2.ebuild,v 1.4 2009/12/15 15:35:45 armin76 Exp $ - -# Must be before x-modular eclass is inherited -#SNAPSHOT="yes" - -inherit x-modular - -DESCRIPTION="Intel i740 video driver" -KEYWORDS="amd64 ia64 x86 ~x86-fbsd" -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-i740/xf86-video-i740-1.3.4-r1.ebuild b/x11-drivers/xf86-video-i740/xf86-video-i740-1.3.4-r1.ebuild new file mode 100644 index 000000000000..9ec774b61fe6 --- /dev/null +++ b/x11-drivers/xf86-video-i740/xf86-video-i740-1.3.4-r1.ebuild @@ -0,0 +1,18 @@ +# 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-i740/xf86-video-i740-1.3.4-r1.ebuild,v 1.1 2013/03/12 16:36:17 chithanh Exp $ + +EAPI=5 +inherit xorg-2 + +DESCRIPTION="Intel i740 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 +) diff --git a/x11-drivers/xf86-video-qxl/ChangeLog b/x11-drivers/xf86-video-qxl/ChangeLog index 029957014d56..0c41f9cd29d8 100644 --- a/x11-drivers/xf86-video-qxl/ChangeLog +++ b/x11-drivers/xf86-video-qxl/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for x11-drivers/xf86-video-qxl -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-qxl/ChangeLog,v 1.17 2012/11/18 12:18:38 ago Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-qxl/ChangeLog,v 1.18 2013/03/12 16:36:30 chithanh Exp $ + +*xf86-video-qxl-0.1.0-r1 (12 Mar 2013) + + 12 Mar 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + +files/xf86-video-qxl-0.1.0-remove-mibstore_h.patch, + +xf86-video-qxl-0.1.0-r1.ebuild, + -files/xf86-video-qxl-0.0.17-xorg-server-1.13.patch, + -xf86-video-qxl-0.0.17-r1.ebuild, -xf86-video-qxl-0.0.17.ebuild: + Fix building against xorg-server-1.14 18 Nov 2012; Agostino Sarubbo <ago@gentoo.org> xf86-video-qxl-0.1.0.ebuild: Stable for x86, wrt bug #440872 diff --git a/x11-drivers/xf86-video-qxl/Manifest b/x11-drivers/xf86-video-qxl/Manifest index a4ee15b0f3af..8003c3392b77 100644 --- a/x11-drivers/xf86-video-qxl/Manifest +++ b/x11-drivers/xf86-video-qxl/Manifest @@ -1,8 +1,6 @@ -AUX xf86-video-qxl-0.0.17-xorg-server-1.13.patch 17845 SHA256 d7746f3cf9982967d10eadb97b3aba28cba67d8f4ac2ad9af6335a993b1db168 SHA512 4bde621b1d30447728030a49ede3ab61a8b671609a1928bdcc6ae8683c39bfa1634f4dea7b611cfa222ab57e229d02131da7d0f13b56557a18e57beddb07ebe3 WHIRLPOOL 80b28fbcd2330349b644b33c362fe827711d4a5e92504dcfa2a3020e0752b9d5a899bfe87e7c112b46ec493490a819230cf9f354e92ece06106731f5b22a3172 -DIST xf86-video-qxl-0.0.17.tar.bz2 379844 SHA256 193c2bb4889de39f7b0071990adaae1753b45e542f68d76cc0d55a7299b49f82 SHA512 04af0eedf548f495c8e84880785db50f8e4198790bc9d2d7ef11cd7c4dbec5c0e1496bc2c1e250481327b90ff8f7dede649b2fcc35baa08f9c24826d996199d8 WHIRLPOOL 487523d6daaab2ad4bb0eed0e90ae8535d28cce3b0bcd50a4b075389b6b04df987fe7db390ee5f67a4bbc9e11a4f1ae425981edb2ee311f59dc2419a6714abfb +AUX xf86-video-qxl-0.1.0-remove-mibstore_h.patch 562 SHA256 241bd977f4ba6e914fc4abf3dbffdebf7c2166989df68218d4436c03937e9d52 SHA512 1027ec2adfff285c418be7ef06d6d115bb69babbd9fa5b66ab2b00522b2668b72424f125b1f1e13ba67855b48d27ad64fef8263b6a60e4963f352a0a2e78bad9 WHIRLPOOL 9dc1d976e827d0931c7ab469eddb11fdede9ddb196faa5066fcddf25152a12699dc0bc0884b6d688a87bb8bbea36bf37e33aaf4c68e70adc4496400a5ac6aca2 DIST xf86-video-qxl-0.1.0.tar.bz2 410355 SHA256 5ca3c1039fc195e73fa68558d0d7ee2b97cf10f4e7474ca533732a5d39ebbce5 SHA512 4ff5f4ca60bf54769833e13ef030fe08bad84955be20c86d26d82687ccb4cd58770e03cfbeaa49dc64b2ff99400d380769b30e3b86cf746377c6d621aa405e1f WHIRLPOOL ff09fe5a06b16ef2ba4a151d9239daa066890d8b9523f3a913aeae67f2a4bde0f464c676335faccdc64eba605b87413a4b9ffd230611670b3b102a4f45577e65 -EBUILD xf86-video-qxl-0.0.17-r1.ebuild 649 SHA256 3e268a19ffcb1c7c6971e76a137c4671f07d0574c780fd54b9439b856b711eaa SHA512 70851fdb884256346ba324031dd25382290ee9d3727abf6655ccc1ad4f586bf842fba182c79e2ea15ec587114d2558dfa9665f357afb7da461e368e021cf71d8 WHIRLPOOL e4be40fdca48c328cf1176a59e0d44c3abf05287195c890726e78d29bce29b3a237892b1ebf6d9807f3fdcb1f199c242e55010ec12eecbdcdc34401903870c84 -EBUILD xf86-video-qxl-0.0.17.ebuild 597 SHA256 143c1c48edf9be5b2ca2fb8532f3265e39f8d37b8f89226c4fb69d612f2255ea SHA512 bed107e864e9366c58980b2e96db233101590f2a0be62293ab6424a38bc2f5d3431f0849e60bedacc6d2bdae3dd366dfd394c7b157f7b126c5c05ebce27c04b8 WHIRLPOOL f1694cc68bf0875cc001ece27748668dd88f98b56ec5b6002ad0a1d420b36ef76c91894cff2590fe8d375c6c242a20ce445aaf6bccf6721b3ca835cec53ec26c +EBUILD xf86-video-qxl-0.1.0-r1.ebuild 650 SHA256 301a4aaa561bf63f921660256479e54a1e44f8456db76b1f056b74b991d49173 SHA512 1c30de0f9dba0f62c05eb1c7315e3f5d136356538ca833b02b8df4849d78afa7495185d8f7e71428f3b70bfeda0c5c8a0b131bd61f4b9eb79260df9cebc870aa WHIRLPOOL 56ab8c515f7402b0f38efaadd3777334354fbc693434d5dd138e6a89359d0af87da8c59665b081c9f62276b29d6589355843e941d760951172c9824f14ccc945 EBUILD xf86-video-qxl-0.1.0.ebuild 583 SHA256 28bb37dac8084cdc1d4512f3f755bd39765ed5d0d612e48d22bd0959ff337efa SHA512 fc32e1f3cd96759127942001c25997a6790ead91c41bca3705bba0613ff11cb80631dae2018ef6ee2334db7f6e7513e1267d6d7a09e76715d8681a8dde443122 WHIRLPOOL 6ddadc6366fed179073278c5b11b4a0348b8b347e7e26dfe26360ce26c25cfc64f17c0464770f1813960cf77c92b04ef6e8f2babbdfb649df6137d7c7f2724ce -MISC ChangeLog 2979 SHA256 8a141bdeec85839c4a9b4f1934c8b0fc7b974c7fb6806bc6539c1cc9eda54e47 SHA512 9cbfb12bbe456edd0164f35c0bcaf101b8106ba5069914de40928345f6407a285cf6d4d96f8d78ea34723a1fc94c39c442c91c1bc8f9520c467d8237471f2e2c WHIRLPOOL 3f0dddd8ee218bda974f75865f68b83390698e66d7a45fe720ce0cc131baf05c43a28760664df68bcb242189316864bf8343ac0c57b58c3199d4e54c9cfd8659 +MISC ChangeLog 3346 SHA256 eeed6fe5b5425323d766d71104031be1d20d56b8e86a13c288695dc8d80a8fdc SHA512 fd223ccfd56265a46545da9bc8ad633ecda9b7b83e95af51fded01287211808824e657892b62dadf2a2378d530e67e9d31ac24ebee1a7c3203a9c8938feb7e9b WHIRLPOOL e8eedd8486bdda19698107378e54b40d72fedfe8df303e4acce35a3a741a33da0a3345a1f47d84cb473e9d38349bd2b1c3ee23079e1a134eb62cad3cdaa50c34 MISC metadata.xml 220 SHA256 02098a3246ae2126fbc3d37008096f3ebfcd48cbb57947f910df9aebf8164849 SHA512 d242006225d374d35db154926c75747798abbbc55f7d6d2539e1f87dcf85cf426ec4123478a4968c33cac6cb5ed3b3e5f27d5c53be9fcb4376c241565174c372 WHIRLPOOL d65762a3ac1a9bff012eac9965b37cf53747e494efb561d0c0b192aec219c16e12131d27faaf636ab13b49092d1035a5f93900534bc2d27452a5369c1c2e855c diff --git a/x11-drivers/xf86-video-qxl/files/xf86-video-qxl-0.0.17-xorg-server-1.13.patch b/x11-drivers/xf86-video-qxl/files/xf86-video-qxl-0.0.17-xorg-server-1.13.patch deleted file mode 100644 index cfb476649125..000000000000 --- a/x11-drivers/xf86-video-qxl/files/xf86-video-qxl-0.0.17-xorg-server-1.13.patch +++ /dev/null @@ -1,538 +0,0 @@ -From f1a9c1b33bff038807755824190c69889ef6d794 Mon Sep 17 00:00:00 2001 -From: Dave Airlie <airlied@redhat.com> -Date: Wed, 06 Jun 2012 13:19:04 +0000 -Subject: qxl: add API compat for latest X server. - -Signed-off-by: Dave Airlie <airlied@redhat.com> ---- -diff --git a/src/Makefile.am b/src/Makefile.am -index c3ba074..79ea3cc 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -47,7 +47,8 @@ qxl_drv_la_SOURCES = \ - mspace.h \ - murmurhash3.c \ - murmurhash3.h \ -- qxl_cursor.c -+ qxl_cursor.c \ -+ compat-api.h - endif - - if BUILD_XSPICE -diff --git a/src/compat-api.h b/src/compat-api.h -new file mode 100644 -index 0000000..6bc946f ---- a/dev/null -+++ b/src/compat-api.h -@@ -0,0 +1,99 @@ -+/* -+ * Copyright 2012 Red Hat, Inc. -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a -+ * copy of this software and associated documentation files (the "Software"), -+ * to deal in the Software without restriction, including without limitation -+ * the rights to use, copy, modify, merge, publish, distribute, sublicense, -+ * and/or sell copies of the Software, and to permit persons to whom the -+ * Software is furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice (including the next -+ * paragraph) shall be included in all copies or substantial portions of the -+ * Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -+ * DEALINGS IN THE SOFTWARE. -+ * -+ * Author: Dave Airlie <airlied@redhat.com> -+ */ -+ -+/* this file provides API compat between server post 1.13 and pre it, -+ it should be reused inside as many drivers as possible */ -+#ifndef COMPAT_API_H -+#define COMPAT_API_H -+ -+#ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR -+#define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum] -+#define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p -+#endif -+ -+#ifndef XF86_HAS_SCRN_CONV -+#define xf86ScreenToScrn(s) xf86Screens[(s)->myNum] -+#define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex] -+#endif -+ -+#ifndef XF86_SCRN_INTERFACE -+ -+#define SCRN_ARG_TYPE int -+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = xf86Screens[(arg1)] -+ -+#define SCREEN_ARG_TYPE int -+#define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)] -+ -+#define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv -+ -+#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask -+#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask -+ -+#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen -+#define CLOSE_SCREEN_ARGS scrnIndex, pScreen -+ -+#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags -+#define ADJUST_FRAME_ARGS(arg, x, y) (arg)->scrnIndex, x, y, 0 -+ -+#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags -+#define SWITCH_MODE_ARGS(arg, m) (arg)->scrnIndex, m, 0 -+ -+#define FREE_SCREEN_ARGS_DECL int arg, int flags -+ -+#define VT_FUNC_ARGS_DECL int arg, int flags -+#define VT_FUNC_ARGS pScrn->scrnIndex, 0 -+ -+#define XF86_SCRN_ARG(x) ((x)->scrnIndex) -+#else -+#define SCRN_ARG_TYPE ScrnInfoPtr -+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = (arg1) -+ -+#define SCREEN_ARG_TYPE ScreenPtr -+#define SCREEN_PTR(arg1) ScreenPtr pScreen = (arg1) -+ -+#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv -+ -+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask -+#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask -+ -+#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen -+#define CLOSE_SCREEN_ARGS pScreen -+ -+#define ADJUST_FRAME_ARGS_DECL ScrnInfoPtr arg, int x, int y -+#define ADJUST_FRAME_ARGS(arg, x, y) arg, x, y -+ -+#define SWITCH_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr mode -+#define SWITCH_MODE_ARGS(arg, m) arg, m -+ -+#define FREE_SCREEN_ARGS_DECL ScrnInfoPtr arg -+ -+#define VT_FUNC_ARGS_DECL ScrnInfoPtr arg -+#define VT_FUNC_ARGS pScrn -+ -+#define XF86_SCRN_ARG(x) (x) -+ -+#endif -+ -+#endif -diff --git a/src/qxl.h b/src/qxl.h -index ed12680..46155c9 100644 ---- a/src/qxl.h -+++ b/src/qxl.h -@@ -50,6 +50,7 @@ - #include "vgaHW.h" - #endif /* XSPICE */ - -+#include "compat-api.h" - #define hidden _X_HIDDEN - - #ifdef XSPICE -diff --git a/src/qxl_driver.c b/src/qxl_driver.c -index f7ccbbf..b0250e5 100644 ---- a/src/qxl_driver.c -+++ b/src/qxl_driver.c -@@ -328,7 +328,7 @@ qxl_blank_screen(ScreenPtr pScreen, int mode) - - #ifdef XSPICE - static void --unmap_memory_helper(qxl_screen_t *qxl, int scrnIndex) -+unmap_memory_helper(qxl_screen_t *qxl) - { - free(qxl->ram); - free(qxl->vram); -@@ -336,7 +336,7 @@ unmap_memory_helper(qxl_screen_t *qxl, int scrnIndex) - } - - static void --map_memory_helper(qxl_screen_t *qxl, int scrnIndex) -+map_memory_helper(qxl_screen_t *qxl) - { - qxl->ram = malloc(RAM_SIZE); - qxl->ram_physical = qxl->ram; -@@ -349,7 +349,7 @@ map_memory_helper(qxl_screen_t *qxl, int scrnIndex) - } - #else /* Default */ - static void --unmap_memory_helper(qxl_screen_t *qxl, int scrnIndex) -+unmap_memory_helper(qxl_screen_t *qxl) - { - #ifdef XSERVER_LIBPCIACCESS - if (qxl->ram) -@@ -369,7 +369,7 @@ unmap_memory_helper(qxl_screen_t *qxl, int scrnIndex) - } - - static void --map_memory_helper(qxl_screen_t *qxl, int scrnIndex) -+map_memory_helper(qxl_screen_t *qxl) - { - #ifdef XSERVER_LIBPCIACCESS - pci_device_map_range(qxl->pci, qxl->pci->regions[0].base_addr, -@@ -412,7 +412,7 @@ map_memory_helper(qxl_screen_t *qxl, int scrnIndex) - #endif /* XSPICE */ - - static void --qxl_unmap_memory(qxl_screen_t *qxl, int scrnIndex) -+qxl_unmap_memory(qxl_screen_t *qxl) - { - #ifdef XSPICE - if (qxl->worker) { -@@ -420,7 +420,7 @@ qxl_unmap_memory(qxl_screen_t *qxl, int scrnIndex) - qxl->worker_running = FALSE; - } - #endif -- unmap_memory_helper(qxl, scrnIndex); -+ unmap_memory_helper(qxl); - qxl->ram = qxl->ram_physical = qxl->vram = qxl->rom = NULL; - - qxl->num_modes = 0; -@@ -430,7 +430,7 @@ qxl_unmap_memory(qxl_screen_t *qxl, int scrnIndex) - static Bool - qxl_map_memory(qxl_screen_t *qxl, int scrnIndex) - { -- map_memory_helper(qxl, scrnIndex); -+ map_memory_helper(qxl); - - if (!qxl->ram || !qxl->vram || !qxl->rom) - return FALSE; -@@ -556,9 +556,9 @@ qxl_reset (qxl_screen_t *qxl) - } - - static Bool --qxl_close_screen(int scrnIndex, ScreenPtr pScreen) -+qxl_close_screen(CLOSE_SCREEN_ARGS_DECL) - { -- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - qxl_screen_t *qxl = pScrn->driverPrivate; - Bool result; - -@@ -569,7 +569,7 @@ qxl_close_screen(int scrnIndex, ScreenPtr pScreen) - pScreen->CreateScreenResources = qxl->create_screen_resources; - pScreen->CloseScreen = qxl->close_screen; - -- result = pScreen->CloseScreen(scrnIndex, pScreen); -+ result = pScreen->CloseScreen(CLOSE_SCREEN_ARGS); - - #ifndef XSPICE - if (!xf86IsPrimaryPci (qxl->pci) && qxl->primary) -@@ -579,7 +579,7 @@ qxl_close_screen(int scrnIndex, ScreenPtr pScreen) - if (pScrn->vtSema) - { - qxl_restore_state(pScrn); -- qxl_unmap_memory(qxl, scrnIndex); -+ qxl_unmap_memory(qxl); - } - pScrn->vtSema = FALSE; - -@@ -589,7 +589,7 @@ qxl_close_screen(int scrnIndex, ScreenPtr pScreen) - static void - set_screen_pixmap_header (ScreenPtr pScreen) - { -- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - qxl_screen_t *qxl = pScrn->driverPrivate; - PixmapPtr pPixmap = pScreen->GetScreenPixmap(pScreen); - -@@ -611,10 +611,11 @@ set_screen_pixmap_header (ScreenPtr pScreen) - } - - static Bool --qxl_switch_mode(int scrnIndex, DisplayModePtr p, int flags) -+qxl_switch_mode(SWITCH_MODE_ARGS_DECL) - { -- qxl_screen_t *qxl = xf86Screens[scrnIndex]->driverPrivate; -- int mode_index = (int)(unsigned long)p->Private; -+ SCRN_INFO_PTR(arg); -+ qxl_screen_t *qxl = pScrn->driverPrivate; -+ int mode_index = (int)(unsigned long)mode->Private; - struct QXLMode *m = qxl->modes + mode_index; - ScreenPtr pScreen; - void *evacuated; -@@ -680,7 +681,7 @@ enum ROPDescriptor - static Bool - qxl_create_screen_resources(ScreenPtr pScreen) - { -- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - qxl_screen_t *qxl = pScrn->driverPrivate; - Bool ret; - PixmapPtr pPixmap; -@@ -848,7 +849,7 @@ qxl_set_screen_pixmap (PixmapPtr pixmap) - static PixmapPtr - qxl_create_pixmap (ScreenPtr screen, int w, int h, int depth, unsigned usage) - { -- ScrnInfoPtr scrn = xf86Screens[screen->myNum]; -+ ScrnInfoPtr scrn = xf86ScreenToScrn(screen); - PixmapPtr pixmap; - qxl_screen_t *qxl = scrn->driverPrivate; - qxl_surface_t *surface; -@@ -906,7 +907,7 @@ static Bool - qxl_destroy_pixmap (PixmapPtr pixmap) - { - ScreenPtr screen = pixmap->drawable.pScreen; -- ScrnInfoPtr scrn = xf86Screens[screen->myNum]; -+ ScrnInfoPtr scrn = xf86ScreenToScrn(screen); - qxl_screen_t *qxl = scrn->driverPrivate; - qxl_surface_t *surface = NULL; - -@@ -936,7 +937,7 @@ qxl_destroy_pixmap (PixmapPtr pixmap) - static Bool - setup_uxa (qxl_screen_t *qxl, ScreenPtr screen) - { -- ScrnInfoPtr scrn = xf86Screens[screen->myNum]; -+ ScrnInfoPtr scrn = xf86ScreenToScrn(screen); - #if HAS_DIXREGISTERPRIVATEKEY - if (!dixRegisterPrivateKey(&uxa_pixmap_index, PRIVATE_PIXMAP, 0)) - return FALSE; -@@ -1030,9 +1031,9 @@ spiceqxl_screen_init(int scrnIndex, ScrnInfoPtr pScrn, qxl_screen_t *qxl) - #endif - - static Bool --qxl_screen_init(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) -+qxl_screen_init(SCREEN_INIT_ARGS_DECL) - { -- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - qxl_screen_t *qxl = pScrn->driverPrivate; - struct QXLRam *ram_header; - VisualPtr visual; -@@ -1041,7 +1042,7 @@ qxl_screen_init(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - - qxl->pScrn = pScrn; - -- if (!qxl_map_memory(qxl, scrnIndex)) -+ if (!qxl_map_memory(qxl, pScrn->scrnIndex)) - return FALSE; - - #ifdef XSPICE -@@ -1160,7 +1161,7 @@ qxl_screen_init(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - pScreen->width = pScrn->currentMode->HDisplay; - pScreen->height = pScrn->currentMode->VDisplay; - -- qxl_switch_mode(scrnIndex, pScrn->currentMode, 0); -+ qxl_switch_mode(SWITCH_MODE_ARGS(pScrn, pScrn->currentMode)); - - CHECK_POINT(); - -@@ -1171,13 +1172,13 @@ out: - } - - static Bool --qxl_enter_vt(int scrnIndex, int flags) -+qxl_enter_vt(VT_FUNC_ARGS_DECL) - { -- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -+ SCRN_INFO_PTR(arg); - qxl_screen_t *qxl = pScrn->driverPrivate; - - qxl_save_state(pScrn); -- qxl_switch_mode(scrnIndex, pScrn->currentMode, 0); -+ qxl_switch_mode(SWITCH_MODE_ARGS(pScrn, pScrn->currentMode)); - - if (qxl->vt_surfaces) - { -@@ -1186,18 +1187,18 @@ qxl_enter_vt(int scrnIndex, int flags) - qxl->vt_surfaces = NULL; - } - -- pScrn->EnableDisableFBAccess (scrnIndex, TRUE); -+ pScrn->EnableDisableFBAccess (XF86_SCRN_ARG(pScrn), TRUE); - - return TRUE; - } - - static void --qxl_leave_vt(int scrnIndex, int flags) -+qxl_leave_vt(VT_FUNC_ARGS_DECL) - { -- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -+ SCRN_INFO_PTR(arg); - qxl_screen_t *qxl = pScrn->driverPrivate; - -- pScrn->EnableDisableFBAccess (scrnIndex, FALSE); -+ pScrn->EnableDisableFBAccess (XF86_SCRN_ARG(pScrn), FALSE); - - qxl->vt_surfaces = qxl_surface_cache_evacuate_all (qxl->surface_cache); - -@@ -1327,9 +1328,9 @@ qxl_find_native_mode(ScrnInfoPtr pScrn, DisplayModePtr p) - } - - static ModeStatus --qxl_valid_mode(int scrn, DisplayModePtr p, Bool flag, int pass) -+qxl_valid_mode(SCRN_ARG_TYPE arg, DisplayModePtr p, Bool flag, int pass) - { -- ScrnInfoPtr pScrn = xf86Screens[scrn]; -+ SCRN_INFO_PTR(arg); - int scrnIndex = pScrn->scrnIndex; - qxl_screen_t *qxl = pScrn->driverPrivate; - int bpp = pScrn->bitsPerPixel; -@@ -1550,7 +1551,7 @@ qxl_pre_init(ScrnInfoPtr pScrn, int flags) - #endif - - /* hate */ -- qxl_unmap_memory(qxl, scrnIndex); -+ qxl_unmap_memory(qxl); - - CHECK_POINT(); - -diff --git a/src/qxl_surface.c b/src/qxl_surface.c -index a8901f0..c6f21a9 100644 ---- a/src/qxl_surface.c -+++ b/src/qxl_surface.c -@@ -842,7 +842,7 @@ qxl_surface_prepare_access (qxl_surface_t *surface, - int n_boxes; - BoxPtr boxes; - ScreenPtr pScreen = pixmap->drawable.pScreen; -- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - RegionRec new; - - if (!pScrn->vtSema) -diff --git a/src/uxa/uxa-glyphs.c b/src/uxa/uxa-glyphs.c -index c9fae0f..dd50dfc 100644 ---- a/src/uxa/uxa-glyphs.c -+++ b/src/uxa/uxa-glyphs.c -@@ -221,7 +221,7 @@ uxa_glyph_cache_upload_glyph(ScreenPtr screen, - GlyphPtr glyph, - int x, int y) - { -- PicturePtr pGlyphPicture = GlyphPicture(glyph)[screen->myNum]; -+ PicturePtr pGlyphPicture = GetGlyphPicture(glyph, screen); - PixmapPtr pGlyphPixmap = (PixmapPtr) pGlyphPicture->pDrawable; - PixmapPtr pCachePixmap = (PixmapPtr) cache->picture->pDrawable; - PixmapPtr scratch; -@@ -430,7 +430,7 @@ uxa_check_glyphs(CARD8 op, - INT16 xSrc, - INT16 ySrc, int nlist, GlyphListPtr list, GlyphPtr * glyphs) - { -- int screen = dst->pDrawable->pScreen->myNum; -+ ScreenPtr pScreen = dst->pDrawable->pScreen; - pixman_image_t *image; - PixmapPtr scratch; - PicturePtr mask; -@@ -494,7 +494,7 @@ uxa_check_glyphs(CARD8 op, - n = list->len; - while (n--) { - GlyphPtr glyph = *glyphs++; -- PicturePtr g = GlyphPicture(glyph)[screen]; -+ PicturePtr g = GetGlyphPicture(glyph, pScreen); - if (g) { - if (maskFormat) { - CompositePicture(PictOpAdd, g, NULL, mask, -@@ -560,7 +560,7 @@ static PicturePtr - uxa_glyph_cache(ScreenPtr screen, GlyphPtr glyph, int *out_x, int *out_y) - { - uxa_screen_t *uxa_screen = uxa_get_screen(screen); -- PicturePtr glyph_picture = GlyphPicture(glyph)[screen->myNum]; -+ PicturePtr glyph_picture = GetGlyphPicture(glyph, screen); - uxa_glyph_cache_t *cache = &uxa_screen->glyphCaches[PICT_FORMAT_RGB(glyph_picture->format) != 0]; - struct uxa_glyph *priv = NULL; - int size, mask, pos, s; -@@ -760,7 +760,7 @@ uxa_glyphs_to_dst(CARD8 op, - this_atlas = uxa_glyph_cache(screen, glyph, &mask_x, &mask_y); - if (this_atlas == NULL) { - /* no cache for this glyph */ -- this_atlas = GlyphPicture(glyph)[screen->myNum]; -+ this_atlas = GetGlyphPicture(glyph, screen); - mask_x = mask_y = 0; - } - } -@@ -970,7 +970,7 @@ uxa_glyphs_via_mask(CARD8 op, - this_atlas = uxa_glyph_cache(screen, glyph, &src_x, &src_y); - if (this_atlas == NULL) { - /* no cache for this glyph */ -- this_atlas = GlyphPicture(glyph)[screen->myNum]; -+ this_atlas = GetGlyphPicture(glyph, screen); - src_x = src_y = 0; - } - } -diff --git a/src/uxa/uxa-priv.h b/src/uxa/uxa-priv.h -index 80095ac..7a3c85e 100644 ---- a/src/uxa/uxa-priv.h -+++ b/src/uxa/uxa-priv.h -@@ -60,6 +60,7 @@ - #endif - #include "damage.h" - -+#include "../compat-api.h" - /* Provide substitutes for gcc's __FUNCTION__ on other compilers */ - #if !defined(__GNUC__) && !defined(__FUNCTION__) - # if defined(__STDC__) && (__STDC_VERSION__>=199901L) /* C99 */ -@@ -110,7 +111,7 @@ typedef struct { - - #define UXA_NUM_SOLID_CACHE 16 - --typedef void (*EnableDisableFBAccessProcPtr) (int, Bool); -+typedef void (*EnableDisableFBAccessProcPtr) (SCREEN_ARG_TYPE, Bool); - typedef struct { - uxa_driver_t *info; - CreateGCProcPtr SavedCreateGC; -diff --git a/src/uxa/uxa.c b/src/uxa/uxa.c -index dc973ef..4acf53f 100644 ---- a/src/uxa/uxa.c -+++ b/src/uxa/uxa.c -@@ -361,10 +361,10 @@ static RegionPtr uxa_bitmap_to_region(PixmapPtr pPix) - return ret; - } - --static void uxa_xorg_enable_disable_fb_access(int index, Bool enable) -+static void uxa_xorg_enable_disable_fb_access(SCREEN_ARG_TYPE arg, Bool enable) - { -- ScreenPtr screen = screenInfo.screens[index]; -- uxa_screen_t *uxa_screen = uxa_get_screen(screen); -+ SCREEN_PTR(arg); -+ uxa_screen_t *uxa_screen = uxa_get_screen(pScreen); - - if (!enable && uxa_screen->disableFbCount++ == 0) - uxa_screen->swappedOut = TRUE; -@@ -373,7 +373,7 @@ static void uxa_xorg_enable_disable_fb_access(int index, Bool enable) - uxa_screen->swappedOut = FALSE; - - if (uxa_screen->SavedEnableDisableFBAccess) -- uxa_screen->SavedEnableDisableFBAccess(index, enable); -+ uxa_screen->SavedEnableDisableFBAccess(arg, enable); - } - - void uxa_set_fallback_debug(ScreenPtr screen, Bool enable) -@@ -401,10 +401,10 @@ Bool uxa_swapped_out(ScreenPtr screen) - * uxa_close_screen() unwraps its wrapped screen functions and tears down UXA's - * screen private, before calling down to the next CloseSccreen. - */ --static Bool uxa_close_screen(int i, ScreenPtr pScreen) -+static Bool uxa_close_screen(CLOSE_SCREEN_ARGS_DECL) - { - uxa_screen_t *uxa_screen = uxa_get_screen(pScreen); -- ScrnInfoPtr scrn = xf86Screens[pScreen->myNum]; -+ ScrnInfoPtr scrn = xf86ScreenToScrn(pScreen); - #ifdef RENDER - PictureScreenPtr ps = GetPictureScreenIfSet(pScreen); - #endif -@@ -447,7 +447,7 @@ static Bool uxa_close_screen(int i, ScreenPtr pScreen) - - free(uxa_screen); - -- return (*pScreen->CloseScreen) (i, pScreen); -+ return (*pScreen->CloseScreen) (CLOSE_SCREEN_ARGS); - } - - /** -@@ -478,7 +478,7 @@ uxa_driver_t *uxa_driver_alloc(void) - Bool uxa_driver_init(ScreenPtr screen, uxa_driver_t * uxa_driver) - { - uxa_screen_t *uxa_screen; -- ScrnInfoPtr scrn = xf86Screens[screen->myNum]; -+ ScrnInfoPtr scrn = xf86ScreenToScrn(screen); - - if (!uxa_driver) - return FALSE; --- -cgit v0.9.0.2-2-gbebe diff --git a/x11-drivers/xf86-video-qxl/files/xf86-video-qxl-0.1.0-remove-mibstore_h.patch b/x11-drivers/xf86-video-qxl/files/xf86-video-qxl-0.1.0-remove-mibstore_h.patch new file mode 100644 index 000000000000..4f11f1d01f46 --- /dev/null +++ b/x11-drivers/xf86-video-qxl/files/xf86-video-qxl-0.1.0-remove-mibstore_h.patch @@ -0,0 +1,21 @@ +From 819b1f62efbecf33db7bb0b4402a798262ae4574 Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Thu, 10 Jan 2013 03:55:47 +0000 +Subject: Remove mibstore.h + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- +diff --git a/src/uxa/uxa-priv.h b/src/uxa/uxa-priv.h +index ad83963..e3c581c 100644 +--- a/src/uxa/uxa-priv.h ++++ b/src/uxa/uxa-priv.h +@@ -45,7 +45,6 @@ + #include "pixmapstr.h" + #include "windowstr.h" + #include "servermd.h" +-#include "mibstore.h" + #include "colormapst.h" + #include "gcstruct.h" + #include "input.h" +-- +cgit v0.9.0.2-2-gbebe diff --git a/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.0.17.ebuild b/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.0.17.ebuild deleted file mode 100644 index 22148985da33..000000000000 --- a/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.0.17.ebuild +++ /dev/null @@ -1,24 +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-qxl/xf86-video-qxl-0.0.17.ebuild,v 1.4 2012/08/08 13:22:32 chithanh Exp $ - -EAPI=4 -inherit xorg-2 - -DESCRIPTION="QEMU QXL paravirt video driver" - -KEYWORDS="amd64 x86" -IUSE="xspice" - -RDEPEND="xspice? ( app-emulation/spice ) - <x11-base/xorg-server-1.12.99[-minimal]" -DEPEND="${RDEPEND} - x11-proto/xf86dgaproto - >=app-emulation/spice-protocol-0.8.1" - -pkg_setup() { - xorg-2_pkg_setup - XORG_CONFIGURE_OPTIONS=( - $(use_enable xspice) - ) -} diff --git a/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.0.17-r1.ebuild b/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.1.0-r1.ebuild index 56f3b0f4379d..4b2ad5b514aa 100644 --- a/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.0.17-r1.ebuild +++ b/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.1.0-r1.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-qxl/xf86-video-qxl-0.0.17-r1.ebuild,v 1.1 2012/08/08 13:33:10 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.1.0-r1.ebuild,v 1.1 2013/03/12 16:36:30 chithanh Exp $ -EAPI=4 +EAPI=5 inherit xorg-2 DESCRIPTION="QEMU QXL paravirt video driver" @@ -14,11 +14,7 @@ RDEPEND="xspice? ( app-emulation/spice ) x11-base/xorg-server[-minimal]" DEPEND="${RDEPEND} x11-proto/xf86dgaproto - >=app-emulation/spice-protocol-0.8.1" - -PATCHES=( - "${FILESDIR}"/${P}-xorg-server-1.13.patch -) + >=app-emulation/spice-protocol-0.12.0" pkg_setup() { xorg-2_pkg_setup @@ -26,3 +22,7 @@ pkg_setup() { $(use_enable xspice) ) } + +PATCHES=( + "${FILESDIR}"/${P}-remove-mibstore_h.patch +) 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 diff --git a/x11-drivers/xf86-video-sisusb/ChangeLog b/x11-drivers/xf86-video-sisusb/ChangeLog index a8ff689ffadb..531fdfef554d 100644 --- a/x11-drivers/xf86-video-sisusb/ChangeLog +++ b/x11-drivers/xf86-video-sisusb/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-drivers/xf86-video-sisusb # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sisusb/ChangeLog,v 1.64 2013/01/01 18:59:40 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sisusb/ChangeLog,v 1.65 2013/03/12 16:37:03 chithanh Exp $ + +*xf86-video-sisusb-0.9.6-r1 (12 Mar 2013) + + 12 Mar 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + +files/xf86-video-sisusb-0.9.6-remove-mibstore_h.patch, + +xf86-video-sisusb-0.9.6-r1.ebuild, -xf86-video-sisusb-0.9.4.ebuild: + Fix building against xorg-server-1.14 01 Jan 2013; Raúl Porcel <armin76@gentoo.org> xf86-video-sisusb-0.9.6.ebuild: diff --git a/x11-drivers/xf86-video-sisusb/Manifest b/x11-drivers/xf86-video-sisusb/Manifest index 0451ac7c640d..6a0b6066b33e 100644 --- a/x11-drivers/xf86-video-sisusb/Manifest +++ b/x11-drivers/xf86-video-sisusb/Manifest @@ -1,18 +1,8 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -DIST xf86-video-sisusb-0.9.4.tar.bz2 349846 SHA256 2bbb27a9df362bb782216d7e664e0f125e7edc8765d0461d191049dc0273aa2c SHA512 4894fd96b7f550b1662977b5b1ac6231a7cd5d5ccd914787647598241b439587038729872c11648210bcfe7251f831eaddb490f63411c3ecb490caf4b8cda330 WHIRLPOOL 63e052da94b093b9fa84fd02e8d5620a1b05c80f702592412691e207c6466a2a1944171725154df84c0a8dc07325d43a55d11f33ee1e566135c99ffecb4a7922 +AUX xf86-video-sisusb-0.9.6-remove-mibstore_h.patch 799 SHA256 9b64f4a9160c1055d3e01e1b603840986163a7880dbbb5c12f3a7d4c66739134 SHA512 86b9be64378efb83483e4d651fdc5e5560c8b5e17000620adcb665a53057a3f17ff74eccbb2a0722dda9b181e63219f3359f762c809275e5e501b9303ac13c2c WHIRLPOOL 79a2fafdec40d00ec697d3bac31ad4deea4d953440a1c4b78a7484d0f8c590a47f1f4b07cae95f78f9992f324c782f28a659fe6933ec6da386cfa61d42a42f4c DIST xf86-video-sisusb-0.9.5.tar.bz2 377439 SHA256 6508f0edcbbca978f97665953135fb564e988fed437a7c56611f8355bb4daa6b SHA512 dd244a98e8c825bb64dcc62822a369f4d563bacc05814d1957432ab8e12f586ee1489bd98512d60af059ed8c4247de259f1e22c26a008e1c8aad41e5bdc23a3c WHIRLPOOL f1a3ee9376bd5a32c36777200780016b08f00bda1dd404a9f213de30da9e857728f5e8a664cb930559d1d7fd74e55d2a4b66450e745d90ed789bcfb2f44a06d8 DIST xf86-video-sisusb-0.9.6.tar.bz2 382112 SHA256 73dbef43c56a4ce1445c27ebac2ddc062c643c32ca6e2a4d095aea2185b9e046 SHA512 648121680982313af1fb4b1256694e2ec940c7d6176ec53a9c79c3f72ce600f59629e53651a579d825daef07205afc529c8100286867c584db7ec05d312e6fe1 WHIRLPOOL 55b7920d6f3b60ff26e0b07981058ef5d54d1a8efac1945a69a867f1e4f130024b47a202588cd9da8603b651a850ce5b950614a7652b6f264d0a543d9a90ed37 -EBUILD xf86-video-sisusb-0.9.4.ebuild 605 SHA256 2cc42fbb2e72bcb787485b44a7934c512d210855a5666e7817b70a6f24b29733 SHA512 4642a3e6421c0bf7e33d759fcdb7e00bbe9ca71f50788d1ccb52b8c44d752b5746496a79b44298b2d474863ff5537b1cca716a97f138d4344696d9126a53739b WHIRLPOOL 3ecdee6544520f0e1853c07526b39e36111cd3cb546e6bd0be532e12eea24e0dab8bae6e338fcd885710073355b7b3612e19a3debfbc218babe4d36055007635 EBUILD xf86-video-sisusb-0.9.5.ebuild 434 SHA256 196c37958c895f4456977992f166f727cab3377978f3a9191d8687b6af0ba431 SHA512 fdcd89877a3901f09a46d1d07789125b24152f47a65fe22276c513dce4ed58401a2a4ab28b0bddb74eb839929a1659ab0e45646f5bc441c7404e608214ce0688 WHIRLPOOL 6e6b5c025c72127005fdddf8321d9e0cea61fb0db40aeda51db0e01d063b7bbcee381f83d33c0fcb1939b6f29d777c89f1fbb93e52e596c1a070209bdc378d47 +EBUILD xf86-video-sisusb-0.9.6-r1.ebuild 494 SHA256 72c48ede70b3fdc8d094da123f40818228e1fe2777e864f391290967d7745a96 SHA512 73b437b0f19c7a097677980ef8a772b64eaa08837741c97673ee32f597119e09a34451dbf5ee37d4e5377ca0d0a9808f1cffe8bffceb5f9bbbf92fe48d5cb08d WHIRLPOOL f95931e7896f376cca5f497d4cdb3979952da62f81588d576b4ebe16cdf896b75b0b4542616578ce50b7218cccbe4e9eddb1970c1f925646f08868ffde9f55f9 EBUILD xf86-video-sisusb-0.9.6.ebuild 425 SHA256 38e29a2fd4928fbf714b70862553bcffd5c8b8cca8042dec3be62c8c3cc41e1d SHA512 8f9057e3a31b174032cc91e08b5e729031804e0b6bb41dccaadb92dca2782301c18767724c22181b30c7867b51d033787b36e342153fc8e600c5b3f466cab6ef WHIRLPOOL 5ad8aa5363669cca59c9770540f868850b273d7cf755c483a028b50145d56154fc8ca54500e5fa12b6f1f58806938b8f9fd20fdc188a028d7bf276126d59fe18 -MISC ChangeLog 8391 SHA256 179b0264fc62914dde98fb8cb1d856a8f430400ad0a3bbae7cbad31a83af68e3 SHA512 fea2f0a494571c5535a88201322e213c799fc6c3e349a2681d29cfeb71d4355104591cdcd68c6ff12d2c5d040b905d760fca61be5840fdbb6f5f3dbfaee0585f WHIRLPOOL b1f0177791699bccb923b46e042d54cf165b1e996e32bf8413d940f5404f5a41495dd864c55f04bebed40e4f88081b332ef9f28a3e260e2d0ee9dc9c4c45224d +MISC ChangeLog 8674 SHA256 d89b9a1c565d5f9d0f72a8b0b739b216f7f480579aee8f329146f33790f4c1ba SHA512 2fcf8cde380d379249556ad689bef43889773831491aff1b1d37f9a3968ed5b8755b08a2665f70d9d22292db17c9edca16375238d65c3f473538dba543532f18 WHIRLPOOL 54a3b221de541c0f96dc08b0a2d984b70534874dfa4baa75ac7326ea2cb1a2da52d635255f670b6b898948c56c6dc675dff7d46ffc08d4da2775b1696526e0c4 MISC metadata.xml 251 SHA256 855f63b6050a478e21c4f1ed0ba0eb8c4efca42ec13327fe249bc5de49a230cc SHA512 6c79da7726336b715a9b390b3df393e552456a06144401c7c0b0b5aaa918e383ad1c8197140b80b29cd285d5bdc2d51be986bf8e1a5fbc6753352355f2c6a7f9 WHIRLPOOL 612602abb7601cb70608d5132f18de04d0f0eade1854ba80f9430d6f6d737a41ae9b19b86fa6462e33bfe1dd5777740b40a5fafa343726801332486fc7d6616c ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) - -iEYEAREIAAYFAlDjMh0ACgkQuQc30/atMkDBSgCfajSZUZB3vy3wEtBiFaVLWAYi -h7wAn3vyoT/aa1AKZ4nMDa6Ag/6BA7N9 -=J1dy ------END PGP SIGNATURE----- diff --git a/x11-drivers/xf86-video-sisusb/files/xf86-video-sisusb-0.9.6-remove-mibstore_h.patch b/x11-drivers/xf86-video-sisusb/files/xf86-video-sisusb-0.9.6-remove-mibstore_h.patch new file mode 100644 index 000000000000..dc920dabdcd7 --- /dev/null +++ b/x11-drivers/xf86-video-sisusb/files/xf86-video-sisusb-0.9.6-remove-mibstore_h.patch @@ -0,0 +1,29 @@ +From 293d0902705c272b83432a955fb6a3c96dd6cea7 Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Tue, 25 Sep 2012 12:54:52 +0000 +Subject: Remove mibstore.h + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- +diff --git a/src/sisusb_driver.c b/src/sisusb_driver.c +index 539b9f1..0fdc8e9 100644 +--- a/src/sisusb_driver.c ++++ b/src/sisusb_driver.c +@@ -39,7 +39,6 @@ + #include "shadowfb.h" + #include "micmap.h" + #include "mipointer.h" +-#include "mibstore.h" + + #include "sisusb_regs.h" + #include "sisusb_dac.h" +@@ -1907,7 +1906,6 @@ SISUSBScreenInit(SCREEN_INIT_ARGS_DECL) + /* Initialize the accelerators */ + SiSUSBAccelInit(pScreen); + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + + /* NO SilkenMouse. Never. Ever. */ +-- +cgit v0.9.0.2-2-gbebe diff --git a/x11-drivers/xf86-video-sisusb/xf86-video-sisusb-0.9.4.ebuild b/x11-drivers/xf86-video-sisusb/xf86-video-sisusb-0.9.4.ebuild deleted file mode 100644 index 7708ad5adcc4..000000000000 --- a/x11-drivers/xf86-video-sisusb/xf86-video-sisusb-0.9.4.ebuild +++ /dev/null @@ -1,22 +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-sisusb/xf86-video-sisusb-0.9.4.ebuild,v 1.8 2011/02/14 23:56:23 xarthisius Exp $ - -EAPI=3 - -inherit xorg-2 - -DESCRIPTION="SiS USB video driver" -KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86" -IUSE="" - -RDEPEND=">=x11-base/xorg-server-1.6" -DEPEND="${RDEPEND} - x11-proto/fontsproto - x11-proto/randrproto - x11-proto/renderproto - x11-proto/videoproto - x11-proto/xextproto - x11-proto/xf86miscproto - x11-proto/xineramaproto - x11-proto/xproto" diff --git a/x11-drivers/xf86-video-sisusb/xf86-video-sisusb-0.9.6-r1.ebuild b/x11-drivers/xf86-video-sisusb/xf86-video-sisusb-0.9.6-r1.ebuild new file mode 100644 index 000000000000..b89868fdf1ec --- /dev/null +++ b/x11-drivers/xf86-video-sisusb/xf86-video-sisusb-0.9.6-r1.ebuild @@ -0,0 +1,18 @@ +# 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-sisusb/xf86-video-sisusb-0.9.6-r1.ebuild,v 1.1 2013/03/12 16:37:03 chithanh Exp $ + +EAPI=5 + +inherit xorg-2 + +DESCRIPTION="SiS USB video driver" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86" +IUSE="" + +RDEPEND=">=x11-base/xorg-server-1.6" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-remove-mibstore_h.patch +) diff --git a/x11-drivers/xf86-video-tdfx/ChangeLog b/x11-drivers/xf86-video-tdfx/ChangeLog index 48565fa40efa..4c1d6b23be4c 100644 --- a/x11-drivers/xf86-video-tdfx/ChangeLog +++ b/x11-drivers/xf86-video-tdfx/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for x11-drivers/xf86-video-tdfx -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-tdfx/ChangeLog,v 1.69 2012/12/30 14:51:16 ago Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-tdfx/ChangeLog,v 1.70 2013/03/12 16:37:20 chithanh Exp $ + +*xf86-video-tdfx-1.4.5-r1 (12 Mar 2013) + + 12 Mar 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + +files/xf86-video-tdfx-1.4.5-remove-mibstore_h.patch, + +xf86-video-tdfx-1.4.5-r1.ebuild, -xf86-video-tdfx-1.4.3.ebuild, + xf86-video-tdfx-1.4.5.ebuild: + Fix building against xorg-server-1.14 30 Dec 2012; Agostino Sarubbo <ago@gentoo.org> xf86-video-tdfx-1.4.5.ebuild: Stable for alpha, wrt bug #440872 diff --git a/x11-drivers/xf86-video-tdfx/Manifest b/x11-drivers/xf86-video-tdfx/Manifest index b2ac970f97ea..14b22f6d2c5f 100644 --- a/x11-drivers/xf86-video-tdfx/Manifest +++ b/x11-drivers/xf86-video-tdfx/Manifest @@ -1,8 +1,8 @@ -DIST xf86-video-tdfx-1.4.3.tar.bz2 290172 SHA256 3ad935ca0aa306d10d1e6125a6bd485a3948c184dcfda01670961dc4740ebf33 SHA512 de40482421c7d0b404ec81c6dda8627cbffefedf2c1615403e503aa8a330f77063a37316201f9688f042760f6c29bfd53ee0383fccef09fd7770df23e7194f49 WHIRLPOOL f9a93064b5b36cc66c0ee69b82c946c4cb1b39845d8e10d69fe51c241bb995af8e7d618358bf2c6210c4b628551b500bb7980723ca94a65a0dc65270d669b32b +AUX xf86-video-tdfx-1.4.5-remove-mibstore_h.patch 906 SHA256 a79d50f619e6976b90a73f1a9842390e1b3fa37e1ce519bfbb178bd3161af9b5 SHA512 794085d14cda5a28dff26bdb7b4b44fafbc3eb2c2a2ff0bdd30e287d2e8fec9fdcf38571b00df863e04898f38394156580b94fc19a8a831bb26526d32d8f0415 WHIRLPOOL 02e32cc84da851fb756a9ea9177f0a3c5b0516506bd38d3aaad2295c65521d17e657bf47e84ca45f464cdd96cfdb7ce38895c74c89635f4c257295620003dab0 DIST xf86-video-tdfx-1.4.4.tar.bz2 338767 SHA256 e0b931dea0fb1ebfaa628a3dc07bf6945b377d3f7bbfd3a43ca4c80c46d48f88 SHA512 81a2da966263798062e88022b8cf9dc38a6ee7b35dbe23c4e6958eef1c6b99f677e112604329285729bc01ac6caddd48164662446e6a0caf2e39a4550dcfe067 WHIRLPOOL 8ef0d1092bc4124450e0f0a1af202afc52b3b66011af59953db587a37de395e414e336e7ad23af77bbfacaf6ed0ba5f0cdec26c78ff61b3f1c07c126831a1cd0 DIST xf86-video-tdfx-1.4.5.tar.bz2 339623 SHA256 70d5fbadfb60fc25e4f90f2a1aad258f64fa3953efbc1059103a8d845870d859 SHA512 721f487fe2f08c51fe4622bbbbdbf5c2b8f078f811e18d03e707fd2ab121a8e0a95165934e1567f4280e2613e94fdf5dd35c6c6ddd1ff935a07cfbb485670555 WHIRLPOOL 58f1e98299041994cac12acf5cdd1e0241cad107645d1275d2f8e8c08838fc229684ac22689313cb43f8eafb622e9f98b6cb599e3f9451e8fac89411ffef9e7f -EBUILD xf86-video-tdfx-1.4.3.ebuild 727 SHA256 151e50a98c38a75006a297e9212195667a3e6f9ebcc534afa4b7634c67b35899 SHA512 ab4409b8bdfefa968a563fc8e0d92f7d524a0bc7fc4bc5fdd3d89dd325f2a9903f7f9a5e0146c53e93c4904bb44f446fa43eaebf4ee41eab1b270c4b1c8b374b WHIRLPOOL 3334375112ed2288fb789f6039a96ecb9a70a4e91cf08b9638461487b9aa0ad5cec66e2b53a0903e9b0827156a7ba0f6baa5a822d7babb98033f249c41d0a1b0 EBUILD xf86-video-tdfx-1.4.4-r1.ebuild 502 SHA256 b5de7ae5938e7d337a004f8935ee1161c9f7bff2ed35de892eccbba5961f69d4 SHA512 15e9d340b3d26f0db16bfc497adb74b9f04434fd3140baef9e2d6b115783178ced81a180e698d61ed5c5909a4fa015edf65c75ba4f5b6f18b194999ac387fc46 WHIRLPOOL 96b2876e87c68c1789abd26687c4a23bb4e90db854d7be8791642d8fcf95a55523b74dde79aee8027b0ff03a035c1b9087d1a9a943b59892e7ce841de5458273 -EBUILD xf86-video-tdfx-1.4.5.ebuild 495 SHA256 6aad0f486e8e9ff484e8474b27cf982a66e9d89a9513cf52de295b61860eee9e SHA512 54aed8d5162238babda93b8b2fcde4f1c5b3b324890e37f5d502e1d447a2734e5edecf17079c0c801f3dccdcb1f5cc8396ba656a2b6b1864e214373d57309f52 WHIRLPOOL c3400f2f11d42bf350336903aa6e78aa42472865d417cb888af2ebf004feaf250942e42dec22a254e6a14921ab8696182414cbb1e5665f9ba3a748c51c8a88f4 -MISC ChangeLog 9558 SHA256 26f50ed079309fa347f36a9fb143fa221e8b78f0df6a71d146fe5ad2d8799a43 SHA512 5524f22800a59bcf6e0147377b3607c029fc3fd204faf97512ca5369050a21fab94d4d43016b4ab0600fc95eaea2a03e5fae7f9c2641f3d56001243f7a39f869 WHIRLPOOL ae7a10216c4e7ed4131205261da711c89ddb5067d4127546201969994d383a072bda11f63bda18eb08d928b629984584e511157bc887d9d6e2701d6a6892d5d2 +EBUILD xf86-video-tdfx-1.4.5-r1.ebuild 566 SHA256 07d2a8280d6763e1ce12b939319ad44d6bea20483cabeb5789b7c3ae6b28fb59 SHA512 d453f4dd46f11a9c0fb06740b8bfa330206a28e9723f78a222af70aced9b7fac1271fca1688e56a90d86b360eb7044e43f078800054c6b1c06ea167a68f2f25e WHIRLPOOL b01bb9df86e5c27fe68cfb2cf20d768842ccc0847329ce22e39be3984995f4567af0e8142d1cfe606be20e872a365fcd65572b8df8c6c81fbbdcef16d53f9693 +EBUILD xf86-video-tdfx-1.4.5.ebuild 500 SHA256 ec71bbde27588725976a1dd63891bc4e27cae9766e9fc00246cb916712394f0b SHA512 b29080089ffb8f1d64cb52976530ff0edf94141766b85ba87f77255e1348c50709ebf4723b47d9ef626430ba48d21884becf8058270dd7e5be330203447c1efe WHIRLPOOL bfadceefcac9a657e8e2c4299257986c3ac8bc4736b1ff25ae3b2f2faaa4b953eff70d56e68519b2446a1901e1873f49aa9e6aa68918acfc384f8e4ff9bea969 +MISC ChangeLog 9869 SHA256 7c0b3c519ce90dbdd850470f03c84c02df31a24a9f490392e01e59619ef0531d SHA512 72c88b3bc0ac1a8151621722884ce0eaf25ab16919ff8baa20738fffbef1e58bafd122d8bc9726ddfe59ecc189d2b7c2d4138a196c2ad5539a89b6565709999d WHIRLPOOL c5ad42d80786cf5a914e5fc9192ae67c6a6830ea5a18f8f496fe3248646077c4e119db0fc6ca3b0ea8f662cd706152926e0aa1caaa8fe10dd046c733352474c8 MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93 diff --git a/x11-drivers/xf86-video-tdfx/files/xf86-video-tdfx-1.4.5-remove-mibstore_h.patch b/x11-drivers/xf86-video-tdfx/files/xf86-video-tdfx-1.4.5-remove-mibstore_h.patch new file mode 100644 index 000000000000..30399cf1aa23 --- /dev/null +++ b/x11-drivers/xf86-video-tdfx/files/xf86-video-tdfx-1.4.5-remove-mibstore_h.patch @@ -0,0 +1,32 @@ +From 10498d2730c651eb7a1890eb9e728269732e9dad Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Tue, 25 Sep 2012 12:54:59 +0000 +Subject: Remove mibstore.h + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- +diff --git a/src/tdfx_driver.c b/src/tdfx_driver.c +index ddd5431..412da07 100644 +--- a/src/tdfx_driver.c ++++ b/src/tdfx_driver.c +@@ -62,10 +62,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + #include "compiler.h" + +-/* Drivers using the mi implementation of backing store need: */ +- +-#include "mibstore.h" +- + /* All drivers using the vgahw module need this */ + /* This driver needs to be modified to not use vgaHW for multihead operation */ + #include "vgaHW.h" +@@ -2373,7 +2369,6 @@ TDFXScreenInit(SCREEN_INIT_ARGS_DECL) { + } + } + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + xf86SetSilkenMouse(pScreen); + +-- +cgit v0.9.0.2-2-gbebe diff --git a/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.3.ebuild b/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.3.ebuild deleted file mode 100644 index 34c51a98c55f..000000000000 --- a/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.3.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.3.ebuild,v 1.5 2009/12/15 15:46:23 armin76 Exp $ - -# Must be before x-modular eclass is inherited -#SNAPSHOT="yes" -XDPVER=4 - -inherit x-modular - -DESCRIPTION="3Dfx video driver" -KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~x86-fbsd" -IUSE="dri" -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 - dri? ( x11-proto/xf86driproto - >=x11-libs/libdrm-2 )" - -pkg_setup() { - CONFIGURE_OPTIONS="$(use_enable dri)" -} diff --git a/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.5-r1.ebuild b/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.5-r1.ebuild new file mode 100644 index 000000000000..952e1c60722a --- /dev/null +++ b/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.5-r1.ebuild @@ -0,0 +1,25 @@ +# 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-tdfx/xf86-video-tdfx-1.4.5-r1.ebuild,v 1.1 2013/03/12 16:37:20 chithanh Exp $ + +EAPI=5 +XORG_DRI=dri + +inherit xorg-2 + +DESCRIPTION="3Dfx video driver" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd" +IUSE="dri" + +RDEPEND=">=x11-base/xorg-server-1.0.99" +DEPEND="${RDEPEND}" + +pkg_setup() { + XORG_CONFIGURE_OPTIONS=( + $(use_enable dri) + ) +} + +PATCHES=( + "${FILESDIR}"/${P}-remove-mibstore_h.patch +) diff --git a/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.5.ebuild b/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.5.ebuild index a89d59480b94..cc1742f7d041 100644 --- a/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.5.ebuild +++ b/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.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-tdfx/xf86-video-tdfx-1.4.5.ebuild,v 1.7 2012/12/30 14:51:16 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.5.ebuild,v 1.8 2013/03/12 16:37:20 chithanh Exp $ EAPI=4 XORG_DRI=dri diff --git a/x11-drivers/xf86-video-tga/ChangeLog b/x11-drivers/xf86-video-tga/ChangeLog index f32502f89d5a..736fe8849a75 100644 --- a/x11-drivers/xf86-video-tga/ChangeLog +++ b/x11-drivers/xf86-video-tga/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for x11-drivers/xf86-video-tga -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-tga/ChangeLog,v 1.40 2012/12/30 14:51:30 ago Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-tga/ChangeLog,v 1.41 2013/03/12 16:37:35 chithanh Exp $ + +*xf86-video-tga-1.2.2-r1 (12 Mar 2013) + + 12 Mar 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + +files/xf86-video-tga-1.2.2-remove-mibstore_h.patch, + +xf86-video-tga-1.2.2-r1.ebuild, -xf86-video-tga-1.2.1.ebuild, + xf86-video-tga-1.2.2.ebuild: + Fix building against xorg-server-1.14 30 Dec 2012; Agostino Sarubbo <ago@gentoo.org> xf86-video-tga-1.2.2.ebuild: Stable for alpha, wrt bug #440872 diff --git a/x11-drivers/xf86-video-tga/Manifest b/x11-drivers/xf86-video-tga/Manifest index 11b906ec24ce..c947381a0b2e 100644 --- a/x11-drivers/xf86-video-tga/Manifest +++ b/x11-drivers/xf86-video-tga/Manifest @@ -1,6 +1,6 @@ -DIST xf86-video-tga-1.2.1.tar.bz2 273334 SHA256 70a4754ef6602cf48d910b9727d015cb3cae946c096ef260b56dfe2f80cdb855 +AUX xf86-video-tga-1.2.2-remove-mibstore_h.patch 1019 SHA256 869a3bdba63f904c06ae4e1acb02c43364bf6b8cc6b3b2f04f64a069ad238ffe SHA512 049d7f65c9c7105c0d015229b105a3c7778c9cd441efe06e7c412b7c1d648cbba9a35cd55f9552d7fa77c5eb6e25e6ddb2b17eff0235dd087cf01c9c07fb884f WHIRLPOOL 427275126607971558b78c2a837875b557411cb2119c1de65649eecf9925b900160f8af4d2bac7303017d23e30fedd59c7ad12cb733cbd478459971a99be05e0 DIST xf86-video-tga-1.2.2.tar.bz2 318943 SHA256 2023818000200eb50a59476e36d59b07a361b110e73b1d9cc526beb669306131 SHA512 38d0f61e0384400187b8a02d8ddc8b08edf2485448d9fcc941b5cc20bfc15f46d7f665b98365227b42b029dc92d76da9efcf8e934bcf382765657a0b54d1d231 WHIRLPOOL 3b977a17cfc4b7f1ba8bb470b6426268266d2a18b15e4404547b52d7753e60501cc7f928e80745ff08428fe5a1951b8203dac0f60528b16dd7e6da6c0cf8099d -EBUILD xf86-video-tga-1.2.1.ebuild 638 SHA256 851699e72d563abdc3abc1f6c5d825c6e4a2e7832bfb6e6e72079b04405c8b24 SHA512 f71572d0bae718a53432d7757e974c4b9ac4349cea85cef262b026cfe3fcc220e7b6588f6e2ab4262d0f19c031eb14395e06dbb5a0e71206ee9218592c866ac4 WHIRLPOOL 9f00822815834a14c70b383a23fceb4601ab1b17236aa54c9eaf602f6993ed235fb4b052310028f0efc3c536fa96ebc5efbcd3c334715abc20120eb79fd3c6d0 -EBUILD xf86-video-tga-1.2.2.ebuild 445 SHA256 43603864aef15b3f905048b9c88c6f46963c06c1c41a6a478c8a7aa7a80bb7ea SHA512 2f3195f1556d24c02d964db1dd032fff085203be822eff3aa5c07025e3ba6c0b13fdfb91e2f9edef027d29b18707c115b56e4e7c3e4c5f888a17768d1c2485a8 WHIRLPOOL 886849bcd313e37c80d55bfc8360029f57c38d47f060e2af4c6114df2ee631cf4a29604b6979fc77759a663f99b865bb45c858f2135c68d5b348102be66e224f -MISC ChangeLog 5315 SHA256 9e63c208c306751be91825e4f380de38619bf2ddb52efdb697afc8df1d989934 SHA512 ecf487788c1de35e0f825e2c10460e45f753c6536f58672ca39dd944aebfe752bac17f986889ecffaf46c5987327442ef494ac502d60eb347e04e6476b48107b WHIRLPOOL 63135a73bd4d870af63c3b58af21c023f0244d4ca8543171d73023e4fcbbe97f0074092c8505e6aae3d7af640174befb53ddc2d6e28a21525d139d8462cf3d9e +EBUILD xf86-video-tga-1.2.2-r1.ebuild 514 SHA256 67ba6f35fc765ac93e52ae2195121d34910425faa69d091f684c5cccd3a30fa1 SHA512 6d9fcb0100fa056a786e3a42f9378c4daa6c7fe7f9697de985318ea2ff316de90ad9d52e40ab44e1b03435ed6063b6cb8563a3dac3c82fb2ccb0b4dde530fbd9 WHIRLPOOL 8b807b7aadfb60a593e90705e19e49d2859b18aeb9066fae14ea1ae5602b35ca4469b3ec3de7b2794a3ed73327a6eb971f76b23dc4141bb8f3ac62cc898c07d8 +EBUILD xf86-video-tga-1.2.2.ebuild 450 SHA256 f902e7fd54e0230d2d839acc6a7bfdf7ba36b3879bd7ecea42579fd19e92caa2 SHA512 4659c5cfcdb6e0c6ac65b69381a23c3e6c7a15071eb2112418552516d72b79f3872ec2f1f879170a94303a5d23a12b1d45a385dfb2d4130b51af4ed6b2e1ec61 WHIRLPOOL 80d158c6404aebea023ba29f923c6d5e610c748a7ce2ea781234d9a31e8b5942b541623695d8fce7bedaa797251e4968e0c519bba5b4288cfc5e73d13da17993 +MISC ChangeLog 5621 SHA256 b85699630cbc91f0a6cb5b4c6f43e71cc84376857e695cb495a955088b60b33a SHA512 12223549e3db36d5033f444a6d78a104a02ab09a8156092f28778a416d774f22160eae02ba5d22fcd0ba0b75d0aee41cb3bda9d0550c0efd4bce9816b44e240a WHIRLPOOL b554109f284cda8595454cf8964f4548adf707fc468eb04fb026ddeb1aede13f462a3c7c0003f8e7d79e25f71bb1f3872f0151a59beb75efec51c6282863f3d9 MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93 diff --git a/x11-drivers/xf86-video-tga/files/xf86-video-tga-1.2.2-remove-mibstore_h.patch b/x11-drivers/xf86-video-tga/files/xf86-video-tga-1.2.2-remove-mibstore_h.patch new file mode 100644 index 000000000000..811444147578 --- /dev/null +++ b/x11-drivers/xf86-video-tga/files/xf86-video-tga-1.2.2-remove-mibstore_h.patch @@ -0,0 +1,42 @@ +From b7022db0559cd1b6cd3eb6b5abf6896a607b478d Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Tue, 25 Sep 2012 12:55:00 +0000 +Subject: Remove mibstore.h + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- +diff --git a/src/tga_accel.c b/src/tga_accel.c +index 35af1a4..b414df5 100644 +--- a/src/tga_accel.c ++++ b/src/tga_accel.c +@@ -37,7 +37,6 @@ + #include "xf86cmap.h" + #include "mipointer.h" + +-#include "mibstore.h" + #include "miline.h" + + #include "tga_regs.h" +diff --git a/src/tga_driver.c b/src/tga_driver.c +index dd4f3e6..90d2660 100644 +--- a/src/tga_driver.c ++++ b/src/tga_driver.c +@@ -46,8 +46,6 @@ + + /* software cursor */ + #include "mipointer.h" +-/* backing store */ +-#include "mibstore.h" + + /* #include "mibank.h" */ + /* colormap manipulation */ +@@ -1451,7 +1449,6 @@ TGAScreenInit(SCREEN_INIT_ARGS_DECL) + + fbPictureInit (pScreen, 0, 0); + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + xf86SetSilkenMouse(pScreen); + +-- +cgit v0.9.0.2-2-gbebe diff --git a/x11-drivers/xf86-video-tga/xf86-video-tga-1.2.1.ebuild b/x11-drivers/xf86-video-tga/xf86-video-tga-1.2.1.ebuild deleted file mode 100644 index e0de35140fcc..000000000000 --- a/x11-drivers/xf86-video-tga/xf86-video-tga-1.2.1.ebuild +++ /dev/null @@ -1,22 +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-tga/xf86-video-tga-1.2.1.ebuild,v 1.5 2012/05/16 02:24:37 aballier Exp $ - -# Must be before x-modular eclass is inherited -#SNAPSHOT="yes" - -inherit x-modular - -DESCRIPTION="X.Org driver for tga cards" -KEYWORDS="alpha amd64 ia64 x86 ~amd64-fbsd ~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/xf86dgaproto - x11-proto/xproto" diff --git a/x11-drivers/xf86-video-tga/xf86-video-tga-1.2.2-r1.ebuild b/x11-drivers/xf86-video-tga/xf86-video-tga-1.2.2-r1.ebuild new file mode 100644 index 000000000000..e4eb4a954462 --- /dev/null +++ b/x11-drivers/xf86-video-tga/xf86-video-tga-1.2.2-r1.ebuild @@ -0,0 +1,18 @@ +# 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-tga/xf86-video-tga-1.2.2-r1.ebuild,v 1.1 2013/03/12 16:37:35 chithanh Exp $ + +EAPI=5 +inherit xorg-2 + +DESCRIPTION="X.Org driver for tga cards" +KEYWORDS="~alpha ~amd64 ~ia64 ~x86 ~amd64-fbsd ~x86-fbsd" +IUSE="" + +RDEPEND=">=x11-base/xorg-server-1.0.99" +DEPEND="${RDEPEND} + x11-proto/xf86dgaproto" + +PATCHES=( + "${FILESDIR}"/${P}-remove-mibstore_h.patch +) diff --git a/x11-drivers/xf86-video-tga/xf86-video-tga-1.2.2.ebuild b/x11-drivers/xf86-video-tga/xf86-video-tga-1.2.2.ebuild index 1bf4048f383a..e3cb5f3c7628 100644 --- a/x11-drivers/xf86-video-tga/xf86-video-tga-1.2.2.ebuild +++ b/x11-drivers/xf86-video-tga/xf86-video-tga-1.2.2.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-tga/xf86-video-tga-1.2.2.ebuild,v 1.5 2012/12/30 14:51:30 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-tga/xf86-video-tga-1.2.2.ebuild,v 1.6 2013/03/12 16:37:35 chithanh Exp $ EAPI=4 inherit xorg-2 diff --git a/x11-drivers/xf86-video-trident/ChangeLog b/x11-drivers/xf86-video-trident/ChangeLog index c5e35fb79793..5b6a6989bf0c 100644 --- a/x11-drivers/xf86-video-trident/ChangeLog +++ b/x11-drivers/xf86-video-trident/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for x11-drivers/xf86-video-trident -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-trident/ChangeLog,v 1.67 2012/12/31 23:27:34 ago Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-trident/ChangeLog,v 1.68 2013/03/12 16:37:59 chithanh Exp $ + +*xf86-video-trident-1.3.6-r2 (12 Mar 2013) + + 12 Mar 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + +files/xf86-video-trident-1.3.6-remove-mibstore_h.patch, + +xf86-video-trident-1.3.6-r2.ebuild, -xf86-video-trident-1.3.4.ebuild, + -xf86-video-trident-1.3.6.ebuild: + Fix building against xorg-server-1.14 31 Dec 2012; Agostino Sarubbo <ago@gentoo.org> xf86-video-trident-1.3.6-r1.ebuild: diff --git a/x11-drivers/xf86-video-trident/Manifest b/x11-drivers/xf86-video-trident/Manifest index ea53b58bd3b0..b378893ef6d7 100644 --- a/x11-drivers/xf86-video-trident/Manifest +++ b/x11-drivers/xf86-video-trident/Manifest @@ -1,10 +1,9 @@ AUX xf86-video-trident-1.3.6-no-xaa.patch 1133 SHA256 e7fd27605e34e7e0d1d85153dbc62427e683e04925bf3650c0b4ac364f35f9b4 SHA512 1541c70423af452450987a19e6a2061af0b9086e7160c9116f1be5a7040e44d4fb9ea4986f31c8774ab7fc5d08ab3166f4816af4b72ebd17a7601177c26b6621 WHIRLPOOL 608f9226f8902499e28c90a806305ebe4683d505230920ce663255ba15b3bdab95dcf914bbc6e6af7e8defa80c6b503db0c1ebefdce90f996c9591e8e1f04fe2 -DIST xf86-video-trident-1.3.4.tar.bz2 310898 SHA256 58e61631e0ef2c58c3c81afb7d7b8d2b46504bdc3dd84fd1ab2798c6f1f29ca8 SHA512 2181a3fd7cde326ee4193dc22c071e4722d878eddc68c62b1a7a76837d8c6e942ee63be4b22bd00eb3dc9ef800f915d4c3e1ddddf0e8888084c5e7ae558dd7f8 WHIRLPOOL 5917dfa5ff741ac744c9219a0e0a7f0d44d4fcea07cc037122787c6a9a314870c2df78d3777ed12172c3d9d353eaad38a4430d447aa9e637c93b23688380b4c6 +AUX xf86-video-trident-1.3.6-remove-mibstore_h.patch 750 SHA256 a2889127284ea278a53bdc3e7f43f19befd8e5f2d8e761651441c386dfe94b2e SHA512 7ea848bd4fe29435c3eb296385932faabaa7a5e9f3a58a5b0ed65b1b5ac324383a5ca38e0e19c2e09715be1d1d43d6dfc307c9e5f0b14d785778ba24def8706f WHIRLPOOL 3bae0d42bab776ee3e8348702642905b7f4016d0b025d4ff81336a75ca7c715873df269265225f74a33db5d8909407c4f3c0a06ed3c63705f559b92b9ca11120 DIST xf86-video-trident-1.3.5.tar.bz2 334649 SHA256 4bb3d091ab7788e1883d6d9e7e0c7ecbf9f57e5ef03d94a5082c2870dbbfc50b SHA512 ccdccc6b16d84925aa750eeb18218cd562cfd3b10d8f07c46ffcec49947865b8ca516ceeaa4788f8bac1b8a4eebbe2113c6000ed97e1103aa7756c97e78081aa WHIRLPOOL 12a970369433d26580d0df05515fcc8201d7fcf7dd7ae70b22be8eed4bee1f7adf60a5eba467810e586f0be0c846696e534e7b9793393c83665f461c6cbc505d DIST xf86-video-trident-1.3.6.tar.bz2 356092 SHA256 6a58e3f3034abd8803af8a5c7dd5a6a4a28ed4fdac742ffb05518caaddc28104 SHA512 16aa61c3b84d8f6f581864cd8a94b6bed4271c17c255760328d5444689344bc6d3a8f8b20eee91d289a9732e59b6e5f34c41ba05e66da5c0e8554c40af8907b2 WHIRLPOOL 9f31868d1500eda5c456ce59be717da44952c2b10fc46868f6347ef68b4fd43177f3acf7223cbf23da98a4fc46e4d6825b10965d3ebbf2bab917fbfff24a0c7a -EBUILD xf86-video-trident-1.3.4.ebuild 565 SHA256 53581cceb9094c8c5fce441d5d0b701fa0b43be1ad53a3edbbbcf33799195478 SHA512 b4ebecfc4c75487894f8387e2826341e3cdf0dc414a57b75f2c9c1f1bd3e0e6b4470cbf6b70e53a14100ca1d6b947daa4e64ac98af802129520d33682b37b2ea WHIRLPOOL 053512c1e3a762aaa8672038a89e1e08d8ab1373afa5f56918c26b3d716ec6920296cc2a11bc451020551e847d005cf08ec07e1ea107dd6db32c315aa9dfef91 EBUILD xf86-video-trident-1.3.5.ebuild 425 SHA256 14963f198ef74b49f3b90c8fa5ea635a610898fb7111221021695e9ff44bfbf4 SHA512 1c95c33173ffb9eac208fa7346fafe24090775ce97c836b7d17f11a9f99fc7a5ead8edf1a1d75659aacf22d503bf5b0c8c6efe534caf3a452c2f40d1f73295da WHIRLPOOL 428965cf714bae1d62a8826494c7cba0eb21b315aa6f6a01a84d013828d0a683b53b02c18e4f1e6805d0285d9212aeeba7ffe6ccd6319e1981c068f60ec49882 EBUILD xf86-video-trident-1.3.6-r1.ebuild 470 SHA256 9ee07fbe66e411c85ac344183260c99fda7f7e736eb9ebc9b4ee6e19048708d6 SHA512 a99d389797331de34f0e138a094b4439348295091706ffe5214f04e70d99e96911459e638b086e9b7e518f396cb49c17fdebf08fa9db8f7cc80e60e005506c74 WHIRLPOOL e251ea8155c279a70a81f31b18ee4acfa3a14d6641eb58d708b1a56418b8df00565e9e4629239e5f8ed7615b29d6c9b8cb8ca4ca621f483f1255db6ba8f2e02c -EBUILD xf86-video-trident-1.3.6.ebuild 425 SHA256 c931ca1049bd0dd778b14b6b2fab3609de095c3b76f5d3ab0408ba2a0e60d85b SHA512 963906213ba3757d4acd09feab1f29063640a13cc2fcf290ed2f551db8994b30f7f3d3dce55615dde28160dd6f06a8ab8c29eb5ee4de84b2b9a0d363f936803b WHIRLPOOL e07e7746997694bbd067cbb626ce8480775eb782ef4d07d01e662f5f79705d4b8f75fa49c9cf722d3a29ab023cd5101318722bec1a79e2edf4d5a25262e57e26 -MISC ChangeLog 9394 SHA256 1301d04f482f913a75a8bf2a248b93d5572b5595b27c0261d4eb84c8333d7273 SHA512 f216b5dcdac6bd27e0a61149f0bb5e2fa34cecdff5412355ec6ccea7f0461f1bdc6aa71f3833abfd0708b9c178667c89aed32ba903066bbd2f9d7b60fd86d14b WHIRLPOOL 748096e7d1d211621b9d025a2bbc99ba2b18e53f6ce2e3c9b5ef5fd37ba07c48ab3ce46a7f297cba83f6bc6028cd32272b1eabde419daada4c0a6f4d4d3edb54 +EBUILD xf86-video-trident-1.3.6-r2.ebuild 523 SHA256 55cda66b52c5c861c461dafb6cfd5af0391c97ed2fe2cf6f53fc5aa8956a83bb SHA512 3096cfd2d1c74036fa665120d4eb28dd73813e00e89fda30471691e368dc53a15d7d1a02711c8bb519ccf213d063e2f9d8f65c20d82af09b1a0dc056fe138a10 WHIRLPOOL 98cacb76a3ca4058cd51dfbffa9e92565cc3e0532113fae6f6cb9254727a80b1af76cd2c3520a767e6c81c8b463b8083c41c13b737e9b85be37a4a3575dfb5f6 +MISC ChangeLog 9721 SHA256 4afa9ed804d44e77dfb5f7dd5968610f5c641b4b6eb0af04e69cb99dd4bfdb11 SHA512 f7f4979e5182c534c942fd1ed3cbcf706b24ae4207b5726e267743f727913321550111eeb243381bc686f76652fe643ad95ebe30c22de039d59f99af943a91fe WHIRLPOOL 25a90b90338c1bae1c161c80f5e949c4bab53961bd90df81826fa4ddc4697f8387bdb8955fbd6929c6839f511d323b32452517a7a806beca1cd1a79fb462b24c MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93 diff --git a/x11-drivers/xf86-video-trident/files/xf86-video-trident-1.3.6-remove-mibstore_h.patch b/x11-drivers/xf86-video-trident/files/xf86-video-trident-1.3.6-remove-mibstore_h.patch new file mode 100644 index 000000000000..c1b7a904ad49 --- /dev/null +++ b/x11-drivers/xf86-video-trident/files/xf86-video-trident-1.3.6-remove-mibstore_h.patch @@ -0,0 +1,29 @@ +From 30787294c837aefa8820b6f76f00fe30d4e54181 Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Tue, 25 Sep 2012 12:55:01 +0000 +Subject: Remove mibstore.h + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- +diff --git a/src/trident_driver.c b/src/trident_driver.c +index dc12b76..408c870 100644 +--- a/src/trident_driver.c ++++ b/src/trident_driver.c +@@ -56,7 +56,6 @@ + + #include "mipointer.h" + +-#include "mibstore.h" + #include "shadow.h" + #include "trident.h" + #include "trident_regs.h" +@@ -3037,7 +3036,6 @@ TRIDENTScreenInit(SCREEN_INIT_ARGS_DECL) + TridentAccelInit(pScreen); + } + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + + /* Initialise cursor functions */ +-- +cgit v0.9.0.2-2-gbebe diff --git a/x11-drivers/xf86-video-trident/xf86-video-trident-1.3.4.ebuild b/x11-drivers/xf86-video-trident/xf86-video-trident-1.3.4.ebuild deleted file mode 100644 index c653e54f7171..000000000000 --- a/x11-drivers/xf86-video-trident/xf86-video-trident-1.3.4.ebuild +++ /dev/null @@ -1,20 +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-trident/xf86-video-trident-1.3.4.ebuild,v 1.5 2011/02/12 19:36:37 armin76 Exp $ - -EAPI=3 -inherit xorg-2 - -DESCRIPTION="Trident video driver" -KEYWORDS="amd64 ia64 ppc 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/xf86dgaproto - x11-proto/xproto" diff --git a/x11-drivers/xf86-video-trident/xf86-video-trident-1.3.6-r2.ebuild b/x11-drivers/xf86-video-trident/xf86-video-trident-1.3.6-r2.ebuild new file mode 100644 index 000000000000..2b580cfd47e0 --- /dev/null +++ b/x11-drivers/xf86-video-trident/xf86-video-trident-1.3.6-r2.ebuild @@ -0,0 +1,18 @@ +# 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-trident/xf86-video-trident-1.3.6-r2.ebuild,v 1.1 2013/03/12 16:37:59 chithanh Exp $ + +EAPI=5 +inherit xorg-2 + +DESCRIPTION="Trident video driver" +KEYWORDS="~amd64 ~ia64 ~ppc ~x86 ~amd64-fbsd ~x86-fbsd" +IUSE="" + +RDEPEND=">=x11-base/xorg-server-1.0.99" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-no-xaa.patch + "${FILESDIR}"/${P}-remove-mibstore_h.patch +) diff --git a/x11-drivers/xf86-video-trident/xf86-video-trident-1.3.6.ebuild b/x11-drivers/xf86-video-trident/xf86-video-trident-1.3.6.ebuild deleted file mode 100644 index 0d1b677fba5c..000000000000 --- a/x11-drivers/xf86-video-trident/xf86-video-trident-1.3.6.ebuild +++ /dev/null @@ -1,13 +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-trident/xf86-video-trident-1.3.6.ebuild,v 1.4 2012/11/28 21:43:02 ranger Exp $ - -EAPI=4 -inherit xorg-2 - -DESCRIPTION="Trident video driver" -KEYWORDS="amd64 ~ia64 ppc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="" - -RDEPEND=">=x11-base/xorg-server-1.0.99" -DEPEND="${RDEPEND}" diff --git a/x11-drivers/xf86-video-tseng/ChangeLog b/x11-drivers/xf86-video-tseng/ChangeLog index ec5d0f9cf1c5..14ecc380fbe1 100644 --- a/x11-drivers/xf86-video-tseng/ChangeLog +++ b/x11-drivers/xf86-video-tseng/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-drivers/xf86-video-tseng -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-tseng/ChangeLog,v 1.53 2012/12/28 11:29:41 ago Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-tseng/ChangeLog,v 1.54 2013/03/12 16:38:13 chithanh Exp $ + +*xf86-video-tseng-1.2.5-r1 (12 Mar 2013) + + 12 Mar 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + +files/xf86-video-tseng-1.2.5-remove-mibstore_h.patch, + +xf86-video-tseng-1.2.5-r1.ebuild: + Fix building against xorg-server-1.14 28 Dec 2012; Agostino Sarubbo <ago@gentoo.org> xf86-video-tseng-1.2.5.ebuild: Stable for ia64, wrt bug #440872 diff --git a/x11-drivers/xf86-video-tseng/Manifest b/x11-drivers/xf86-video-tseng/Manifest index a240b09da54e..b68d5cf643d1 100644 --- a/x11-drivers/xf86-video-tseng/Manifest +++ b/x11-drivers/xf86-video-tseng/Manifest @@ -1,6 +1,8 @@ +AUX xf86-video-tseng-1.2.5-remove-mibstore_h.patch 873 SHA256 8a337e2bab9a5ee7ba15dde6665abcfa9559d769074873cb2a85cc86716bd5da SHA512 3c2586b137ab3185681cec945e759334d4c4b48d333a9b770d3b061bfe8a51aa536b1c0b3680c04d2f12365255c2fa99aceafcbd595e04d5c8ea29d43356bf90 WHIRLPOOL e75b7b26f1e4ea528ae6f81802a19654fb6f9d33b40df6d28c3fb4ad9038191af58ff2269c70ef1cdc7ff9eefcd30430266b84df8c97101610d8047bf5025a13 DIST xf86-video-tseng-1.2.4.tar.bz2 296314 SHA256 d0dd5dfb4c6a8d0e0baf7fbb5f1784d6b4d1804f1eb188d19963867245e7d13d DIST xf86-video-tseng-1.2.5.tar.bz2 330575 SHA256 c06dc5205f627e5afc795ecfa75e18d2d1db4e1f1f195fd017dad60854407819 SHA512 6e0010b24d5b97ade00ef80fda5ea91bce3a9ce07881551e84ac552ba49336905b62f062c656c72ea3097a0bec1517ec5038aa5766f8424e5f81d67dc777480c WHIRLPOOL 5462561a42e410dbef9f482485af69efe759930567a16656cbfc1477bf499953548d6bafd1111bf168ef3f557a5d6e37ab87b87a3610939d0df90d2f64572f2c EBUILD xf86-video-tseng-1.2.4.ebuild 536 SHA256 1ed935fa3b5a8989d99b08e16dada2704630994fe3fbecdc58575989dc09b48a SHA512 d20055c4af16f3c92ba57a1b0d83dc4325ea901aeac5339208dedecc5b8cc6b238565fe5a621af462fa9fc39e4d9b99728c03011586b6806dcd2f095eb0dc7db WHIRLPOOL 766efc4b602fa6e5c05fdc9b811456098b61da20c9cf65bdc275fbdf05d36019efeaf320c86263c848f05e819a0253d0c4159b7e28be505036ed712420e6b7f9 +EBUILD xf86-video-tseng-1.2.5-r1.ebuild 484 SHA256 c7a9c6872a0c49f525b94dc5bf7958594cc5cf7cf10c1b1feaf840850dd02eb7 SHA512 e324ec082cbfd892be7d7307bfdaeed7df5abeccf59348b4e42807fa952fd2fe4d65cd3fdb1d7942f4067d0911fa5aec8a7dbe12a8fa5878e2e0d7cc96af7c56 WHIRLPOOL c308a675e9052464e431dbd309de46fccbe1f04bd05deab71cf25409a7b0c6783e1490df3eddda97605de5d07a3ae95299845d8be626ebbe15c3b4562def099c EBUILD xf86-video-tseng-1.2.5.ebuild 416 SHA256 6d6eb17698647ff47de31a393825ff7b4b436c8329085edb35180183f360f6f3 SHA512 acf918c74c645e8aaea127d264c203b8b1fc5b30d9c90e9138b723772aef62100ea95216be9775d40164a2cf17c2d7a280e3e21abaeb441b60d0a3d62bc68b39 WHIRLPOOL 95ddcc2e688823151429a1a97ef591a131506bb36e8ca59314f2796c207ea0e35a7fe0286e78f24caa6be18c49c688679679e2c8d60d0c95c5595866e0e27373 -MISC ChangeLog 7270 SHA256 57363b84a1faa939ebc386f3d10d561a46304be395145686a2dd55bdef1d99b0 SHA512 55e5b51cd9bafb33a4df87a279426426047c0a1caede943228f79339c4e0c3bf0675f07e2454a063633ed65a0e4ed0ef4f3224660c82510f891a2f522dcf4894 WHIRLPOOL 4bed685d7e13f36c3a9d2b12da40fb4a1f4ead64f6744eec59004207d16815b552721c2d831f99df2ba8b7cf3897f1008ed8e8e98ba995a3f8db252f1560ae9e +MISC ChangeLog 7521 SHA256 d90f191c43bf5052b2fbffbc59a7534c63d7a16528b62e9d902dca1a615f2ab2 SHA512 892be0ce980c4d870db11b0d5f388e8f36e1b2af5b3489dd2a34092fa19b85d83974e8bc51cef1978e02d399910696d8dc13cece4826db092a9b16dc58d2d5bf WHIRLPOOL 04afe1105f34c589e57e8dffc3b3682ea6114852abe3abd571d676d9011d23ec8fc88e904845cbb5ec98aa412883f0ae4e8f2978ff17631eeca926dac4d7d635 MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93 diff --git a/x11-drivers/xf86-video-tseng/files/xf86-video-tseng-1.2.5-remove-mibstore_h.patch b/x11-drivers/xf86-video-tseng/files/xf86-video-tseng-1.2.5-remove-mibstore_h.patch new file mode 100644 index 000000000000..88f9cc570128 --- /dev/null +++ b/x11-drivers/xf86-video-tseng/files/xf86-video-tseng-1.2.5-remove-mibstore_h.patch @@ -0,0 +1,31 @@ +From d2d5c8437e401181f56804cc68594c4831a0983d Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Tue, 25 Sep 2012 12:55:02 +0000 +Subject: Remove mibstore.h + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- +diff --git a/src/tseng_driver.c b/src/tseng_driver.c +index ffafb19..0db62e5 100644 +--- a/src/tseng_driver.c ++++ b/src/tseng_driver.c +@@ -39,9 +39,6 @@ + /* All drivers initialising the SW cursor need this */ + #include "mipointer.h" + +-/* All drivers implementing backing store need this */ +-#include "mibstore.h" +- + #include "fb.h" + + #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 +@@ -1453,7 +1450,6 @@ TsengScreenInit(SCREEN_INIT_ARGS_DECL) + } + } + +- miInitializeBackingStore(pScreen); + xf86SetSilkenMouse(pScreen); + /* Initialise cursor functions */ + miDCInitialize(pScreen, xf86GetPointerScreenFuncs()); +-- +cgit v0.9.0.2-2-gbebe diff --git a/x11-drivers/xf86-video-tseng/xf86-video-tseng-1.2.5-r1.ebuild b/x11-drivers/xf86-video-tseng/xf86-video-tseng-1.2.5-r1.ebuild new file mode 100644 index 000000000000..52e5731c9185 --- /dev/null +++ b/x11-drivers/xf86-video-tseng/xf86-video-tseng-1.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-tseng/xf86-video-tseng-1.2.5-r1.ebuild,v 1.1 2013/03/12 16:38:13 chithanh Exp $ + +EAPI=5 +inherit xorg-2 + +DESCRIPTION="Tseng Labs 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 +) diff --git a/x11-drivers/xf86-video-vmware/ChangeLog b/x11-drivers/xf86-video-vmware/ChangeLog index 625eedb42add..8ad04d239609 100644 --- a/x11-drivers/xf86-video-vmware/ChangeLog +++ b/x11-drivers/xf86-video-vmware/ChangeLog @@ -1,6 +1,13 @@ # 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.71 2013/01/20 18:53:56 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-vmware/ChangeLog,v 1.72 2013/03/12 16:38:27 chithanh Exp $ + +*xf86-video-vmware-13.0.0-r1 (12 Mar 2013) + + 12 Mar 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + +files/xf86-video-vmware-13.0.0-remove-mibstore_h.patch, + +xf86-video-vmware-13.0.0-r1.ebuild: + Fix building against xorg-server-1.14 *xf86-video-vmware-13.0.0 (20 Jan 2013) diff --git a/x11-drivers/xf86-video-vmware/Manifest b/x11-drivers/xf86-video-vmware/Manifest index c047f9fa17a9..3bf0be6eaf3a 100644 --- a/x11-drivers/xf86-video-vmware/Manifest +++ b/x11-drivers/xf86-video-vmware/Manifest @@ -1,7 +1,9 @@ AUX xf86-video-vmware-12.0.2-xorg-server-1.13.patch 19856 SHA256 22363b8decf438db2eace2e2d7768517d2a5b4c48669cf40e55239dfbeb32ea6 SHA512 d4d5f58973c8ff463d3acc5166a23b932d9f5f47154f68ad23e74dc836d0681bf6fbc696f1de526fd18cad9d4fb4648d543d32db078e273a21e59ad88566bad0 WHIRLPOOL 3ff992b6ead7f768c374d1318aafc1962e1fb800f11f8da075e5283545e2704202f41e236f6687fd6d932dea7b63aea92285d792286448bb4499fdfd375d9f9c +AUX xf86-video-vmware-13.0.0-remove-mibstore_h.patch 1686 SHA256 0a0fce7ddcb9c53da1b2aa1aa11317c10f0161026f40c82523c4dc0fd496016f SHA512 e362315fde7c4b61462aef49d7d21affafc0e5641bef693a2910247d0ad1331f1f2a538a2f5addafd1d96cc2decf140743728adbc61387201ba8b02d5ae06e0e WHIRLPOOL 72ab6c88a628bc0d27e6bb52538271e9304207cc57c8cc47e3f6eafdc1b51c6a65d8cfa2d2e19a22b91e59d9349d4cd9ca77821b06c4b5530405a30edbfc11f0 DIST xf86-video-vmware-12.0.2.tar.bz2 432468 SHA256 c827875fd94805ec9b925fe09aaa973e7e3f9096c7ef311d449c3f134ae75147 SHA512 14adbde330e247251fd425449fb79c8399f14ad9a295a1bea776e9bd77706ff9db9a7d0351f5faa8b96aac2b1d747ea289dc89b5cfdcbce5a11bba80b6765709 WHIRLPOOL b3061ef519f77bd8418bf48dafa2f18abb9d435f2eee7b3f64a217744eabaae4313d1d7cc22803817b5eceaeaa0347bcfc03e1c22535d34a6854a5d638c08fdc DIST xf86-video-vmware-13.0.0.tar.bz2 445703 SHA256 44919ecd88654f2ab40a1732b5ea6a1dbd1c696b4b0748e68e8b5f1a3486bca6 SHA512 4106c17469dc1d7fd3d6a9acd5c45d0cdae0d7c8c5ad9463d24de138fd67dbdf09cd32e0665063822d12dad512b27ccd16497097484551778fffabf7db8d5cfe WHIRLPOOL 86889dc1de009699db3b926ba76d5a1775c05f048ff47acd51212e61d6826b572966d89a4e54bc5551884d604e08b5255bd5d4638863ffc97ea8831286514088 EBUILD xf86-video-vmware-12.0.2-r1.ebuild 513 SHA256 5563ed9b1309df0c1446f596c06448d1f3feefdacf423002f1d8f85e8b4c03ad SHA512 b550ea276f9214920f6a710a11f3e6f1ed13d2166b1a76a933634ac714bfb0b69aadf42ad0aee7a4d86aba1ae0cbad4172901c156036cd8373ef9612c8d108ae WHIRLPOOL 91ebadf26c4edbe91f3fb243e723d08421b48a4e129265808b05dba62c976dc9c0d5ac770fe9a3681d3f186b943853f7e31ec27945487e48455e9b23a6c5919b +EBUILD xf86-video-vmware-13.0.0-r1.ebuild 521 SHA256 8275223630860dd91d6f3db28dd6f27b2ed16a5943dc0fddad3c18dfe1f9398b SHA512 1c283ba44e9db5f7d4cf42f60f4c59394f80fecbc7559e73e2e06436e5e622c929d7bf8ec3a62682ef544a1170f1342f8cca410a9ef02607d9aaa76073cfb2cf WHIRLPOOL 571379bc1c6b5a536236c2e93b539c49233bf968113ef1035cd61d07b915b3485e693c541558c1d0c6c1bd757c578b97155873dac07d33b3309f39afe350c6de EBUILD xf86-video-vmware-13.0.0.ebuild 461 SHA256 18a97061379acf8da326be0810f01e062c2fc9450af8a6bbde12bd52827408ca SHA512 adc5e9bfbf0aa4d93d5ea3f1bbebc502edcaa6fa8868e11daa37f13c5893fca2bd9133d96c5373085ef5099d644518ac90d3c185b79bbaaefd93106069bc5bf6 WHIRLPOOL 51736e6f7a459e8e90126fddd9850e10157dec999ecb1d8abf214570469c0c67890e754f4d8f150876489d7703a5d94d4db4f9d999cd58f977f94e48a6c35b2e -MISC ChangeLog 11071 SHA256 a30a2f00e11cc1f529091091221003a055e423142ff1510faab827df189aeee2 SHA512 5c6b08d87b6b854fbeeb535bc3371f83c98abee5e2449998eed17de5cdded4283f1dbd1edd8d6ea5f39090806587b1f6d78e6e1a6fc925a2e3e756b3233daa1e WHIRLPOOL bd46b09477898c341450829eebe2938907455d96753cbb4e927f8c0423b2e1b4bbb565f1b43d3b98e92869a8f27b3f0564465f64a578966320b2e619d32469b3 +MISC ChangeLog 11323 SHA256 5409f5154d02ed02aeb327a0e54f0bdac58e0cf61c5d729e1cd3cb10d8a43e1a SHA512 1186680dd2d7794395ea3f380e2efe0adf7f5f42ec91c50a3981007accf467a1ba4b856246e34162235f3a1e51e7b03af62acff880b1225df3f191402fc3e72a WHIRLPOOL daacf30afe1710cb1945a661f57fbf09e0f2e03c95a17a61114996c792d4b77aa5896f3028103fc6aa39ebcc94340cb7da66b9b3d8235a7f81b243966d39c358 MISC metadata.xml 254 SHA256 32d68d1ad2e14d3f3af865dce8b2e42fec8722f17b1b35beeb5ecbd9b8e1a253 SHA512 6d59e8be0228a3a61b27b0984a3ec1a98d5288106c62d9b5fcec735138f3671aec4217de6220c7c978e255242d0db6f71abccae79cc385ce06a6b3d895d00f06 WHIRLPOOL 64bff93fcf13f4db3f1adb4a3d07352faf3d1d2af0ae4fca3411e9b31e40f6494cca8373f83ef0daac2bfaeed1c20bb6af06507d3ae50f3fece86dc7c80c41fa diff --git a/x11-drivers/xf86-video-vmware/files/xf86-video-vmware-13.0.0-remove-mibstore_h.patch b/x11-drivers/xf86-video-vmware/files/xf86-video-vmware-13.0.0-remove-mibstore_h.patch new file mode 100644 index 000000000000..70597def7ddd --- /dev/null +++ b/x11-drivers/xf86-video-vmware/files/xf86-video-vmware-13.0.0-remove-mibstore_h.patch @@ -0,0 +1,55 @@ +From 23d87c92b7211cc5249eefe4ab3a2c7f370e279e Mon Sep 17 00:00:00 2001 +From: Zack Rusin <zackr@vmware.com> +Date: Thu, 14 Feb 2013 22:33:01 +0000 +Subject: Kill mibstore + +It was a noop for at least 5 years and it has been removed. + +Signed-off-by: Zack Rusin <zackr@vmware.com> +--- +diff --git a/saa/saa_priv.h b/saa/saa_priv.h +index 6652054..5d81453 100644 +--- a/saa/saa_priv.h ++++ b/saa/saa_priv.h +@@ -48,7 +48,6 @@ + #include "pixmapstr.h" + #include "windowstr.h" + #include "servermd.h" +-#include "mibstore.h" + #include "colormapst.h" + #include "gcstruct.h" + #include "input.h" +diff --git a/src/vmware.c b/src/vmware.c +index 41201f1..6b74e14 100644 +--- a/src/vmware.c ++++ b/src/vmware.c +@@ -23,7 +23,6 @@ char rcsId_vmware[] = + #include "xf86Pci.h" /* pci */ + + #include "mipointer.h" /* sw cursor */ +-#include "mibstore.h" /* backing store */ + #include "micmap.h" /* mi color map */ + #include "vgaHW.h" /* VGA hardware */ + #include "fb.h" +@@ -1483,7 +1482,6 @@ VMWAREScreenInit(SCREEN_INIT_ARGS_DECL) + * If backing store is to be supported (as is usually the case), + * initialise it. + */ +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + xf86SetSilkenMouse(pScreen); + +diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c +index 9959ffb..7863ba2 100644 +--- a/vmwgfx/vmwgfx_driver.c ++++ b/vmwgfx/vmwgfx_driver.c +@@ -1036,7 +1036,6 @@ drv_screen_init(SCREEN_INIT_ARGS_DECL) + (ms->only_hw_presents) ? "enabled" : "disabled"); + } + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + xf86SetSilkenMouse(pScreen); + miDCInitialize(pScreen, xf86GetPointerScreenFuncs()); +-- +cgit v0.9.0.2-2-gbebe diff --git a/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.0.0-r1.ebuild b/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.0.0-r1.ebuild new file mode 100644 index 000000000000..bd1841bc451a --- /dev/null +++ b/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.0.0-r1.ebuild @@ -0,0 +1,20 @@ +# 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.0-r1.ebuild,v 1.1 2013/03/12 16:38:27 chithanh Exp $ + +EAPI=5 + +XORG_DRI=always +inherit xorg-2 + +DESCRIPTION="VMware SVGA video driver" +KEYWORDS="~amd64 ~x86 ~x86-fbsd" +IUSE="" + +RDEPEND="x11-libs/libdrm[libkms,video_cards_vmware] + media-libs/mesa[xa]" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-remove-mibstore_h.patch +) |