Gentoo Archives: gentoo-commits

From: "Chí-Thanh Christopher Nguyễn" <chithanh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-base/xorg-server/
Date: Mon, 26 Oct 2015 17:34:01
Message-Id: 1445880832.7eba9e1bb32e79f77f8489697bb1eb895369a4c5.chithanh@gentoo
1 commit: 7eba9e1bb32e79f77f8489697bb1eb895369a4c5
2 Author: Chí-Thanh Christopher Nguyễn <chithanh <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 26 17:32:57 2015 +0000
4 Commit: Chí-Thanh Christopher Nguyễn <chithanh <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 26 17:33:52 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7eba9e1b
7
8 x11-base/xorg-server: update ebuilds for new eselect-opengl
9
10 Package-Manager: portage-2.2.20.1
11
12 x11-base/xorg-server/xorg-server-1.12.4-r6.ebuild | 226 +++++++++++++++++++++
13 x11-base/xorg-server/xorg-server-1.15.2-r3.ebuild | 235 ++++++++++++++++++++++
14 2 files changed, 461 insertions(+)
15
16 diff --git a/x11-base/xorg-server/xorg-server-1.12.4-r6.ebuild b/x11-base/xorg-server/xorg-server-1.12.4-r6.ebuild
17 new file mode 100644
18 index 0000000..1f04d68
19 --- /dev/null
20 +++ b/x11-base/xorg-server/xorg-server-1.12.4-r6.ebuild
21 @@ -0,0 +1,226 @@
22 +# Copyright 1999-2015 Gentoo Foundation
23 +# Distributed under the terms of the GNU General Public License v2
24 +# $Id$
25 +
26 +EAPI=5
27 +
28 +XORG_DOC=doc
29 +inherit xorg-2 multilib versionator flag-o-matic
30 +EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
31 +
32 +DESCRIPTION="X.Org X servers"
33 +SLOT="0/${PV}"
34 +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
35 +
36 +SRC_URI="${SRC_URI} mirror://gentoo/${PN}-1.12-cve-2014-8091..8103.patches.tar.xz"
37 +
38 +IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
39 +IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux tslib +udev"
40 +
41 +RDEPEND=">=app-eselect/eselect-opengl-1.3.0
42 + dev-libs/openssl
43 + media-libs/freetype
44 + >=x11-apps/iceauth-1.0.2
45 + >=x11-apps/rgb-1.0.3
46 + >=x11-apps/xauth-1.0.3
47 + x11-apps/xkbcomp
48 + >=x11-libs/libpciaccess-0.12.901
49 + >=x11-libs/libXau-1.0.4
50 + >=x11-libs/libXdmcp-1.0.2
51 + >=x11-libs/libXfont-1.4.2
52 + <x11-libs/libXfont-1.5.0
53 + >=x11-libs/libxkbfile-1.0.4
54 + >=x11-libs/pixman-0.21.8
55 + >=x11-libs/xtrans-1.2.2
56 + >=x11-misc/xbitmaps-1.0.1
57 + >=x11-misc/xkeyboard-config-2.4.1-r3
58 + dmx? (
59 + x11-libs/libXt
60 + >=x11-libs/libdmx-1.0.99.1
61 + >=x11-libs/libX11-1.1.5
62 + >=x11-libs/libXaw-1.0.4
63 + >=x11-libs/libXext-1.0.99.4
64 + >=x11-libs/libXfixes-5.0
65 + >=x11-libs/libXi-1.2.99.1
66 + >=x11-libs/libXmu-1.0.3
67 + x11-libs/libXrender
68 + >=x11-libs/libXres-1.0.3
69 + >=x11-libs/libXtst-1.0.99.2
70 + )
71 + kdrive? (
72 + >=x11-libs/libXext-1.0.5
73 + x11-libs/libXv
74 + )
75 + !minimal? (
76 + >=x11-libs/libX11-1.1.5
77 + >=x11-libs/libXext-1.0.5
78 + >=media-libs/mesa-10.3.7-r2[nptl=]
79 + )
80 + tslib? ( >=x11-libs/tslib-1.0 )
81 + udev? ( >=virtual/udev-150 )
82 + >=x11-apps/xinit-1.3
83 + selinux? ( sec-policy/selinux-xserver )"
84 +
85 +DEPEND="${RDEPEND}
86 + sys-devel/flex
87 + >=x11-proto/bigreqsproto-1.1.0
88 + >=x11-proto/compositeproto-0.4
89 + >=x11-proto/damageproto-1.1
90 + >=x11-proto/fixesproto-5.0
91 + >=x11-proto/fontsproto-2.0.2
92 + <x11-proto/fontsproto-2.1.3
93 + >=x11-proto/glproto-1.4.17-r1
94 + >=x11-proto/inputproto-2.1.99.3
95 + >=x11-proto/kbproto-1.0.3
96 + >=x11-proto/randrproto-1.2.99.3
97 + >=x11-proto/recordproto-1.13.99.1
98 + >=x11-proto/renderproto-0.11
99 + >=x11-proto/resourceproto-1.0.2
100 + >=x11-proto/scrnsaverproto-1.1
101 + >=x11-proto/trapproto-3.4.3
102 + >=x11-proto/videoproto-2.2.2
103 + >=x11-proto/xcmiscproto-1.2.0
104 + >=x11-proto/xextproto-7.1.99
105 + >=x11-proto/xf86dgaproto-2.0.99.1
106 + >=x11-proto/xf86rushproto-1.1.2
107 + >=x11-proto/xf86vidmodeproto-2.2.99.1
108 + >=x11-proto/xineramaproto-1.1.3
109 + >=x11-proto/xproto-7.0.22
110 + dmx? (
111 + >=x11-proto/dmxproto-2.2.99.1
112 + doc? (
113 + || (
114 + www-client/links
115 + www-client/lynx
116 + www-client/w3m
117 + )
118 + )
119 + )
120 + !minimal? (
121 + >=x11-proto/xf86driproto-2.1.0
122 + >=x11-proto/dri2proto-2.6
123 + >=x11-libs/libdrm-2.4.20
124 + )"
125 +
126 +PDEPEND="
127 + xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
128 +
129 +REQUIRED_USE="!minimal? (
130 + || ( ${IUSE_SERVERS} )
131 + )"
132 +
133 +# Security patches taken from Debian from their 1.12 package
134 +UPSTREAMED_PATCHES=(
135 + "${WORKDIR}"/patches/${PN}-1.12-cve-2014-8091..8103.patch
136 +)
137 +
138 +PATCHES=(
139 + "${UPSTREAMED_PATCHES[@]}"
140 + "${FILESDIR}"/${PN}-1.12-disable-acpi.patch
141 + "${FILESDIR}"/${PN}-1.12-cve-2013-1940.patch
142 + "${FILESDIR}"/${PN}-1.12-cve-2013-4396.patch
143 + "${FILESDIR}"/${PN}-1.17-cve-2015-0255-0.patch
144 + "${FILESDIR}"/${PN}-1.17-cve-2015-0255-1.patch
145 + "${FILESDIR}"/${PN}-1.12-cve-2015-3418.patch
146 +)
147 +
148 +pkg_pretend() {
149 + # older gcc is not supported
150 + [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
151 + die "Sorry, but gcc earlier than 4.0 wont work for xorg-server."
152 +}
153 +
154 +src_configure() {
155 + # localstatedir is used for the log location; we need to override the default
156 + # from ebuild.sh
157 + # sysconfdir is used for the xorg.conf location; same applies
158 + # --enable-install-setuid needed because sparcs default off
159 + # NOTE: fop is used for doc generating ; and i have no idea if gentoo
160 + # package it somewhere
161 + XORG_CONFIGURE_OPTIONS=(
162 + $(use_enable ipv6)
163 + $(use_enable dmx)
164 + $(use_enable kdrive)
165 + $(use_enable kdrive kdrive-kbd)
166 + $(use_enable kdrive kdrive-mouse)
167 + $(use_enable kdrive kdrive-evdev)
168 + $(use_enable tslib)
169 + $(use_enable !minimal record)
170 + $(use_enable !minimal xfree86-utils)
171 + $(use_enable !minimal install-libxf86config)
172 + $(use_enable !minimal dri)
173 + $(use_enable !minimal dri2)
174 + $(use_enable !minimal glx)
175 + $(use_enable xnest)
176 + $(use_enable xorg)
177 + $(use_enable xvfb)
178 + $(use_enable nptl glx-tls)
179 + $(use_enable udev config-udev)
180 + $(use_with doc doxygen)
181 + $(use_with doc xmlto)
182 + --sysconfdir=/etc/X11
183 + --localstatedir=/var
184 + --enable-install-setuid
185 + --with-fontrootdir=/usr/share/fonts
186 + --with-xkb-output=/var/lib/xkb
187 + --disable-config-hal
188 + --without-dtrace
189 + --without-fop
190 + --with-os-vendor=Gentoo
191 + )
192 +
193 + xorg-2_src_configure
194 +}
195 +
196 +src_install() {
197 + xorg-2_src_install
198 +
199 + server_based_install
200 +
201 + if ! use minimal && use xorg; then
202 + # Install xorg.conf.example into docs
203 + dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
204 + fi
205 +
206 + newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
207 + newinitd "${FILESDIR}"/xdm.initd-9 xdm
208 + newconfd "${FILESDIR}"/xdm.confd-4 xdm
209 +
210 + # install the @x11-module-rebuild set for Portage
211 + insinto /usr/share/portage/config/sets
212 + newins "${FILESDIR}"/xorg-sets.conf xorg.conf
213 +}
214 +
215 +pkg_postinst() {
216 + # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
217 + eselect opengl set xorg-x11 --use-old
218 +
219 + if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then
220 + ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)"
221 + ewarn "because the ABI changed. If you cannot start X because"
222 + ewarn "of module version mismatch errors, this is your problem."
223 +
224 + echo
225 + ewarn "You can generate a list of all installed packages in the x11-drivers"
226 + ewarn "category using this command:"
227 + ewarn " emerge portage-utils; qlist -I -C x11-drivers/"
228 + ewarn "or using sets from portage-2.2:"
229 + ewarn " emerge @x11-module-rebuild"
230 + fi
231 +}
232 +
233 +pkg_postrm() {
234 + # Get rid of module dir to ensure opengl-update works properly
235 + if [[ -z ${REPLACED_BY_VERSION} && -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then
236 + rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules
237 + fi
238 +}
239 +
240 +server_based_install() {
241 + if ! use xorg; then
242 + rm "${D}"/usr/share/man/man1/Xserver.1x \
243 + "${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \
244 + "${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
245 + "${D}"/usr/share/man/man1/Xserver.1x
246 + fi
247 +}
248
249 diff --git a/x11-base/xorg-server/xorg-server-1.15.2-r3.ebuild b/x11-base/xorg-server/xorg-server-1.15.2-r3.ebuild
250 new file mode 100644
251 index 0000000..0d51022
252 --- /dev/null
253 +++ b/x11-base/xorg-server/xorg-server-1.15.2-r3.ebuild
254 @@ -0,0 +1,235 @@
255 +# Copyright 1999-2015 Gentoo Foundation
256 +# Distributed under the terms of the GNU General Public License v2
257 +# $Id$
258 +
259 +EAPI=5
260 +
261 +XORG_EAUTORECONF=yes
262 +XORG_DOC=doc
263 +inherit xorg-2 multilib versionator flag-o-matic
264 +EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
265 +
266 +DESCRIPTION="X.Org X servers"
267 +SLOT="0/${PV}"
268 +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
269 +
270 +SRC_URI="${SRC_URI} mirror://gentoo/${PN}-1.16-cve-2014-8091..8103.patches.tar.xz"
271 +
272 +IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
273 +IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux +suid tslib +udev unwind"
274 +
275 +CDEPEND=">=app-eselect/eselect-opengl-1.3.0
276 + dev-libs/openssl
277 + media-libs/freetype
278 + >=x11-apps/iceauth-1.0.2
279 + >=x11-apps/rgb-1.0.3
280 + >=x11-apps/xauth-1.0.3
281 + x11-apps/xkbcomp
282 + >=x11-libs/libdrm-2.4.20
283 + >=x11-libs/libpciaccess-0.12.901
284 + >=x11-libs/libXau-1.0.4
285 + >=x11-libs/libXdmcp-1.0.2
286 + >=x11-libs/libXfont-1.4.2
287 + <x11-libs/libXfont-1.5.0
288 + >=x11-libs/libxkbfile-1.0.4
289 + >=x11-libs/libxshmfence-1.1
290 + >=x11-libs/pixman-0.27.2
291 + >=x11-libs/xtrans-1.3.2
292 + >=x11-misc/xbitmaps-1.0.1
293 + >=x11-misc/xkeyboard-config-2.4.1-r3
294 + dmx? (
295 + x11-libs/libXt
296 + >=x11-libs/libdmx-1.0.99.1
297 + >=x11-libs/libX11-1.1.5
298 + >=x11-libs/libXaw-1.0.4
299 + >=x11-libs/libXext-1.0.99.4
300 + >=x11-libs/libXfixes-5.0
301 + >=x11-libs/libXi-1.2.99.1
302 + >=x11-libs/libXmu-1.0.3
303 + x11-libs/libXrender
304 + >=x11-libs/libXres-1.0.3
305 + >=x11-libs/libXtst-1.0.99.2
306 + )
307 + kdrive? (
308 + >=x11-libs/libXext-1.0.5
309 + x11-libs/libXv
310 + )
311 + !minimal? (
312 + >=x11-libs/libX11-1.1.5
313 + >=x11-libs/libXext-1.0.5
314 + >=media-libs/mesa-10.3.7-r2[nptl=]
315 + )
316 + tslib? ( >=x11-libs/tslib-1.0 )
317 + udev? ( >=virtual/udev-150 )
318 + unwind? ( sys-libs/libunwind )
319 + >=x11-apps/xinit-1.3"
320 +
321 +DEPEND="${CDEPEND}
322 + sys-devel/flex
323 + >=x11-proto/bigreqsproto-1.1.0
324 + >=x11-proto/compositeproto-0.4
325 + >=x11-proto/damageproto-1.1
326 + >=x11-proto/fixesproto-5.0
327 + >=x11-proto/fontsproto-2.0.2
328 + <x11-proto/fontsproto-2.1.3
329 + >=x11-proto/glproto-1.4.17-r1
330 + >=x11-proto/inputproto-2.2.99.1
331 + >=x11-proto/kbproto-1.0.3
332 + >=x11-proto/randrproto-1.4.0
333 + >=x11-proto/recordproto-1.13.99.1
334 + >=x11-proto/renderproto-0.11
335 + >=x11-proto/resourceproto-1.2.0
336 + >=x11-proto/scrnsaverproto-1.1
337 + >=x11-proto/trapproto-3.4.3
338 + >=x11-proto/videoproto-2.2.2
339 + >=x11-proto/xcmiscproto-1.2.0
340 + >=x11-proto/xextproto-7.2.99.901
341 + >=x11-proto/xf86dgaproto-2.0.99.1
342 + >=x11-proto/xf86rushproto-1.1.2
343 + >=x11-proto/xf86vidmodeproto-2.2.99.1
344 + >=x11-proto/xineramaproto-1.1.3
345 + >=x11-proto/xproto-7.0.22
346 + >=x11-proto/presentproto-1.0
347 + >=x11-proto/dri3proto-1.0
348 + dmx? (
349 + >=x11-proto/dmxproto-2.2.99.1
350 + doc? (
351 + || (
352 + www-client/links
353 + www-client/lynx
354 + www-client/w3m
355 + )
356 + )
357 + )
358 + !minimal? (
359 + >=x11-proto/xf86driproto-2.1.0
360 + >=x11-proto/dri2proto-2.8
361 + )"
362 +
363 +RDEPEND="${CDEPEND}
364 + selinux? ( sec-policy/selinux-xserver )
365 +"
366 +
367 +PDEPEND="
368 + xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
369 +
370 +REQUIRED_USE="!minimal? (
371 + || ( ${IUSE_SERVERS} )
372 + )"
373 +
374 +pkg_pretend() {
375 + # older gcc is not supported
376 + [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
377 + die "Sorry, but gcc earlier than 4.0 will not work for xorg-server."
378 +}
379 +
380 +src_prepare() {
381 + UPSTREAMED_PATCHES=(
382 + "${WORKDIR}"/patches/*.patch
383 + )
384 + PATCHES=(
385 + "${UPSTREAMED_PATCHES[@]}"
386 + "${FILESDIR}"/${PN}-1.12-ia64-fix_inx_outx.patch
387 + "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
388 + "${FILESDIR}"/${PN}-1.17-cve-2015-0255-0.patch
389 + "${FILESDIR}"/${PN}-1.17-cve-2015-0255-1.patch
390 +
391 + )
392 + xorg-2_src_prepare
393 +}
394 +
395 +src_configure() {
396 + # localstatedir is used for the log location; we need to override the default
397 + # from ebuild.sh
398 + # sysconfdir is used for the xorg.conf location; same applies
399 + # NOTE: fop is used for doc generating ; and i have no idea if gentoo
400 + # package it somewhere
401 + XORG_CONFIGURE_OPTIONS=(
402 + $(use_enable ipv6)
403 + $(use_enable dmx)
404 + $(use_enable kdrive)
405 + $(use_enable kdrive kdrive-kbd)
406 + $(use_enable kdrive kdrive-mouse)
407 + $(use_enable kdrive kdrive-evdev)
408 + $(use_enable suid install-setuid)
409 + $(use_enable tslib)
410 + $(use_enable unwind libunwind)
411 + $(use_enable !minimal record)
412 + $(use_enable !minimal xfree86-utils)
413 + $(use_enable !minimal install-libxf86config)
414 + $(use_enable !minimal dri)
415 + $(use_enable !minimal dri2)
416 + $(use_enable !minimal glx)
417 + $(use_enable xnest)
418 + $(use_enable xorg)
419 + $(use_enable xvfb)
420 + $(use_enable nptl glx-tls)
421 + $(use_enable udev config-udev)
422 + $(use_with doc doxygen)
423 + $(use_with doc xmlto)
424 + --enable-libdrm
425 + --sysconfdir="${EPREFIX}"/etc/X11
426 + --localstatedir="${EPREFIX}"/var
427 + --with-fontrootdir="${EPREFIX}"/usr/share/fonts
428 + --with-xkb-output="${EPREFIX}"/var/lib/xkb
429 + --disable-config-hal
430 + --disable-linux-acpi
431 + --without-dtrace
432 + --without-fop
433 + --with-os-vendor=Gentoo
434 + --with-sha1=libcrypto
435 + )
436 +
437 + xorg-2_src_configure
438 +}
439 +
440 +src_install() {
441 + xorg-2_src_install
442 +
443 + server_based_install
444 +
445 + if ! use minimal && use xorg; then
446 + # Install xorg.conf.example into docs
447 + dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
448 + fi
449 +
450 + newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
451 + newinitd "${FILESDIR}"/xdm.initd-11 xdm
452 + newconfd "${FILESDIR}"/xdm.confd-4 xdm
453 +
454 + # install the @x11-module-rebuild set for Portage
455 + insinto /usr/share/portage/config/sets
456 + newins "${FILESDIR}"/xorg-sets.conf xorg.conf
457 +}
458 +
459 +pkg_postinst() {
460 + # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
461 + eselect opengl set xorg-x11 --use-old
462 +
463 + if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then
464 + ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)"
465 + ewarn "because the ABI changed. If you cannot start X because"
466 + ewarn "of module version mismatch errors, this is your problem."
467 +
468 + echo
469 + ewarn "You can rebuild all installed packages in the x11-drivers"
470 + ewarn "category using this command:"
471 + ewarn " emerge @x11-module-rebuild"
472 + fi
473 +}
474 +
475 +pkg_postrm() {
476 + # Get rid of module dir to ensure opengl-update works properly
477 + if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
478 + rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
479 + fi
480 +}
481 +
482 +server_based_install() {
483 + if ! use xorg; then
484 + rm "${ED}"/usr/share/man/man1/Xserver.1x \
485 + "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
486 + "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
487 + "${ED}"/usr/share/man/man1/Xserver.1x
488 + fi
489 +}