1 |
remi 09/01/13 22:29:06 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: xorg-server-1.5.3-r1.ebuild |
5 |
Log: |
6 |
x11-base/xorg-server: include patches from upstream's server-1.5-branch and backport more EXA fixes (including one for bug #251242) |
7 |
(Portage version: 2.2_rc20/cvs/Linux 2.6.28-00002-g72e2bfb i686) |
8 |
|
9 |
Revision Changes Path |
10 |
1.374 x11-base/xorg-server/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.374&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.374&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/ChangeLog?r1=1.373&r2=1.374 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v |
19 |
retrieving revision 1.373 |
20 |
retrieving revision 1.374 |
21 |
diff -u -r1.373 -r1.374 |
22 |
--- ChangeLog 16 Dec 2008 19:45:58 -0000 1.373 |
23 |
+++ ChangeLog 13 Jan 2009 22:29:06 -0000 1.374 |
24 |
@@ -1,6 +1,12 @@ |
25 |
# ChangeLog for x11-base/xorg-server |
26 |
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.373 2008/12/16 19:45:58 ranger Exp $ |
28 |
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
29 |
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.374 2009/01/13 22:29:06 remi Exp $ |
30 |
+ |
31 |
+*xorg-server-1.5.3-r1 (13 Jan 2009) |
32 |
+ |
33 |
+ 13 Jan 2009; RĂ©mi Cardona <remi@g.o> +xorg-server-1.5.3-r1.ebuild: |
34 |
+ include patches from upstream's server-1.5-branch and backport more EXA |
35 |
+ fixes (including one for bug #251242) |
36 |
|
37 |
16 Dec 2008; Brent Baude <ranger@g.o> xorg-server-1.5.3.ebuild: |
38 |
Marking xorg-server-1.5.3 ~ppc64 for bug 237411 |
39 |
|
40 |
|
41 |
|
42 |
1.1 x11-base/xorg-server/xorg-server-1.5.3-r1.ebuild |
43 |
|
44 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/xorg-server-1.5.3-r1.ebuild?rev=1.1&view=markup |
45 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/xorg-server-1.5.3-r1.ebuild?rev=1.1&content-type=text/plain |
46 |
|
47 |
Index: xorg-server-1.5.3-r1.ebuild |
48 |
=================================================================== |
49 |
# Copyright 1999-2009 Gentoo Foundation |
50 |
# Distributed under the terms of the GNU General Public License v2 |
51 |
# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.5.3-r1.ebuild,v 1.1 2009/01/13 22:29:06 remi Exp $ |
52 |
|
53 |
# Must be before x-modular eclass is inherited |
54 |
SNAPSHOT="yes" |
55 |
|
56 |
inherit x-modular multilib |
57 |
|
58 |
OPENGL_DIR="xorg-x11" |
59 |
|
60 |
SRC_URI="${SRC_URI} |
61 |
http://xorg.freedesktop.org/releases/individual/xserver/${P}.tar.bz2 |
62 |
mirror://gentoo/${P}-gentoo-patches-02.tar.bz2" |
63 |
DESCRIPTION="X.Org X servers" |
64 |
KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
65 |
IUSE_INPUT_DEVICES=" |
66 |
input_devices_acecad |
67 |
input_devices_aiptek |
68 |
input_devices_calcomp |
69 |
input_devices_citron |
70 |
input_devices_digitaledge |
71 |
input_devices_dmc |
72 |
input_devices_dynapro |
73 |
input_devices_elo2300 |
74 |
input_devices_elographics |
75 |
input_devices_evdev |
76 |
input_devices_fpit |
77 |
input_devices_hyperpen |
78 |
input_devices_jamstudio |
79 |
input_devices_joystick |
80 |
input_devices_keyboard |
81 |
input_devices_magellan |
82 |
input_devices_microtouch |
83 |
input_devices_mouse |
84 |
input_devices_mutouch |
85 |
input_devices_palmax |
86 |
input_devices_penmount |
87 |
input_devices_spaceorb |
88 |
input_devices_summa |
89 |
input_devices_tek4957 |
90 |
input_devices_tslib |
91 |
input_devices_ur98 |
92 |
input_devices_vmmouse |
93 |
input_devices_void |
94 |
|
95 |
input_devices_synaptics |
96 |
input_devices_wacom" |
97 |
IUSE_VIDEO_CARDS=" |
98 |
video_cards_apm |
99 |
video_cards_ark |
100 |
video_cards_ast |
101 |
video_cards_chips |
102 |
video_cards_cirrus |
103 |
video_cards_cyrix |
104 |
video_cards_dummy |
105 |
video_cards_epson |
106 |
video_cards_fbdev |
107 |
video_cards_geode |
108 |
video_cards_glint |
109 |
video_cards_i128 |
110 |
video_cards_i740 |
111 |
video_cards_intel |
112 |
video_cards_impact |
113 |
video_cards_imstt |
114 |
video_cards_mach64 |
115 |
video_cards_mga |
116 |
video_cards_neomagic |
117 |
video_cards_newport |
118 |
video_cards_nsc |
119 |
video_cards_nv |
120 |
video_cards_r128 |
121 |
video_cards_radeon |
122 |
video_cards_radeonhd |
123 |
video_cards_rendition |
124 |
video_cards_s3 |
125 |
video_cards_s3virge |
126 |
video_cards_savage |
127 |
video_cards_siliconmotion |
128 |
video_cards_sis |
129 |
video_cards_sisusb |
130 |
video_cards_sunbw2 |
131 |
video_cards_suncg14 |
132 |
video_cards_suncg3 |
133 |
video_cards_suncg6 |
134 |
video_cards_sunffb |
135 |
video_cards_sunleo |
136 |
video_cards_suntcx |
137 |
video_cards_tdfx |
138 |
video_cards_tga |
139 |
video_cards_trident |
140 |
video_cards_tseng |
141 |
video_cards_v4l |
142 |
video_cards_vermilion |
143 |
video_cards_vesa |
144 |
video_cards_vga |
145 |
video_cards_via |
146 |
video_cards_vmware |
147 |
video_cards_voodoo |
148 |
video_cards_xgi |
149 |
video_cards_fglrx |
150 |
video_cards_nvidia" |
151 |
IUSE_SERVERS="dmx kdrive xorg" |
152 |
IUSE="${IUSE_VIDEO_CARDS} |
153 |
${IUSE_INPUT_DEVICES} |
154 |
${IUSE_SERVERS} |
155 |
3dfx tslib |
156 |
hal ipv6 minimal nptl sdl" |
157 |
RDEPEND="hal? ( sys-apps/hal ) |
158 |
tslib? ( x11-libs/tslib ) |
159 |
>=x11-libs/libXfont-1.3.3 |
160 |
>=x11-libs/xtrans-1.2.2 |
161 |
>=x11-libs/libXau-1.0.4 |
162 |
>=x11-libs/libXext-1.0.4 |
163 |
>=x11-libs/libX11-1.1.5 |
164 |
>=x11-libs/libxkbfile-1.0.4 |
165 |
>=x11-libs/libXdmcp-1.0.2 |
166 |
>=x11-libs/libXmu-1.0.3 |
167 |
>=x11-libs/libXrender-0.9.4 |
168 |
>=x11-libs/libXi-1.1.3 |
169 |
>=x11-libs/pixman-0.12 |
170 |
media-libs/freetype |
171 |
>=x11-misc/xbitmaps-1.0.1 |
172 |
>=x11-misc/xkeyboard-config-1.4 |
173 |
>=x11-apps/iceauth-1.0.2 |
174 |
>=x11-apps/rgb-1.0.3 |
175 |
>=x11-apps/xauth-1.0.3 |
176 |
>=x11-apps/xinit-1.0.8-r3 |
177 |
app-admin/eselect-opengl |
178 |
>=x11-libs/libXaw-1.0.4 |
179 |
>=x11-libs/libXpm-3.5.7 |
180 |
>=x11-libs/libXxf86misc-1.0.1 |
181 |
>=x11-libs/libXxf86vm-1.0.2 |
182 |
>=x11-libs/libpciaccess-0.10.3 |
183 |
dmx? ( >=x11-libs/libdmx-1.0.2 |
184 |
>=x11-libs/libXfixes-4.0.3 ) |
185 |
!minimal? ( >=x11-libs/libXtst-1.0.3 |
186 |
>=x11-libs/libXres-1.0.3 |
187 |
>=media-libs/mesa-7.1 |
188 |
media-fonts/font-adobe-75dpi ) |
189 |
>=x11-libs/libxkbui-1.0.2 |
190 |
>=x11-libs/liblbxutil-1.0.1 |
191 |
kdrive? ( sdl? ( media-libs/libsdl ) )" |
192 |
# Xres is dmx-dependent, xkbui is xorgcfg-dependent |
193 |
# Xaw is dmx- and xorgcfg-dependent |
194 |
# Xpm is dmx- and xorgcfg-dependent, pulls in Xt |
195 |
# Xxf86misc and Xxf86vm are xorgcfg-dependent |
196 |
# liblbxutil is lbx- dependent |
197 |
DEPEND="${RDEPEND} |
198 |
!net-dialup/dtrace |
199 |
sys-devel/flex |
200 |
>=x11-proto/randrproto-1.2.2 |
201 |
>=x11-proto/renderproto-0.9.3 |
202 |
>=x11-proto/fixesproto-4 |
203 |
>=x11-proto/damageproto-1.1 |
204 |
>=x11-proto/xextproto-7.0.3 |
205 |
>=x11-proto/xproto-7.0.13 |
206 |
>=x11-proto/xf86dgaproto-2.0.3 |
207 |
>=x11-proto/xf86miscproto-0.9.2 |
208 |
>=x11-proto/xf86rushproto-1.1.2 |
209 |
>=x11-proto/xf86vidmodeproto-2.2.2 |
210 |
>=x11-proto/xf86bigfontproto-1.1.2 |
211 |
>=x11-proto/compositeproto-0.4 |
212 |
>=x11-proto/recordproto-1.13.2 |
213 |
>=x11-proto/resourceproto-1.0.2 |
214 |
>=x11-proto/videoproto-2.2.2 |
215 |
>=x11-proto/scrnsaverproto-1.1.0 |
216 |
>=x11-proto/evieext-1.0.2 |
217 |
>=x11-proto/trapproto-3.4.3 |
218 |
>=x11-proto/xineramaproto-1.1.2 |
219 |
>=x11-proto/fontsproto-2.0.2 |
220 |
>=x11-proto/kbproto-1.0.3 |
221 |
>=x11-proto/inputproto-1.4.4 |
222 |
>=x11-proto/bigreqsproto-1.0.2 |
223 |
>=x11-proto/xcmiscproto-1.1.2 |
224 |
>=x11-proto/glproto-1.4.9 |
225 |
dmx? ( >=x11-proto/dmxproto-2.2.2 ) |
226 |
!minimal? ( >=x11-proto/xf86driproto-2.0.4 |
227 |
>=x11-libs/libdrm-2.3 )" |
228 |
|
229 |
# Drivers |
230 |
PDEPEND=" |
231 |
xorg? ( |
232 |
input_devices_acecad? ( >=x11-drivers/xf86-input-acecad-1.2.2 ) |
233 |
input_devices_aiptek? ( >=x11-drivers/xf86-input-aiptek-1.1.1 ) |
234 |
input_devices_calcomp? ( >=x11-drivers/xf86-input-calcomp-1.1.2 ) |
235 |
input_devices_citron? ( >=x11-drivers/xf86-input-citron-2.2.1 ) |
236 |
input_devices_digitaledge? ( >=x11-drivers/xf86-input-digitaledge-1.1.1 ) |
237 |
input_devices_dmc? ( >=x11-drivers/xf86-input-dmc-1.1.2 ) |
238 |
input_devices_dynapro? ( >=x11-drivers/xf86-input-dynapro-1.1.2 ) |
239 |
input_devices_elo2300? ( >=x11-drivers/xf86-input-elo2300-1.1.2 ) |
240 |
input_devices_elographics? ( >=x11-drivers/xf86-input-elographics-1.2.2 ) |
241 |
input_devices_evdev? ( >=x11-drivers/xf86-input-evdev-2.1.0 ) |
242 |
input_devices_fpit? ( >=x11-drivers/xf86-input-fpit-1.2.0 ) |
243 |
input_devices_hyperpen? ( >=x11-drivers/xf86-input-hyperpen-1.2.0 ) |
244 |
input_devices_jamstudio? ( >=x11-drivers/xf86-input-jamstudio-1.2.0 ) |
245 |
input_devices_joystick? ( >=x11-drivers/xf86-input-joystick-1.3.2 ) |
246 |
input_devices_keyboard? ( >=x11-drivers/xf86-input-keyboard-1.3.1 ) |
247 |
input_devices_magellan? ( >=x11-drivers/xf86-input-magellan-1.2.0 ) |
248 |
input_devices_microtouch? ( >=x11-drivers/xf86-input-microtouch-1.2.0 ) |
249 |
input_devices_mouse? ( >=x11-drivers/xf86-input-mouse-1.3.0 ) |
250 |
input_devices_mutouch? ( >=x11-drivers/xf86-input-mutouch-1.2.1 ) |
251 |
input_devices_palmax? ( >=x11-drivers/xf86-input-palmax-1.2.0 ) |
252 |
input_devices_penmount? ( >=x11-drivers/xf86-input-penmount-1.3.0 ) |
253 |
input_devices_spaceorb? ( >=x11-drivers/xf86-input-spaceorb-1.1.1 ) |
254 |
input_devices_summa? ( >=x11-drivers/xf86-input-summa-1.2.0 ) |
255 |
input_devices_tek4957? ( >=x11-drivers/xf86-input-tek4957-1.2.0 ) |
256 |
input_devices_tslib? ( x11-drivers/xf86-input-tslib ) |
257 |
input_devices_ur98? ( >=x11-drivers/xf86-input-ur98-1.1.0 ) |
258 |
input_devices_vmmouse? ( >=x11-drivers/xf86-input-vmmouse-12.5.0 ) |
259 |
input_devices_void? ( >=x11-drivers/xf86-input-void-1.1.1 ) |
260 |
input_devices_synaptics? ( >=x11-drivers/xf86-input-synaptics-0.15.0 ) |
261 |
input_devices_wacom? ( x11-drivers/linuxwacom ) |
262 |
|
263 |
video_cards_apm? ( >=x11-drivers/xf86-video-apm-1.2.0 ) |
264 |
video_cards_ark? ( >=x11-drivers/xf86-video-ark-0.7.0 ) |
265 |
video_cards_ast? ( >=x11-drivers/xf86-video-ast-0.85.0 ) |
266 |
video_cards_chips? ( >=x11-drivers/xf86-video-chips-1.2.0 ) |
267 |
video_cards_cirrus? ( >=x11-drivers/xf86-video-cirrus-1.2.1 ) |
268 |
video_cards_dummy? ( >=x11-drivers/xf86-video-dummy-0.3.0 ) |
269 |
video_cards_fbdev? ( >=x11-drivers/xf86-video-fbdev-0.4.0 ) |
270 |
video_cards_geode? ( >=x11-drivers/xf86-video-geode-2.9.0 ) |
271 |
video_cards_glint? ( >=x11-drivers/xf86-video-glint-1.2.1 ) |
272 |
video_cards_i128? ( >=x11-drivers/xf86-video-i128-1.3.1 ) |
273 |
video_cards_i740? ( >=x11-drivers/xf86-video-i740-1.2.0 ) |
274 |
video_cards_intel? ( >=x11-drivers/xf86-video-intel-2.4.2-r1 ) |
275 |
video_cards_mach64? ( >=x11-drivers/xf86-video-mach64-6.8.0 ) |
276 |
video_cards_mga? ( >=x11-drivers/xf86-video-mga-1.4.9 ) |
277 |
video_cards_neomagic? ( >=x11-drivers/xf86-video-neomagic-1.2.1 ) |
278 |
video_cards_nv? ( >=x11-drivers/xf86-video-nv-2.1.12 ) |
279 |
video_cards_nvidia? ( x11-drivers/nvidia-drivers ) |
280 |
video_cards_fglrx? ( >=x11-drivers/ati-drivers-8.552-r2 ) |
281 |
video_cards_r128? ( >=x11-drivers/xf86-video-r128-6.8.0 ) |
282 |
video_cards_radeon? ( >=x11-drivers/xf86-video-ati-6.9.0 ) |
283 |
video_cards_radeonhd? ( >=x11-drivers/xf86-video-radeonhd-1.2.1 ) |
284 |
video_cards_rendition? ( >=x11-drivers/xf86-video-rendition-4.2.0 ) |
285 |
video_cards_s3? ( >=x11-drivers/xf86-video-s3-0.6.0 ) |
286 |
video_cards_s3virge? ( >=x11-drivers/xf86-video-s3virge-1.10.1 ) |
287 |
video_cards_savage? ( >=x11-drivers/xf86-video-savage-2.2.1 ) |
288 |
video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.6.0 ) |
289 |
video_cards_sis? ( >=x11-drivers/xf86-video-sis-0.10.0 ) |
290 |
video_cards_sisusb? ( >=x11-drivers/xf86-video-sisusb-0.9.0 ) |
291 |
video_cards_sunffb? ( >=x11-drivers/xf86-video-sunffb-1.2.0 ) |
292 |
video_cards_sunleo? ( >=x11-drivers/xf86-video-sunleo-1.2.0 ) |
293 |
video_cards_tdfx? ( >=x11-drivers/xf86-video-tdfx-1.4.0 ) |
294 |
video_cards_tga? ( >=x11-drivers/xf86-video-tga-1.2.0 ) |
295 |
video_cards_trident? ( >=x11-drivers/xf86-video-trident-1.3.0 ) |
296 |
video_cards_tseng? ( >=x11-drivers/xf86-video-tseng-1.2.0 ) |
297 |
video_cards_v4l? ( >=x11-drivers/xf86-video-v4l-0.2.0 ) |
298 |
video_cards_vesa? ( >=x11-drivers/xf86-video-vesa-2.0.0 ) |
299 |
video_cards_via? ( >=x11-drivers/xf86-video-openchrome-0.2.903 ) |
300 |
video_cards_vmware? ( >=x11-drivers/xf86-video-vmware-10.16.5 ) |
301 |
video_cards_voodoo? ( >=x11-drivers/xf86-video-voodoo-1.2.0 ) |
302 |
video_cards_xgi? ( >=x11-drivers/xf86-video-xgi-1.5.0 ) |
303 |
|
304 |
video_cards_tdfx? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) ) |
305 |
|
306 |
!x11-drivers/xf86-video-impact |
307 |
!x11-drivers/xf86-video-imstt |
308 |
!x11-drivers/xf86-video-newport |
309 |
!x11-drivers/xf86-video-sunbw2 |
310 |
!x11-drivers/xf86-video-suncg14 |
311 |
!x11-drivers/xf86-video-suncg3 |
312 |
!x11-drivers/xf86-video-suncg6 |
313 |
!x11-drivers/xf86-video-suntcx |
314 |
!x11-drivers/xf86-video-vermilion |
315 |
|
316 |
!x11-drivers/xf86-video-cyrix |
317 |
!x11-drivers/xf86-video-nsc |
318 |
!x11-drivers/xf86-video-vga |
319 |
)" |
320 |
LICENSE="${LICENSE} MIT" |
321 |
|
322 |
EPATCH_FORCE="yes" |
323 |
EPATCH_SUFFIX="patch" |
324 |
|
325 |
# Local customizations, unsuitable for upstream |
326 |
GENTOO_PATCHES=( |
327 |
"${FILESDIR}/1.4-fpic-libxf86config.patch" |
328 |
"${FILESDIR}/1.4-fix-kdrive-automake.patch" |
329 |
"${FILESDIR}/1.5.3-builtin-fonts.patch" |
330 |
) |
331 |
|
332 |
# These have been sent upstream |
333 |
UPSTREAMED_PATCHES=( |
334 |
"${WORKDIR}/patches/" |
335 |
) |
336 |
|
337 |
PATCHES=( |
338 |
"${GENTOO_PATCHES[@]}" |
339 |
"${UPSTREAMED_PATCHES[@]}" |
340 |
) |
341 |
|
342 |
pkg_setup() { |
343 |
use minimal || ensure_a_server_is_building |
344 |
|
345 |
# SDL only available in kdrive build |
346 |
if use kdrive && use sdl; then |
347 |
conf_opts="${conf_opts} --enable-xsdl" |
348 |
else |
349 |
conf_opts="${conf_opts} --disable-xsdl" |
350 |
fi |
351 |
|
352 |
# localstatedir is used for the log location; we need to override the default |
353 |
# from ebuild.sh |
354 |
# sysconfdir is used for the xorg.conf location; same applies |
355 |
# --enable-install-setuid needed because sparcs default off |
356 |
CONFIGURE_OPTIONS=" |
357 |
$(use_enable ipv6) |
358 |
$(use_enable dmx) |
359 |
$(use_enable kdrive) |
360 |
$(use_enable tslib) |
361 |
$(use_enable !minimal xvfb) |
362 |
$(use_enable !minimal xnest) |
363 |
$(use_enable !minimal xtrap) |
364 |
$(use_enable !minimal record) |
365 |
$(use_enable !minimal xfree86-utils) |
366 |
$(use_enable !minimal install-libxf86config) |
367 |
$(use_enable !minimal dri) |
368 |
$(use_enable !minimal glx) |
369 |
$(use_enable xorg) |
370 |
$(use_enable nptl glx-tls) |
371 |
$(use_enable !minimal xorgcfg) |
372 |
$(use_enable hal config-dbus) |
373 |
$(use_enable hal config-hal) |
374 |
--disable-dri2 |
375 |
--sysconfdir=/etc/X11 |
376 |
--localstatedir=/var |
377 |
--enable-install-setuid |
378 |
--with-fontdir=/usr/share/fonts |
379 |
--with-xkb-output=/var/lib/xkb |
380 |
--with-default-font-path=built-ins |
381 |
${conf_opts}" |
382 |
|
383 |
local diemsg="You must build xorg-server and mesa with the same nptl USE setting." |
384 |
if ! use minimal; then |
385 |
if built_with_use media-libs/mesa nptl; then |
386 |
use nptl || die "${diemsg}" |
387 |
else |
388 |
use nptl && die "${diemsg}" |
389 |
fi |
390 |
fi |
391 |
|
392 |
# (#121394) Causes window corruption |
393 |
filter-flags -fweb |
394 |
|
395 |
# Nothing else provides new enough glxtokens.h |
396 |
ewarn "Forcing on xorg-x11 for new enough glxtokens.h..." |
397 |
OLD_IMPLEM="$(eselect opengl show)" |
398 |
eselect opengl set --impl-headers ${OPENGL_DIR} |
399 |
} |
400 |
|
401 |
src_unpack() { |
402 |
x-modular_specs_check |
403 |
x-modular_dri_check |
404 |
x-modular_unpack_source |
405 |
x-modular_patch_source |
406 |
|
407 |
# Set up kdrive servers to build |
408 |
if use kdrive; then |
409 |
kdrive_setup |
410 |
fi |
411 |
|
412 |
# Make sure eautoreconf gets run if we need the autoconf/make |
413 |
# changes. |
414 |
if [[ ${SNAPSHOT} != "yes" ]]; then |
415 |
if use kdrive || use dmx; then |
416 |
SNAPSHOT="yes" |
417 |
fi |
418 |
fi |
419 |
|
420 |
if use hal; then |
421 |
sed -i \ |
422 |
-e "s:^\(dbusconfigdir = \).*\(dbus-1.*\):\1/etc/\2:g" \ |
423 |
"${S}"/config/Makefile.am \ |
424 |
|| die "failed to fix DBUS config directory" |
425 |
SNAPSHOT="yes" |
426 |
fi |
427 |
|
428 |
x-modular_reconf_source |
429 |
} |
430 |
|
431 |
src_install() { |
432 |
x-modular_src_install |
433 |
|
434 |
dynamic_libgl_install |
435 |
|
436 |
server_based_install |
437 |
|
438 |
# Install video mode files for system-config-display |
439 |
insinto /usr/share/xorg |
440 |
doins hw/xfree86/common/{extra,vesa}modes \ |
441 |
|| die "couldn't install extra modes" |
442 |
|
443 |
# Bug #151421 - this file is not built with USE="minimal" |
444 |
# Bug #151670 - this file is also not build if USE="-xorg" |
445 |
if ! use minimal && use xorg; then |
446 |
# Install xorg.conf.example |
447 |
insinto /etc/X11 |
448 |
doins hw/xfree86/xorg.conf.example \ |
449 |
|| die "couldn't install xorg.conf.example" |
450 |
fi |
451 |
} |
452 |
|
453 |
pkg_postinst() { |
454 |
switch_opengl_implem |
455 |
|
456 |
# Bug #135544 |
457 |
ewarn "Users of reduced blanking now need:" |
458 |
ewarn " Option \"ReducedBlanking\"" |
459 |
ewarn "In the relevant Monitor section(s)." |
460 |
ewarn "Make sure your reduced blanking modelines are safe!" |
461 |
|
462 |
echo |
463 |
ewarn "You must rebuild all drivers if upgrading from xorg-server 1.4.1" |
464 |
ewarn "or earlier, because the ABI changed. If you cannot start X because" |
465 |
ewarn "of module version mismatch errors, this is your problem." |
466 |
|
467 |
echo |
468 |
ewarn "You can generate a list of all installed packages in the x11-drivers" |
469 |
ewarn "category using this command:" |
470 |
ewarn "emerge portage-utils; qlist -I -C x11-drivers/" |
471 |
|
472 |
ebeep 5 |
473 |
epause 10 |
474 |
} |
475 |
|
476 |
pkg_postrm() { |
477 |
# Get rid of module dir to ensure opengl-update works properly |
478 |
if ! has_version x11-base/xorg-server; then |
479 |
if [[ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then |
480 |
rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules |
481 |
fi |
482 |
fi |
483 |
} |
484 |
|
485 |
kdrive_setup() { |
486 |
local card real_card disable_card kdrive_fbdev kdrive_vesa |
487 |
|
488 |
einfo "Removing unused kdrive drivers ..." |
489 |
|
490 |
# Some kdrive servers require fbdev and vesa |
491 |
kdrive_fbdev="radeon neomagic sis siliconmotion" |
492 |
# Some kdrive servers require just vesa |
493 |
kdrive_vesa="chips mach64 mga nv glint r128 via" |
494 |
|
495 |
for card in ${IUSE_VIDEO_CARDS}; do |
496 |
real_card=${card#video_cards_} |
497 |
|
498 |
# Differences between VIDEO_CARDS name and kdrive server name |
499 |
real_card=${real_card/glint/pm2} |
500 |
real_card=${real_card/radeon/ati} |
501 |
real_card=${real_card/%nv/nvidia} |
502 |
real_card=${real_card/siliconmotion/smi} |
503 |
real_card=${real_card/%sis/sis300} |
504 |
|
505 |
disable_card=0 |
506 |
|
507 |
# Check whether it's a valid kdrive server before we waste time |
508 |
# on the rest of this |
509 |
if ! grep -q -o "\b${real_card}\b" "${S}"/hw/kdrive/Makefile.am; then |
510 |
continue |
511 |
fi |
512 |
|
513 |
if ! use ${card}; then |
514 |
if use x86; then |
515 |
# Some kdrive servers require fbdev and vesa |
516 |
for i in ${kdrive_fbdev}; do |
517 |
if use video_cards_${i}; then |
518 |
if [[ ${real_card} = fbdev ]] \ |
519 |
|| [[ ${real_card} = vesa ]]; then |
520 |
continue 2 # Don't disable |
521 |
fi |
522 |
fi |
523 |
done |
524 |
|
525 |
# Some kdrive servers require just vesa |
526 |
for i in ${kdrive_vesa}; do |
527 |
if use video_cards_${i}; then |
528 |
if [[ ${real_card} = vesa ]]; then |
529 |
continue 2 # Don't disable |
530 |
fi |
531 |
fi |
532 |
done |
533 |
fi |
534 |
disable_card=1 |
535 |
# Bug #150052 |
536 |
# fbdev is the only VIDEO_CARDS setting that works on non-x86 |
537 |
elif ! use x86 \ |
538 |
&& [[ ${real_card} != fbdev ]]; then |
539 |
ewarn " $real_card does not work on your architecture; disabling." |
540 |
disable_card=1 |
541 |
fi |
542 |
|
543 |
if [[ $disable_card = 1 ]]; then |
544 |
ebegin " ${real_card}" |
545 |
sed -i \ |
546 |
-e "s:\b${real_card}\b::g" \ |
547 |
"${S}"/hw/kdrive/Makefile.am \ |
548 |
|| die "sed of ${real_card} failed" |
549 |
eend |
550 |
fi |
551 |
|
552 |
done |
553 |
} |
554 |
|
555 |
dynamic_libgl_install() { |
556 |
# next section is to setup the dynamic libGL stuff |
557 |
ebegin "Moving GL files for dynamic switching" |
558 |
dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions |
559 |
local x="" |
560 |
for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/libglx*; do |
561 |
if [ -f ${x} -o -L ${x} ]; then |
562 |
mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions |
563 |
fi |
564 |
done |
565 |
eend 0 |
566 |
} |
567 |
|
568 |
server_based_install() { |
569 |
if ! use xorg; then |
570 |
rm "${D}"/usr/share/man/man1/Xserver.1x \ |
571 |
"${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \ |
572 |
"${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
573 |
"${D}"/usr/share/man/man1/Xserver.1x |
574 |
fi |
575 |
} |
576 |
|
577 |
switch_opengl_implem() { |
578 |
# Switch to the xorg implementation. |
579 |
# Use new opengl-update that will not reset user selected |
580 |
# OpenGL interface ... |
581 |
echo |
582 |
# eselect opengl set --use-old ${OPENGL_DIR} |
583 |
eselect opengl set ${OLD_IMPLEM} |
584 |
} |
585 |
|
586 |
ensure_a_server_is_building() { |
587 |
for server in ${IUSE_SERVERS}; do |
588 |
use ${server} && return; |
589 |
done |
590 |
eerror "You need to specify at least one server to build." |
591 |
eerror "Valid servers are: ${IUSE_SERVERS}." |
592 |
die "No servers were specified to build." |
593 |
} |