| 1 |
commit: 3406b7b5a9c63f1f14f3574b437801e098b4f619 |
| 2 |
Author: Felix Janda <felix.janda <AT> posteo <DOT> de> |
| 3 |
AuthorDate: Sat Oct 1 19:22:44 2016 +0000 |
| 4 |
Commit: Felix Janda <felix.janda <AT> posteo <DOT> de> |
| 5 |
CommitDate: Sat Oct 1 19:25:24 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=3406b7b5 |
| 7 |
|
| 8 |
x11-base/xorg-server: add version 1.18.3 for arm |
| 9 |
|
| 10 |
Reduce KEYWORDS to arm since this is the only arch that still |
| 11 |
needs patching. |
| 12 |
|
| 13 |
x11-base/xorg-server/Manifest | 3 + |
| 14 |
...rver-1.18-support-multiple-Files-sections.patch | 53 +++++ |
| 15 |
x11-base/xorg-server/xorg-server-1.18.3-r99.ebuild | 243 +++++++++++++++++++++ |
| 16 |
3 files changed, 299 insertions(+) |
| 17 |
|
| 18 |
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest |
| 19 |
index 6c5da35..45e2d2d 100644 |
| 20 |
--- a/x11-base/xorg-server/Manifest |
| 21 |
+++ b/x11-base/xorg-server/Manifest |
| 22 |
@@ -7,9 +7,12 @@ AUX xorg-server-1.14.3-musl.patch 916 SHA256 aa3d44a6b21a7991eb730d5ddf345e8ab9c |
| 23 |
AUX xorg-server-1.17-ia64-fix_inx_outx.patch 1539 SHA256 4c844b2d41b6412304b8a918e3cd93d8f2ab8dad8e6a22310cd87d1f3d8f5e95 SHA512 1db65132bb04eff380d38ccc8441f9f9e5286d7a47956495c0a7de7978107d15e5638d05df0aabbcd11687dd03189a7ac50fca51d755d082869aed71e66dbda1 WHIRLPOOL 8f7f3d107e2f8ce5e07d5dac9bf68b7547425943c3e6b6db92eab8bebc0194da53384c953f5e823a5284025e1bbcf18000b497d31de7c5d46e43f9cc02999915 |
| 24 |
AUX xorg-server-1.17-support-multiple-Files-sections.patch 2256 SHA256 1cc57d2e8449d50737c507005df348610bb68241fe36e997e4803b3b8b3e6d86 SHA512 e3141727c993e02b2e067095807e96ef0cc82e2e7c8b65664d0530ef05a0f7b9170272e4e1e3523ede3f1cc23b00c4776785b8299e0b58a6e7fd56062aecefb6 WHIRLPOOL 078a5e30777a8f6e908421a1c7cc4a7e63c23f57b600bb1117bc1e8de2db0e6440870f811e65283acaa48da06fcc5666434d2bdce257709344e8f584d1525623 |
| 25 |
AUX xorg-server-1.17.4-arm-musl.patch 682 SHA256 b210a93b4d6128c0963ade3458925ff293e1c68ac20a15964357fd401f7161e0 SHA512 b799e757a22a61ac283adbd7a8df1ad4eccce0bb6cac38a0c962ba8438bba3cf6637a65bb64859e7b32399fca672283a49960207e186c271ba574580de360d09 WHIRLPOOL 3a197692f3d5a7563294248784d8afb5d74eb19e8533cab5166364e96753e0c99c1cbfc236b74c9fcfa553822e277b62f19a4b7193697c9e0c991d3f00de5b8e |
| 26 |
+AUX xorg-server-1.18-support-multiple-Files-sections.patch 1902 SHA256 07ef91cb5da75d5165d10d5bc29c58a8b003e743092c1e290453bd6f82a2cf63 SHA512 5cd0a4ce9c2efef7abc84df805a3c6da33bd64fdb16c3aa2fa61da4f805605a3d12cab0f452d3bc217b6e5d5d5bea29c9f3bf262e46347a074770ebd75ddf5b5 WHIRLPOOL 08fa76e82278cc103ba91555d679413409fd70c29609950e9c1fdd7cfc1e13d5d5b76dc2891465b8faa0fca37c89a32556d0c4cb644a131a7abd332a91fc6cad |
| 27 |
AUX xorg-sets.conf 199 SHA256 1201d0337ac69d9715f4454a86dfb8a7bd1ae6f4c2578042fc08f283a997597c SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41 WHIRLPOOL 4acac88e1688ea71df59a86a8a188b5369ad05f61e1369cd620eecd754511578e961a537ff6d0b22156f671d3485289cbc941dfe83bea24a27329b7bebb46c7d |
| 28 |
DIST xorg-server-1.16.4.tar.bz2 5817330 SHA256 abb6e1cc9213a9915a121f48576ff6739a0b8cdb3d32796f9a7743c9a6efc871 SHA512 f756fca65535aa921a85d8d8eb36ea2ba5b7af90a46d640b0ca76259a9abd9d323885087e11156528d95240937c70373045001ae20266a1b9e89909f007e9e74 WHIRLPOOL 63980a3e2b57d2860998344f21a6524598b3dc135c277e5a868e34b57ab5060681ae7137358b3ba8b9ca5fd622a91aeb06bd0ac9e3e5ce1f4dc55df2b2dc0e33 |
| 29 |
DIST xorg-server-1.17.4.tar.bz2 5791384 SHA256 0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457 SHA512 4b8377b86ca88f27dcf59db2996b2ee620ce6f181a37dc47600365db588d48f2f3ca66a3149e7c856e686e5783b1cccb2ba0827aa7413299163dfca869f4d376 WHIRLPOOL c5baa1b01e57eac9e18bd1890c0a7e2246836524645057d5e05a1a19225d863645616aafaadbf9d083ffb672d47ea1934ad8323d813533e9519f0d92f9a1c6ab |
| 30 |
+DIST xorg-server-1.18.3.tar.bz2 5867330 SHA256 ea739c22517cdbe2b5f7c0a5fd05fe8a10ac0629003e71c0c7862f4bb60142cd SHA512 9540b2fb69bf531b57e54af09b103c92c8d9d9cc4e6abe911f63b73b7c63eb6587eeae87927d7bdd7be83749785bf6b395891f85394e86ad2b01c182749f2171 WHIRLPOOL 8ddf040ff24a4668a460b323b6604347120868658d61b9b84853568f768f7f84267d7caf299c4fe306aeff0bc68d28613a51eaee5a2904bfd524e2aac7ff2e7a |
| 31 |
EBUILD xorg-server-1.16.4-r99.ebuild 6767 SHA256 9d2027c38b5e6cb0f8ecb7f97733172af29d2834dfb023a5f3bdc5a178938cf5 SHA512 08b8b271c273ba27ac06fcca259ffdf87beaf8768ee326af8750a4f79bf78b99d935d2afa1249086961d5f937e65d597db7f08831d4df7db56ab65e2d9a36f25 WHIRLPOOL b94da2f8bbccefd58b53437042cc3211a75abeaefa814e0fae4b829db055ce4034994dd1395fa2a809aa7c52af16140859de1920d1324a253aa688f1d7a5b911 |
| 32 |
EBUILD xorg-server-1.17.4.ebuild 6282 SHA256 d522e5273a368d66e8cd95906c47873009325dd83cd29dd9dfb4dd3765c8a675 SHA512 ca9bb36a6c1bb26a579f44496931a8302c8b78c1a5287cbd772447cd79c7b468785b5dfb28368aad47ac8ed4368dab65313ca68528d7145566eb8561d184a2ef WHIRLPOOL 019705c66bc05cbaa8b08affe45de151ec04ccc101df6cb717ec926a7dcadb085f74a774801c3b516dfd01f930fb3ceb00db7047ac93741b768542f0b0a9c11e |
| 33 |
+EBUILD xorg-server-1.18.3-r99.ebuild 6115 SHA256 538e0f93f41cef8b58628ae60bc94ab57716d19187363979eb0381745903102a SHA512 1c696fd0c6c5a9ec14d3a3df826c7a02d0de58790f2ddd579c7a0e68f1c46ddccfbae4acd5b8f2e15c0c65f14cc8647020dac75eddd49eebb513b5f76fc89212 WHIRLPOOL d0f153e9c7e85bb90a3990d6dae032e57681227160cf67c068998f50038c6ef98a35d9f4c89319c17c495e1eea08b378d790a749ca8502b2352d679a10e4a919 |
| 34 |
MISC metadata.xml 877 SHA256 b41a133db7c20ca9b78a620f30af984d178baef7207c8c4329e1309835e8b522 SHA512 370e41da26388e328697958396b808c831e07245dc9e2ea230316bee8067d8501d032a0c9f89b7f1ea27c816490803839a8f14485aacde6143b3db38a6e1ede2 WHIRLPOOL ce70642eac3ef6ea824755d4d1bc7bdf8e5d3b95300ef43a41e1f5e710df0f12179f0a15b21dae0fbebb0dd56e35008f1e991463215a7f23dd2fd977400da40b |
| 35 |
|
| 36 |
diff --git a/x11-base/xorg-server/files/xorg-server-1.18-support-multiple-Files-sections.patch b/x11-base/xorg-server/files/xorg-server-1.18-support-multiple-Files-sections.patch |
| 37 |
new file mode 100644 |
| 38 |
index 0000000..0a61145 |
| 39 |
--- /dev/null |
| 40 |
+++ b/x11-base/xorg-server/files/xorg-server-1.18-support-multiple-Files-sections.patch |
| 41 |
@@ -0,0 +1,53 @@ |
| 42 |
+See http://lists.x.org/archives/xorg-devel/2015-February/045755.html |
| 43 |
+ |
| 44 |
+diff --git a/hw/xfree86/parser/Files.c b/hw/xfree86/parser/Files.c |
| 45 |
+index 849bf92..5cc3ec7 100644 |
| 46 |
+--- a/hw/xfree86/parser/Files.c |
| 47 |
++++ b/hw/xfree86/parser/Files.c |
| 48 |
+@@ -76,14 +76,18 @@ static xf86ConfigSymTabRec FilesTab[] = { |
| 49 |
+ #define CLEANUP xf86freeFiles |
| 50 |
+ |
| 51 |
+ XF86ConfFilesPtr |
| 52 |
+-xf86parseFilesSection(void) |
| 53 |
++xf86parseFilesSection(XF86ConfFilesPtr ptr) |
| 54 |
+ { |
| 55 |
+ int i, j; |
| 56 |
+ int k, l; |
| 57 |
+ char *str; |
| 58 |
+ int token; |
| 59 |
+ |
| 60 |
+- parsePrologue(XF86ConfFilesPtr, XF86ConfFilesRec) |
| 61 |
++ if (!ptr) { |
| 62 |
++ if( (ptr=calloc(1,sizeof(XF86ConfFilesRec))) == NULL ) { |
| 63 |
++ return NULL; |
| 64 |
++ } |
| 65 |
++ } |
| 66 |
+ |
| 67 |
+ while ((token = xf86getToken(FilesTab)) != ENDSECTION) { |
| 68 |
+ switch (token) { |
| 69 |
+diff --git a/hw/xfree86/parser/configProcs.h b/hw/xfree86/parser/configProcs.h |
| 70 |
+index 171f8e8..e8199fe 100644 |
| 71 |
+--- a/hw/xfree86/parser/configProcs.h |
| 72 |
++++ b/hw/xfree86/parser/configProcs.h |
| 73 |
+@@ -36,7 +36,7 @@ void xf86freeDeviceList(XF86ConfDevicePtr ptr); |
| 74 |
+ int xf86validateDevice(XF86ConfigPtr p); |
| 75 |
+ |
| 76 |
+ /* Files.c */ |
| 77 |
+-XF86ConfFilesPtr xf86parseFilesSection(void); |
| 78 |
++XF86ConfFilesPtr xf86parseFilesSection(XF86ConfFilesPtr ptr); |
| 79 |
+ void xf86printFileSection(FILE * cf, XF86ConfFilesPtr ptr); |
| 80 |
+ void xf86freeFiles(XF86ConfFilesPtr p); |
| 81 |
+ |
| 82 |
+diff --git a/hw/xfree86/parser/read.c b/hw/xfree86/parser/read.c |
| 83 |
+index 327c02a..e0d6139 100644 |
| 84 |
+--- a/hw/xfree86/parser/read.c |
| 85 |
++++ b/hw/xfree86/parser/read.c |
| 86 |
+@@ -110,7 +110,7 @@ xf86readConfigFile(void) |
| 87 |
+ if (xf86nameCompare(xf86_lex_val.str, "files") == 0) { |
| 88 |
+ free(xf86_lex_val.str); |
| 89 |
+ xf86_lex_val.str = NULL; |
| 90 |
+- HANDLE_RETURN(conf_files, xf86parseFilesSection()); |
| 91 |
++ HANDLE_RETURN(conf_files, xf86parseFilesSection(ptr->conf_files)); |
| 92 |
+ } |
| 93 |
+ else if (xf86nameCompare(xf86_lex_val.str, "serverflags") == 0) { |
| 94 |
+ free(xf86_lex_val.str); |
| 95 |
|
| 96 |
diff --git a/x11-base/xorg-server/xorg-server-1.18.3-r99.ebuild b/x11-base/xorg-server/xorg-server-1.18.3-r99.ebuild |
| 97 |
new file mode 100644 |
| 98 |
index 0000000..edc100e |
| 99 |
--- /dev/null |
| 100 |
+++ b/x11-base/xorg-server/xorg-server-1.18.3-r99.ebuild |
| 101 |
@@ -0,0 +1,243 @@ |
| 102 |
+# Copyright 1999-2016 Gentoo Foundation |
| 103 |
+# Distributed under the terms of the GNU General Public License v2 |
| 104 |
+# $Id$ |
| 105 |
+ |
| 106 |
+EAPI=5 |
| 107 |
+ |
| 108 |
+XORG_DOC=doc |
| 109 |
+inherit xorg-2 multilib versionator flag-o-matic |
| 110 |
+EGIT_REPO_URI="git://anongit.freedesktop.org/xorg/xserver" |
| 111 |
+ |
| 112 |
+DESCRIPTION="X.Org X servers" |
| 113 |
+SLOT="0/${PV}" |
| 114 |
+KEYWORDS="arm" |
| 115 |
+ |
| 116 |
+IUSE_SERVERS="dmx kdrive xephyr xnest xorg xvfb" |
| 117 |
+IUSE="${IUSE_SERVERS} glamor ipv6 libressl minimal selinux +suid systemd tslib +udev unwind wayland" |
| 118 |
+ |
| 119 |
+CDEPEND=">=app-eselect/eselect-opengl-1.3.0 |
| 120 |
+ !libressl? ( dev-libs/openssl:0= ) |
| 121 |
+ libressl? ( dev-libs/libressl ) |
| 122 |
+ media-libs/freetype |
| 123 |
+ >=x11-apps/iceauth-1.0.2 |
| 124 |
+ >=x11-apps/rgb-1.0.3 |
| 125 |
+ >=x11-apps/xauth-1.0.3 |
| 126 |
+ x11-apps/xkbcomp |
| 127 |
+ >=x11-libs/libdrm-2.4.46 |
| 128 |
+ >=x11-libs/libpciaccess-0.12.901 |
| 129 |
+ >=x11-libs/libXau-1.0.4 |
| 130 |
+ >=x11-libs/libXdmcp-1.0.2 |
| 131 |
+ >=x11-libs/libXfont-1.4.2 |
| 132 |
+ >=x11-libs/libxkbfile-1.0.4 |
| 133 |
+ >=x11-libs/libxshmfence-1.1 |
| 134 |
+ >=x11-libs/pixman-0.27.2 |
| 135 |
+ >=x11-libs/xtrans-1.3.5 |
| 136 |
+ >=x11-misc/xbitmaps-1.0.1 |
| 137 |
+ >=x11-misc/xkeyboard-config-2.4.1-r3 |
| 138 |
+ dmx? ( |
| 139 |
+ x11-libs/libXt |
| 140 |
+ >=x11-libs/libdmx-1.0.99.1 |
| 141 |
+ >=x11-libs/libX11-1.1.5 |
| 142 |
+ >=x11-libs/libXaw-1.0.4 |
| 143 |
+ >=x11-libs/libXext-1.0.99.4 |
| 144 |
+ >=x11-libs/libXfixes-5.0 |
| 145 |
+ >=x11-libs/libXi-1.2.99.1 |
| 146 |
+ >=x11-libs/libXmu-1.0.3 |
| 147 |
+ x11-libs/libXrender |
| 148 |
+ >=x11-libs/libXres-1.0.3 |
| 149 |
+ >=x11-libs/libXtst-1.0.99.2 |
| 150 |
+ ) |
| 151 |
+ glamor? ( |
| 152 |
+ media-libs/libepoxy |
| 153 |
+ >=media-libs/mesa-10.3.4-r1[egl,gbm] |
| 154 |
+ !x11-libs/glamor |
| 155 |
+ ) |
| 156 |
+ kdrive? ( |
| 157 |
+ >=x11-libs/libXext-1.0.5 |
| 158 |
+ x11-libs/libXv |
| 159 |
+ ) |
| 160 |
+ xephyr? ( |
| 161 |
+ x11-libs/libxcb |
| 162 |
+ x11-libs/xcb-util |
| 163 |
+ x11-libs/xcb-util-image |
| 164 |
+ x11-libs/xcb-util-keysyms |
| 165 |
+ x11-libs/xcb-util-renderutil |
| 166 |
+ x11-libs/xcb-util-wm |
| 167 |
+ ) |
| 168 |
+ !minimal? ( |
| 169 |
+ >=x11-libs/libX11-1.1.5 |
| 170 |
+ >=x11-libs/libXext-1.0.5 |
| 171 |
+ >=media-libs/mesa-10.3.4-r1 |
| 172 |
+ ) |
| 173 |
+ tslib? ( >=x11-libs/tslib-1.0 ) |
| 174 |
+ udev? ( >=virtual/udev-150 ) |
| 175 |
+ unwind? ( sys-libs/libunwind ) |
| 176 |
+ wayland? ( |
| 177 |
+ >=dev-libs/wayland-1.3.0 |
| 178 |
+ media-libs/libepoxy |
| 179 |
+ ) |
| 180 |
+ >=x11-apps/xinit-1.3.3-r1 |
| 181 |
+ systemd? ( |
| 182 |
+ sys-apps/dbus |
| 183 |
+ sys-apps/systemd |
| 184 |
+ )" |
| 185 |
+ |
| 186 |
+DEPEND="${CDEPEND} |
| 187 |
+ sys-devel/flex |
| 188 |
+ >=x11-proto/bigreqsproto-1.1.0 |
| 189 |
+ >=x11-proto/compositeproto-0.4 |
| 190 |
+ >=x11-proto/damageproto-1.1 |
| 191 |
+ >=x11-proto/fixesproto-5.0 |
| 192 |
+ >=x11-proto/fontsproto-2.1.3 |
| 193 |
+ >=x11-proto/glproto-1.4.17-r1 |
| 194 |
+ >=x11-proto/inputproto-2.3 |
| 195 |
+ >=x11-proto/kbproto-1.0.3 |
| 196 |
+ >=x11-proto/randrproto-1.5.0 |
| 197 |
+ >=x11-proto/recordproto-1.13.99.1 |
| 198 |
+ >=x11-proto/renderproto-0.11 |
| 199 |
+ >=x11-proto/resourceproto-1.2.0 |
| 200 |
+ >=x11-proto/scrnsaverproto-1.1 |
| 201 |
+ >=x11-proto/trapproto-3.4.3 |
| 202 |
+ >=x11-proto/videoproto-2.2.2 |
| 203 |
+ >=x11-proto/xcmiscproto-1.2.0 |
| 204 |
+ >=x11-proto/xextproto-7.2.99.901 |
| 205 |
+ >=x11-proto/xf86dgaproto-2.0.99.1 |
| 206 |
+ >=x11-proto/xf86rushproto-1.1.2 |
| 207 |
+ >=x11-proto/xf86vidmodeproto-2.2.99.1 |
| 208 |
+ >=x11-proto/xineramaproto-1.1.3 |
| 209 |
+ >=x11-proto/xproto-7.0.28 |
| 210 |
+ >=x11-proto/presentproto-1.0 |
| 211 |
+ >=x11-proto/dri3proto-1.0 |
| 212 |
+ dmx? ( |
| 213 |
+ >=x11-proto/dmxproto-2.2.99.1 |
| 214 |
+ doc? ( |
| 215 |
+ || ( |
| 216 |
+ www-client/links |
| 217 |
+ www-client/lynx |
| 218 |
+ www-client/w3m |
| 219 |
+ ) |
| 220 |
+ ) |
| 221 |
+ ) |
| 222 |
+ !minimal? ( |
| 223 |
+ >=x11-proto/xf86driproto-2.1.0 |
| 224 |
+ >=x11-proto/dri2proto-2.8 |
| 225 |
+ )" |
| 226 |
+ |
| 227 |
+RDEPEND="${CDEPEND} |
| 228 |
+ selinux? ( sec-policy/selinux-xserver ) |
| 229 |
+ !x11-drivers/xf86-video-modesetting |
| 230 |
+" |
| 231 |
+ |
| 232 |
+PDEPEND=" |
| 233 |
+ xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" |
| 234 |
+ |
| 235 |
+REQUIRED_USE="!minimal? ( |
| 236 |
+ || ( ${IUSE_SERVERS} ) |
| 237 |
+ ) |
| 238 |
+ xephyr? ( kdrive )" |
| 239 |
+ |
| 240 |
+#UPSTREAMED_PATCHES=( |
| 241 |
+# "${WORKDIR}/patches/" |
| 242 |
+#) |
| 243 |
+ |
| 244 |
+PATCHES=( |
| 245 |
+ "${UPSTREAMED_PATCHES[@]}" |
| 246 |
+ "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch |
| 247 |
+ # needed for new eselect-opengl, bug #541232 |
| 248 |
+ "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch |
| 249 |
+ "${FILESDIR}"/${PN}-1.17.4-arm-musl.patch |
| 250 |
+) |
| 251 |
+ |
| 252 |
+pkg_pretend() { |
| 253 |
+ # older gcc is not supported |
| 254 |
+ [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ |
| 255 |
+ die "Sorry, but gcc earlier than 4.0 will not work for xorg-server." |
| 256 |
+} |
| 257 |
+ |
| 258 |
+src_configure() { |
| 259 |
+ # localstatedir is used for the log location; we need to override the default |
| 260 |
+ # from ebuild.sh |
| 261 |
+ # sysconfdir is used for the xorg.conf location; same applies |
| 262 |
+ # NOTE: fop is used for doc generating; and I have no idea if Gentoo |
| 263 |
+ # package it somewhere |
| 264 |
+ XORG_CONFIGURE_OPTIONS=( |
| 265 |
+ $(use_enable ipv6) |
| 266 |
+ $(use_enable dmx) |
| 267 |
+ $(use_enable glamor) |
| 268 |
+ $(use_enable kdrive) |
| 269 |
+ $(use_enable kdrive kdrive-kbd) |
| 270 |
+ $(use_enable kdrive kdrive-mouse) |
| 271 |
+ $(use_enable kdrive kdrive-evdev) |
| 272 |
+ $(use_enable suid install-setuid) |
| 273 |
+ $(use_enable tslib) |
| 274 |
+ $(use_enable unwind libunwind) |
| 275 |
+ $(use_enable wayland xwayland) |
| 276 |
+ $(use_enable !minimal record) |
| 277 |
+ $(use_enable !minimal xfree86-utils) |
| 278 |
+ $(use_enable !minimal dri) |
| 279 |
+ $(use_enable !minimal dri2) |
| 280 |
+ $(use_enable !minimal glx) |
| 281 |
+ $(use_enable xephyr) |
| 282 |
+ $(use_enable xnest) |
| 283 |
+ $(use_enable xorg) |
| 284 |
+ $(use_enable xvfb) |
| 285 |
+ $(use_enable udev config-udev) |
| 286 |
+ $(use_with doc doxygen) |
| 287 |
+ $(use_with doc xmlto) |
| 288 |
+ $(use_with systemd systemd-daemon) |
| 289 |
+ $(use_enable systemd systemd-logind) |
| 290 |
+ --enable-libdrm |
| 291 |
+ --sysconfdir="${EPREFIX}"/etc/X11 |
| 292 |
+ --localstatedir="${EPREFIX}"/var |
| 293 |
+ --with-fontrootdir="${EPREFIX}"/usr/share/fonts |
| 294 |
+ --with-xkb-output="${EPREFIX}"/var/lib/xkb |
| 295 |
+ --disable-config-hal |
| 296 |
+ --disable-linux-acpi |
| 297 |
+ --without-dtrace |
| 298 |
+ --without-fop |
| 299 |
+ --with-os-vendor=Gentoo |
| 300 |
+ --with-sha1=libcrypto |
| 301 |
+ ) |
| 302 |
+ |
| 303 |
+ xorg-2_src_configure |
| 304 |
+} |
| 305 |
+ |
| 306 |
+src_install() { |
| 307 |
+ xorg-2_src_install |
| 308 |
+ |
| 309 |
+ server_based_install |
| 310 |
+ |
| 311 |
+ if ! use minimal && use xorg; then |
| 312 |
+ # Install xorg.conf.example into docs |
| 313 |
+ dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example |
| 314 |
+ fi |
| 315 |
+ |
| 316 |
+ newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup |
| 317 |
+ newinitd "${FILESDIR}"/xdm.initd-11 xdm |
| 318 |
+ newconfd "${FILESDIR}"/xdm.confd-4 xdm |
| 319 |
+ |
| 320 |
+ # install the @x11-module-rebuild set for Portage |
| 321 |
+ insinto /usr/share/portage/config/sets |
| 322 |
+ newins "${FILESDIR}"/xorg-sets.conf xorg.conf |
| 323 |
+} |
| 324 |
+ |
| 325 |
+pkg_postinst() { |
| 326 |
+ # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) |
| 327 |
+ eselect opengl set xorg-x11 --use-old |
| 328 |
+} |
| 329 |
+ |
| 330 |
+pkg_postrm() { |
| 331 |
+ # Get rid of module dir to ensure opengl-update works properly |
| 332 |
+ if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then |
| 333 |
+ rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules |
| 334 |
+ fi |
| 335 |
+} |
| 336 |
+ |
| 337 |
+server_based_install() { |
| 338 |
+ if ! use xorg; then |
| 339 |
+ rm "${ED}"/usr/share/man/man1/Xserver.1x \ |
| 340 |
+ "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ |
| 341 |
+ "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
| 342 |
+ "${ED}"/usr/share/man/man1/Xserver.1x |
| 343 |
+ fi |
| 344 |
+} |
Archives