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.11.2-r1.ebuild ChangeLog xorg-server-1.11.2.ebuild xorg-server-1.11.1-r1.ebuild
Date: Wed, 16 Nov 2011 21:50:10
Message-Id: 20111116214959.98E1A2004B@flycatcher.gentoo.org
1 chithanh 11/11/16 21:49:59
2
3 Modified: ChangeLog
4 Added: xorg-server-1.11.2-r1.ebuild
5 Removed: xorg-server-1.11.2.ebuild
6 xorg-server-1.11.1-r1.ebuild
7 Log:
8 Add dependency on libXrender when building dmx, bug #390697. Prevent dbus from starting too late, bug #390609.
9
10 (Portage version: 2.2.0_alpha72/cvs/Linux x86_64)
11
12 Revision Changes Path
13 1.627 x11-base/xorg-server/ChangeLog
14
15 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.627&view=markup
16 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.627&content-type=text/plain
17 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/ChangeLog?r1=1.626&r2=1.627
18
19 Index: ChangeLog
20 ===================================================================
21 RCS file: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v
22 retrieving revision 1.626
23 retrieving revision 1.627
24 diff -u -r1.626 -r1.627
25 --- ChangeLog 16 Nov 2011 02:29:48 -0000 1.626
26 +++ ChangeLog 16 Nov 2011 21:49:59 -0000 1.627
27 @@ -1,6 +1,14 @@
28 # ChangeLog for x11-base/xorg-server
29 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
30 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.626 2011/11/16 02:29:48 chithanh Exp $
31 +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.627 2011/11/16 21:49:59 chithanh Exp $
32 +
33 +*xorg-server-1.11.2-r1 (16 Nov 2011)
34 +
35 + 16 Nov 2011; Chí-Thanh Christopher Nguyễn <chithanh@g.o>
36 + -xorg-server-1.11.1-r1.ebuild, -xorg-server-1.11.2.ebuild,
37 + +xorg-server-1.11.2-r1.ebuild, +files/xdm.initd-4:
38 + Add dependency on libXrender when building dmx, bug #390697. Prevent dbus
39 + from starting too late, bug #390609.
40
41 16 Nov 2011; Chí-Thanh Christopher Nguyễn <chithanh@g.o>
42 xorg-server-1.11.2.ebuild:
43
44
45
46 1.1 x11-base/xorg-server/xorg-server-1.11.2-r1.ebuild
47
48 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/xorg-server-1.11.2-r1.ebuild?rev=1.1&view=markup
49 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/xorg-server-1.11.2-r1.ebuild?rev=1.1&content-type=text/plain
50
51 Index: xorg-server-1.11.2-r1.ebuild
52 ===================================================================
53 # Copyright 1999-2011 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 # $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.11.2-r1.ebuild,v 1.1 2011/11/16 21:49:59 chithanh Exp $
56
57 EAPI=4
58
59 XORG_DOC=doc
60 inherit xorg-2 multilib versionator
61 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
62
63 DESCRIPTION="X.Org X servers"
64 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
65
66 IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
67 IUSE="${IUSE_SERVERS} ipv6 minimal nptl tslib +udev"
68
69 RDEPEND=">=app-admin/eselect-opengl-1.0.8
70 dev-libs/openssl
71 media-libs/freetype
72 >=x11-apps/iceauth-1.0.2
73 >=x11-apps/rgb-1.0.3
74 >=x11-apps/xauth-1.0.3
75 x11-apps/xkbcomp
76 >=x11-libs/libpciaccess-0.10.3
77 >=x11-libs/libXau-1.0.4
78 >=x11-libs/libXdmcp-1.0.2
79 >=x11-libs/libXfont-1.4.2
80 >=x11-libs/libxkbfile-1.0.4
81 >=x11-libs/pixman-0.21.8
82 >=x11-libs/xtrans-1.2.2
83 >=x11-misc/xbitmaps-1.0.1
84 >=x11-misc/xkeyboard-config-1.4
85 dmx? (
86 x11-libs/libXt
87 >=x11-libs/libdmx-1.0.99.1
88 >=x11-libs/libX11-1.1.5
89 >=x11-libs/libXaw-1.0.4
90 >=x11-libs/libXext-1.0.99.4
91 >=x11-libs/libXfixes-5.0
92 >=x11-libs/libXi-1.2.99.1
93 >=x11-libs/libXmu-1.0.3
94 x11-libs/libXrender
95 >=x11-libs/libXres-1.0.3
96 >=x11-libs/libXtst-1.0.99.2
97 )
98 kdrive? (
99 >=x11-libs/libXext-1.0.5
100 x11-libs/libXv
101 )
102 !minimal? (
103 >=x11-libs/libX11-1.1.5
104 >=x11-libs/libXext-1.0.5
105 >=media-libs/mesa-7.8_rc[nptl=]
106 )
107 tslib? ( >=x11-libs/tslib-1.0 )
108 udev? ( >=sys-fs/udev-150 )
109 >=x11-apps/xinit-1.3"
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.14
119 >=x11-proto/inputproto-1.9.99.902
120 >=x11-proto/kbproto-1.0.3
121 >=x11-proto/randrproto-1.2.99.3
122 >=x11-proto/recordproto-1.13.99.1
123 >=x11-proto/renderproto-0.11
124 >=x11-proto/resourceproto-1.0.2
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.6
148 >=x11-libs/libdrm-2.4.20
149 )"
150
151 PDEPEND="
152 xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
153
154 REQUIRED_USE="!minimal? (
155 || ( ${IUSE_SERVERS} )
156 )"
157
158 #UPSTREAMED_PATCHES=(
159 # "${WORKDIR}/patches/"
160 #)
161
162 PATCHES=(
163 "${UPSTREAMED_PATCHES[@]}"
164 "${FILESDIR}"/${PN}-disable-acpi.patch
165 "${FILESDIR}"/${PN}-1.9-nouveau-default.patch
166 )
167
168 pkg_pretend() {
169 # older gcc is not supported
170 [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
171 die "Sorry, but gcc earlier than 4.0 wont work for xorg-server."
172 }
173
174 pkg_setup() {
175 xorg-2_pkg_setup
176
177 # localstatedir is used for the log location; we need to override the default
178 # from ebuild.sh
179 # sysconfdir is used for the xorg.conf location; same applies
180 # --enable-install-setuid needed because sparcs default off
181 # NOTE: fop is used for doc generating ; and i have no idea if gentoo
182 # package it somewhere
183 XORG_CONFIGURE_OPTIONS=(
184 $(use_enable ipv6)
185 $(use_enable dmx)
186 $(use_enable kdrive)
187 $(use_enable kdrive kdrive-kbd)
188 $(use_enable kdrive kdrive-mouse)
189 $(use_enable kdrive kdrive-evdev)
190 $(use_enable tslib)
191 $(use_enable !minimal record)
192 $(use_enable !minimal xfree86-utils)
193 $(use_enable !minimal install-libxf86config)
194 $(use_enable !minimal dri)
195 $(use_enable !minimal dri2)
196 $(use_enable !minimal glx)
197 $(use_enable xnest)
198 $(use_enable xorg)
199 $(use_enable xvfb)
200 $(use_enable nptl glx-tls)
201 $(use_enable udev config-udev)
202 $(use_with doc doxygen)
203 $(use_with doc xmlto)
204 --sysconfdir=/etc/X11
205 --localstatedir=/var
206 --enable-install-setuid
207 --with-fontrootdir=/usr/share/fonts
208 --with-xkb-output=/var/lib/xkb
209 --disable-config-hal
210 --without-dtrace
211 --without-fop
212 --with-os-vendor=Gentoo
213 )
214
215 # Xorg-server requires includes from OS mesa which are not visible for
216 # users of binary drivers.
217 mkdir -p "${T}/mesa-symlinks/GL"
218 for i in gl glx glxmd glxproto glxtokens; do
219 ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
220 done
221 for i in glext glxext; do
222 ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
223 done
224 append-cppflags "-I${T}/mesa-symlinks"
225 }
226
227 src_install() {
228 xorg-2_src_install
229
230 dynamic_libgl_install
231
232 server_based_install
233
234 if ! use minimal && use xorg; then
235 # Install xorg.conf.example into docs
236 dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
237 fi
238
239 newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
240 newinitd "${FILESDIR}"/xdm.initd-4 xdm
241 newconfd "${FILESDIR}"/xdm.confd-4 xdm
242
243 # install the @x11-module-rebuild set for Portage
244 insinto /usr/share/portage/config/sets
245 newins "${FILESDIR}"/xorg-sets.conf xorg.conf
246 }
247
248 pkg_postinst() {
249 # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
250 eselect opengl set xorg-x11 --use-old
251
252 if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then
253 ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)"
254 ewarn "because the ABI changed. If you cannot start X because"
255 ewarn "of module version mismatch errors, this is your problem."
256
257 echo
258 ewarn "You can generate a list of all installed packages in the x11-drivers"
259 ewarn "category using this command:"
260 ewarn " emerge portage-utils; qlist -I -C x11-drivers/"
261 ewarn "or using sets from portage-2.2:"
262 ewarn " emerge @x11-module-rebuild"
263 fi
264 }
265
266 pkg_postrm() {
267 # Get rid of module dir to ensure opengl-update works properly
268 if [[ -z ${REPLACED_BY_VERSION} && -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then
269 rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules
270 fi
271 }
272
273 dynamic_libgl_install() {
274 # next section is to setup the dynamic libGL stuff
275 ebegin "Moving GL files for dynamic switching"
276 dodir /usr/$(get_libdir)/opengl/xorg-x11/extensions
277 local x=""
278 for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do
279 if [ -f ${x} -o -L ${x} ]; then
280 mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/xorg-x11/extensions
281 fi
282 done
283 eend 0
284 }
285
286 server_based_install() {
287 if ! use xorg; then
288 rm "${D}"/usr/share/man/man1/Xserver.1x \
289 "${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \
290 "${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
291 "${D}"/usr/share/man/man1/Xserver.1x
292 fi
293 }
Report Message
Find on MARC Find on Google Groups