diff options
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xorg-server/ChangeLog | 9 | ||||
| -rw-r--r-- | x11-base/xorg-server/Manifest | 35 | ||||
| -rw-r--r-- | x11-base/xorg-server/files/xorg-server-1.17-ia64-fix_inx_outx.patch | 59 | ||||
| -rw-r--r-- | x11-base/xorg-server/metadata.xml | 1 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-1.17.0.ebuild | 249 |
5 files changed, 336 insertions, 17 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index f81bf0274617..1de9097fdad9 100644 --- a/x11-base/xorg-server/ChangeLog +++ b/x11-base/xorg-server/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-base/xorg-server # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.818 2015/01/25 15:22:08 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.819 2015/02/08 17:40:24 chithanh Exp $ + +*xorg-server-1.17.0 (08 Feb 2015) + + 08 Feb 2015; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + +files/xorg-server-1.17-ia64-fix_inx_outx.patch, +xorg-server-1.17.0.ebuild, + metadata.xml: + Version bump, bug #539168. 25 Jan 2015; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> -xorg-server-1.12.4-r2.ebuild, -xorg-server-1.15.0.ebuild, diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index 54ce4edeff41..50e1fb35b5b0 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -17,6 +17,7 @@ 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.17-ia64-fix_inx_outx.patch 1539 SHA256 4c844b2d41b6412304b8a918e3cd93d8f2ab8dad8e6a22310cd87d1f3d8f5e95 SHA512 1db65132bb04eff380d38ccc8441f9f9e5286d7a47956495c0a7de7978107d15e5638d05df0aabbcd11687dd03189a7ac50fca51d755d082869aed71e66dbda1 WHIRLPOOL 8f7f3d107e2f8ce5e07d5dac9bf68b7547425943c3e6b6db92eab8bebc0194da53384c953f5e823a5284025e1bbcf18000b497d31de7c5d46e43f9cc02999915 AUX xorg-server-1.9-cve-2013-1940.patch 1159 SHA256 2ddde47a5b80b28d5240e51a33862722787d37cf7621aa919d2966b7bdaa7f7c SHA512 744abfda3defd3746783e2e71501c769ee7a09160efbed8fa37d3dc02eea89151de36ff7ad47f8a5cb5c56fa960cf7ea68a09a2ef45e0d0bfb49e9296a9571da WHIRLPOOL c446c7e4a2aad2ee1960d1fab142d1df84fca4822e1bec37e1851576be6fa85522eea64977565303e144d8bd55df866f6a38991575878034f762f883b4706f01 AUX xorg-server-1.9-cve-2013-4396.patch 915 SHA256 a1686c0bd07337991eba7edf769790be30b33d1295a22a847fd139f4573379cb SHA512 e8a4fb8c4097662d0e4188fec3d6ab827addd7edb0122ddb94f66795ebc8e0ef18bba899da8fd76e918556a625ffa0c0d19c650182683ff6216faa7655aa8d11 WHIRLPOOL 98b4999c932669047094f6063b007d673957547180507dfe714943d21eda5f2371d97424efb97be6b9039aeba8d2b9282efc6023ae3edbfa9d5c8fc63fac848f AUX xorg-server-1.9-nouveau-default.patch 916 SHA256 a7ff421dd928e3025194279f9afb7cc033a896b3417abe339741e9c6ed4b54ea SHA512 fe91ff469c2569aaf6e2ceb0decf44c46ec4be4314dcb94c42b107adf2aaa8592c84b78b1621856acfd51e604e012c35c0609a3651930999829c7040d4b46ed3 WHIRLPOOL 18ced96c233b537634ee32a5aad186764d8796c5cadc398e9406457c8ace02c6608dc7378ca37fd09ecb178c5564c16f602d46772472166ca3fcb56ac9a04e52 @@ -33,6 +34,7 @@ DIST xorg-server-1.14.7.tar.bz2 5520884 SHA256 fcf66fa6ad86227613d2d3e8ae13ded29 DIST xorg-server-1.15.2.tar.bz2 5551426 SHA256 3c0585607c654ded836da43a45a75492fc13454ff4149704fb08dac39f051163 SHA512 5fcbf0012af309f80e1db206e05d7861796146d765cd17f3963fde6da7f43f0e57d63dbbdbf2c554612a557aa4dee623ef62f7ca7d007834aafd7a46ca7bb1d6 WHIRLPOOL 22cdbad68462f9bac32b13be958df496411ca72fe47435ec7e3ebb470b121ba4b4a0e023913f31a92113c5a56bc4be660dfec5086bc1fb72a617d2cdeaa8adf1 DIST xorg-server-1.16-cve-2014-8091..8103.patches.tar.xz 27892 SHA256 47d8c9bb79c829389e7599aef1110d43afbc5bf744dbcf73d8f3cf01796d287a SHA512 f8b55c009166883b3e6ec2c8c7a2ff4ed61df6970afcc4f0efb9efa36741af194456a368d4b1c7ba9345ef973fb139a48eb50cb5a7ebc144b43749b9ffdb1f7b WHIRLPOOL 2f8b26c018f4ad4cf780ed7dcb0b844de64e7a612adc30c622d1956dfcee710086ffcc837ff0a64cdcc14d47720d82d8797374488bf0b52d77ca63adf6806885 DIST xorg-server-1.16.3.tar.bz2 5806406 SHA256 5e0f443238af1078b48f6eea98a382861b59187da221c2cf714d31c1d560b0fb SHA512 c0459ed95a6682b2094340b6b8fc7b59fcda5227ee2f13e87f68eb5c29b91cd3f05c5fc2126e33d6303beb3ad04d19466951ef4eb53f2e9918684cdaf3692c5a WHIRLPOOL 960ecad4cbee0514c2c2b5856d35e51b37942795092e743346d2182b887db53e9fb96c8437f2e9b608d9412941c8ea5c3f3d287a18acc8de1e428e9ee0bf3d72 +DIST xorg-server-1.17.0.tar.bz2 5852312 SHA256 4e8548bae163129d2fc8f8e1f3b6071fe9d62821e3d5617507ccd2f589526166 SHA512 95e8fec64a05d56f12c29843d0d7b659e37bb5b8afa86bb8ca27bb94c88a41bff0177d1debc44189788269911eecd688393c13fad700b6fd1c8f40fcae22a2b7 WHIRLPOOL 36f7fed319e70f2a978f5b382d39677b7cc91aaf8aa80a1a657dc912a875289afeaec9e21a1702450a51fc114ca63265085435f1c9513a9b35cc90ad666f4bc8 DIST xorg-server-1.9.5.tar.bz2 5172054 SHA256 3fc775097c4f0e8f731447d0183ee709ae37c44c0c286ba00a4b028274e029dc SHA512 f17baa6e871c7df4dc61330e32e235906d9e4c842a70226b0833d2b64ab62811131b960eb942f4dc9359ea828676ce60afd82802aa7cffc711d27c4946c32345 WHIRLPOOL a8ede9d5e4ae80713e2b363042a80fe7ac9a03f8623dbf058b241a4237edd2397b437dda5ea56076ec1da71b946dc5b936adfd4afd436893b5c8350996ba169e EBUILD xorg-server-1.10.6-r3.ebuild 7244 SHA256 0ecb1d013df6b783d07e1b98a3b63279303a09adc77c894ce3707d1324cdde97 SHA512 7e360a813c87d33bc1e3e13f9634ace0bec8349835aea1c1a24d4c7a26ebb4dd9359cdd597ff920c62fe32cf4af13f95414f71e9b3034a224dd4dc645cd974d9 WHIRLPOOL d0c1a7e8c63254d9f3c4475a0a2fad7c12a9fb2d7a9bb3341c85b0b9d743cf306d4547897d88577af3d03f436de3dfcb9a7a75e763251d3d7f34e956b9c9af05 EBUILD xorg-server-1.11.4-r3.ebuild 7256 SHA256 864ef1891d91d492725bd34c7494810df85cca470dd045d9cc0255bd5f80b43f SHA512 6f7a6eed11e8fc2be8de1a1318afdd4d48b82a1084ea6e9f00bb85ba463287fba53c4350deaf5ef58f15d66666a6357955ae79bdceb834863f19976ab0e2970e WHIRLPOOL 67dfa1d6e552eb9d4c6d850a82686185b9a43a116e739a118a17251d1e972a0ce22a6bece879f4aae7cf75ced0c43f53bdf0b4d8567c08525fee9fd7467e54fd @@ -43,26 +45,27 @@ EBUILD xorg-server-1.14.7.ebuild 6990 SHA256 fb8095e48e36082fea4a0d49fb4d0c66cb7 EBUILD xorg-server-1.15.2-r1.ebuild 7223 SHA256 a5f4065ca7d9a0ddd26202cbf933bf7a0e3d42812f18f6d113e0f730d39e505d SHA512 9c7568589838955f8b3fecded46ea7149bc62a6f6c35c56ddf4c31c5dbae190315bfe155406f25786d81627bbf4666fb3f74fe1e036041701f8fd65e5199202e WHIRLPOOL af0b64311352dff7eac33b2bd5948b540d9be0e112fcc1abb948d1cf5d6e4fdc3cfb7a00be051d10ab1f0c631311987aeefa887af13ba18208eea6d432cd2b88 EBUILD xorg-server-1.16.3-r1.ebuild 6761 SHA256 285ba4a6c9c8e40b1261fae8f606c350dfa03df96fb233f0de237a981bfb8b4c SHA512 457d08a77be36547c4f1802cf0e965449e713e7f930754a10b32d996bfec23fbe69f2e96870d88798d5fc468229552d25a09f18b17c1b591b788552b3e202f66 WHIRLPOOL 1039b0eee178cf6b0f862ee2b26579658e9dbe32ee9c9f278b7c9938f228384dee2aa42ead4375492f6cab191cd322fcd12e59b67cddbc26fb9d0ed341268565 EBUILD xorg-server-1.16.3.ebuild 7662 SHA256 ed4a52760a60b2baf5162235a5ce6d3c6c0aa87c91f4d05de3c209fbe1f41a61 SHA512 6687e90d925bcd1af3d2e21c2dc8abaec9866ab4952f04d0c2edefa54e00cf246b299ab73c4f5fd7fbf9af3802e4be892ee6e5c8135a7eddb2c1fb3fdad7d1f7 WHIRLPOOL 950ea824fbd63110f11d99d1387031c85c3ecaea7f231e18ac609153cf2f5e981ed284ebcf78b8a36b276447e5f86bd6318c2a168207497bf83048e86e01ef02 +EBUILD xorg-server-1.17.0.ebuild 6873 SHA256 a00c8e490786fa16eeae303ac8149d5e8e04625ad07f515582179548581993f4 SHA512 771ada71b9bfd6d899fa8d36944716407c34ab5d5c9890590d96c20fd332046b6adafdbb945b80bf9b36dffe537c81dc92141e61809614f52d169055e0586d14 WHIRLPOOL 511ccc1142a8d5558322e4f0c3442c49ef55c7e7c5f4bea91e725a975adec31872900aa65d3c10bfa34453524ec9a2a020059fa2f50807feb3b4ce23db755cae EBUILD xorg-server-1.9.5-r3.ebuild 7967 SHA256 74e6a536de6c99f4c3081ca6f4b65c653e6b54d72ba17963b2186be0b031a3a6 SHA512 bb5b4f17f6fbd07cc1501019464b7b944599256e5ca0021d5481e6c194fd19fdb0e5029351b999b1efa621c61c1c7256970d431f99b3c31a659859649a09a63d WHIRLPOOL 4ff73d879f6a8c3c69d2f8f7414eb08d873187e3cbd6b4f1453d53398a3b13a93da4e3847a62c87e6b26f30fffb2fb7153b2e3da3a8bd0eaffc4eeb870701cb8 -MISC ChangeLog 60840 SHA256 6cd7c2d3ad23787a42f1e4071e6fb8899d7e3ee65eaf54936ea2c819e5bc16b9 SHA512 b25b0f8f8d6da0786fad0aeb00f0ea8da13a8f1f71e7344fe9f2e61897c1fb76c3fa95df1a96e85b211b6294f8e2a4a387f98d5f22e36315dcfb994b300e52c0 WHIRLPOOL 0214f897236090efa35846d8ba1cbabe55aeb35045985ddf56513c485bd5e9fb5c85e593a570b5310975449be4d011994a38703b0d26e0b2a09b687ac7b37a6b +MISC ChangeLog 61069 SHA256 7b3e4e4c4bd089ce1a4482f0f0d309f3da8af580f08e6de87de50e9d0801e489 SHA512 a5c107ddfaa19e81d9d844167a80b052fba7884c1c76b030440b64a163b97977cfc7433adc3b83c40dbbc6b2f18d761f32b98dfe6830062069b737cc69fac72d WHIRLPOOL c559e24dba1ceeee752c422828d57dd9549327b12d0172f5638d318d533216f4c667e420eafc0ad616e32d4df0270ff4c86bfe6da1ebf02f39322a71207fbde3 MISC ChangeLog-2009 109242 SHA256 76119bd85f64b74b4f8129911eef944e8f1baa3ae38bbfb65bcd6197a6f58c88 SHA512 200b2a1f8d66bc4461de84a5b675ae9bdc1fd38ffea339cdc69afdb613d7a6d6ffe29175fba62b10c4f9d95e050035933f59e21172bf9c545d7a70137c8d04f4 WHIRLPOOL 1c084a461e803c1a6627986cb2444cd7a23743f409df5bb1ca5f55d1e7c3106670cfc2cd4f875a479e0c75513b7937ee35b591b4016b715f7fa45209e098cece -MISC metadata.xml 751 SHA256 02f470045d13e4baad4089f1cbc7cafd4dd1ab1b1799eeb2c0fb7864e956df80 SHA512 a58ad7f347519d7ba3bd710f1eab0f67925645961bcfa97fd9f106d5ea81400da79eebe95037ee4589b19c462fbdf6948949818f31210995ec9a930eaef78b26 WHIRLPOOL 67b3f0584a5c1d9e6da206761fc34a82caae36a4d9544c5512a95cdef800417c0f3f03a49606ebef72aa61522f097bf448fa0bdf651b5dd3b04554dcc86aaf5f +MISC metadata.xml 803 SHA256 11ce7d6b3d1a4b32ac268d791e3e9fc1a47e579fb0587f87caf4c064c1abc355 SHA512 73fee10d52b8012ee64bdb789d0ecc0368c418822ec823ad22c1eac3c7c4af37c561a58599db68a6638059624e6f37e7d3cb5f3fd363255a372a9614c1deaf75 WHIRLPOOL f26245d7f8c9bf8c653730e1e832781289e06e43dc6cbc1efc422b6e8e3f7342e5a94f8cb731b4c2193c40af6087048da0ca384e4f13e697f86098296936e2e2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0 -iQJ8BAEBCABmBQJUxQoqXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCABmBQJU15+WXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RDFCODdDQUUxMkUwNkJCNjUyMDMxOEIy -MzI0RTdCNTY2REYyNjExAAoJECMk57Vm3yYR+9IP/ib4N/VQANWdXOkt3imSSYTt -2RH4l7E4rlNpE/PaIk3aZLSxiYGeJJhptWjIGVx2qEtU4PQGljR0SEDZnrE+kytW -oAKdMlHrzq0FoiiGQ34e7bjB4JkN7MNpvUKVX6yT7OWbgrDTrSQWbZjSe+6pn28J -+8Y5jV36KZ8b7cC4E48oDH0nLczTlgwSLCH01wl2MN+Z/Wr19hTi0B1njX3Cw6Av -46bxeDOeNSRzWTvU87pmWVKgUw89U7w8EnyxImIUKWdE8GNi1Te0iuObcUW1gpip -qxA5OKV6+N4HVarHjAa/xMODSIneBCjV7Xtb8kbW5dI1pbP6ZIFesCdHsAIyfX5R -+RPSdayMJsRpyAWNI/4bAMfg+GiOitJDDlR8ig9uyq/pxEfyH/LaXxB+5IgF/sgO -c9qZ53h1aVNdezpOI8/K0bWmHrgsi3LBrkWP50lR0PwH3jXjs6EcmhkP7sIHG7xU -yJoTYAQFzu5UvAL7Dt15SO6bhtyJ65YdAWYI9lnCacgJVPJSUyyplNUEmcbmPQx7 -JLVjuENpi2m3QMxvkVsWZYSfX/3EBSBFtUWgmLQMaoYHnKPBJcvics6PPO7Royqk -V7va7nA7MJc5JSPCbnkGgJgSV7tn2Bd0d/BHCPNUwB12IpHtlQr9dDAyuxKu07Q2 -LJVOzHB+NOoIu+6NG3hY -=RySl +MzI0RTdCNTY2REYyNjExAAoJECMk57Vm3yYRIKcP/iEBbQMfiY9ExMApImQ4n/f2 +Ufrhvrw9PseESpJ/N+ZyDrMvIYQRbPzN+NKBwuKLPh9n2OgOg7eMg19F1a8x2uSO +vD7CbDQWgKy/Fj0O2eH+X2KkIMFVTm6W8taumMGlHX4520W1vUQ9LcAAvzh8CJy+ +76lrH9ueF0mr+bOHUTZzFEmsT+e8v6VUaT8Rc2uyd267hDNGlsSKU0PRG+qWjXSF +ZXQ+Hl9dmZcgRb2Ic7itCzVNcRF3XO/uNAmajFj7/Sv++fJ0WUTCRngSUVaSX3Ek +RM3tm9J1PAPnW0Z1Dq76pU/Czawqs1vh9NyCgaaCqqZ/YQh6vqymUKDPgvmolzLd +zPVfu6l1gOyPbRFi/u64FKR1tgqFLJ1N7XgYNMwCi7Wu0IOoGtDuwRVyrPTxIA4v +tjvazkzgwo+5p3OakinhfkF5h11+8oHxHNmBU083Aoy0tNN8VesHMRVdo0HCDx+U +ahFVj7n3vVF0NNJRxGvvJ/oUfTbDGIssbEI9eNRp622pmV5rtL4AGZrqUF5W2Bso +zQT9yV0HFyXevmUKsOkECxAT3tg8VALeZBN1Q2ngavyNYhBmOTncZwKSxM0rGFGB +yUc1YOOnnDFYbAiJi905yQdu6pjwGooAdULK7jZBHQYYnBK0NGUIREYj+QRj/v/V +uLyLXz+A2aSNJqhjnDtf +=EmC9 -----END PGP SIGNATURE----- diff --git a/x11-base/xorg-server/files/xorg-server-1.17-ia64-fix_inx_outx.patch b/x11-base/xorg-server/files/xorg-server-1.17-ia64-fix_inx_outx.patch new file mode 100644 index 000000000000..84485c986aa5 --- /dev/null +++ b/x11-base/xorg-server/files/xorg-server-1.17-ia64-fix_inx_outx.patch @@ -0,0 +1,59 @@ +diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h +index 1653574..fe881ee 100644 +--- a/hw/xfree86/common/compiler.h ++++ b/hw/xfree86/common/compiler.h +@@ -286,6 +286,54 @@ extern _X_EXPORT unsigned int inl(unsigned int port); + #include <machine/pio.h> + #endif /* __NetBSD__ */ + ++#elif defined(linux) && defined(__ia64__) ++/* for Linux on ia64, we use the LIBC _inx/_outx routines */ ++/* note that the appropriate setup via "ioperm" needs to be done */ ++/* *before* any inx/outx is done. */ ++ ++extern _X_EXPORT void _outb(unsigned char val, unsigned long port); ++extern _X_EXPORT void _outw(unsigned short val, unsigned long port); ++extern _X_EXPORT void _outl(unsigned int val, unsigned long port); ++extern _X_EXPORT unsigned int _inb(unsigned long port); ++extern _X_EXPORT unsigned int _inw(unsigned long port); ++extern _X_EXPORT unsigned int _inl(unsigned long port); ++ ++static __inline__ void ++outb(unsigned long port, unsigned char val) ++{ ++ _outb(val, port); ++} ++ ++static __inline__ void ++outw(unsigned long port, unsigned short val) ++{ ++ _outw(val, port); ++} ++ ++static __inline__ void ++outl(unsigned long port, unsigned int val) ++{ ++ _outl(val, port); ++} ++ ++static __inline__ unsigned int ++inb(unsigned long port) ++{ ++ return _inb(port); ++} ++ ++static __inline__ unsigned int ++inw(unsigned long port) ++{ ++ return _inw(port); ++} ++ ++static __inline__ unsigned int ++inl(unsigned long port) ++{ ++ return _inl(port); ++} ++ + #elif defined(__amd64__) + + #include <inttypes.h> diff --git a/x11-base/xorg-server/metadata.xml b/x11-base/xorg-server/metadata.xml index cbff1d2488c4..25f1e04d6a0a 100644 --- a/x11-base/xorg-server/metadata.xml +++ b/x11-base/xorg-server/metadata.xml @@ -9,6 +9,7 @@ <flag name='tslib'>Build with tslib support for touchscreen devices</flag> <flag name='unwind'>Enable libunwind usage for backtraces</flag> <flag name='xnest'>Build the Xnest server</flag> + <flag name='xephyr'>Build the Xephyr server</flag> <flag name='xorg'>Build the Xorg X server (HIGHLY RECOMMENDED)</flag> <flag name='xvfb'>Build the Xvfb server</flag> </use> diff --git a/x11-base/xorg-server/xorg-server-1.17.0.ebuild b/x11-base/xorg-server/xorg-server-1.17.0.ebuild new file mode 100644 index 000000000000..2a5e1932e107 --- /dev/null +++ b/x11-base/xorg-server/xorg-server-1.17.0.ebuild @@ -0,0 +1,249 @@ +# Copyright 1999-2015 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.17.0.ebuild,v 1.1 2015/02/08 17:40:24 chithanh Exp $ + +EAPI=5 + +XORG_DOC=doc +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 xephyr xnest xorg xvfb" +IUSE="${IUSE_SERVERS} glamor ipv6 minimal nptl selinux +suid systemd tslib +udev unwind wayland" + +CDEPEND=">=app-admin/eselect-opengl-1.3.0 + 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/libxshmfence-1.1 + >=x11-libs/pixman-0.27.2 + >=x11-libs/xtrans-1.3.5 + >=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 + ) + glamor? ( + media-libs/libepoxy + >=media-libs/mesa-10.3.4-r1[egl,gbm] + !x11-libs/glamor + ) + kdrive? ( + >=x11-libs/libXext-1.0.5 + x11-libs/libXv + ) + xephyr? ( x11-libs/libxcb ) + !minimal? ( + >=x11-libs/libX11-1.1.5 + >=x11-libs/libXext-1.0.5 + >=media-libs/mesa-10.3.4-r1[nptl=] + ) + tslib? ( >=x11-libs/tslib-1.0 ) + udev? ( >=virtual/udev-150 ) + unwind? ( sys-libs/libunwind ) + wayland? ( + >=dev-libs/wayland-1.3.0 + media-libs/libepoxy + ) + >=x11-apps/xinit-1.3 + systemd? ( + sys-apps/dbus + sys-apps/systemd + )" + +DEPEND="${CDEPEND} + 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.1.3 + >=x11-proto/glproto-1.4.17-r1 + >=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.2.99.901 + >=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.26 + >=x11-proto/presentproto-1.0 + >=x11-proto/dri3proto-1.0 + 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 + )" + +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-xserver ) + !x11-drivers/xf86-video-modesetting +" + +PDEPEND=" + xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" + +REQUIRED_USE="!minimal? ( + || ( ${IUSE_SERVERS} ) + ) + xephyr? ( kdrive )" + +#UPSTREAMED_PATCHES=( +# "${WORKDIR}/patches/" +#) + +PATCHES=( + "${UPSTREAMED_PATCHES[@]}" + "${FILESDIR}"/${PN}-1.17-ia64-fix_inx_outx.patch + "${FILESDIR}"/${PN}-1.12-unloadsubmodule.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 glamor) + $(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 unwind libunwind) + $(use_enable wayland xwayland) + $(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 xephyr) + $(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) + $(use_with systemd systemd-daemon) + $(use_enable systemd systemd-logind) + --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 + --disable-linux-acpi + --without-dtrace + --without-fop + --with-os-vendor=Gentoo + --with-sha1=libcrypto + ) + + xorg-2_src_configure +} + +src_install() { + xorg-2_src_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-11 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 + elog "You should consider reading upgrade guide for this release:" + elog " http://www.gentoo.org/proj/en/desktop/x/x11/xorg-server-$(get_version_component_range 1-2)-upgrade-guide.xml" + echo + 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 +} + +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 +} + +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 +} |