Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Michal Gorny (mgorny)" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-base/xorg-server: xorg-server-1.16.4-r2.ebuild ChangeLog
Date: Sat, 28 Feb 2015 19:03:37
Message-Id: 20150228190329.B0E0B12C0E@oystercatcher.gentoo.org
1 mgorny 15/02/28 19:03:29
2
3 Modified: ChangeLog
4 Added: xorg-server-1.16.4-r2.ebuild
5 Log:
6 Backport the eselect-opengl/Files section fix to 1.16* branch.
7
8 (Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
9
10 Revision Changes Path
11 1.835 x11-base/xorg-server/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.835&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.835&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/ChangeLog?r1=1.834&r2=1.835
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v
20 retrieving revision 1.834
21 retrieving revision 1.835
22 diff -u -r1.834 -r1.835
23 --- ChangeLog 27 Feb 2015 21:44:56 -0000 1.834
24 +++ ChangeLog 28 Feb 2015 19:03:29 -0000 1.835
25 @@ -1,6 +1,11 @@
26 # ChangeLog for x11-base/xorg-server
27 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.834 2015/02/27 21:44:56 mgorny Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.835 2015/02/28 19:03:29 mgorny Exp $
30 +
31 +*xorg-server-1.16.4-r2 (28 Feb 2015)
32 +
33 + 28 Feb 2015; Michał Górny <mgorny@g.o> +xorg-server-1.16.4-r2.ebuild:
34 + Backport the eselect-opengl/Files section fix to 1.16* branch.
35
36 *xorg-server-1.17.1-r1 (27 Feb 2015)
37
38
39
40
41 1.1 x11-base/xorg-server/xorg-server-1.16.4-r2.ebuild
42
43 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/xorg-server-1.16.4-r2.ebuild?rev=1.1&view=markup
44 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/xorg-server-1.16.4-r2.ebuild?rev=1.1&content-type=text/plain
45
46 Index: xorg-server-1.16.4-r2.ebuild
47 ===================================================================
48 # Copyright 1999-2015 Gentoo Foundation
49 # Distributed under the terms of the GNU General Public License v2
50 # $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.16.4-r2.ebuild,v 1.1 2015/02/28 19:03:29 mgorny Exp $
51
52 EAPI=5
53
54 XORG_DOC=doc
55 inherit xorg-2 multilib versionator flag-o-matic
56 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
57
58 DESCRIPTION="X.Org X servers"
59 SLOT="0/1.16.1"
60 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
61
62 IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
63 IUSE="${IUSE_SERVERS} glamor ipv6 minimal nptl selinux +suid systemd tslib +udev unwind wayland"
64
65 CDEPEND=">=app-admin/eselect-opengl-1.3.0
66 dev-libs/openssl
67 media-libs/freetype
68 >=x11-apps/iceauth-1.0.2
69 >=x11-apps/rgb-1.0.3
70 >=x11-apps/xauth-1.0.3
71 x11-apps/xkbcomp
72 >=x11-libs/libdrm-2.4.20
73 >=x11-libs/libpciaccess-0.12.901
74 >=x11-libs/libXau-1.0.4
75 >=x11-libs/libXdmcp-1.0.2
76 >=x11-libs/libXfont-1.4.2
77 >=x11-libs/libxkbfile-1.0.4
78 >=x11-libs/libxshmfence-1.1
79 >=x11-libs/pixman-0.27.2
80 >=x11-libs/xtrans-1.3.3
81 >=x11-misc/xbitmaps-1.0.1
82 >=x11-misc/xkeyboard-config-2.4.1-r3
83 dmx? (
84 x11-libs/libXt
85 >=x11-libs/libdmx-1.0.99.1
86 >=x11-libs/libX11-1.1.5
87 >=x11-libs/libXaw-1.0.4
88 >=x11-libs/libXext-1.0.99.4
89 >=x11-libs/libXfixes-5.0
90 >=x11-libs/libXi-1.2.99.1
91 >=x11-libs/libXmu-1.0.3
92 x11-libs/libXrender
93 >=x11-libs/libXres-1.0.3
94 >=x11-libs/libXtst-1.0.99.2
95 )
96 glamor? (
97 media-libs/libepoxy
98 >=media-libs/mesa-10.3.4-r1[egl,gbm]
99 !x11-libs/glamor
100 )
101 kdrive? (
102 >=x11-libs/libXext-1.0.5
103 x11-libs/libXv
104 )
105 !minimal? (
106 >=x11-libs/libX11-1.1.5
107 >=x11-libs/libXext-1.0.5
108 >=media-libs/mesa-10.3.4-r1[nptl=]
109 )
110 tslib? ( >=x11-libs/tslib-1.0 )
111 udev? ( >=virtual/udev-150 )
112 unwind? ( sys-libs/libunwind )
113 wayland? (
114 >=dev-libs/wayland-1.3.0
115 media-libs/libepoxy
116 )
117 >=x11-apps/xinit-1.3
118 systemd? (
119 sys-apps/dbus
120 sys-apps/systemd
121 )"
122
123 DEPEND="${CDEPEND}
124 sys-devel/flex
125 >=x11-proto/bigreqsproto-1.1.0
126 >=x11-proto/compositeproto-0.4
127 >=x11-proto/damageproto-1.1
128 >=x11-proto/fixesproto-5.0
129 >=x11-proto/fontsproto-2.1.3
130 >=x11-proto/glproto-1.4.17-r1
131 >=x11-proto/inputproto-2.2.99.1
132 >=x11-proto/kbproto-1.0.3
133 >=x11-proto/randrproto-1.4.0
134 >=x11-proto/recordproto-1.13.99.1
135 >=x11-proto/renderproto-0.11
136 >=x11-proto/resourceproto-1.2.0
137 >=x11-proto/scrnsaverproto-1.1
138 >=x11-proto/trapproto-3.4.3
139 >=x11-proto/videoproto-2.2.2
140 >=x11-proto/xcmiscproto-1.2.0
141 >=x11-proto/xextproto-7.2.99.901
142 >=x11-proto/xf86dgaproto-2.0.99.1
143 >=x11-proto/xf86rushproto-1.1.2
144 >=x11-proto/xf86vidmodeproto-2.2.99.1
145 >=x11-proto/xineramaproto-1.1.3
146 >=x11-proto/xproto-7.0.26
147 >=x11-proto/presentproto-1.0
148 >=x11-proto/dri3proto-1.0
149 dmx? (
150 >=x11-proto/dmxproto-2.2.99.1
151 doc? (
152 || (
153 www-client/links
154 www-client/lynx
155 www-client/w3m
156 )
157 )
158 )
159 !minimal? (
160 >=x11-proto/xf86driproto-2.1.0
161 >=x11-proto/dri2proto-2.8
162 )"
163
164 RDEPEND="${CDEPEND}
165 selinux? ( sec-policy/selinux-xserver )
166 "
167
168 PDEPEND="
169 xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
170
171 REQUIRED_USE="!minimal? (
172 || ( ${IUSE_SERVERS} )
173 )"
174
175 #UPSTREAMED_PATCHES=(
176 # "${WORKDIR}/patches/"
177 #)
178
179 PATCHES=(
180 "${UPSTREAMED_PATCHES[@]}"
181 "${FILESDIR}"/${PN}-1.12-ia64-fix_inx_outx.patch
182 "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
183 # needed for new eselect-opengl, bug #541232
184 "${FILESDIR}"/${PN}-1.17-support-multiple-Files-sections.patch
185 )
186
187 pkg_pretend() {
188 # older gcc is not supported
189 [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
190 die "Sorry, but gcc earlier than 4.0 will not work for xorg-server."
191 }
192
193 src_configure() {
194 # localstatedir is used for the log location; we need to override the default
195 # from ebuild.sh
196 # sysconfdir is used for the xorg.conf location; same applies
197 # NOTE: fop is used for doc generating ; and i have no idea if gentoo
198 # package it somewhere
199 XORG_CONFIGURE_OPTIONS=(
200 $(use_enable ipv6)
201 $(use_enable dmx)
202 $(use_enable glamor)
203 $(use_enable kdrive)
204 $(use_enable kdrive kdrive-kbd)
205 $(use_enable kdrive kdrive-mouse)
206 $(use_enable kdrive kdrive-evdev)
207 $(use_enable suid install-setuid)
208 $(use_enable tslib)
209 $(use_enable unwind libunwind)
210 $(use_enable wayland xwayland)
211 $(use_enable !minimal record)
212 $(use_enable !minimal xfree86-utils)
213 $(use_enable !minimal install-libxf86config)
214 $(use_enable !minimal dri)
215 $(use_enable !minimal dri2)
216 $(use_enable !minimal glx)
217 $(use_enable xnest)
218 $(use_enable xorg)
219 $(use_enable xvfb)
220 $(use_enable nptl glx-tls)
221 $(use_enable udev config-udev)
222 $(use_with doc doxygen)
223 $(use_with doc xmlto)
224 $(use_with systemd systemd-daemon)
225 $(use_enable systemd systemd-logind)
226 --enable-libdrm
227 --sysconfdir="${EPREFIX}"/etc/X11
228 --localstatedir="${EPREFIX}"/var
229 --with-fontrootdir="${EPREFIX}"/usr/share/fonts
230 --with-xkb-output="${EPREFIX}"/var/lib/xkb
231 --disable-config-hal
232 --disable-linux-acpi
233 --without-dtrace
234 --without-fop
235 --with-os-vendor=Gentoo
236 --with-sha1=libcrypto
237 )
238
239 xorg-2_src_configure
240 }
241
242 src_install() {
243 xorg-2_src_install
244
245 server_based_install
246
247 if ! use minimal && use xorg; then
248 # Install xorg.conf.example into docs
249 dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
250 fi
251
252 newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
253 newinitd "${FILESDIR}"/xdm.initd-11 xdm
254 newconfd "${FILESDIR}"/xdm.confd-4 xdm
255
256 # install the @x11-module-rebuild set for Portage
257 insinto /usr/share/portage/config/sets
258 newins "${FILESDIR}"/xorg-sets.conf xorg.conf
259 }
260
261 pkg_postinst() {
262 # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
263 eselect opengl set xorg-x11 --use-old
264 }
265
266 pkg_postrm() {
267 # Get rid of module dir to ensure opengl-update works properly
268 if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
269 rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
270 fi
271 }
272
273 server_based_install() {
274 if ! use xorg; then
275 rm "${ED}"/usr/share/man/man1/Xserver.1x \
276 "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
277 "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
278 "${ED}"/usr/share/man/man1/Xserver.1x
279 fi
280 }
Report Message
Find on MARC Find on Google Groups