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