From: Chí-Thanh Christopher Nguyễn Date: Sat, 7 Feb 2015 16:13:37 +0000 (+0000) Subject: Version bump. Remove old. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=712f87e9e7a32f45981c8377607a78f7609927fa;p=gentoo.git Version bump. Remove old. Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0x2324E7B566DF2611! --- diff --git a/x11-drivers/xf86-video-vmware/ChangeLog b/x11-drivers/xf86-video-vmware/ChangeLog index d3a989221a00..566114b43d93 100644 --- a/x11-drivers/xf86-video-vmware/ChangeLog +++ b/x11-drivers/xf86-video-vmware/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for x11-drivers/xf86-video-vmware # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-vmware/ChangeLog,v 1.81 2015/01/18 22:21:11 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-vmware/ChangeLog,v 1.82 2015/02/07 16:13:28 chithanh Exp $ + +*xf86-video-vmware-13.1.0 (07 Feb 2015) + + 07 Feb 2015; Chí-Thanh Christopher Nguyễn + +xf86-video-vmware-13.1.0.ebuild, + -files/xf86-video-vmware-12.0.2-xorg-server-1.13.patch, + -files/xf86-video-vmware-13.0.0-remove-mibstore_h.patch, + -xf86-video-vmware-12.0.2-r1.ebuild, -xf86-video-vmware-13.0.0-r1.ebuild, + -xf86-video-vmware-13.0.0.ebuild, -xf86-video-vmware-13.0.1.ebuild: + Version bump. Remove old. 18 Jan 2015; Pacho Ramos +files/xf86-video-vmware-13.0.2-fix-includes.patch, diff --git a/x11-drivers/xf86-video-vmware/Manifest b/x11-drivers/xf86-video-vmware/Manifest index f84758cf4142..4f4d3ec62dd0 100644 --- a/x11-drivers/xf86-video-vmware/Manifest +++ b/x11-drivers/xf86-video-vmware/Manifest @@ -1,28 +1,34 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -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 AUX xf86-video-vmware-13.0.1-damageunregister.patch 1095 SHA256 2f60533fa5f0f1b7cefe174b6b0cd3b60373d0a3a5ea2bfea73a33c1764c2a13 SHA512 d6b9a37dba30b7d47624f86f824723fa4b98b8b06072b33439a65ba44ff7c18123dbefd5aad7d19c079c3bf6028d683d9c852b014428fcff79412bee779a0efb WHIRLPOOL 55d3c8f521e9c80d77fb7521ceb937d560ab8279beb6060e901a66aa104185f7b7bbb35dc14cc9c8c60e01af24c3dab7a305c184fdf1bcb7a8f027852ec58eb3 AUX xf86-video-vmware-13.0.1-xa-compat-2.patch 830 SHA256 7f6da81f7ff750f64894fba2d3d290724c8c9c0dcb1ddce561f150367ec3680b SHA512 332ce8c6f0cd1a19a3b718cc07a599bbb73f9c34a146be2f18e8ba1596dfa4bd4e0d5ed95e4b593bc17fb11601d3c1b9b47b146836d56bab361dec26c8a41b8c WHIRLPOOL 82ae8f42916dd46efd5c630cebcfccc1827b9c54341c29746eea5a696dffc9657d9b8a57a8427223bb2556426b54df1b40b9f9a2b9dffd58b52338bf642ed775 AUX xf86-video-vmware-13.0.1-xatracker-2.patch 5781 SHA256 4a04f46547f9f35f222d59dbc727ea4f2691f0aada4bf9b555e49b04964c88a1 SHA512 5325801b0c5f228d6241df62e16de5505d670bdbf77888ecefb3e7d7c83822070e8f9295beea9dc51ab714163b7825200e5c472042248b389911c57e275f0e8a WHIRLPOOL 13e13a6aaac961be3fa83023543ede8be9b408130dc474a4dda11e2786b08cf4a3be6595625d6b58d9f3ce47efd1a26b9f178913deaf23a79476eecbc2482e3e AUX xf86-video-vmware-13.0.2-fix-includes.patch 1396 SHA256 a3f9b959e79958b44cdda0444e5f3e54503c5f72e869fb6d242e9463d25e2a8f SHA512 5e0d419952e0f9ecc56a9b34bbb55bbd4086682a8ca1500244799f3283244365161e1b26ffa62fac8c5b46d6b3bc0c3d02dff704cb58ba26f3c0b644fe80f3d8 WHIRLPOOL c2c488075567ae7408cfd1de19172d25a6dcd831f4867c0522d83856e10d0db2f6204fcac64131a133ab69e16d1de0da041fe1e533e89a8ba90f95ebac2901ff -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 DIST xf86-video-vmware-13.0.1.tar.bz2 432401 SHA256 802dda415c22412edad6c3df44fe18a06e91d0f8456d9a58bac0d340fdf8fe3d SHA512 2faf5fd524dffd2cd89a8b5a06b5470acbc51c3ee4f48bafc425b8e9c7c76d294201651cfb8c1d104c313885108e22abb6da736de1f3dbcf134a0926158ed147 WHIRLPOOL c52cb2a65f243a3cbe70da5f007aa0af97cf32e576b8bb6a400374d775edaab78ccf9ac341f94fc4bd95a2cf58672adce4462b079d889338f0b5ea93a8cd4252 DIST xf86-video-vmware-13.0.2.tar.bz2 438773 SHA256 c8ba3d2cead3620dba2cbf5defb7f1759b2b96f4fe209f4bf6976832b6763c54 SHA512 18d6867c0bd497d9f2aeb96d04b26fa0e3af1d37ae7628d19a8c1e829ef1df825371225c68e140d4d65097fa53178e6f1a7d3e371a623c9ef6cd98cccc0f826c WHIRLPOOL e6083ce2248442bba2ca3447fe3e50d3b2df5e28d3116f3b1caf9a76036c8a6269341b08bf37b02d4253738daeab4aec15bc6cfa893ebde914c6be301fa58fdf -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 +DIST xf86-video-vmware-13.1.0.tar.bz2 459255 SHA256 3c1d244e4b1b77e92126957965cdc9fb82de4c215c0706a3a8aaff6939e4a0cc SHA512 43d6a15e40896c793e49a1670b937e417271baff15b737b6b8cd3845bb7d2fc6354bf53cb40350caf0e7aac1e005a0fb2c9c80ce25690678b79e8e48f05f1de0 WHIRLPOOL c637dafa0d93ef49c475b68f81aa2422b896450dee0f187c58ed2cc475c9406d69241b11a6d19d239a42c330acd41d7c7228c0b0484b30b96b33750bba0d870d EBUILD xf86-video-vmware-13.0.1-r1.ebuild 615 SHA256 ec5b8b74675e9e2c981f229defc0743ff4ddbe0a5e995f2a5c810310e6654df1 SHA512 3417efd392d11e233bd8b233d15e1b13f964b745dd89d3cfcefa511eb334a69c6854547399eecdd71c3e5714205ad91ac9c332d9e0d5e6e11382c8d4305d7b65 WHIRLPOOL a184c293b5a148764e72fd03e522e470349b91500ad35135d0b99727af865491b093c08cb9b76826cb890ff1552fd5bdc9f805abf92e992596a6ac9a4eda8704 -EBUILD xf86-video-vmware-13.0.1.ebuild 515 SHA256 ad7f69e252909ffb2a3f152c264514837cf31779a4a90b8a7f5cb802440d5dea SHA512 e45be0f180c4715e08a6bc68cb97a04c9446d730c4b0d9a007eaa32a788d42a1d961523fb71015a9d4d22b610a87612207d4b03ccc16ad6970acbd7375ff7ab8 WHIRLPOOL 1541a158ea55418311ce980acdd15c61db2bb8080df3a28d86e5867bd4a9c509b0bb81082397ecd91d7902aa5b6dfe7ec6475cc9b4fa2a79ae539899b880e461 EBUILD xf86-video-vmware-13.0.2.ebuild 517 SHA256 bd5d4309017f6553d9a3d7c042e90d6574f1ba430e0095b4f4ae5a04a787d15e SHA512 fc1d4b51305995ab663ca1ba37779273fb2f01dfdc88162b44fc97669ce96e7cfb9616a06ed262183d1334e62505b04d59fe08e35adc1c923609a92835ef09f1 WHIRLPOOL c7559af078e270bc26328924adf942be3a2125d89999ee3841e62d828f7e7536c71007d68a89f40194e3ff8107ff2aad1346aed0e1ddc8fad47e5fd67484581f -MISC ChangeLog 12921 SHA256 56c08e30a72f798fd07d0437311521da950348dec1a20d2f65cd00c9c680dbfb SHA512 cf50e612e6e33f95cb0cbe1adff6fc146dbc1d9b2439ab130afee1fa92b14bec7c3c8e5a51327b7fb8bfb696fb52d94f6008d82c10a9c58f9babd05706bd5d59 WHIRLPOOL 48c852337debd9a10e49aa2920a8ba0edbdd3cba0662930b73d0083491113a2fb78a264554b16aabd0c0818561153d41950e801bbf18a2a23e34e806f237a355 +EBUILD xf86-video-vmware-13.1.0.ebuild 461 SHA256 a3afa12dd556ec7283014cb5917f6e59551e0d5e086826cb351e52f966475193 SHA512 601073b60b50fa4da23a3de61a46c185ff31daefbfc2ee4519e9dfd1dff771bc8b53e1c8681c5fb60cf2bfd1fb97ecb0ec820aa9b66c34b7eeecf5704cfcf593 WHIRLPOOL 11e1d1738274e21778312c4edd74d02e6b0ca3c059652e9707566fdc572cd1038b36bd508c9c425a4eb02ee3e628c4eea29362a196d620c2459b9694e6a8a1ed +MISC ChangeLog 13362 SHA256 86f0bbbe2b8d672b69cd5da3f74b193b06c836b0647d6e95780a7e431bd70513 SHA512 839fabafac6a6d5957f9c67673e43cff1df39c874d4361cb93d000950bc8d52bef527f5fae353d073fc2d7f09faa1a18d63df1c3bef3a597cfc2b3a720c855d8 WHIRLPOOL c4da74d1d06e1dd8804ea9c84b43146424eebf83c10595f1a32729772d3783a2fc737d25e6076a3f9e5a19fc96952daa918bd7390ba01b1425fa0663af45c8ff MISC metadata.xml 254 SHA256 32d68d1ad2e14d3f3af865dce8b2e42fec8722f17b1b35beeb5ecbd9b8e1a253 SHA512 6d59e8be0228a3a61b27b0984a3ec1a98d5288106c62d9b5fcec735138f3671aec4217de6220c7c978e255242d0db6f71abccae79cc385ce06a6b3d895d00f06 WHIRLPOOL 64bff93fcf13f4db3f1adb4a3d07352faf3d1d2af0ae4fca3411e9b31e40f6494cca8373f83ef0daac2bfaeed1c20bb6af06507d3ae50f3fece86dc7c80c41fa -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2 +Version: GnuPG v2.0 -iEYEAREIAAYFAlS8MdgACgkQCaWpQKGI+9QUqQCfSTzaekx+d5lxgVe6ZbhSDGln -wPoAn2EGwSgyadckTHrHKzMbl+wZcLfD -=Asyz +iQJ8BAEBCABmBQJU1jm4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RDFCODdDQUUxMkUwNkJCNjUyMDMxOEIy +MzI0RTdCNTY2REYyNjExAAoJECMk57Vm3yYRFiYP/RK0qotU7ekYKCDOyAsUs7TL +XzMFqQH1VS6PnBl+zTJJQ0a03hYDr7bUVK7opi5yec5CISxcFNSvc84Dj2TRfh8r +9imWMQH7D8hHu34vV6PGx7SYnk1Cn1xiiwJSCQTLY+SOXwwCDhrXi2suFT5s/I8k +QfPkHX/3iwlEErrhNWp3JcqCInMxEGDCuGfJyueNxl7gyRwrVkAgezKJPfTC7ulE +wSV+XwXegvVcwZveAD8Rv5pU37F9nFXBZmid0wS+BvLhFcFO4fKosQSAFa96oo4p +flA/MLNyoc9teyM/4qWg4Y/Wv1UedOT94ZoIYTJQD6G5/HuSTzsEXa9AVOBf9ZCy +cyhjza/ZTpT0G1q4QOrv1e1PzEAG/q0W3C0TGIBPrwnTSIhxfDiOIqm02DWuOdYe +b8d4dNalqdotFPMFP61hPrhoH1ao2NccwjXXlExXsiTFf0GgfKcg7KBJBieOkcSL +Sw8YZgmdnxoex6f/emGm7y1rbi9EimtMUMop8HC0YvH5/qoj7uCD2BYTmtusWDq2 +aMOWKyt7FvUHAASXhIFNlgniD8cMZdumBT559vKoIYaq2Y8bqyKCoOjXyGi9OWrr +3xoASjKiSU/x0dYDa0qNivmJT1xVjhgXg8y5AkZXnQKtIsEWrMEIZTzCZTFONx6n +1Z6tkPn0/jCOmmfu+0TP +=eXJy -----END PGP SIGNATURE----- diff --git a/x11-drivers/xf86-video-vmware/files/xf86-video-vmware-12.0.2-xorg-server-1.13.patch b/x11-drivers/xf86-video-vmware/files/xf86-video-vmware-12.0.2-xorg-server-1.13.patch deleted file mode 100644 index a45b4ab60a20..000000000000 --- a/x11-drivers/xf86-video-vmware/files/xf86-video-vmware-12.0.2-xorg-server-1.13.patch +++ /dev/null @@ -1,610 +0,0 @@ -diff -urN a/saa/saa.c b/saa/saa.c ---- a/saa/saa.c 2012-03-08 17:13:16.000000000 +0100 -+++ b/saa/saa.c 2012-08-09 01:23:14.000000000 +0200 -@@ -594,7 +594,7 @@ - * screen private, before calling down to the next CloseScreen. - */ - Bool --saa_close_screen(int i, ScreenPtr pScreen) -+saa_close_screen(CLOSE_SCREEN_ARGS_DECL) - { - struct saa_screen_priv *sscreen = saa_screen(pScreen); - struct saa_driver *driver = sscreen->driver; -@@ -624,7 +624,7 @@ - - free(sscreen); - -- return (*pScreen->CloseScreen) (i, pScreen); -+ return (*pScreen->CloseScreen) (CLOSE_SCREEN_ARGS); - } - - struct saa_driver * -diff -urN a/saa/saa.h b/saa/saa.h ---- a/saa/saa.h 2012-03-08 17:13:16.000000000 +0100 -+++ b/saa/saa.h 2012-08-09 01:23:14.000000000 +0200 -@@ -44,6 +44,8 @@ - #include - #include - -+#include "../src/compat-api.h" -+ - #define SAA_VERSION_MAJOR 0 - #define SAA_VERSION_MINOR 1 - -@@ -173,7 +175,7 @@ - saa_bitmap_to_region(PixmapPtr pPix); - - extern _X_EXPORT Bool --saa_close_screen(int i, ScreenPtr pScreen); -+saa_close_screen(CLOSE_SCREEN_ARGS_DECL); - - extern _X_EXPORT Bool - saa_gc_reads_destination(DrawablePtr pDrawable, GCPtr pGC); -diff -urN a/src/compat-api.h b/src/compat-api.h ---- a/src/compat-api.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/src/compat-api.h 2012-08-09 01:20:23.000000000 +0200 -@@ -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 -+ */ -+ -+/* 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 -urN a/src/Makefile.am b/src/Makefile.am ---- a/src/Makefile.am 2012-03-14 00:06:41.000000000 +0100 -+++ b/src/Makefile.am 2012-08-09 01:23:14.000000000 +0200 -@@ -37,6 +37,7 @@ - vmware_drv_la_SOURCES = \ - bits2pixels.c \ - bits2pixels.h \ -+ compat-api.h \ - guest_os.h \ - includeCheck.h \ - svga_escape.h \ -diff -urN a/src/vmware.c b/src/vmware.c ---- a/src/vmware.c 2012-03-21 19:57:59.000000000 +0100 -+++ b/src/vmware.c 2012-08-09 01:23:14.000000000 +0200 -@@ -901,8 +901,8 @@ - pScrn->pScreen->rootDepth), - (pointer)(pVMWARE->FbBase + pScrn->fbOffset)); - -- (*pScrn->EnableDisableFBAccess)(pScrn->pScreen->myNum, FALSE); -- (*pScrn->EnableDisableFBAccess)(pScrn->pScreen->myNum, TRUE); -+ (*pScrn->EnableDisableFBAccess)(XF86_SCRN_ARG(pScrn), FALSE); -+ (*pScrn->EnableDisableFBAccess)(XF86_SCRN_ARG(pScrn), TRUE); - } - - vgaHWProtect(pScrn, FALSE); -@@ -1018,7 +1018,7 @@ - } - - static void --VMWAREAdjustFrame(int scrnIndex, int x, int y, int flags) -+VMWAREAdjustFrame(ADJUST_FRAME_ARGS_DECL) - { - /* FIXME */ - } -@@ -1089,9 +1089,9 @@ - } - - static Bool --VMWARECloseScreen(int scrnIndex, ScreenPtr pScreen) -+VMWARECloseScreen(CLOSE_SCREEN_ARGS_DECL) - { -- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - VMWAREPtr pVMWARE = VMWAREPTR(pScrn); - ScreenPtr save = &pVMWARE->ScrnFuncs; - -@@ -1119,7 +1119,7 @@ - pScrn->DriverFunc = NULL; - #endif - -- return (*pScreen->CloseScreen)(scrnIndex, pScreen); -+ return (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS); - } - - static Bool -@@ -1296,16 +1296,14 @@ - } - - static Bool --VMWAREScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) -+VMWAREScreenInit(SCREEN_INIT_ARGS_DECL) - { -- ScrnInfoPtr pScrn; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - vgaHWPtr hwp; - VMWAREPtr pVMWARE; - OptionInfoPtr options; - Bool useXinerama = TRUE; - -- /* Get the ScrnInfoRec */ -- pScrn = xf86Screens[pScreen->myNum]; - pVMWARE = VMWAREPTR(pScrn); - - -@@ -1381,7 +1379,7 @@ - VMWAREModeInit(pScrn, pScrn->currentMode, FALSE); - - /* Set the viewport if supported */ -- VMWAREAdjustFrame(scrnIndex, pScrn->frameX0, pScrn->frameY0, 0); -+ VMWAREAdjustFrame(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0, pScrn->frameY0)); - - /* - * Setup the screen's visuals, and initialise the framebuffer -@@ -1582,10 +1580,9 @@ - } - - static Bool --VMWARESwitchMode(int scrnIndex, DisplayModePtr mode, int flags) -- -+VMWARESwitchMode(SWITCH_MODE_ARGS_DECL) - { -- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -+ SCRN_INFO_PTR(arg); - ScreenPtr pScreen = pScrn->pScreen; - - pScreen->mmWidth = (pScreen->width * VMWARE_INCHTOMM + -@@ -1597,9 +1594,9 @@ - } - - static Bool --VMWAREEnterVT(int scrnIndex, int flags) -+VMWAREEnterVT(VT_FUNC_ARGS_DECL) - { -- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -+ SCRN_INFO_PTR(arg); - VMWAREPtr pVMWARE = VMWAREPTR(pScrn); - - /* -@@ -1616,9 +1613,9 @@ - } - - static void --VMWARELeaveVT(int scrnIndex, int flags) -+VMWARELeaveVT(VT_FUNC_ARGS_DECL) - { -- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -+ SCRN_INFO_PTR(arg); - VMWAREPtr pVMWARE = VMWAREPTR(pScrn); - - /* -@@ -1631,17 +1628,18 @@ - } - - static void --VMWAREFreeScreen(int scrnIndex, int flags) -+VMWAREFreeScreen(FREE_SCREEN_ARGS_DECL) - { -+ SCRN_INFO_PTR(arg); - /* - * If the vgahw module is used vgaHWFreeHWRec() would be called - * here. - */ -- VMWAREFreeRec(xf86Screens[scrnIndex]); -+ VMWAREFreeRec(pScrn); - } - - static ModeStatus --VMWAREValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags) -+VMWAREValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, int flags) - { - return MODE_OK; - } -diff -urN a/src/vmware_common.h b/src/vmware_common.h ---- a/src/vmware_common.h 2012-03-08 17:13:16.000000000 +0100 -+++ b/src/vmware_common.h 2012-08-09 01:23:14.000000000 +0200 -@@ -32,6 +32,8 @@ - #include - #include - -+#include "compat-api.h" -+ - xXineramaScreenInfo * - VMWAREParseTopologyString(ScrnInfoPtr pScrn, - const char *topology, -diff -urN a/src/vmware.h b/src/vmware.h ---- a/src/vmware.h 2012-03-08 17:13:16.000000000 +0100 -+++ b/src/vmware.h 2012-08-09 01:23:14.000000000 +0200 -@@ -177,7 +177,7 @@ - #define VMWAREPTR(p) ((VMWAREPtr)((p)->driverPrivate)) - - static __inline ScrnInfoPtr infoFromScreen(ScreenPtr s) { -- return xf86Screens[s->myNum]; -+ return xf86ScreenToScrn(s); - } - - #define MIN(a,b) ((a)<(b)?(a):(b)) -diff -urN a/vmwgfx/vmwgfx_dri2.c b/vmwgfx/vmwgfx_dri2.c ---- a/vmwgfx/vmwgfx_dri2.c 2012-03-08 17:13:16.000000000 +0100 -+++ b/vmwgfx/vmwgfx_dri2.c 2012-08-09 01:23:14.000000000 +0200 -@@ -83,7 +83,7 @@ - dri2_do_create_buffer(DrawablePtr pDraw, DRI2Buffer2Ptr buffer, unsigned int format) - { - ScreenPtr pScreen = pDraw->pScreen; -- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - modesettingPtr ms = modesettingPTR(pScrn); - BufferPrivatePtr private = buffer->driverPrivate; - PixmapPtr pPixmap; -@@ -371,7 +371,7 @@ - Bool - xorg_dri2_init(ScreenPtr pScreen) - { -- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - modesettingPtr ms = modesettingPTR(pScrn); - DRI2InfoRec dri2info; - int major, minor; -diff -urN a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c ---- a/vmwgfx/vmwgfx_driver.c 2012-03-08 17:13:16.000000000 +0100 -+++ b/vmwgfx/vmwgfx_driver.c 2012-08-09 01:23:14.000000000 +0200 -@@ -107,14 +107,13 @@ - */ - - static Bool drv_pre_init(ScrnInfoPtr pScrn, int flags); --static Bool drv_screen_init(int scrnIndex, ScreenPtr pScreen, int argc, -- char **argv); --static Bool drv_switch_mode(int scrnIndex, DisplayModePtr mode, int flags); --static void drv_adjust_frame(int scrnIndex, int x, int y, int flags); --static Bool drv_enter_vt(int scrnIndex, int flags); --static void drv_leave_vt(int scrnIndex, int flags); --static void drv_free_screen(int scrnIndex, int flags); --static ModeStatus drv_valid_mode(int scrnIndex, DisplayModePtr mode, Bool verbose, -+static Bool drv_screen_init(SCREEN_INIT_ARGS_DECL); -+static Bool drv_switch_mode(SWITCH_MODE_ARGS_DECL); -+static void drv_adjust_frame(ADJUST_FRAME_ARGS_DECL); -+static Bool drv_enter_vt(VT_FUNC_ARGS_DECL); -+static void drv_leave_vt(VT_FUNC_ARGS_DECL); -+static void drv_free_screen(FREE_SCREEN_ARGS_DECL); -+static ModeStatus drv_valid_mode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, - int flags); - - extern void xorg_tracker_set_functions(ScrnInfoPtr scrn); -@@ -133,7 +132,7 @@ - * Internal function definitions - */ - --static Bool drv_close_screen(int scrnIndex, ScreenPtr pScreen); -+static Bool drv_close_screen(CLOSE_SCREEN_ARGS_DECL); - - /* - * Internal functions -@@ -633,7 +632,7 @@ - - void xorg_flush(ScreenPtr pScreen) - { -- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - modesettingPtr ms = modesettingPTR(pScrn); - xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn); - PixmapPtr pixmap = NULL; -@@ -708,14 +707,13 @@ - free(pixmaps); - } - --static void drv_block_handler(int i, pointer blockData, pointer pTimeout, -- pointer pReadmask) -+static void drv_block_handler(BLOCKHANDLER_ARGS_DECL) - { -- ScreenPtr pScreen = screenInfo.screens[i]; -- modesettingPtr ms = modesettingPTR(xf86Screens[pScreen->myNum]); -+ SCREEN_PTR(arg); -+ modesettingPtr ms = modesettingPTR(xf86ScreenToScrn(pScreen)); - - vmwgfx_swap(ms, pScreen, BlockHandler); -- pScreen->BlockHandler(i, blockData, pTimeout, pReadmask); -+ pScreen->BlockHandler(BLOCKHANDLER_ARGS); - vmwgfx_swap(ms, pScreen, BlockHandler); - - vmwgfx_flush_dri2(pScreen); -@@ -725,7 +723,7 @@ - static Bool - drv_create_screen_resources(ScreenPtr pScreen) - { -- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - modesettingPtr ms = modesettingPTR(pScrn); - Bool ret; - -@@ -735,9 +733,9 @@ - if (!ret) - return ret; - -- drv_adjust_frame(pScrn->scrnIndex, pScrn->frameX0, pScrn->frameY0, 0); -+ drv_adjust_frame(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0, pScrn->frameY0)); - -- return drv_enter_vt(pScreen->myNum, 1); -+ return drv_enter_vt(VT_FUNC_ARGS); - } - - static Bool -@@ -773,7 +771,7 @@ - static Bool - vmwgfx_use_hw_cursor_argb(ScreenPtr screen, CursorPtr cursor) - { -- ScrnInfoPtr pScrn = xf86Screens[screen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(screen); - xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); - xf86CursorInfoPtr cursor_info = xf86_config->cursor_info; - modesettingPtr ms = modesettingPTR(pScrn); -@@ -804,7 +802,7 @@ - static Bool - vmwgfx_use_hw_cursor(ScreenPtr screen, CursorPtr cursor) - { -- ScrnInfoPtr pScrn = xf86Screens[screen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(screen); - xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); - xf86CursorInfoPtr cursor_info = xf86_config->cursor_info; - modesettingPtr ms = modesettingPTR(pScrn); -@@ -902,9 +900,9 @@ - - - static Bool --drv_screen_init(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) -+drv_screen_init(SCREEN_INIT_ARGS_DECL) - { -- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - modesettingPtr ms = modesettingPTR(pScrn); - VisualPtr visual; - -@@ -1088,9 +1086,9 @@ - } - - static void --drv_adjust_frame(int scrnIndex, int x, int y, int flags) -+drv_adjust_frame(ADJUST_FRAME_ARGS_DECL) - { -- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -+ SCRN_INFO_PTR(arg); - xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn); - xf86OutputPtr output = config->output[config->compat_output]; - xf86CrtcPtr crtc = output->crtc; -@@ -1104,15 +1102,16 @@ - } - - static void --drv_free_screen(int scrnIndex, int flags) -+drv_free_screen(FREE_SCREEN_ARGS_DECL) - { -- drv_free_rec(xf86Screens[scrnIndex]); -+ SCRN_INFO_PTR(arg); -+ drv_free_rec(pScrn); - } - - static void --drv_leave_vt(int scrnIndex, int flags) -+drv_leave_vt(VT_FUNC_ARGS_DECL) - { -- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -+ SCRN_INFO_PTR(arg); - modesettingPtr ms = modesettingPTR(pScrn); - - vmwgfx_cursor_bypass(ms->fd, 0, 0); -@@ -1130,9 +1129,9 @@ - * This gets called when gaining control of the VT, and from ScreenInit(). - */ - static Bool --drv_enter_vt(int scrnIndex, int flags) -+drv_enter_vt(VT_FUNC_ARGS_DECL) - { -- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -+ SCRN_INFO_PTR(arg); - - if (!drv_set_master(pScrn)) - return FALSE; -@@ -1144,17 +1143,17 @@ - } - - static Bool --drv_switch_mode(int scrnIndex, DisplayModePtr mode, int flags) -+drv_switch_mode(SWITCH_MODE_ARGS_DECL) - { -- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -+ SCRN_INFO_PTR(arg); - - return xf86SetSingleMode(pScrn, mode, RR_Rotate_0); - } - - static Bool --drv_close_screen(int scrnIndex, ScreenPtr pScreen) -+drv_close_screen(CLOSE_SCREEN_ARGS_DECL) - { -- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - modesettingPtr ms = modesettingPTR(pScrn); - - if (ms->cursor) { -@@ -1166,7 +1165,7 @@ - xorg_dri2_close(pScreen); - - if (pScrn->vtSema) -- pScrn->LeaveVT(scrnIndex, 0); -+ pScrn->LeaveVT(VT_FUNC_ARGS); - - pScrn->vtSema = FALSE; - -@@ -1180,11 +1179,11 @@ - if (ms->xat) - xa_tracker_destroy(ms->xat); - -- return (*pScreen->CloseScreen) (scrnIndex, pScreen); -+ return (*pScreen->CloseScreen) (CLOSE_SCREEN_ARGS); - } - - static ModeStatus --drv_valid_mode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags) -+drv_valid_mode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, int flags) - { - return MODE_OK; - } -diff -urN a/vmwgfx/vmwgfx_driver.h b/vmwgfx/vmwgfx_driver.h ---- a/vmwgfx/vmwgfx_driver.h 2012-03-08 17:13:16.000000000 +0100 -+++ b/vmwgfx/vmwgfx_driver.h 2012-08-09 01:23:14.000000000 +0200 -@@ -46,6 +46,7 @@ - #include - #include - -+#include "../src/compat-api.h" - #ifdef DRI2 - #include - #if (!defined(DRI2INFOREC_VERSION) || (DRI2INFOREC_VERSION < 3)) -@@ -118,9 +119,9 @@ - ScreenBlockHandlerProcPtr saved_BlockHandler; - CreateScreenResourcesProcPtr saved_CreateScreenResources; - CloseScreenProcPtr saved_CloseScreen; -- Bool (*saved_EnterVT)(int, int); -- void (*saved_LeaveVT)(int, int); -- void (*saved_AdjustFrame)(int, int, int, int); -+ Bool (*saved_EnterVT)(VT_FUNC_ARGS_DECL); -+ void (*saved_LeaveVT)(VT_FUNC_ARGS_DECL); -+ void (*saved_AdjustFrame)(ADJUST_FRAME_ARGS_DECL); - Bool (*saved_UseHWCursor)(ScreenPtr, CursorPtr); - Bool (*saved_UseHWCursorARGB)(ScreenPtr, CursorPtr); - -diff -urN a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c ---- a/vmwgfx/vmwgfx_saa.c 2012-03-21 19:57:59.000000000 +0100 -+++ b/vmwgfx/vmwgfx_saa.c 2012-08-09 01:23:14.000000000 +0200 -@@ -460,7 +460,7 @@ - struct vmwgfx_saa *vsaa = - to_vmwgfx_saa(saa_get_driver(pScreen)); - struct _WsbmListHead *list, *next; -- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - - if (!pScrn->vtSema) - return; -@@ -1199,7 +1199,7 @@ - struct vmwgfx_saa *vsaa = to_vmwgfx_saa(driver); - struct saa_pixmap *spix = saa_get_saa_pixmap(pixmap); - struct vmwgfx_saa_pixmap *vpix = to_vmwgfx_saa_pixmap(spix); -- ScrnInfoPtr pScrn = xf86Screens[vsaa->pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(vsaa->pScreen); - - /* - * Make dri2 drawables up to date, or add them to the flush list -diff -urN a/vmwgfx/vmwgfx_tex_video.c b/vmwgfx/vmwgfx_tex_video.c ---- a/vmwgfx/vmwgfx_tex_video.c 2012-03-08 17:13:16.000000000 +0100 -+++ b/vmwgfx/vmwgfx_tex_video.c 2012-08-09 01:23:14.000000000 +0200 -@@ -638,7 +638,7 @@ - DrawablePtr pDraw) - { - struct xorg_xv_port_priv *pPriv = (struct xorg_xv_port_priv *) data; -- ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex]; -+ ScreenPtr pScreen = xf86ScrnToScreen(pScrn); - PixmapPtr pPixmap; - INT32 x1, x2, y1, y2; - BoxRec dstBox; -@@ -732,7 +732,7 @@ - static XF86VideoAdaptorPtr - xorg_setup_textured_adapter(ScreenPtr pScreen) - { -- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - modesettingPtr ms = modesettingPTR(pScrn); - XF86VideoAdaptorPtr adapt; - XF86AttributePtr attrs; -@@ -799,7 +799,7 @@ - void - xorg_xv_init(ScreenPtr pScreen) - { -- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - modesettingPtr ms = modesettingPTR(pScrn); - XF86VideoAdaptorPtr *adaptors, *new_adaptors = NULL; - XF86VideoAdaptorPtr textured_adapter = NULL, overlay_adaptor = NULL; 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 deleted file mode 100644 index 70597def7ddd..000000000000 --- a/x11-drivers/xf86-video-vmware/files/xf86-video-vmware-13.0.0-remove-mibstore_h.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 23d87c92b7211cc5249eefe4ab3a2c7f370e279e Mon Sep 17 00:00:00 2001 -From: Zack Rusin -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 ---- -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-12.0.2-r1.ebuild b/x11-drivers/xf86-video-vmware/xf86-video-vmware-12.0.2-r1.ebuild deleted file mode 100644 index f965250a97b3..000000000000 --- a/x11-drivers/xf86-video-vmware/xf86-video-vmware-12.0.2-r1.ebuild +++ /dev/null @@ -1,20 +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-vmware/xf86-video-vmware-12.0.2-r1.ebuild,v 1.3 2012/11/18 12:22:46 ago Exp $ - -EAPI=4 - -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}-xorg-server-1.13.patch -) 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 deleted file mode 100644 index bd1841bc451a..000000000000 --- a/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.0.0-r1.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# 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 -) diff --git a/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.0.1.ebuild b/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.0.1.ebuild deleted file mode 100644 index acd4f12ab809..000000000000 --- a/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.0.1.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# 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.1.ebuild,v 1.4 2013/12/04 01:17:58 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}-damageunregister.patch -) diff --git a/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.0.0.ebuild b/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.1.0.ebuild similarity index 77% rename from x11-drivers/xf86-video-vmware/xf86-video-vmware-13.0.0.ebuild rename to x11-drivers/xf86-video-vmware/xf86-video-vmware-13.1.0.ebuild index ba4c71901b76..6863299371b5 100644 --- a/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.0.0.ebuild +++ b/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.1.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 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.ebuild,v 1.1 2013/01/20 18:53:56 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.1.0.ebuild,v 1.1 2015/02/07 16:13:28 chithanh Exp $ EAPI=5