1 |
commit: 89c25f9c569b6b382aa13c46f8bd4b1831f4ba45 |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Mar 1 19:20:16 2018 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Mar 1 19:56:44 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89c25f9c |
7 |
|
8 |
x11-base/xorg-server: Version bump to 1.19.99.901 (1.20 RC1) |
9 |
|
10 |
Lets give suid-wrapper a try again... |
11 |
|
12 |
x11-base/xorg-server/Manifest | 1 + |
13 |
.../xorg-server/xorg-server-1.19.99.901.ebuild | 219 +++++++++++++++++++++ |
14 |
2 files changed, 220 insertions(+) |
15 |
|
16 |
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest |
17 |
index 6c5d01ced02..843e283419d 100644 |
18 |
--- a/x11-base/xorg-server/Manifest |
19 |
+++ b/x11-base/xorg-server/Manifest |
20 |
@@ -1,2 +1,3 @@ |
21 |
DIST xorg-server-1.19.5.tar.bz2 5965044 BLAKE2B 23375793ea4459a962f412440e307081ce2acd3c646e5db4d1bfac20e267bcbb1752ba8f6de66df06d25eaf92d1b55082a80eced0d44c257a757d5926ca6a7f3 SHA512 928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c |
22 |
DIST xorg-server-1.19.6.tar.bz2 5984528 BLAKE2B 7aaef0bccbfef669ea5e78faabf736e8ab4f460079b7b12b58a642dd9cb42ad4b6c662a6e8671bfc41e697561c856cb663dfbe9cbdf3a4e67d800f2e98c253f6 SHA512 38519a8d0af9dd034045fc346959496dd718fa59b6188307974797a1cd9c349deb54987f6232ea8396baf810dcc710c0ff191f76ed2186cae4d44921b3680412 |
23 |
+DIST xorg-server-1.19.99.901.tar.bz2 6131851 BLAKE2B 5b3588fe7c42d10eb89fa4ebea5ab6f2c7fb25f876ec6a5c5b523062f5c712c52c20767aa60b607847b50aa12ec75307b8715d63aa92331b70a1971c8d740670 SHA512 c2fbe4868788cd0d6d5fe546acb8c2ddec39ac3e851f352ee438a785a248a048a87073972f51ff98ef36a35a6753f8c2f22c2ecfc719d47dd9bb3c453fdb3ae5 |
24 |
|
25 |
diff --git a/x11-base/xorg-server/xorg-server-1.19.99.901.ebuild b/x11-base/xorg-server/xorg-server-1.19.99.901.ebuild |
26 |
new file mode 100644 |
27 |
index 00000000000..e85854fdf4e |
28 |
--- /dev/null |
29 |
+++ b/x11-base/xorg-server/xorg-server-1.19.99.901.ebuild |
30 |
@@ -0,0 +1,219 @@ |
31 |
+# Copyright 1999-2018 Gentoo Foundation |
32 |
+# Distributed under the terms of the GNU General Public License v2 |
33 |
+ |
34 |
+EAPI=5 |
35 |
+ |
36 |
+XORG_DOC=doc |
37 |
+inherit xorg-2 multilib versionator flag-o-matic |
38 |
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/xserver.git" |
39 |
+ |
40 |
+DESCRIPTION="X.Org X servers" |
41 |
+SLOT="0/${PV}" |
42 |
+if [[ ${PV} != 9999* ]]; then |
43 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" |
44 |
+fi |
45 |
+ |
46 |
+IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" |
47 |
+IUSE="${IUSE_SERVERS} debug +glamor ipv6 libressl minimal selinux systemd +udev unwind xcsecurity" |
48 |
+ |
49 |
+CDEPEND=">=app-eselect/eselect-opengl-1.3.0 |
50 |
+ !libressl? ( dev-libs/openssl:0= ) |
51 |
+ libressl? ( dev-libs/libressl ) |
52 |
+ >=x11-apps/iceauth-1.0.2 |
53 |
+ >=x11-apps/rgb-1.0.3 |
54 |
+ >=x11-apps/xauth-1.0.3 |
55 |
+ x11-apps/xkbcomp |
56 |
+ >=x11-libs/libdrm-2.4.46 |
57 |
+ >=x11-libs/libpciaccess-0.12.901 |
58 |
+ >=x11-libs/libXau-1.0.4 |
59 |
+ >=x11-libs/libXdmcp-1.0.2 |
60 |
+ >=x11-libs/libXfont2-2.0.1 |
61 |
+ >=x11-libs/libxkbfile-1.0.4 |
62 |
+ >=x11-libs/libxshmfence-1.1 |
63 |
+ >=x11-libs/pixman-0.27.2 |
64 |
+ >=x11-libs/xtrans-1.3.5 |
65 |
+ >=x11-misc/xbitmaps-1.0.1 |
66 |
+ >=x11-misc/xkeyboard-config-2.4.1-r3 |
67 |
+ dmx? ( |
68 |
+ x11-libs/libXt |
69 |
+ >=x11-libs/libdmx-1.0.99.1 |
70 |
+ >=x11-libs/libX11-1.1.5 |
71 |
+ >=x11-libs/libXaw-1.0.4 |
72 |
+ >=x11-libs/libXext-1.0.99.4 |
73 |
+ >=x11-libs/libXfixes-5.0 |
74 |
+ >=x11-libs/libXi-1.2.99.1 |
75 |
+ >=x11-libs/libXmu-1.0.3 |
76 |
+ x11-libs/libXrender |
77 |
+ >=x11-libs/libXres-1.0.3 |
78 |
+ >=x11-libs/libXtst-1.0.99.2 |
79 |
+ ) |
80 |
+ glamor? ( |
81 |
+ media-libs/libepoxy[X] |
82 |
+ >=media-libs/mesa-10.3.4-r1[egl,gbm] |
83 |
+ !x11-libs/glamor |
84 |
+ ) |
85 |
+ kdrive? ( |
86 |
+ >=x11-libs/libXext-1.0.5 |
87 |
+ x11-libs/libXv |
88 |
+ ) |
89 |
+ xephyr? ( |
90 |
+ x11-libs/libxcb[xkb] |
91 |
+ x11-libs/xcb-util |
92 |
+ x11-libs/xcb-util-image |
93 |
+ x11-libs/xcb-util-keysyms |
94 |
+ x11-libs/xcb-util-renderutil |
95 |
+ x11-libs/xcb-util-wm |
96 |
+ ) |
97 |
+ !minimal? ( |
98 |
+ >=x11-libs/libX11-1.1.5 |
99 |
+ >=x11-libs/libXext-1.0.5 |
100 |
+ >=media-libs/mesa-10.3.4-r1 |
101 |
+ ) |
102 |
+ udev? ( >=virtual/udev-150 ) |
103 |
+ unwind? ( sys-libs/libunwind ) |
104 |
+ wayland? ( |
105 |
+ >=dev-libs/wayland-1.3.0 |
106 |
+ media-libs/libepoxy |
107 |
+ >=dev-libs/wayland-protocols-1.1 |
108 |
+ ) |
109 |
+ >=x11-apps/xinit-1.3.3-r1 |
110 |
+ systemd? ( |
111 |
+ sys-apps/dbus |
112 |
+ sys-apps/systemd |
113 |
+ )" |
114 |
+ |
115 |
+DEPEND="${CDEPEND} |
116 |
+ sys-devel/flex |
117 |
+ >=x11-base/xorg-proto-2018.3 |
118 |
+ dmx? ( |
119 |
+ doc? ( |
120 |
+ || ( |
121 |
+ www-client/links |
122 |
+ www-client/lynx |
123 |
+ www-client/w3m |
124 |
+ ) |
125 |
+ ) |
126 |
+ )" |
127 |
+ |
128 |
+RDEPEND="${CDEPEND} |
129 |
+ selinux? ( sec-policy/selinux-xserver ) |
130 |
+ !x11-drivers/xf86-video-modesetting |
131 |
+" |
132 |
+ |
133 |
+PDEPEND=" |
134 |
+ xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" |
135 |
+ |
136 |
+REQUIRED_USE="!minimal? ( |
137 |
+ || ( ${IUSE_SERVERS} ) |
138 |
+ ) |
139 |
+ xephyr? ( kdrive )" |
140 |
+ |
141 |
+#UPSTREAMED_PATCHES=( |
142 |
+# "${WORKDIR}/patches/" |
143 |
+#) |
144 |
+ |
145 |
+PATCHES=( |
146 |
+ "${UPSTREAMED_PATCHES[@]}" |
147 |
+ "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch |
148 |
+ # needed for new eselect-opengl, bug #541232 |
149 |
+ "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch |
150 |
+) |
151 |
+ |
152 |
+pkg_pretend() { |
153 |
+ # older gcc is not supported |
154 |
+ [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ |
155 |
+ die "Sorry, but gcc earlier than 4.0 will not work for xorg-server." |
156 |
+} |
157 |
+ |
158 |
+pkg_setup() { |
159 |
+ if use wayland && ! use glamor; then |
160 |
+ ewarn "glamor is necessary for acceleration under Xwayland." |
161 |
+ ewarn "Performance may be unacceptable without it." |
162 |
+ fi |
163 |
+} |
164 |
+ |
165 |
+src_configure() { |
166 |
+ # localstatedir is used for the log location; we need to override the default |
167 |
+ # from ebuild.sh |
168 |
+ # sysconfdir is used for the xorg.conf location; same applies |
169 |
+ # NOTE: fop is used for doc generating; and I have no idea if Gentoo |
170 |
+ # package it somewhere |
171 |
+ XORG_CONFIGURE_OPTIONS=( |
172 |
+ $(use_enable ipv6) |
173 |
+ $(use_enable debug) |
174 |
+ $(use_enable dmx) |
175 |
+ $(use_enable glamor) |
176 |
+ $(use_enable kdrive) |
177 |
+ $(use_enable unwind libunwind) |
178 |
+ $(use_enable wayland xwayland) |
179 |
+ $(use_enable !minimal record) |
180 |
+ $(use_enable !minimal xfree86-utils) |
181 |
+ $(use_enable !minimal dri) |
182 |
+ $(use_enable !minimal dri2) |
183 |
+ $(use_enable !minimal glx) |
184 |
+ $(use_enable xcsecurity) |
185 |
+ $(use_enable xephyr) |
186 |
+ $(use_enable xnest) |
187 |
+ $(use_enable xorg) |
188 |
+ $(use_enable xvfb) |
189 |
+ $(use_enable udev config-udev) |
190 |
+ $(use_with doc doxygen) |
191 |
+ $(use_with doc xmlto) |
192 |
+ $(use_with systemd systemd-daemon) |
193 |
+ $(use_enable systemd systemd-logind) |
194 |
+ --enable-libdrm |
195 |
+ --enable-suid-wrapper |
196 |
+ --sysconfdir="${EPREFIX}"/etc/X11 |
197 |
+ --localstatedir="${EPREFIX}"/var |
198 |
+ --with-fontrootdir="${EPREFIX}"/usr/share/fonts |
199 |
+ --with-xkb-output="${EPREFIX}"/var/lib/xkb |
200 |
+ --disable-config-hal |
201 |
+ --disable-linux-acpi |
202 |
+ --without-dtrace |
203 |
+ --without-fop |
204 |
+ --with-os-vendor=Gentoo |
205 |
+ --with-sha1=libcrypto |
206 |
+ ) |
207 |
+ |
208 |
+ xorg-2_src_configure |
209 |
+} |
210 |
+ |
211 |
+src_install() { |
212 |
+ xorg-2_src_install |
213 |
+ |
214 |
+ server_based_install |
215 |
+ |
216 |
+ if ! use minimal && use xorg; then |
217 |
+ # Install xorg.conf.example into docs |
218 |
+ dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example |
219 |
+ fi |
220 |
+ |
221 |
+ newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup |
222 |
+ newinitd "${FILESDIR}"/xdm.initd-11 xdm |
223 |
+ newconfd "${FILESDIR}"/xdm.confd-4 xdm |
224 |
+ |
225 |
+ # install the @x11-module-rebuild set for Portage |
226 |
+ insinto /usr/share/portage/config/sets |
227 |
+ newins "${FILESDIR}"/xorg-sets.conf xorg.conf |
228 |
+} |
229 |
+ |
230 |
+pkg_postinst() { |
231 |
+ # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) |
232 |
+ eselect opengl set xorg-x11 --use-old |
233 |
+} |
234 |
+ |
235 |
+pkg_postrm() { |
236 |
+ # Get rid of module dir to ensure opengl-update works properly |
237 |
+ if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then |
238 |
+ rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules |
239 |
+ fi |
240 |
+} |
241 |
+ |
242 |
+server_based_install() { |
243 |
+ if ! use xorg; then |
244 |
+ rm "${ED}"/usr/share/man/man1/Xserver.1x \ |
245 |
+ "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ |
246 |
+ "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
247 |
+ "${ED}"/usr/share/man/man1/Xserver.1x |
248 |
+ fi |
249 |
+} |