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

Gentoo Archives: gentoo-commits

From: "Chi-Thanh Christopher Nguyen (chithanh)" <chithanh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-base/xorg-server: xorg-server-1.13.2.ebuild ChangeLog xorg-server-1.13.1.901.ebuild
Date: Tue, 29 Jan 2013 15:41:56
Message-Id: 20130129154152.5C9942171D@flycatcher.gentoo.org
1 chithanh 13/01/29 15:41:52
2
3 Modified: ChangeLog
4 Added: xorg-server-1.13.2.ebuild
5 Removed: xorg-server-1.13.1.901.ebuild
6 Log:
7 Version bump. Switch to EAPI=5 and add a subslot.
8
9 (Portage version: 2.1.11.31/cvs/Linux x86_64, unsigned Manifest commit)
10
11 Revision Changes Path
12 1.722 x11-base/xorg-server/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.722&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.722&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/ChangeLog?r1=1.721&r2=1.722
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v
21 retrieving revision 1.721
22 retrieving revision 1.722
23 diff -u -r1.721 -r1.722
24 --- ChangeLog 21 Jan 2013 01:37:22 -0000 1.721
25 +++ ChangeLog 29 Jan 2013 15:41:52 -0000 1.722
26 @@ -1,6 +1,12 @@
27 # ChangeLog for x11-base/xorg-server
28 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.721 2013/01/21 01:37:22 vapier Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.722 2013/01/29 15:41:52 chithanh Exp $
31 +
32 +*xorg-server-1.13.2 (29 Jan 2013)
33 +
34 + 29 Jan 2013; Chí-Thanh Christopher Nguyễn <chithanh@g.o>
35 + +xorg-server-1.13.2.ebuild, -xorg-server-1.13.1.901.ebuild:
36 + Version bump. Switch to EAPI=5 and add a subslot.
37
38 21 Jan 2013; Mike Frysinger <vapier@g.o> xorg-server-1.13.1.901.ebuild,
39 xorg-server-1.13.1.ebuild, xorg-server-1.13.99.901.ebuild:
40
41
42
43 1.1 x11-base/xorg-server/xorg-server-1.13.2.ebuild
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/xorg-server-1.13.2.ebuild?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/xorg-server-1.13.2.ebuild?rev=1.1&content-type=text/plain
47
48 Index: xorg-server-1.13.2.ebuild
49 ===================================================================
50 # Copyright 1999-2013 Gentoo Foundation
51 # Distributed under the terms of the GNU General Public License v2
52 # $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.13.2.ebuild,v 1.1 2013/01/29 15:41:52 chithanh Exp $
53
54 EAPI=5
55
56 XORG_DOC=doc
57 inherit xorg-2 multilib versionator flag-o-matic
58 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
59
60 DESCRIPTION="X.Org X servers"
61 SLOT="0/${PV}"
62 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
63
64 IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
65 IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux +suid tslib +udev"
66
67 RDEPEND=">=app-admin/eselect-opengl-1.0.8
68 dev-libs/openssl
69 media-libs/freetype
70 >=x11-apps/iceauth-1.0.2
71 >=x11-apps/rgb-1.0.3
72 >=x11-apps/xauth-1.0.3
73 x11-apps/xkbcomp
74 >=x11-libs/libdrm-2.4.20
75 >=x11-libs/libpciaccess-0.12.901
76 >=x11-libs/libXau-1.0.4
77 >=x11-libs/libXdmcp-1.0.2
78 >=x11-libs/libXfont-1.4.2
79 >=x11-libs/libxkbfile-1.0.4
80 >=x11-libs/pixman-0.21.8
81 >=x11-libs/xtrans-1.2.2
82 >=x11-misc/xbitmaps-1.0.1
83 >=x11-misc/xkeyboard-config-2.4.1-r3
84 dmx? (
85 x11-libs/libXt
86 >=x11-libs/libdmx-1.0.99.1
87 >=x11-libs/libX11-1.1.5
88 >=x11-libs/libXaw-1.0.4
89 >=x11-libs/libXext-1.0.99.4
90 >=x11-libs/libXfixes-5.0
91 >=x11-libs/libXi-1.2.99.1
92 >=x11-libs/libXmu-1.0.3
93 x11-libs/libXrender
94 >=x11-libs/libXres-1.0.3
95 >=x11-libs/libXtst-1.0.99.2
96 )
97 kdrive? (
98 >=x11-libs/libXext-1.0.5
99 x11-libs/libXv
100 )
101 !minimal? (
102 >=x11-libs/libX11-1.1.5
103 >=x11-libs/libXext-1.0.5
104 >=media-libs/mesa-8[nptl=]
105 )
106 tslib? ( >=x11-libs/tslib-1.0 )
107 udev? ( >=virtual/udev-150 )
108 >=x11-apps/xinit-1.3
109 selinux? ( sec-policy/selinux-xserver )"
110
111 DEPEND="${RDEPEND}
112 sys-devel/flex
113 >=x11-proto/bigreqsproto-1.1.0
114 >=x11-proto/compositeproto-0.4
115 >=x11-proto/damageproto-1.1
116 >=x11-proto/fixesproto-5.0
117 >=x11-proto/fontsproto-2.0.2
118 >=x11-proto/glproto-1.4.16
119 >=x11-proto/inputproto-2.1.99.3
120 >=x11-proto/kbproto-1.0.3
121 >=x11-proto/randrproto-1.4.0
122 >=x11-proto/recordproto-1.13.99.1
123 >=x11-proto/renderproto-0.11
124 >=x11-proto/resourceproto-1.2.0
125 >=x11-proto/scrnsaverproto-1.1
126 >=x11-proto/trapproto-3.4.3
127 >=x11-proto/videoproto-2.2.2
128 >=x11-proto/xcmiscproto-1.2.0
129 >=x11-proto/xextproto-7.1.99
130 >=x11-proto/xf86dgaproto-2.0.99.1
131 >=x11-proto/xf86rushproto-1.1.2
132 >=x11-proto/xf86vidmodeproto-2.2.99.1
133 >=x11-proto/xineramaproto-1.1.3
134 >=x11-proto/xproto-7.0.22
135 dmx? (
136 >=x11-proto/dmxproto-2.2.99.1
137 doc? (
138 || (
139 www-client/links
140 www-client/lynx
141 www-client/w3m
142 )
143 )
144 )
145 !minimal? (
146 >=x11-proto/xf86driproto-2.1.0
147 >=x11-proto/dri2proto-2.8
148 )"
149
150 PDEPEND="
151 xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
152
153 REQUIRED_USE="!minimal? (
154 || ( ${IUSE_SERVERS} )
155 )"
156
157 #UPSTREAMED_PATCHES=(
158 # "${WORKDIR}/patches/"
159 #)
160
161 PATCHES=(
162 "${UPSTREAMED_PATCHES[@]}"
163 "${FILESDIR}"/${PN}-1.12-disable-acpi.patch
164 "${FILESDIR}"/${PN}-1.13-ia64-asm.patch
165 )
166
167 pkg_pretend() {
168 # older gcc is not supported
169 [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
170 die "Sorry, but gcc earlier than 4.0 will not work for xorg-server."
171 }
172
173 src_configure() {
174 # localstatedir is used for the log location; we need to override the default
175 # from ebuild.sh
176 # sysconfdir is used for the xorg.conf location; same applies
177 # NOTE: fop is used for doc generating ; and i have no idea if gentoo
178 # package it somewhere
179 XORG_CONFIGURE_OPTIONS=(
180 $(use_enable ipv6)
181 $(use_enable dmx)
182 $(use_enable kdrive)
183 $(use_enable kdrive kdrive-kbd)
184 $(use_enable kdrive kdrive-mouse)
185 $(use_enable kdrive kdrive-evdev)
186 $(use_enable suid install-setuid)
187 $(use_enable tslib)
188 $(use_enable !minimal record)
189 $(use_enable !minimal xfree86-utils)
190 $(use_enable !minimal install-libxf86config)
191 $(use_enable !minimal dri)
192 $(use_enable !minimal dri2)
193 $(use_enable !minimal glx)
194 $(use_enable xnest)
195 $(use_enable xorg)
196 $(use_enable xvfb)
197 $(use_enable nptl glx-tls)
198 $(use_enable udev config-udev)
199 $(use_with doc doxygen)
200 $(use_with doc xmlto)
201 --enable-libdrm
202 --sysconfdir="${EPREFIX}"/etc/X11
203 --localstatedir="${EPREFIX}"/var
204 --with-fontrootdir="${EPREFIX}"/usr/share/fonts
205 --with-xkb-output="${EPREFIX}"/var/lib/xkb
206 --disable-config-hal
207 --without-dtrace
208 --without-fop
209 --with-os-vendor=Gentoo
210 )
211
212 # Xorg-server requires includes from OS mesa which are not visible for
213 # users of binary drivers.
214 mkdir -p "${T}/mesa-symlinks/GL"
215 for i in gl glx glxmd glxproto glxtokens; do
216 ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
217 done
218 for i in glext glxext; do
219 ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
220 done
221 append-cppflags "-I${T}/mesa-symlinks"
222
223 xorg-2_src_configure
224 }
225
226 src_install() {
227 xorg-2_src_install
228
229 dynamic_libgl_install
230
231 server_based_install
232
233 if ! use minimal && use xorg; then
234 # Install xorg.conf.example into docs
235 dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
236 fi
237
238 newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
239 newinitd "${FILESDIR}"/xdm.initd-9 xdm
240 newconfd "${FILESDIR}"/xdm.confd-4 xdm
241
242 # install the @x11-module-rebuild set for Portage
243 insinto /usr/share/portage/config/sets
244 newins "${FILESDIR}"/xorg-sets.conf xorg.conf
245 }
246
247 pkg_postinst() {
248 # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
249 eselect opengl set xorg-x11 --use-old
250
251 if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then
252 ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)"
253 ewarn "because the ABI changed. If you cannot start X because"
254 ewarn "of module version mismatch errors, this is your problem."
255
256 echo
257 ewarn "You can generate a list of all installed packages in the x11-drivers"
258 ewarn "category using this command:"
259 ewarn " emerge portage-utils; qlist -I -C x11-drivers/"
260 ewarn "or using sets from portage-2.2:"
261 ewarn " emerge @x11-module-rebuild"
262 fi
263
264 if use udev && has_version virtual/udev[-keymap]; then
265 ewarn "virtual/udev was built without keymap support. This may cause input device"
266 ewarn "autoconfiguration to fail."
267 fi
268 }
269
270 pkg_postrm() {
271 # Get rid of module dir to ensure opengl-update works properly
272 if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
273 rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
274 fi
275 }
276
277 dynamic_libgl_install() {
278 # next section is to setup the dynamic libGL stuff
279 ebegin "Moving GL files for dynamic switching"
280 dodir /usr/$(get_libdir)/opengl/xorg-x11/extensions
281 local x=""
282 for x in "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do
283 if [ -f ${x} -o -L ${x} ]; then
284 mv -f ${x} "${ED}"/usr/$(get_libdir)/opengl/xorg-x11/extensions
285 fi
286 done
287 eend 0
288 }
289
290 server_based_install() {
291 if ! use xorg; then
292 rm "${ED}"/usr/share/man/man1/Xserver.1x \
293 "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
294 "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
295 "${ED}"/usr/share/man/man1/Xserver.1x
296 fi
297 }
Report Message
Find on MARC Find on Google Groups