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

Gentoo Archives: gentoo-commits

From: "Remi Cardona (remi)" <remi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-base/xorg-server: ChangeLog xorg-server-1.8.1.902.ebuild
Date: Sat, 26 Jun 2010 22:11:56
Message-Id: 20100626221150.56C992CF81@corvid.gentoo.org
1 remi 10/06/26 22:11:50
2
3 Modified: ChangeLog
4 Added: xorg-server-1.8.1.902.ebuild
5 Log:
6 x11-base/xorg-server: bump to 1.8.1.902
7 (Portage version: 2.2_rc67/cvs/Linux i686)
8
9 Revision Changes Path
10 1.518 x11-base/xorg-server/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.518&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.518&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/ChangeLog?r1=1.517&r2=1.518
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v
19 retrieving revision 1.517
20 retrieving revision 1.518
21 diff -u -r1.517 -r1.518
22 --- ChangeLog 18 Jun 2010 14:14:35 -0000 1.517
23 +++ ChangeLog 26 Jun 2010 22:11:49 -0000 1.518
24 @@ -1,6 +1,12 @@
25 # ChangeLog for x11-base/xorg-server
26 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.517 2010/06/18 14:14:35 scarabeus Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.518 2010/06/26 22:11:49 remi Exp $
29 +
30 +*xorg-server-1.8.1.902 (26 Jun 2010)
31 +
32 + 26 Jun 2010; Rémi Cardona <remi@g.o>
33 + +xorg-server-1.8.1.902.ebuild:
34 + bump to 1.8.1.902
35
36 18 Jun 2010; Tomáš Chvátal <scarabeus@g.o>
37 xorg-server-1.8.1.901.ebuild:
38
39
40
41 1.1 x11-base/xorg-server/xorg-server-1.8.1.902.ebuild
42
43 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/xorg-server-1.8.1.902.ebuild?rev=1.1&view=markup
44 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/xorg-server-1.8.1.902.ebuild?rev=1.1&content-type=text/plain
45
46 Index: xorg-server-1.8.1.902.ebuild
47 ===================================================================
48 # Copyright 1999-2010 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.8.1.902.ebuild,v 1.1 2010/06/26 22:11:50 remi Exp $
51
52 EAPI=3
53 XORG_EAUTORECONF="yes"
54 inherit xorg-2 multilib versionator
55 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
56
57 OPENGL_DIR="xorg-x11"
58
59 DESCRIPTION="X.Org X servers"
60 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
61
62 IUSE_SERVERS="dmx kdrive xorg"
63 IUSE="${IUSE_SERVERS} doc hal ipv6 minimal nptl tslib +udev"
64 RDEPEND=">=app-admin/eselect-opengl-1.0.8
65 dev-libs/openssl
66 media-libs/freetype
67 >=x11-apps/iceauth-1.0.2
68 >=x11-apps/rgb-1.0.3
69 >=x11-apps/xauth-1.0.3
70 x11-apps/xkbcomp
71 >=x11-libs/libpciaccess-0.10.3
72 >=x11-libs/libXau-1.0.4
73 >=x11-libs/libXdmcp-1.0.2
74 >=x11-libs/libXfont-1.3.3
75 >=x11-libs/libxkbfile-1.0.4
76 >=x11-libs/pixman-0.15.20
77 >=x11-libs/xtrans-1.2.2
78 >=x11-misc/xbitmaps-1.0.1
79 >=x11-misc/xkeyboard-config-1.4
80 dmx? (
81 x11-libs/libXt
82 >=x11-libs/libdmx-1.0.99.1
83 >=x11-libs/libX11-1.1.5
84 >=x11-libs/libXaw-1.0.4
85 >=x11-libs/libXext-1.0.5
86 >=x11-libs/libXfixes-4.0.3
87 >=x11-libs/libXi-1.2.99.1
88 >=x11-libs/libXmu-1.0.3
89 >=x11-libs/libXres-1.0.3
90 >=x11-libs/libXtst-1.0.3
91 )
92 !udev? ( hal? ( sys-apps/hal ) )
93 kdrive? (
94 >=x11-libs/libXext-1.0.5
95 )
96 !minimal? (
97 >=x11-libs/libX11-1.1.5
98 >=x11-libs/libXext-1.0.5
99 >=media-libs/mesa-7.8_rc[nptl=]
100 )
101 tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto )
102 udev? ( sys-fs/udev )"
103
104 DEPEND="${RDEPEND}
105 !<x11-apps/xinit-1.2.1-r1
106 sys-devel/flex
107 >=x11-proto/bigreqsproto-1.1.0
108 >=x11-proto/compositeproto-0.4
109 >=x11-proto/damageproto-1.1
110 >=x11-proto/fixesproto-4.1
111 >=x11-proto/fontsproto-2.0.2
112 >=x11-proto/glproto-1.4.11
113 >=x11-proto/inputproto-1.9.99.902
114 >=x11-proto/kbproto-1.0.3
115 >=x11-proto/randrproto-1.2.99.3
116 >=x11-proto/recordproto-1.13.99.1
117 >=x11-proto/renderproto-0.11
118 >=x11-proto/resourceproto-1.0.2
119 >=x11-proto/scrnsaverproto-1.1
120 >=x11-proto/trapproto-3.4.3
121 >=x11-proto/videoproto-2.2.2
122 >=x11-proto/xcmiscproto-1.2.0
123 >=x11-proto/xextproto-7.0.99.3
124 >=x11-proto/xf86dgaproto-2.0.99.1
125 >=x11-proto/xf86rushproto-1.1.2
126 >=x11-proto/xf86vidmodeproto-2.2.99.1
127 >=x11-proto/xineramaproto-1.1.3
128 >=x11-proto/xproto-7.0.13
129 dmx? ( >=x11-proto/dmxproto-2.2.99.1 )
130 doc? ( >=app-doc/doxygen-1.6.1 )
131 !minimal? (
132 >=x11-proto/xf86driproto-2.1.0
133 >=x11-proto/dri2proto-2.1
134 >=x11-libs/libdrm-2.3.0
135 )"
136
137 PDEPEND="
138 >=x11-apps/xinit-1.2.1-r1
139 xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
140
141 EPATCH_FORCE="yes"
142 EPATCH_SUFFIX="patch"
143
144 # These have been sent upstream
145 #UPSTREAMED_PATCHES=(
146 # "${WORKDIR}/patches/"
147 # )
148
149 PATCHES=(
150 "${UPSTREAMED_PATCHES[@]}"
151 "${FILESDIR}"/${PN}-disable-acpi.patch
152 )
153
154 pkg_setup() {
155 local myconf
156
157 xorg-2_pkg_setup
158
159 use minimal || ensure_a_server_is_building
160
161 # HAL shebang
162 if use hal; then
163 ewarn "Usage of hal is strongly discouraged. Please migrate to udev."
164 ewarn "From next major release on the hal support will be fully disabled."
165 fi
166 if use hal && use udev; then
167 ewarn "Both hal and udev flags are enabled."
168 ewarn "Enabling only udev!"
169 myconf="
170 $(use_enable udev config-udev)
171 --disable-config-hal
172 "
173 else
174 myconf="
175 $(use_enable hal config-hal)
176 $(use_enable udev config-udev)
177 "
178 fi
179
180 # localstatedir is used for the log location; we need to override the default
181 # from ebuild.sh
182 # sysconfdir is used for the xorg.conf location; same applies
183 # --enable-install-setuid needed because sparcs default off
184 CONFIGURE_OPTIONS="
185 $(use_enable ipv6)
186 $(use_enable dmx)
187 $(use_enable kdrive)
188 $(use_enable tslib)
189 $(use_enable tslib xcalibrate)
190 $(use_enable !minimal xvfb)
191 $(use_enable !minimal xnest)
192 $(use_enable !minimal record)
193 $(use_enable !minimal xfree86-utils)
194 $(use_enable !minimal install-libxf86config)
195 $(use_enable !minimal dri)
196 $(use_enable !minimal dri2)
197 $(use_enable !minimal glx)
198 $(use_enable xorg)
199 $(use_enable nptl glx-tls)
200 $(use_with doc doxygen)
201 ${myconf}
202 --sysconfdir=/etc/X11
203 --localstatedir=/var
204 --enable-install-setuid
205 --with-fontrootdir=/usr/share/fonts
206 --with-xkb-output=/var/lib/xkb
207 --without-dtrace
208 --with-os-vendor=Gentoo
209 ${conf_opts}"
210
211 # Due to the limitations of CONFIGURE_OPTIONS, we have to export this.
212 mkdir -p "${T}/mesa-symlinks/GL"
213 pushd "${T}/mesa-symlinks/GL" &> /dev/null
214 for i in gl glx glxmd glxproto glxtokens; do
215 ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" $i.h
216 done
217 for i in glext glxext; do
218 ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" $i.h
219 done
220 popd &> /dev/null
221 export CPPFLAGS="${CPPFLAGS:+${CPPFLAGS} }-I${T}/mesa-symlinks"
222
223 # (#121394) Causes window corruption
224 filter-flags -fweb
225
226 # Incompatible with GCC 3.x SSP on x86, bug #244352
227 if use x86 ; then
228 if [[ $(gcc-major-version) -lt 4 ]]; then
229 filter-flags -fstack-protector
230 fi
231 fi
232
233 # Incompatible with GCC 3.x CPP, bug #314615
234 if [[ $(gcc-major-version) -lt 4 ]]; then
235 ewarn "GCC 3.x C preprocessor may cause build failures. Use GCC 4.x"
236 ewarn "or set CPP=cpp-4.3.4 (replace with the actual installed version)"
237 fi
238
239 # detect if we should inform user about ebuild breakage
240 if ! has_version "x11-base/xorg-server" ||
241 has_version "<x11-base/xorg-server-$(get_version_component_range 1-2)"; then
242 INFO="yes"
243 fi
244 }
245
246 src_install() {
247 xorg-2_src_install
248
249 dynamic_libgl_install
250
251 server_based_install
252
253 if ! use minimal && use xorg; then
254 # Install xorg.conf.example into docs
255 dodoc hw/xfree86/xorg.conf.example \
256 || die "couldn't install xorg.conf.example"
257 fi
258
259 # install the xdm.init
260 cp "${FILESDIR}"/xdm.initd "${T}"
261 if use hal && ! use udev; then
262 sed -i \
263 -e "s/@HALD_DEPEND@/need hald/g" \
264 "${T}"/xdm.initd \
265 || die "sed failed"
266 else
267 sed -i \
268 -e "/@HALD_DEPEND@/ d" \
269 "${T}"/xdm.initd \
270 || die "sed failed"
271 fi
272 newinitd "${T}"/xdm.initd xdm || die "initd file install failed"
273 newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup || die
274 newconfd "${FILESDIR}"/xdm.confd-3 xdm || die
275 }
276
277 pkg_postinst() {
278 # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
279 eselect opengl set --use-old xorg-x11
280
281 if [[ ${INFO} = yes ]]; then
282 einfo "You should consider reading upgrade guide for this release:"
283 einfo " http://www.gentoo.org/proj/en/desktop/x/x11/xorg-server-$(get_version_component_range 1-2)-upgrade-guide.xml"
284 echo
285 ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)"
286 ewarn "because the ABI changed. If you cannot start X because"
287 ewarn "of module version mismatch errors, this is your problem."
288
289 echo
290 ewarn "You can generate a list of all installed packages in the x11-drivers"
291 ewarn "category using this command:"
292 ewarn " emerge portage-utils; qlist -I -C x11-drivers/"
293 fi
294 }
295
296 pkg_postrm() {
297 # Get rid of module dir to ensure opengl-update works properly
298 if ! has_version x11-base/xorg-server; then
299 if [[ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then
300 rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules
301 fi
302 fi
303 }
304
305 dynamic_libgl_install() {
306 # next section is to setup the dynamic libGL stuff
307 ebegin "Moving GL files for dynamic switching"
308 dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
309 local x=""
310 for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do
311 if [ -f ${x} -o -L ${x} ]; then
312 mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
313 fi
314 done
315 eend 0
316 }
317
318 server_based_install() {
319 if ! use xorg; then
320 rm "${D}"/usr/share/man/man1/Xserver.1x \
321 "${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \
322 "${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
323 "${D}"/usr/share/man/man1/Xserver.1x
324 fi
325 }
326
327 ensure_a_server_is_building() {
328 for server in ${IUSE_SERVERS}; do
329 use ${server} && return;
330 done
331 eerror "You need to specify at least one server to build."
332 eerror "Valid servers are: ${IUSE_SERVERS}."
333 die "No servers were specified to build."
334 }
Report Message
Find on MARC Find on Google Groups