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