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.7.3.ebuild
Date: Thu, 03 Dec 2009 11:40:53
Message-Id: E1NGA3H-0003Be-9l@stork.gentoo.org
1 remi 09/12/03 11:40:51
2
3 Modified: ChangeLog
4 Added: xorg-server-1.7.3.ebuild
5 Log:
6 x11-base/xorg-server: bump to 1.7.3
7 (Portage version: 2.2_rc54/cvs/Linux i686)
8
9 Revision Changes Path
10 1.466 x11-base/xorg-server/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.466&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.466&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/ChangeLog?r1=1.465&r2=1.466
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v
19 retrieving revision 1.465
20 retrieving revision 1.466
21 diff -u -r1.465 -r1.466
22 --- ChangeLog 28 Nov 2009 09:14:38 -0000 1.465
23 +++ ChangeLog 3 Dec 2009 11:40:51 -0000 1.466
24 @@ -1,6 +1,11 @@
25 # ChangeLog for x11-base/xorg-server
26 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.465 2009/11/28 09:14:38 scarabeus Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.466 2009/12/03 11:40:51 remi Exp $
29 +
30 +*xorg-server-1.7.3 (03 Dec 2009)
31 +
32 + 03 Dec 2009; Rémi Cardona <remi@g.o> +xorg-server-1.7.3.ebuild:
33 + bump to 1.7.3
34
35 28 Nov 2009; Tomáš Chvátal <scarabeus@g.o>
36 xorg-server-1.5.3-r6.ebuild, xorg-server-1.5.3-r7.ebuild,
37
38
39
40 1.1 x11-base/xorg-server/xorg-server-1.7.3.ebuild
41
42 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/xorg-server-1.7.3.ebuild?rev=1.1&view=markup
43 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/xorg-server-1.7.3.ebuild?rev=1.1&content-type=text/plain
44
45 Index: xorg-server-1.7.3.ebuild
46 ===================================================================
47 # Copyright 1999-2009 Gentoo Foundation
48 # Distributed under the terms of the GNU General Public License v2
49 # $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.7.3.ebuild,v 1.1 2009/12/03 11:40:51 remi Exp $
50
51 EAPI="2"
52
53 # Must be before x-modular eclass is inherited
54 #SNAPSHOT="yes"
55
56 inherit x-modular multilib versionator
57
58 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
59
60 OPENGL_DIR="xorg-x11"
61
62 DESCRIPTION="X.Org X servers"
63 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
64
65 IUSE_SERVERS="dmx kdrive xorg"
66 IUSE="${IUSE_SERVERS} tslib hal ipv6 minimal nptl sdl"
67 RDEPEND="hal? ( sys-apps/hal )
68 tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto )
69 dev-libs/openssl
70 >=x11-libs/libXfont-1.3.3
71 >=x11-libs/xtrans-1.2.2
72 >=x11-libs/libXau-1.0.4
73 >=x11-libs/libxkbfile-1.0.4
74 >=x11-libs/libXdmcp-1.0.2
75 >=x11-libs/libpciaccess-0.10.3
76 >=x11-libs/pixman-0.15.20
77 media-libs/freetype
78 >=x11-misc/xbitmaps-1.0.1
79 >=x11-misc/xkeyboard-config-1.4
80 x11-apps/xkbcomp
81 >=x11-apps/iceauth-1.0.2
82 >=x11-apps/rgb-1.0.3
83 >=x11-apps/xauth-1.0.3
84 >=x11-apps/xinit-1.0.8-r3
85 >=app-admin/eselect-opengl-1.0.8
86 dmx? (
87 x11-libs/libXt
88 >=x11-libs/libdmx-1.0.99.1
89 >=x11-libs/libX11-1.1.5
90 >=x11-libs/libXaw-1.0.4
91 >=x11-libs/libXext-1.0.5
92 >=x11-libs/libXfixes-4.0.3
93 >=x11-libs/libXi-1.2.99.1
94 >=x11-libs/libXmu-1.0.3
95 >=x11-libs/libXtst-1.0.3
96 )
97 !minimal? (
98 >=x11-libs/libX11-1.1.5
99 >=x11-libs/libXext-1.0.5
100 >=x11-libs/libXres-1.0.3
101 >=media-libs/mesa-7.4[nptl=]
102 )
103 >=x11-libs/libxkbui-1.0.2
104 kdrive? (
105 >=x11-libs/libXext-1.0.5
106 sdl? ( media-libs/libsdl ) )"
107 # Xres is dmx-dependent
108 # Xaw is dmx-dependent
109 # Xpm is dmx-dependent, pulls in Xt
110 # xkbcomp is launched at startup but not checked by ./configure
111
112 ## Deps that don't have a version in configure.ac but do here:
113 # x11-proto/resourceproto
114 # x11-proto/fontsproto
115 # x11-libs/libXau
116 # x11-libs/libXfont
117 # x11-libs/libXdmcp
118 # x11-libs/libXext
119 # x11-libs/libX11
120 # x11-libs/libXrender
121 # x11-libs/libXmu
122 # x11-libs/libXfixes
123 # x11-libs/libXtst
124 # x11-proto/xineramaproto
125 # x11-proto/dmxproto
126 ## Deps that are larger here than in configure.ac
127 # x11-libs/libpciaccess-0.8.0
128 #
129
130 DEPEND="${RDEPEND}
131 !!net-dialup/dtrace
132 sys-devel/flex
133 >=x11-proto/randrproto-1.2.99.3
134 >=x11-proto/renderproto-0.11
135 >=x11-proto/fixesproto-4.1
136 >=x11-proto/damageproto-1.1
137 >=x11-proto/xextproto-7.0.99.3
138 >=x11-proto/xproto-7.0.13
139 >=x11-proto/xf86dgaproto-2.0.99.1
140 >=x11-proto/xf86rushproto-1.1.2
141 >=x11-proto/xf86vidmodeproto-2.2.99.1
142 >=x11-proto/compositeproto-0.4
143 >=x11-proto/recordproto-1.13.99.1
144 >=x11-proto/resourceproto-1.0.2
145 >=x11-proto/videoproto-2.2.2
146 >=x11-proto/scrnsaverproto-1.1
147 >=x11-proto/trapproto-3.4.3
148 >=x11-proto/xineramaproto-1.1.3
149 >=x11-proto/fontsproto-2.0.2
150 >=x11-proto/kbproto-1.0.3
151 >=x11-proto/inputproto-1.9.99.902
152 >=x11-proto/bigreqsproto-1.1.0
153 >=x11-proto/xcmiscproto-1.2.0
154 >=x11-proto/glproto-1.4.9
155 dmx? ( >=x11-proto/dmxproto-2.2.99.1 )
156 !minimal? (
157 >=x11-proto/xf86driproto-2.1.0
158 >=x11-proto/dri2proto-2.1
159 >=x11-libs/libdrm-2.3.0
160 )"
161
162 PDEPEND="xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
163
164 EPATCH_FORCE="yes"
165 EPATCH_SUFFIX="patch"
166
167 # These have been sent upstream
168 UPSTREAMED_PATCHES=(
169 #"${WORKDIR}/patches/"
170 )
171
172 PATCHES=(
173 "${UPSTREAMED_PATCHES[@]}"
174 )
175
176 pkg_setup() {
177 use minimal || ensure_a_server_is_building
178
179 # SDL only available in kdrive build
180 if use kdrive && use sdl; then
181 conf_opts="${conf_opts} --enable-xsdl"
182 else
183 conf_opts="${conf_opts} --disable-xsdl"
184 fi
185
186 # localstatedir is used for the log location; we need to override the default
187 # from ebuild.sh
188 # sysconfdir is used for the xorg.conf location; same applies
189 # --enable-install-setuid needed because sparcs default off
190 CONFIGURE_OPTIONS="
191 $(use_enable ipv6)
192 $(use_enable dmx)
193 $(use_enable kdrive)
194 $(use_enable tslib)
195 $(use_enable tslib xcalibrate)
196 $(use_enable !minimal xvfb)
197 $(use_enable !minimal xnest)
198 $(use_enable !minimal record)
199 $(use_enable !minimal xfree86-utils)
200 $(use_enable !minimal install-libxf86config)
201 $(use_enable !minimal dri)
202 $(use_enable !minimal dri2)
203 $(use_enable !minimal glx)
204 $(use_enable xorg)
205 $(use_enable nptl glx-tls)
206 $(use_enable hal config-hal)
207 --sysconfdir=/etc/X11
208 --localstatedir=/var
209 --enable-install-setuid
210 --with-fontdir=/usr/share/fonts
211 --with-xkb-output=/var/lib/xkb
212 --without-dtrace
213 ${conf_opts}"
214
215 # (#121394) Causes window corruption
216 filter-flags -fweb
217
218 # Incompatible with GCC 3.x SSP on x86, bug #244352
219 if use x86 ; then
220 if [[ $(gcc-major-version) -lt 4 ]]; then
221 filter-flags -fstack-protector
222 fi
223 fi
224
225 OLD_IMPLEM="$(eselect opengl show)"
226 eselect opengl set ${OPENGL_DIR}
227 }
228
229 src_install() {
230 x-modular_src_install
231
232 dynamic_libgl_install
233
234 server_based_install
235
236 if ! use minimal && use xorg; then
237 # Install xorg.conf.example (see bugs #151421 and #151670)
238 insinto /etc/X11
239 doins hw/xfree86/xorg.conf.example \
240 || die "couldn't install xorg.conf.example"
241 fi
242 }
243
244 pkg_postinst() {
245 switch_opengl_implem
246
247 echo
248 ewarn "You must rebuild all drivers if upgrading from xorg-server 1.6"
249 ewarn "or earlier, because the ABI changed. If you cannot start X because"
250 ewarn "of module version mismatch errors, this is your problem."
251
252 echo
253 ewarn "You can generate a list of all installed packages in the x11-drivers"
254 ewarn "category using this command:"
255 ewarn "emerge portage-utils; qlist -I -C x11-drivers/"
256
257 ebeep 5
258 epause 10
259 }
260
261 pkg_postrm() {
262 # Get rid of module dir to ensure opengl-update works properly
263 if ! has_version x11-base/xorg-server; then
264 if [[ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then
265 rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules
266 fi
267 fi
268 }
269
270 dynamic_libgl_install() {
271 # next section is to setup the dynamic libGL stuff
272 ebegin "Moving GL files for dynamic switching"
273 dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
274 local x=""
275 for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do
276 if [ -f ${x} -o -L ${x} ]; then
277 mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
278 fi
279 done
280 eend 0
281 }
282
283 server_based_install() {
284 if ! use xorg; then
285 rm "${D}"/usr/share/man/man1/Xserver.1x \
286 "${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \
287 "${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
288 "${D}"/usr/share/man/man1/Xserver.1x
289 fi
290 }
291
292 switch_opengl_implem() {
293 # Switch to the xorg implementation.
294 # Use new opengl-update that will not reset user selected
295 # OpenGL interface ...
296 echo
297 eselect opengl set ${OLD_IMPLEM}
298 }
299
300 ensure_a_server_is_building() {
301 for server in ${IUSE_SERVERS}; do
302 use ${server} && return;
303 done
304 eerror "You need to specify at least one server to build."
305 eerror "Valid servers are: ${IUSE_SERVERS}."
306 die "No servers were specified to build."
307 }
Report Message
Find on MARC Find on Google Groups