diff options
author | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2013-09-15 14:28:22 +0000 |
---|---|---|
committer | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2013-09-15 14:28:22 +0000 |
commit | aada6e0bf00391dcf6739955958ede24ed64d0d2 (patch) | |
tree | 4bc49e225957cd8d72ed966bcc7cc2e24f252b2e /x11-base/xorg-server | |
parent | 2.2.6 version bump. This fixes bug #485006 (regression in 2.2.5 which (diff) | |
download | historical-aada6e0bf00391dcf6739955958ede24ed64d0d2.tar.gz historical-aada6e0bf00391dcf6739955958ede24ed64d0d2.tar.bz2 historical-aada6e0bf00391dcf6739955958ede24ed64d0d2.zip |
Version bump
Package-Manager: portage-2.2.1/cvs/Linux x86_64
Diffstat (limited to 'x11-base/xorg-server')
-rw-r--r-- | x11-base/xorg-server/ChangeLog | 10 | ||||
-rw-r--r-- | x11-base/xorg-server/Manifest | 8 | ||||
-rw-r--r-- | x11-base/xorg-server/files/xorg-server-1.14-kdrive-out-of-bounds-array-access.patch | 34 | ||||
-rw-r--r-- | x11-base/xorg-server/xorg-server-1.14.2.902.ebuild | 246 | ||||
-rw-r--r-- | x11-base/xorg-server/xorg-server-1.14.3.ebuild (renamed from x11-base/xorg-server/xorg-server-1.14.2.902-r1.ebuild) | 3 |
5 files changed, 13 insertions, 288 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index f60ea326ce0a..f0ed0cfa93bf 100644 --- a/x11-base/xorg-server/ChangeLog +++ b/x11-base/xorg-server/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for x11-base/xorg-server # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.750 2013/09/12 16:17:57 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.751 2013/09/15 14:28:19 chithanh Exp $ + +*xorg-server-1.14.3 (15 Sep 2013) + + 15 Sep 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + +xorg-server-1.14.3.ebuild, + -files/xorg-server-1.14-kdrive-out-of-bounds-array-access.patch, + -xorg-server-1.14.2.902-r1.ebuild, -xorg-server-1.14.2.902.ebuild: + Version bump 12 Sep 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> xorg-server-1.14.2.902-r1.ebuild: diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index 6e659b53e0d9..f6ad9b0118d3 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -11,7 +11,6 @@ AUX xorg-server-1.12-disable-acpi.patch 275 SHA256 1d3878d44e2b8690bb7d1595960d0 AUX xorg-server-1.12-ia64-fix_inx_outx.patch 1737 SHA256 bf996a01faf3d1e6f00f12b17373a2530e7e433d3e6c4cac8935ebddc91cd089 SHA512 18bf9bbb973ae4e3f95ffafca8f82845f0c318c3b2dbf0cf9089a2614215ecf000b9037bfed7d80d9367be01247bf316ba2f6e16aa04fe79c54d81441c962bcd WHIRLPOOL cd133d58fc74de9d49773fe2a570d023cea38d09d7550fb9097a8c83a8393e8fc829ffaac566eee732475410e5d8063d0f99d437a68a67e8d3f65d012522240e AUX xorg-server-1.12-unloadsubmodule.patch 1373 SHA256 c68c4c0749b9229c3ca11c72b5ca98b58c7dbaf5c7311ce45890204bdc637c3c SHA512 a6a8ebbb1005f2ea9cfdfc928209a23fe213caab31a889c3290f14bcae0a9afd40176330e2e56cb5ff986d522505e7fb98fa0c71187f403e2afd33c9c919780e WHIRLPOOL 7e9dce7dc4e064567e68697a2966f87cef756670db7e49da50c8d9a5379d7930c3f9642913b8482b8c7597067ef9098e1989284986b5ec605aca6a536329c05c AUX xorg-server-1.13-ia64-asm.patch 1166 SHA256 525fc255734f062758877ad45a29862dfeb1fb8e7b3a476d9410a6f0d73420a2 SHA512 51b8695af30988f99a480d2ecadc6dbe7cb46d4d9461fa006d9001200dfc1bed7390025fd1ebbadc936aee90444bb5cfd892d41c5260d5c33347ee2bdc88e78e WHIRLPOOL 46d8b55b67c82118e2a36a01c739217c6e6dd02228b0a0e730b44372b77b476f4a76fcfa8a584550cdfc87db22c26839890b7719318678aaedba7db761a39c6c -AUX xorg-server-1.14-kdrive-out-of-bounds-array-access.patch 1281 SHA256 35b1d81fee99e69912518e04ac444da91469ced50c569a50e91c91b1e9bce3f2 SHA512 4eb101f1c4332351f1d06052cb7515743211da0970d358f8327265037b2997f4912e41b2fe8d2fac23f123da22b5ce4e57f152e2fc072b82d32943584fb5410b WHIRLPOOL 3aa841480873fa80a4861be1f419b6762c70a37977b52f843796663aaacd85020b7138444b363951d4a765d60e3bebe1adc6404424ec889db7664261f898be6a AUX xorg-server-1.9-cve-2013-1940.patch 1159 SHA256 2ddde47a5b80b28d5240e51a33862722787d37cf7621aa919d2966b7bdaa7f7c SHA512 744abfda3defd3746783e2e71501c769ee7a09160efbed8fa37d3dc02eea89151de36ff7ad47f8a5cb5c56fa960cf7ea68a09a2ef45e0d0bfb49e9296a9571da WHIRLPOOL c446c7e4a2aad2ee1960d1fab142d1df84fca4822e1bec37e1851576be6fa85522eea64977565303e144d8bd55df866f6a38991575878034f762f883b4706f01 AUX xorg-server-1.9-nouveau-default.patch 916 SHA256 a7ff421dd928e3025194279f9afb7cc033a896b3417abe339741e9c6ed4b54ea SHA512 fe91ff469c2569aaf6e2ceb0decf44c46ec4be4314dcb94c42b107adf2aaa8592c84b78b1621856acfd51e604e012c35c0609a3651930999829c7040d4b46ed3 WHIRLPOOL 18ced96c233b537634ee32a5aad186764d8796c5cadc398e9406457c8ace02c6608dc7378ca37fd09ecb178c5564c16f602d46772472166ca3fcb56ac9a04e52 AUX xorg-server-disable-acpi.patch 663 SHA256 5b3cc7c8bea18fe3ba81851d2846d19ffd8fab9cdf5d8f3a274846847e734200 SHA512 0f741e3dac610ba75c3f22cb9412d93e6d8422216100bce886be5f8d6dc49a94e0dab525039247d7af668f162b02fdab302aeb55b02a949ebf56c1f455fa68cf WHIRLPOOL 69e7425e3fbb1154b64568261ab17dc513d561a0d92558fad4e1281869b43132892f14eb89443dc11003cc62bacb4a80f86f592d9dc4bdd873f29fd970c25558 @@ -22,18 +21,17 @@ DIST xorg-server-1.11.4.tar.bz2 4900810 SHA256 3e2935bc400612df58d5b5e6840829e2c DIST xorg-server-1.12.4.tar.bz2 5444761 SHA256 8ac07c35306ba3fb3c0972722dd4e919303039eca1d40ac7862560e0b2c94cf7 SHA512 70997e8ba4f948829c158e52924753c5691a783dd14e5a86fdce4fc601638dd4e0b281590876b0315a303bf8d5195bdf43ede7113d1d569415a41ab03d938d85 WHIRLPOOL bfee61329ca85ecedb991ca933de6e3a1e94e34a04d9a723a0e9c90a36e067824701c38e8a0034498ed28dfca82eb653d1e1ab5c0223020f5da69cbbf80bbf98 DIST xorg-server-1.13.4.tar.bz2 5506293 SHA256 a2c969887f3c7b0f3f7d31e2ee8e91fa73ce81ba3c16d82da9150ffa302c98cf SHA512 600fe0fc77a9d6c242ec264f74624cddf5e3dd0e2eacaa65d475be638e2b4d9497bc555d753b43b24845bd6f446a811e387446f94fa98d3e75f664063a7a3d3d WHIRLPOOL 68ca7d6f121496d3a371fb4242c4e9c8fa77eae5c79a13dfec2cdbfd8f0ed82b9a97aa607923674f2e17f3380ec9a8c82d3aab9b2d8b829457a29b8330970f54 DIST xorg-server-1.14.1.tar.bz2 5509219 SHA256 a5adb02571efb7d7459dde83286a3adb77dfd1a52a7348e75d2dc72d6f8d28aa SHA512 43558eb561161f85e43a4d80c1e4e8b410a4afe5f83509b73ad9c9370705f074ec1bdbb9e4b7c994996dc245086110fa4731bba293ecd32a1e20de733dd4a686 WHIRLPOOL 3c1f71738a6310b082087f34c709da8d09b6cc6edee9dbfc671126c52f87a83bf0c271b401f64ecfb10ca8f3714d4b4720b0b62d7d82172f8ca88be7aab0d15b -DIST xorg-server-1.14.2.902.tar.bz2 5503532 SHA256 1c596aa0dc86328a1915890f1c3cf7936b18be422b00190abcfce1d6681d0e39 SHA512 057423024f263700e65d47f0a76453e5adeee60774b5ed729fc12bb43a5d3f724d42a23b0e08654c5a5a2b36901a8863bdf6c15e08e00829e5d82974e027acc1 WHIRLPOOL 2c15beb95ea2e062b401d7ef8ae5aee882b89e28ea0cdecbcc43e0db2f4e5fe452a7b441e4d3bd4a31bcb62de9fbf04271bc5cf1bb3d0deecf404a8e6c35b309 DIST xorg-server-1.14.2.tar.bz2 5490488 SHA256 f6ddfb3f1cfff2d69d45657aec626ebe8b5847810154ff7df7ed2072b076c86b SHA512 5a8caf61039b1605a85da9cba36ff525ccf9deda2f52be2b3f6360171d058b929a3a49e97db24b0587c4933009b2c479514f31d364eba54918a20a7e26a9060c WHIRLPOOL e20b6f60a806065184bb51d718eb50cad5b2809b7e0fe322f865ad5db3ed53cd3e9c7e6f8b577becde9c0cbec171435370087d1a19f496ed8645d4f93e2bac50 +DIST xorg-server-1.14.3.tar.bz2 5502845 SHA256 02125ae13a443dcbb55f964d5c37f1da2f58ad54c2102356037bec23c1b84f5e SHA512 d5379e2f52e93985ab2636ca02f503baadd359a4ec05bed80162213392e16d433a2b7308e90cdd18c1a0bd283429f2c8b8758b5a2c585923533cced6245de989 WHIRLPOOL 241feac891f48bdc7470891d54abec0e13921cc127898b083665778ab87920d2bf10088536ac05b9db200cc2cc8b002307873786223995624aa70098370ba183 DIST xorg-server-1.9.5.tar.bz2 5172054 SHA256 3fc775097c4f0e8f731447d0183ee709ae37c44c0c286ba00a4b028274e029dc SHA512 f17baa6e871c7df4dc61330e32e235906d9e4c842a70226b0833d2b64ab62811131b960eb942f4dc9359ea828676ce60afd82802aa7cffc711d27c4946c32345 WHIRLPOOL a8ede9d5e4ae80713e2b363042a80fe7ac9a03f8623dbf058b241a4237edd2397b437dda5ea56076ec1da71b946dc5b936adfd4afd436893b5c8350996ba169e EBUILD xorg-server-1.10.6-r2.ebuild 7202 SHA256 9c2246cb0d6bd068a99af82af47b5945e53215542089347a0e9f3e88a2233490 SHA512 d495863b139d3a8a2535caddb54a98ed9195b663ecd7b2ca432517e6b75a213368fc845fec650794b61ca5f207c7bd14b96e3a6c10ccd853a574077739b4aa5f WHIRLPOOL bb8a4fb46c1c9f1c28e04e921e697ad5f540828f7916ed456c6dcbfe31c2bf16e57a268545115f1f16635355f019b40c47acadfc1def6cc7346ee1c2acfc62bb EBUILD xorg-server-1.11.4-r2.ebuild 7391 SHA256 ae064266bea347c773d9fc4349e596290f7acc54bf4391e32bfcfea55a3bf498 SHA512 a410dbfcea353036ed2845f870fc8e1e8faffd32483abe2d5fe528704090c108eab5cf53ccc9a04a67a3fa67647843d833e17b418dde6229b8cd1019940f9644 WHIRLPOOL fdb6f10da37cfb4e6341cff4111a0121939aaa0c08128637556c61336079e1a7756b717fdea4422eaa6e10867be085e315bf77f143e98651482abf71522e0ab8 EBUILD xorg-server-1.12.4-r1.ebuild 7058 SHA256 3b0d0059dbf959df79a5d28c4e87b56d1513e9ffd490019299a9a90b56e416b5 SHA512 c5aedb627c1e3c55d6cd5ecc6b39e5d2a4a939e0dac53f4a49b7be7bb6f858063fee5fe74159d13876aece106cacc753c6a790ab5fb4a1f137c71f7a1f1c472f WHIRLPOOL 35a4037bed8ed9c37f6b508007abbe64e5c978e18256de77efff55bc50b6cce26ccb44984105dc265d49fd3a72b39a7a438513d586a5a60189b58eade6c003d4 EBUILD xorg-server-1.13.4.ebuild 6998 SHA256 90ad778a2b3c5fdcc18d1b774d0b6a35b81ba6b98b60ddbcd8ba4cd2d6d86832 SHA512 ef957d8c7ce1d6367d3f83517738ff48924b2ef9210b27759a24cb3e06e1ba977194a64994811a0a7e9256ec4b4e32d2d4369078a6789484dbe0db68a9b3cabe WHIRLPOOL 3610f774d94e7b3e828c936730b2f8dcac828358a1f971eed3031e7d65202feb9b51cda8d41645aa54dc1663e0001e456fd3e35596a12957a6449f97540dfec4 EBUILD xorg-server-1.14.1.ebuild 6993 SHA256 f9d64cea7d8e2cea0f99433cb56bbd607881ffaa300f70a73cda6fb9bb2be3ec SHA512 1aa2f2655cccaa4fffd52e274ef97bf4916d4161937cb7134fc7c8b8105ac4b1bf8cecb21efe41e230dcd7180e138f7edf3ad56aba1cc3336a41ad7a37389ebf WHIRLPOOL 9f1e6d70cfd1bcc37bf6a3b1806219c0d584930fa9f9a49daff8a2b5a3582c4d5031f6fc6ecdf6b5376b8024417d4034672f242bdab986985fbc65e3dbf02a2c -EBUILD xorg-server-1.14.2.902-r1.ebuild 7201 SHA256 8a61d046faf008cb3a18b79ef1a6967dd6d6c89fae1c8a498b3940f2e149fe15 SHA512 5a5b1a7625399fd461cba07e668c45d902daba7a23ce9650bdf52896e10c7a81ebff7c2e3ec30cc93945e1c3ca0341e77043007236360c073dc1b1108f891e2b WHIRLPOOL 58f228aaa9d4f3dbac8035fdfa321d3bd9033202c6c7c0ec8f1c359d8058c0ec836282e019bd2e5a9e2d5b3bbbc9184a8380984b0398aeed9ad1fa5a1de7f128 -EBUILD xorg-server-1.14.2.902.ebuild 6997 SHA256 0ac248bfb22f0a242af93d2f542880d9f27f90d06de793206eb139a706d7463d SHA512 9b4c81c0efa38deb3c6512b3e236dcc8bbccbaf225c067e70cdf380a3bad3ff7f4a7b7bca2de0bba6ffc2b733565e4ff9e7684640fd7e4eef34787fc4e0fb1e6 WHIRLPOOL 9b2d823ad7c25f7620038a29e8dee86fc7951631e3c9ec9bcd046d7704e16707c3139981e109fdc5514f09c8f0fa488d01c620a5ed331141ae5c6c172b0a5849 EBUILD xorg-server-1.14.2.ebuild 6993 SHA256 c02f70f7e2ce2931f763328012bf45a3c2f8c79530a9855751855376deb32abf SHA512 9d19036f61216c80bbd60ea777fbe27807e385a9e050c6ee9babcf13e647d4629b306f4c8778247ab029e4a5b97d49cf27ff583cbe86243202d84cecbd00c371 WHIRLPOOL 469d6c9eea480b10f9e255f0786cb4198b297599ccf08cb59d05e9006079e0ec4890500ffcd4de9730f46ec9e5cf95aa5722c34cf2eb675d661a251f2cd98d2f +EBUILD xorg-server-1.14.3.ebuild 7128 SHA256 fef92eec58e8e87cfb2264fd394bd94776407159b6dcb8ab5472d94ac0ae03f0 SHA512 07651aad3f894c1276f829f37f66b58a5c617368b24adcb2d15abb8ff6c928bde5dcfda87058a03389c13af8cf03607fe85be04608900b77bec3eec9d0344c4f WHIRLPOOL ecf98d1eb28499eefbe66a04955b5e688ad917ad26290f40f6435d645695c704ad5266b7c8c17fbb6acfaa548608da0b9abbaa601894e47c1965ec49dd9d0bda EBUILD xorg-server-1.9.5-r2.ebuild 7925 SHA256 07bf78aab6229019bd88f1778564fe32ee9802eef200d61e96e55bccd5048800 SHA512 9b204a74d70deee2b4b7093c27d3faaecbb3f479e19f7d17d59a6ffb1116bbcaaafde5eddcc9f2e01789e43ebf59f3d82e3d94ebae04177534480de876cc5fe0 WHIRLPOOL ded655272aa87d651f6370836effa6588457196e8bd269bc7faeec87f606b6d81902d241bcb0b792b18992b885bdb861e244bab460d2eae29ca4e44c9a9f8e75 -MISC ChangeLog 46688 SHA256 25dbea7f5616fe0dbf41f2de3acb081b9510c4c4621b8ce84a700f36da63af59 SHA512 4bb387e02103255c1a0d892bf27ce970c2714d107b77dd74df7ef0cb3a382e4c038d28c184a1241ea6172750aa9cb18362d7e3a9528412ec047dc0b345b05922 WHIRLPOOL 2c0805752921915d70a393310ab6545e02db7d878b7bc932c55656b000fe426131208920800c847009542f730a09317566ee7e12a8ca27957171924c07fb473b +MISC ChangeLog 46974 SHA256 9070b8da1bf8a48a14d4e11c677e0842a2d74f4f57ed9e9a5c63357caf5c5a28 SHA512 9d1d67addea6a682902a0a5af4e31f12eb373e34a973f6c01cd62d2a81114872f3b409fdc414bc1d25721dadae410ea7de28e3c3453d66c2d468d7643bb29db3 WHIRLPOOL 5b2a6b7e2d9c3e745acb8d6c34c9886312e8a553c4a66bbabc3cb69f1740411ce2fe0bb6a2aca7605e4370ac21a80e8b78c40edc86b6c4a2ee0bd81e13df94e8 MISC ChangeLog-2009 109242 SHA256 76119bd85f64b74b4f8129911eef944e8f1baa3ae38bbfb65bcd6197a6f58c88 SHA512 200b2a1f8d66bc4461de84a5b675ae9bdc1fd38ffea339cdc69afdb613d7a6d6ffe29175fba62b10c4f9d95e050035933f59e21172bf9c545d7a70137c8d04f4 WHIRLPOOL 1c084a461e803c1a6627986cb2444cd7a23743f409df5bb1ca5f55d1e7c3106670cfc2cd4f875a479e0c75513b7937ee35b591b4016b715f7fa45209e098cece MISC metadata.xml 620 SHA256 3fc2f9ce825d48cf91810542f8aa57a0bafbdd24cdd62fcdaf55958a46c1a9b7 SHA512 fc7832f2fc242cc2d8e078ac8593c3e1d2d62b26dab129fd62cd63b984abc2b14dcdfecd19388978d1af4a5c0ff4c42b0b79102fa344a421e0a848e1b321e23d WHIRLPOOL e5d9b64bd5bbe57d0de24ecf7d40ee115aa93646ad031b78ebe69b88f2d1dfabde596f99ec90209d6bdeafaeecbe6e0f080d85febb0e931adda0c04e2680c0c1 diff --git a/x11-base/xorg-server/files/xorg-server-1.14-kdrive-out-of-bounds-array-access.patch b/x11-base/xorg-server/files/xorg-server-1.14-kdrive-out-of-bounds-array-access.patch deleted file mode 100644 index f4a3bff66934..000000000000 --- a/x11-base/xorg-server/files/xorg-server-1.14-kdrive-out-of-bounds-array-access.patch +++ /dev/null @@ -1,34 +0,0 @@ -From af1c57152e10cfa55843e6330cffc6a3c8c517d3 Mon Sep 17 00:00:00 2001 -From: Chris Clayton <chris2553@googlemail.com> -Date: Wed, 04 Sep 2013 05:42:04 +0000 -Subject: kdrive: fix build error on gcc 4.8 for out-of-bounds array access - -I'm getting a error building xorg-server-1.14.1.902 with thelatest snapshot -of gcc-4.8: - -input.c:225:43: error: array subscript is above array bounds -[-Werror=array-bounds] - -This is because kdNumInputFds can become equal to KD_MAX_INPUT_FDS in -KdRegisterFd(). This means that in KdUnregisterFd(), kdInputFds[j + 1] can -be beyond the end of the array. - -Signed-off-by: Chris Clayton <chris2553@googlemail.com> -Reviewed-by: Keith Packard <keithp@keithp.com> -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> ---- -diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c -index b1068bb..09aae44 100644 ---- a/hw/kdrive/src/kinput.c -+++ b/hw/kdrive/src/kinput.c -@@ -221,7 +221,7 @@ KdUnregisterFd(void *closure, int fd, Bool do_close) - if (do_close) - close(kdInputFds[i].fd); - kdNumInputFds--; -- for (j = i; j < kdNumInputFds; j++) -+ for (j = i; j < (kdNumInputFds - 1); j++) - kdInputFds[j] = kdInputFds[j + 1]; - break; - } --- -cgit v0.9.0.2-2-gbebe diff --git a/x11-base/xorg-server/xorg-server-1.14.2.902.ebuild b/x11-base/xorg-server/xorg-server-1.14.2.902.ebuild deleted file mode 100644 index 38dce6b3db11..000000000000 --- a/x11-base/xorg-server/xorg-server-1.14.2.902.ebuild +++ /dev/null @@ -1,246 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.14.2.902.ebuild,v 1.1 2013/08/23 17:56:11 chithanh Exp $ - -EAPI=5 - -XORG_DOC=doc -XORG_EAUTORECONF=yes -inherit xorg-2 multilib versionator flag-o-matic -EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver" - -DESCRIPTION="X.Org X servers" -SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" - -IUSE_SERVERS="dmx kdrive xnest xorg xvfb" -IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux +suid tslib +udev" - -RDEPEND=">=app-admin/eselect-opengl-1.0.8 - dev-libs/openssl - media-libs/freetype - >=x11-apps/iceauth-1.0.2 - >=x11-apps/rgb-1.0.3 - >=x11-apps/xauth-1.0.3 - x11-apps/xkbcomp - >=x11-libs/libdrm-2.4.20 - >=x11-libs/libpciaccess-0.12.901 - >=x11-libs/libXau-1.0.4 - >=x11-libs/libXdmcp-1.0.2 - >=x11-libs/libXfont-1.4.2 - >=x11-libs/libxkbfile-1.0.4 - >=x11-libs/pixman-0.27.2 - >=x11-libs/xtrans-1.2.2 - >=x11-misc/xbitmaps-1.0.1 - >=x11-misc/xkeyboard-config-2.4.1-r3 - dmx? ( - x11-libs/libXt - >=x11-libs/libdmx-1.0.99.1 - >=x11-libs/libX11-1.1.5 - >=x11-libs/libXaw-1.0.4 - >=x11-libs/libXext-1.0.99.4 - >=x11-libs/libXfixes-5.0 - >=x11-libs/libXi-1.2.99.1 - >=x11-libs/libXmu-1.0.3 - x11-libs/libXrender - >=x11-libs/libXres-1.0.3 - >=x11-libs/libXtst-1.0.99.2 - ) - kdrive? ( - >=x11-libs/libXext-1.0.5 - x11-libs/libXv - ) - !minimal? ( - >=x11-libs/libX11-1.1.5 - >=x11-libs/libXext-1.0.5 - >=media-libs/mesa-8[nptl=] - ) - tslib? ( >=x11-libs/tslib-1.0 ) - udev? ( >=virtual/udev-150 ) - >=x11-apps/xinit-1.3 - selinux? ( sec-policy/selinux-xserver )" - -DEPEND="${RDEPEND} - sys-devel/flex - >=x11-proto/bigreqsproto-1.1.0 - >=x11-proto/compositeproto-0.4 - >=x11-proto/damageproto-1.1 - >=x11-proto/fixesproto-5.0 - >=x11-proto/fontsproto-2.0.2 - >=x11-proto/glproto-1.4.16 - >=x11-proto/inputproto-2.2.99.1 - >=x11-proto/kbproto-1.0.3 - >=x11-proto/randrproto-1.4.0 - >=x11-proto/recordproto-1.13.99.1 - >=x11-proto/renderproto-0.11 - >=x11-proto/resourceproto-1.2.0 - >=x11-proto/scrnsaverproto-1.1 - >=x11-proto/trapproto-3.4.3 - >=x11-proto/videoproto-2.2.2 - >=x11-proto/xcmiscproto-1.2.0 - >=x11-proto/xextproto-7.1.99 - >=x11-proto/xf86dgaproto-2.0.99.1 - >=x11-proto/xf86rushproto-1.1.2 - >=x11-proto/xf86vidmodeproto-2.2.99.1 - >=x11-proto/xineramaproto-1.1.3 - >=x11-proto/xproto-7.0.22 - dmx? ( - >=x11-proto/dmxproto-2.2.99.1 - doc? ( - || ( - www-client/links - www-client/lynx - www-client/w3m - ) - ) - ) - !minimal? ( - >=x11-proto/xf86driproto-2.1.0 - >=x11-proto/dri2proto-2.8 - )" - -PDEPEND=" - xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" - -REQUIRED_USE="!minimal? ( - || ( ${IUSE_SERVERS} ) - )" - -#UPSTREAMED_PATCHES=( -# "${WORKDIR}/patches/" -#) - -PATCHES=( - "${UPSTREAMED_PATCHES[@]}" - "${FILESDIR}"/${PN}-1.12-disable-acpi.patch -) - -pkg_pretend() { - # older gcc is not supported - [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ - die "Sorry, but gcc earlier than 4.0 will not work for xorg-server." -} - -src_configure() { - # localstatedir is used for the log location; we need to override the default - # from ebuild.sh - # sysconfdir is used for the xorg.conf location; same applies - # NOTE: fop is used for doc generating ; and i have no idea if gentoo - # package it somewhere - XORG_CONFIGURE_OPTIONS=( - $(use_enable ipv6) - $(use_enable dmx) - $(use_enable kdrive) - $(use_enable kdrive kdrive-kbd) - $(use_enable kdrive kdrive-mouse) - $(use_enable kdrive kdrive-evdev) - $(use_enable suid install-setuid) - $(use_enable tslib) - $(use_enable !minimal record) - $(use_enable !minimal xfree86-utils) - $(use_enable !minimal install-libxf86config) - $(use_enable !minimal dri) - $(use_enable !minimal dri2) - $(use_enable !minimal glx) - $(use_enable xnest) - $(use_enable xorg) - $(use_enable xvfb) - $(use_enable nptl glx-tls) - $(use_enable udev config-udev) - $(use_with doc doxygen) - $(use_with doc xmlto) - --enable-libdrm - --sysconfdir="${EPREFIX}"/etc/X11 - --localstatedir="${EPREFIX}"/var - --with-fontrootdir="${EPREFIX}"/usr/share/fonts - --with-xkb-output="${EPREFIX}"/var/lib/xkb - --disable-config-hal - --without-dtrace - --without-fop - --with-os-vendor=Gentoo - ) - - # Xorg-server requires includes from OS mesa which are not visible for - # users of binary drivers. - mkdir -p "${T}/mesa-symlinks/GL" - for i in gl glx glxmd glxproto glxtokens; do - ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die - done - for i in glext glxext; do - ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die - done - append-cppflags "-I${T}/mesa-symlinks" - - xorg-2_src_configure -} - -src_install() { - xorg-2_src_install - - dynamic_libgl_install - - server_based_install - - if ! use minimal && use xorg; then - # Install xorg.conf.example into docs - dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example - fi - - newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup - newinitd "${FILESDIR}"/xdm.initd-9 xdm - newconfd "${FILESDIR}"/xdm.confd-4 xdm - - # install the @x11-module-rebuild set for Portage - insinto /usr/share/portage/config/sets - newins "${FILESDIR}"/xorg-sets.conf xorg.conf -} - -pkg_postinst() { - # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) - eselect opengl set xorg-x11 --use-old - - if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then - ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)" - ewarn "because the ABI changed. If you cannot start X because" - ewarn "of module version mismatch errors, this is your problem." - - echo - ewarn "You can rebuild all installed packages in the x11-drivers" - ewarn "category using this command:" - ewarn " emerge @x11-module-rebuild" - fi - - if use udev && has_version virtual/udev[-keymap]; then - ewarn "virtual/udev was built without keymap support. This may cause input device" - ewarn "autoconfiguration to fail." - fi -} - -pkg_postrm() { - # Get rid of module dir to ensure opengl-update works properly - if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then - rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules - fi -} - -dynamic_libgl_install() { - # next section is to setup the dynamic libGL stuff - ebegin "Moving GL files for dynamic switching" - dodir /usr/$(get_libdir)/opengl/xorg-x11/extensions - local x="" - for x in "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do - if [ -f ${x} -o -L ${x} ]; then - mv -f ${x} "${ED}"/usr/$(get_libdir)/opengl/xorg-x11/extensions - fi - done - eend 0 -} - -server_based_install() { - if ! use xorg; then - rm "${ED}"/usr/share/man/man1/Xserver.1x \ - "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ - "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ - "${ED}"/usr/share/man/man1/Xserver.1x - fi -} diff --git a/x11-base/xorg-server/xorg-server-1.14.2.902-r1.ebuild b/x11-base/xorg-server/xorg-server-1.14.3.ebuild index b5c2fdf895c3..df0514e0a675 100644 --- a/x11-base/xorg-server/xorg-server-1.14.2.902-r1.ebuild +++ b/x11-base/xorg-server/xorg-server-1.14.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.14.2.902-r1.ebuild,v 1.2 2013/09/12 16:17:57 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.14.3.ebuild,v 1.1 2013/09/15 14:28:19 chithanh Exp $ EAPI=5 @@ -116,7 +116,6 @@ PATCHES=( "${FILESDIR}"/${PN}-1.12-disable-acpi.patch "${FILESDIR}"/${PN}-1.12-ia64-fix_inx_outx.patch "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch - "${FILESDIR}"/${PN}-1.14-kdrive-out-of-bounds-array-access.patch ) pkg_pretend() { |