1 |
commit: 9e44e2d61430671df85de58d6c0b60122a955bc9 |
2 |
Author: stefson <herrtimson <AT> yahoo <DOT> de> |
3 |
AuthorDate: Sat Jan 19 08:44:45 2019 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 23 19:28:34 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=9e44e2d6 |
7 |
|
8 |
x11-base/xorg-server: drop old |
9 |
|
10 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
11 |
|
12 |
x11-base/xorg-server/Manifest | 1 - |
13 |
.../files/xorg-server-1.19.4-sysmacros.patch | 36 ---- |
14 |
...t-pick-sRGB-config-for-32-bit-RGBA-visual.patch | 39 ---- |
15 |
x11-base/xorg-server/xorg-server-1.19.5-r2.ebuild | 225 --------------------- |
16 |
4 files changed, 301 deletions(-) |
17 |
|
18 |
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest |
19 |
index 3bc38c0..4dc1591 100644 |
20 |
--- a/x11-base/xorg-server/Manifest |
21 |
+++ b/x11-base/xorg-server/Manifest |
22 |
@@ -1,2 +1 @@ |
23 |
-DIST xorg-server-1.19.5.tar.bz2 5965044 BLAKE2B 23375793ea4459a962f412440e307081ce2acd3c646e5db4d1bfac20e267bcbb1752ba8f6de66df06d25eaf92d1b55082a80eced0d44c257a757d5926ca6a7f3 SHA512 928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c |
24 |
DIST xorg-server-1.20.3.tar.bz2 6205000 BLAKE2B 9fc8acf1812d0aa4800941dd1846060f91edf1e7ebc92b35e8c2028266d88d3ab3ba14e95f535e5ee41941f8e20769ee75723ba609f5653d4892f97bc5cf91c4 SHA512 ee44554f86df4297f54c5871fe7a18954eeef4338775a25f36d6577b279c4775f61128da71b86cfaeadcc080838d6749dede138d4db178866579da2056543fba |
25 |
|
26 |
diff --git a/x11-base/xorg-server/files/xorg-server-1.19.4-sysmacros.patch b/x11-base/xorg-server/files/xorg-server-1.19.4-sysmacros.patch |
27 |
deleted file mode 100644 |
28 |
index 8a3cb76..0000000 |
29 |
--- a/x11-base/xorg-server/files/xorg-server-1.19.4-sysmacros.patch |
30 |
+++ /dev/null |
31 |
@@ -1,36 +0,0 @@ |
32 |
-From 7d097c0c38ab82115a1e56489bfe09f9f01b24de Mon Sep 17 00:00:00 2001 |
33 |
-From: Mart Raudsepp <leio@g.o> |
34 |
-Date: Wed, 11 Oct 2017 16:11:49 +0300 |
35 |
-Subject: [PATCH] config/udev: Add sys/sysmacros.h include for major/minor |
36 |
- functions for new glibc |
37 |
- |
38 |
-Commits d732c36597fa and 84e3b96b5313 added the include to some files, but |
39 |
-missed config/udev.c, where the major and minor functions are used as well. |
40 |
-This should be Linux-only, so we don't need the sys/mkdev.h case here for |
41 |
-Solaris. |
42 |
- |
43 |
-Signed-off-by: Mart Raudsepp <leio@g.o> |
44 |
---- |
45 |
-https://bugs.gentoo.org/633530 |
46 |
-https://patchwork.freedesktop.org/patch/181800/ |
47 |
- |
48 |
- config/udev.c | 3 +++ |
49 |
- 1 file changed, 3 insertions(+) |
50 |
- |
51 |
-diff --git a/config/udev.c b/config/udev.c |
52 |
-index 932f230..b3b8d0f 100644 |
53 |
---- a/config/udev.c |
54 |
-+++ b/config/udev.c |
55 |
-@@ -30,6 +30,9 @@ |
56 |
- #include <libudev.h> |
57 |
- #include <ctype.h> |
58 |
- #include <unistd.h> |
59 |
-+#ifdef HAVE_SYS_SYSMACROS_H |
60 |
-+#include <sys/sysmacros.h> |
61 |
-+#endif |
62 |
- |
63 |
- #include "input.h" |
64 |
- #include "inputstr.h" |
65 |
--- |
66 |
-2.10.2 |
67 |
- |
68 |
|
69 |
diff --git a/x11-base/xorg-server/files/xorg-server-1.19.5-glx-do-not-pick-sRGB-config-for-32-bit-RGBA-visual.patch b/x11-base/xorg-server/files/xorg-server-1.19.5-glx-do-not-pick-sRGB-config-for-32-bit-RGBA-visual.patch |
70 |
deleted file mode 100644 |
71 |
index d7e5e51..0000000 |
72 |
--- a/x11-base/xorg-server/files/xorg-server-1.19.5-glx-do-not-pick-sRGB-config-for-32-bit-RGBA-visual.patch |
73 |
+++ /dev/null |
74 |
@@ -1,39 +0,0 @@ |
75 |
-From c2954b16c8730c7ed8441fd8dba25900f3aed265 Mon Sep 17 00:00:00 2001 |
76 |
-From: =?UTF-8?q?Tapani=20P=C3=A4lli?= <tapani.palli@×××××.com> |
77 |
-Date: Tue, 28 Nov 2017 09:23:29 +0200 |
78 |
-Subject: [PATCH] glx: do not pick sRGB config for 32-bit RGBA visual |
79 |
-MIME-Version: 1.0 |
80 |
-Content-Type: text/plain; charset=UTF-8 |
81 |
-Content-Transfer-Encoding: 8bit |
82 |
- |
83 |
-This fixes blending issues seen with kwin and gnome-shell when |
84 |
-32bit visual has sRGB capability set. |
85 |
- |
86 |
-Reviewed-by: Adam Jackson <ajax@××××××.com> |
87 |
-Signed-off-by: Tapani Pälli <tapani.palli@×××××.com> |
88 |
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103699 |
89 |
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103646 |
90 |
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103655 |
91 |
---- |
92 |
- glx/glxscreens.c | 5 +++++ |
93 |
- 1 file changed, 5 insertions(+) |
94 |
- |
95 |
-diff --git a/glx/glxscreens.c b/glx/glxscreens.c |
96 |
-index 73444152a..596d972e0 100644 |
97 |
---- a/glx/glxscreens.c |
98 |
-+++ b/glx/glxscreens.c |
99 |
-@@ -271,6 +271,11 @@ pickFBConfig(__GLXscreen * pGlxScreen, VisualPtr visual) |
100 |
- /* If it's the 32-bit RGBA visual, demand a 32-bit fbconfig. */ |
101 |
- if (visual->nplanes == 32 && config->rgbBits != 32) |
102 |
- continue; |
103 |
-+ /* If it's the 32-bit RGBA visual, do not pick sRGB capable config. |
104 |
-+ * This can cause issues with compositors that are not sRGB aware. |
105 |
-+ */ |
106 |
-+ if (visual->nplanes == 32 && config->sRGBCapable == GL_TRUE) |
107 |
-+ continue; |
108 |
- /* Can't use the same FBconfig for multiple X visuals. I think. */ |
109 |
- if (config->visualID != 0) |
110 |
- continue; |
111 |
--- |
112 |
-2.17.0 |
113 |
- |
114 |
|
115 |
diff --git a/x11-base/xorg-server/xorg-server-1.19.5-r2.ebuild b/x11-base/xorg-server/xorg-server-1.19.5-r2.ebuild |
116 |
deleted file mode 100644 |
117 |
index cac9ce7..0000000 |
118 |
--- a/x11-base/xorg-server/xorg-server-1.19.5-r2.ebuild |
119 |
+++ /dev/null |
120 |
@@ -1,225 +0,0 @@ |
121 |
-# Copyright 1999-2018 Gentoo Foundation |
122 |
-# Distributed under the terms of the GNU General Public License v2 |
123 |
- |
124 |
-EAPI=5 |
125 |
- |
126 |
-XORG_DOC=doc |
127 |
-inherit xorg-2 multilib versionator flag-o-matic |
128 |
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/xserver.git" |
129 |
- |
130 |
-DESCRIPTION="X.Org X servers" |
131 |
-SLOT="0/${PV}" |
132 |
-KEYWORDS="arm" |
133 |
- |
134 |
-IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" |
135 |
-IUSE="${IUSE_SERVERS} debug +glamor ipv6 libressl minimal selinux +suid systemd tslib +udev unwind xcsecurity" |
136 |
- |
137 |
-CDEPEND=">=app-eselect/eselect-opengl-1.3.0 |
138 |
- !libressl? ( dev-libs/openssl:0= ) |
139 |
- libressl? ( dev-libs/libressl:0= ) |
140 |
- >=x11-apps/iceauth-1.0.2 |
141 |
- >=x11-apps/rgb-1.0.3 |
142 |
- >=x11-apps/xauth-1.0.3 |
143 |
- x11-apps/xkbcomp |
144 |
- >=x11-libs/libdrm-2.4.46 |
145 |
- >=x11-libs/libpciaccess-0.12.901 |
146 |
- >=x11-libs/libXau-1.0.4 |
147 |
- >=x11-libs/libXdmcp-1.0.2 |
148 |
- >=x11-libs/libXfont2-2.0.1 |
149 |
- >=x11-libs/libxkbfile-1.0.4 |
150 |
- >=x11-libs/libxshmfence-1.1 |
151 |
- >=x11-libs/pixman-0.27.2 |
152 |
- >=x11-libs/xtrans-1.3.5 |
153 |
- >=x11-misc/xbitmaps-1.0.1 |
154 |
- >=x11-misc/xkeyboard-config-2.4.1-r3 |
155 |
- dmx? ( |
156 |
- x11-libs/libXt |
157 |
- >=x11-libs/libdmx-1.0.99.1 |
158 |
- >=x11-libs/libX11-1.1.5 |
159 |
- >=x11-libs/libXaw-1.0.4 |
160 |
- >=x11-libs/libXext-1.0.99.4 |
161 |
- >=x11-libs/libXfixes-5.0 |
162 |
- >=x11-libs/libXi-1.2.99.1 |
163 |
- >=x11-libs/libXmu-1.0.3 |
164 |
- x11-libs/libXrender |
165 |
- >=x11-libs/libXres-1.0.3 |
166 |
- >=x11-libs/libXtst-1.0.99.2 |
167 |
- ) |
168 |
- glamor? ( |
169 |
- media-libs/libepoxy[X] |
170 |
- >=media-libs/mesa-10.3.4-r1[egl,gbm] |
171 |
- !x11-libs/glamor |
172 |
- ) |
173 |
- kdrive? ( |
174 |
- >=x11-libs/libXext-1.0.5 |
175 |
- x11-libs/libXv |
176 |
- ) |
177 |
- xephyr? ( |
178 |
- x11-libs/libxcb[xkb] |
179 |
- x11-libs/xcb-util |
180 |
- x11-libs/xcb-util-image |
181 |
- x11-libs/xcb-util-keysyms |
182 |
- x11-libs/xcb-util-renderutil |
183 |
- x11-libs/xcb-util-wm |
184 |
- ) |
185 |
- !minimal? ( |
186 |
- >=x11-libs/libX11-1.1.5 |
187 |
- >=x11-libs/libXext-1.0.5 |
188 |
- >=media-libs/mesa-10.3.4-r1 |
189 |
- ) |
190 |
- tslib? ( >=x11-libs/tslib-1.0 ) |
191 |
- udev? ( >=virtual/udev-150 ) |
192 |
- unwind? ( sys-libs/libunwind ) |
193 |
- wayland? ( |
194 |
- >=dev-libs/wayland-1.3.0 |
195 |
- media-libs/libepoxy |
196 |
- >=dev-libs/wayland-protocols-1.1 |
197 |
- ) |
198 |
- >=x11-apps/xinit-1.3.3-r1 |
199 |
- systemd? ( |
200 |
- sys-apps/dbus |
201 |
- sys-apps/systemd |
202 |
- )" |
203 |
- |
204 |
-DEPEND="${CDEPEND} |
205 |
- sys-devel/flex |
206 |
- x11-base/xorg-proto |
207 |
- dmx? ( |
208 |
- doc? ( |
209 |
- || ( |
210 |
- www-client/links |
211 |
- www-client/lynx |
212 |
- www-client/w3m |
213 |
- ) |
214 |
- ) |
215 |
- )" |
216 |
- |
217 |
-RDEPEND="${CDEPEND} |
218 |
- selinux? ( sec-policy/selinux-xserver ) |
219 |
- !x11-drivers/xf86-video-modesetting |
220 |
-" |
221 |
- |
222 |
-PDEPEND=" |
223 |
- xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" |
224 |
- |
225 |
-REQUIRED_USE="!minimal? ( |
226 |
- || ( ${IUSE_SERVERS} ) |
227 |
- ) |
228 |
- xephyr? ( kdrive )" |
229 |
- |
230 |
-#UPSTREAMED_PATCHES=( |
231 |
-# "${WORKDIR}/patches/" |
232 |
-#) |
233 |
- |
234 |
-PATCHES=( |
235 |
- "${UPSTREAMED_PATCHES[@]}" |
236 |
- "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch |
237 |
- # needed for new eselect-opengl, bug #541232 |
238 |
- "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch |
239 |
- "${FILESDIR}"/${PN}-1.19.4-sysmacros.patch #633530 |
240 |
- "${FILESDIR}"/${PN}-1.19.5-glx-do-not-pick-sRGB-config-for-32-bit-RGBA-visual.patch #653688 |
241 |
- "${FILESDIR}"/${PN}-1.17.4-arm-musl.patch |
242 |
-) |
243 |
- |
244 |
-pkg_pretend() { |
245 |
- # older gcc is not supported |
246 |
- [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ |
247 |
- die "Sorry, but gcc earlier than 4.0 will not work for xorg-server." |
248 |
-} |
249 |
- |
250 |
-pkg_setup() { |
251 |
- if use wayland && ! use glamor; then |
252 |
- ewarn "glamor is necessary for acceleration under Xwayland." |
253 |
- ewarn "Performance may be unacceptable without it." |
254 |
- fi |
255 |
-} |
256 |
- |
257 |
-src_configure() { |
258 |
- # localstatedir is used for the log location; we need to override the default |
259 |
- # from ebuild.sh |
260 |
- # sysconfdir is used for the xorg.conf location; same applies |
261 |
- # NOTE: fop is used for doc generating; and I have no idea if Gentoo |
262 |
- # package it somewhere |
263 |
- XORG_CONFIGURE_OPTIONS=( |
264 |
- $(use_enable ipv6) |
265 |
- $(use_enable debug) |
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 xcsecurity) |
282 |
- $(use_enable xephyr) |
283 |
- $(use_enable xnest) |
284 |
- $(use_enable xorg) |
285 |
- $(use_enable xvfb) |
286 |
- $(use_enable udev config-udev) |
287 |
- $(use_with doc doxygen) |
288 |
- $(use_with doc xmlto) |
289 |
- $(use_with systemd systemd-daemon) |
290 |
- $(use_enable systemd systemd-logind) |
291 |
- --enable-libdrm |
292 |
- --sysconfdir="${EPREFIX}"/etc/X11 |
293 |
- --localstatedir="${EPREFIX}"/var |
294 |
- --with-fontrootdir="${EPREFIX}"/usr/share/fonts |
295 |
- --with-xkb-output="${EPREFIX}"/var/lib/xkb |
296 |
- --disable-config-hal |
297 |
- --disable-linux-acpi |
298 |
- --without-dtrace |
299 |
- --without-fop |
300 |
- --with-os-vendor=Gentoo |
301 |
- --with-sha1=libcrypto |
302 |
- ) |
303 |
- |
304 |
- xorg-2_src_configure |
305 |
-} |
306 |
- |
307 |
-src_install() { |
308 |
- xorg-2_src_install |
309 |
- |
310 |
- server_based_install |
311 |
- |
312 |
- if ! use minimal && use xorg; then |
313 |
- # Install xorg.conf.example into docs |
314 |
- dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example |
315 |
- fi |
316 |
- |
317 |
- newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup |
318 |
- newinitd "${FILESDIR}"/xdm.initd-11 xdm |
319 |
- newconfd "${FILESDIR}"/xdm.confd-4 xdm |
320 |
- |
321 |
- # install the @x11-module-rebuild set for Portage |
322 |
- insinto /usr/share/portage/config/sets |
323 |
- newins "${FILESDIR}"/xorg-sets.conf xorg.conf |
324 |
-} |
325 |
- |
326 |
-pkg_postinst() { |
327 |
- # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) |
328 |
- eselect opengl set xorg-x11 --use-old |
329 |
-} |
330 |
- |
331 |
-pkg_postrm() { |
332 |
- # Get rid of module dir to ensure opengl-update works properly |
333 |
- if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then |
334 |
- rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules |
335 |
- fi |
336 |
-} |
337 |
- |
338 |
-server_based_install() { |
339 |
- if ! use xorg; then |
340 |
- rm "${ED}"/usr/share/man/man1/Xserver.1x \ |
341 |
- "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ |
342 |
- "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
343 |
- "${ED}"/usr/share/man/man1/Xserver.1x |
344 |
- fi |
345 |
-} |