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