1 |
remi 09/06/28 17:34:33 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: xorg-server-1.6.1.901-r5.ebuild |
5 |
Log: |
6 |
x11-base/xorg-server: backport some more patches from upstream's 1.6 nominations, bump dri2proto dep to 2.1 |
7 |
(Portage version: 2.1.6.13/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.418 x11-base/xorg-server/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.418&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.418&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/ChangeLog?r1=1.417&r2=1.418 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v |
19 |
retrieving revision 1.417 |
20 |
retrieving revision 1.418 |
21 |
diff -u -r1.417 -r1.418 |
22 |
--- ChangeLog 28 Jun 2009 16:00:37 -0000 1.417 |
23 |
+++ ChangeLog 28 Jun 2009 17:34:33 -0000 1.418 |
24 |
@@ -1,6 +1,13 @@ |
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.417 2009/06/28 16:00:37 remi Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.418 2009/06/28 17:34:33 remi Exp $ |
29 |
+ |
30 |
+*xorg-server-1.6.1.901-r5 (28 Jun 2009) |
31 |
+ |
32 |
+ 28 Jun 2009; Rémi Cardona <remi@g.o> |
33 |
+ +xorg-server-1.6.1.901-r5.ebuild: |
34 |
+ backport some more patches from upstream's 1.6 nominations, bump dri2proto |
35 |
+ dep to 2.1 |
36 |
|
37 |
28 Jun 2009; Rémi Cardona <remi@g.o> -xorg-server-1.5.3-r5.ebuild, |
38 |
-xorg-server-1.6.1.901-r2.ebuild, -xorg-server-1.6.1.901-r3.ebuild: |
39 |
|
40 |
|
41 |
|
42 |
1.1 x11-base/xorg-server/xorg-server-1.6.1.901-r5.ebuild |
43 |
|
44 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/xorg-server-1.6.1.901-r5.ebuild?rev=1.1&view=markup |
45 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/xorg-server-1.6.1.901-r5.ebuild?rev=1.1&content-type=text/plain |
46 |
|
47 |
Index: xorg-server-1.6.1.901-r5.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.6.1.901-r5.ebuild,v 1.1 2009/06/28 17:34:33 remi Exp $ |
52 |
|
53 |
EAPI="2" |
54 |
|
55 |
# Must be before x-modular eclass is inherited |
56 |
#SNAPSHOT="yes" |
57 |
|
58 |
inherit x-modular multilib |
59 |
|
60 |
# keithp put this one in archive/ instead of releases/ for unknown reasons |
61 |
BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/archive/individual" |
62 |
SRC_URI="${SRC_URI} |
63 |
${BASE_INDIVIDUAL_URI}/${MODULE}/${P}.tar.bz2 |
64 |
mirror://gentoo/${P}-gentoo-patches-04.tar.bz2" |
65 |
|
66 |
OPENGL_DIR="xorg-x11" |
67 |
|
68 |
DESCRIPTION="X.Org X servers" |
69 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" |
70 |
IUSE_INPUT_DEVICES=" |
71 |
input_devices_acecad |
72 |
input_devices_aiptek |
73 |
input_devices_calcomp |
74 |
input_devices_citron |
75 |
input_devices_digitaledge |
76 |
input_devices_dmc |
77 |
input_devices_dynapro |
78 |
input_devices_elo2300 |
79 |
input_devices_elographics |
80 |
input_devices_evdev |
81 |
input_devices_fpit |
82 |
input_devices_hyperpen |
83 |
input_devices_jamstudio |
84 |
input_devices_joystick |
85 |
input_devices_keyboard |
86 |
input_devices_magellan |
87 |
input_devices_microtouch |
88 |
input_devices_mouse |
89 |
input_devices_mutouch |
90 |
input_devices_palmax |
91 |
input_devices_penmount |
92 |
input_devices_spaceorb |
93 |
input_devices_summa |
94 |
input_devices_tek4957 |
95 |
input_devices_tslib |
96 |
input_devices_ur98 |
97 |
input_devices_virtualbox |
98 |
input_devices_vmmouse |
99 |
input_devices_void |
100 |
|
101 |
input_devices_synaptics |
102 |
input_devices_wacom" |
103 |
IUSE_VIDEO_CARDS=" |
104 |
video_cards_apm |
105 |
video_cards_ark |
106 |
video_cards_ast |
107 |
video_cards_chips |
108 |
video_cards_cirrus |
109 |
video_cards_dummy |
110 |
video_cards_epson |
111 |
video_cards_fbdev |
112 |
video_cards_geode |
113 |
video_cards_glint |
114 |
video_cards_i128 |
115 |
video_cards_i740 |
116 |
video_cards_intel |
117 |
video_cards_impact |
118 |
video_cards_imstt |
119 |
video_cards_mach64 |
120 |
video_cards_mga |
121 |
video_cards_neomagic |
122 |
video_cards_nv |
123 |
video_cards_r128 |
124 |
video_cards_radeon |
125 |
video_cards_radeonhd |
126 |
video_cards_rendition |
127 |
video_cards_s3 |
128 |
video_cards_s3virge |
129 |
video_cards_savage |
130 |
video_cards_siliconmotion |
131 |
video_cards_sis |
132 |
video_cards_sisusb |
133 |
video_cards_sunbw2 |
134 |
video_cards_suncg14 |
135 |
video_cards_suncg3 |
136 |
video_cards_suncg6 |
137 |
video_cards_sunffb |
138 |
video_cards_sunleo |
139 |
video_cards_suntcx |
140 |
video_cards_tdfx |
141 |
video_cards_tga |
142 |
video_cards_trident |
143 |
video_cards_tseng |
144 |
video_cards_v4l |
145 |
video_cards_vermilion |
146 |
video_cards_vesa |
147 |
video_cards_via |
148 |
video_cards_virtualbox |
149 |
video_cards_vmware |
150 |
video_cards_voodoo |
151 |
video_cards_xgi |
152 |
video_cards_fglrx |
153 |
video_cards_nvidia" |
154 |
IUSE_SERVERS="dmx kdrive xorg" |
155 |
IUSE="${IUSE_VIDEO_CARDS} |
156 |
${IUSE_INPUT_DEVICES} |
157 |
${IUSE_SERVERS} |
158 |
tslib hal ipv6 minimal nptl sdl" |
159 |
RDEPEND="hal? ( sys-apps/hal ) |
160 |
tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto ) |
161 |
dev-libs/openssl |
162 |
>=x11-libs/libXfont-1.4.0 |
163 |
>=x11-libs/xtrans-1.2.3 |
164 |
>=x11-libs/libXau-1.0.4 |
165 |
>=x11-libs/libXext-1.0.4 |
166 |
>=x11-libs/libX11-1.1.5 |
167 |
>=x11-libs/libxkbfile-1.0.4 |
168 |
>=x11-libs/libXdmcp-1.0.2 |
169 |
>=x11-libs/libXmu-1.0.3 |
170 |
>=x11-libs/libXrender-0.9.4 |
171 |
>=x11-libs/libXi-1.2.1 |
172 |
>=x11-libs/pixman-0.14.0 |
173 |
media-libs/freetype |
174 |
>=x11-misc/xbitmaps-1.0.1 |
175 |
>=x11-misc/xkeyboard-config-1.4 |
176 |
x11-apps/xkbcomp |
177 |
>=x11-apps/iceauth-1.0.2 |
178 |
>=x11-apps/rgb-1.0.3 |
179 |
>=x11-apps/xauth-1.0.3 |
180 |
>=x11-apps/xinit-1.0.8-r3 |
181 |
>=app-admin/eselect-opengl-1.0.7 |
182 |
>=x11-libs/libXaw-1.0.5 |
183 |
>=x11-libs/libXpm-3.5.7 |
184 |
>=x11-libs/libXinerama-1.0.3 |
185 |
>=x11-libs/libpciaccess-0.10.3 |
186 |
dmx? ( |
187 |
>=x11-libs/libdmx-1.0.2 |
188 |
>=x11-libs/libXfixes-4.0.3 |
189 |
) |
190 |
!minimal? ( |
191 |
>=x11-libs/libXtst-1.0.3 |
192 |
>=x11-libs/libXres-1.0.3 |
193 |
>=media-libs/mesa-7.3_rc1[nptl=] |
194 |
) |
195 |
>=x11-libs/libxkbui-1.0.2 |
196 |
kdrive? ( sdl? ( media-libs/libsdl ) )" |
197 |
# Xres is dmx-dependent |
198 |
# Xaw is dmx-dependent |
199 |
# Xpm is dmx-dependent, pulls in Xt |
200 |
# xkbcomp is launched at startup but not checked by ./configure |
201 |
DEPEND="${RDEPEND} |
202 |
!net-dialup/dtrace |
203 |
sys-devel/flex |
204 |
>=x11-proto/randrproto-1.2.99.4 |
205 |
>=x11-proto/renderproto-0.9.3 |
206 |
>=x11-proto/fixesproto-4 |
207 |
>=x11-proto/damageproto-1.1 |
208 |
>=x11-proto/xextproto-7.0.4 |
209 |
>=x11-proto/xproto-7.0.14 |
210 |
>=x11-proto/xf86dgaproto-2.0.3 |
211 |
>=x11-proto/xf86rushproto-1.1.2 |
212 |
>=x11-proto/xf86vidmodeproto-2.2.2 |
213 |
>=x11-proto/compositeproto-0.4 |
214 |
>=x11-proto/recordproto-1.13.2 |
215 |
>=x11-proto/resourceproto-1.0.2 |
216 |
>=x11-proto/videoproto-2.2.2 |
217 |
>=x11-proto/scrnsaverproto-1.1.0 |
218 |
>=x11-proto/trapproto-3.4.3 |
219 |
>=x11-proto/xineramaproto-1.1.2 |
220 |
>=x11-proto/fontsproto-2.0.2 |
221 |
>=x11-proto/kbproto-1.0.3 |
222 |
>=x11-proto/inputproto-1.5.0 |
223 |
>=x11-proto/bigreqsproto-1.0.2 |
224 |
>=x11-proto/xcmiscproto-1.1.2 |
225 |
>=x11-proto/glproto-1.4.9 |
226 |
dmx? ( >=x11-proto/dmxproto-2.2.2 ) |
227 |
!minimal? ( |
228 |
>=x11-proto/xf86driproto-2.0.4 |
229 |
>=x11-proto/dri2proto-2.1 |
230 |
>=x11-libs/libdrm-2.3 |
231 |
)" |
232 |
|
233 |
# Drivers |
234 |
PDEPEND=" |
235 |
xorg? ( |
236 |
input_devices_acecad? ( >=x11-drivers/xf86-input-acecad-1.3.0 ) |
237 |
input_devices_aiptek? ( >=x11-drivers/xf86-input-aiptek-1.2.0 ) |
238 |
input_devices_calcomp? ( >=x11-drivers/xf86-input-calcomp-1.1.2 ) |
239 |
input_devices_citron? ( >=x11-drivers/xf86-input-citron-2.2.1 ) |
240 |
input_devices_digitaledge? ( >=x11-drivers/xf86-input-digitaledge-1.1.1 ) |
241 |
input_devices_dmc? ( >=x11-drivers/xf86-input-dmc-1.1.2 ) |
242 |
input_devices_dynapro? ( >=x11-drivers/xf86-input-dynapro-1.1.2 ) |
243 |
input_devices_elo2300? ( >=x11-drivers/xf86-input-elo2300-1.1.2 ) |
244 |
input_devices_elographics? ( >=x11-drivers/xf86-input-elographics-1.2.3 ) |
245 |
input_devices_evdev? ( >=x11-drivers/xf86-input-evdev-2.1.3 ) |
246 |
input_devices_fpit? ( >=x11-drivers/xf86-input-fpit-1.3.0 ) |
247 |
input_devices_hyperpen? ( >=x11-drivers/xf86-input-hyperpen-1.2.0 ) |
248 |
input_devices_jamstudio? ( >=x11-drivers/xf86-input-jamstudio-1.2.0 ) |
249 |
input_devices_joystick? ( >=x11-drivers/xf86-input-joystick-1.4.0 ) |
250 |
input_devices_keyboard? ( >=x11-drivers/xf86-input-keyboard-1.3.2 ) |
251 |
input_devices_magellan? ( >=x11-drivers/xf86-input-magellan-1.2.0 ) |
252 |
input_devices_microtouch? ( >=x11-drivers/xf86-input-microtouch-1.2.0 ) |
253 |
input_devices_mouse? ( >=x11-drivers/xf86-input-mouse-1.4.0 ) |
254 |
input_devices_mutouch? ( >=x11-drivers/xf86-input-mutouch-1.2.1 ) |
255 |
input_devices_palmax? ( >=x11-drivers/xf86-input-palmax-1.2.0 ) |
256 |
input_devices_penmount? ( >=x11-drivers/xf86-input-penmount-1.4.0 ) |
257 |
input_devices_spaceorb? ( >=x11-drivers/xf86-input-spaceorb-1.1.1 ) |
258 |
input_devices_summa? ( >=x11-drivers/xf86-input-summa-1.2.0 ) |
259 |
input_devices_tek4957? ( >=x11-drivers/xf86-input-tek4957-1.2.0 ) |
260 |
input_devices_tslib? ( x11-drivers/xf86-input-tslib ) |
261 |
input_devices_ur98? ( >=x11-drivers/xf86-input-ur98-1.1.0 ) |
262 |
input_devices_virtualbox? ( x11-drivers/xf86-input-virtualbox ) |
263 |
input_devices_vmmouse? ( >=x11-drivers/xf86-input-vmmouse-12.6.3 ) |
264 |
input_devices_void? ( >=x11-drivers/xf86-input-void-1.2.0 ) |
265 |
input_devices_synaptics? ( >=x11-drivers/xf86-input-synaptics-0.15.0 ) |
266 |
input_devices_wacom? ( x11-drivers/linuxwacom ) |
267 |
|
268 |
video_cards_apm? ( >=x11-drivers/xf86-video-apm-1.2.1 ) |
269 |
video_cards_ark? ( >=x11-drivers/xf86-video-ark-0.7.1 ) |
270 |
video_cards_ast? ( >=x11-drivers/xf86-video-ast-0.87.0 ) |
271 |
video_cards_chips? ( >=x11-drivers/xf86-video-chips-1.2.1 ) |
272 |
video_cards_cirrus? ( >=x11-drivers/xf86-video-cirrus-1.2.1 ) |
273 |
video_cards_dummy? ( >=x11-drivers/xf86-video-dummy-0.3.1 ) |
274 |
video_cards_fbdev? ( >=x11-drivers/xf86-video-fbdev-0.4.0 ) |
275 |
video_cards_geode? ( >=x11-drivers/xf86-video-geode-2.9.0 ) |
276 |
video_cards_glint? ( >=x11-drivers/xf86-video-glint-1.2.2 ) |
277 |
video_cards_i128? ( >=x11-drivers/xf86-video-i128-1.3.1 ) |
278 |
video_cards_i740? ( >=x11-drivers/xf86-video-i740-1.2.0 ) |
279 |
video_cards_intel? ( >=x11-drivers/xf86-video-intel-2.4.2-r1 ) |
280 |
video_cards_mach64? ( >=x11-drivers/xf86-video-mach64-6.8.0 ) |
281 |
video_cards_mga? ( >=x11-drivers/xf86-video-mga-1.4.9 ) |
282 |
video_cards_neomagic? ( >=x11-drivers/xf86-video-neomagic-1.2.2 ) |
283 |
video_cards_nv? ( >=x11-drivers/xf86-video-nv-2.1.12 ) |
284 |
video_cards_nvidia? ( x11-drivers/nvidia-drivers ) |
285 |
video_cards_fglrx? ( >=x11-drivers/ati-drivers-8.552-r2 ) |
286 |
video_cards_r128? ( >=x11-drivers/xf86-video-r128-6.8.0 ) |
287 |
video_cards_radeon? ( >=x11-drivers/xf86-video-ati-6.11.0 ) |
288 |
video_cards_radeonhd? ( >=x11-drivers/xf86-video-radeonhd-1.2.1 ) |
289 |
video_cards_rendition? ( >=x11-drivers/xf86-video-rendition-4.2.1 ) |
290 |
video_cards_s3? ( >=x11-drivers/xf86-video-s3-0.6.1 ) |
291 |
video_cards_s3virge? ( >=x11-drivers/xf86-video-s3virge-1.10.2 ) |
292 |
video_cards_savage? ( >=x11-drivers/xf86-video-savage-2.2.1 ) |
293 |
video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.7.0 ) |
294 |
video_cards_sis? ( >=x11-drivers/xf86-video-sis-0.10.1 ) |
295 |
video_cards_sisusb? ( >=x11-drivers/xf86-video-sisusb-0.9.1 ) |
296 |
video_cards_sunffb? ( >=x11-drivers/xf86-video-sunffb-1.2.0 ) |
297 |
video_cards_sunleo? ( >=x11-drivers/xf86-video-sunleo-1.2.0 ) |
298 |
video_cards_tdfx? ( >=x11-drivers/xf86-video-tdfx-1.4.1 ) |
299 |
video_cards_tga? ( >=x11-drivers/xf86-video-tga-1.2.0 ) |
300 |
video_cards_trident? ( >=x11-drivers/xf86-video-trident-1.3.1 ) |
301 |
video_cards_tseng? ( >=x11-drivers/xf86-video-tseng-1.2.1 ) |
302 |
video_cards_v4l? ( >=x11-drivers/xf86-video-v4l-0.2.0 ) |
303 |
video_cards_vesa? ( >=x11-drivers/xf86-video-vesa-2.2.0 ) |
304 |
video_cards_via? ( >=x11-drivers/xf86-video-openchrome-0.2.903 ) |
305 |
video_cards_virtualbox? ( x11-drivers/xf86-video-virtualbox ) |
306 |
video_cards_vmware? ( >=x11-drivers/xf86-video-vmware-10.16.5 ) |
307 |
video_cards_voodoo? ( >=x11-drivers/xf86-video-voodoo-1.2.1 ) |
308 |
video_cards_xgi? ( >=x11-drivers/xf86-video-xgi-1.5.0 ) |
309 |
|
310 |
!x11-drivers/xf86-video-impact |
311 |
!x11-drivers/xf86-video-imstt |
312 |
!x11-drivers/xf86-video-newport |
313 |
!x11-drivers/xf86-video-sunbw2 |
314 |
!x11-drivers/xf86-video-suncg14 |
315 |
!x11-drivers/xf86-video-suncg3 |
316 |
!x11-drivers/xf86-video-suncg6 |
317 |
!x11-drivers/xf86-video-suntcx |
318 |
!x11-drivers/xf86-video-vermilion |
319 |
|
320 |
!x11-drivers/xf86-video-cyrix |
321 |
!x11-drivers/xf86-video-nsc |
322 |
!x11-drivers/xf86-video-vga |
323 |
)" |
324 |
LICENSE="${LICENSE} MIT" |
325 |
|
326 |
EPATCH_FORCE="yes" |
327 |
EPATCH_SUFFIX="patch" |
328 |
|
329 |
# Local customizations, unsuitable for upstream |
330 |
GENTOO_PATCHES=( |
331 |
"${FILESDIR}/1.4-fpic-libxf86config.patch" |
332 |
) |
333 |
|
334 |
# These have been sent upstream |
335 |
UPSTREAMED_PATCHES=( |
336 |
"${WORKDIR}/patches/" |
337 |
) |
338 |
|
339 |
PATCHES=( |
340 |
"${GENTOO_PATCHES[@]}" |
341 |
"${UPSTREAMED_PATCHES[@]}" |
342 |
) |
343 |
|
344 |
pkg_setup() { |
345 |
use minimal || ensure_a_server_is_building |
346 |
|
347 |
# SDL only available in kdrive build |
348 |
if use kdrive && use sdl; then |
349 |
conf_opts="${conf_opts} --enable-xsdl" |
350 |
else |
351 |
conf_opts="${conf_opts} --disable-xsdl" |
352 |
fi |
353 |
|
354 |
# localstatedir is used for the log location; we need to override the default |
355 |
# from ebuild.sh |
356 |
# sysconfdir is used for the xorg.conf location; same applies |
357 |
# --enable-install-setuid needed because sparcs default off |
358 |
CONFIGURE_OPTIONS=" |
359 |
$(use_enable ipv6) |
360 |
$(use_enable dmx) |
361 |
$(use_enable kdrive) |
362 |
$(use_enable tslib) |
363 |
$(use_enable tslib xcalibrate) |
364 |
$(use_enable !minimal xvfb) |
365 |
$(use_enable !minimal xnest) |
366 |
$(use_enable !minimal record) |
367 |
$(use_enable !minimal xfree86-utils) |
368 |
$(use_enable !minimal install-libxf86config) |
369 |
$(use_enable !minimal dri) |
370 |
$(use_enable !minimal dri2) |
371 |
$(use_enable !minimal glx) |
372 |
$(use_enable xorg) |
373 |
$(use_enable nptl glx-tls) |
374 |
$(use_enable hal config-dbus) |
375 |
$(use_enable hal config-hal) |
376 |
--sysconfdir=/etc/X11 |
377 |
--localstatedir=/var |
378 |
--enable-install-setuid |
379 |
--with-fontdir=/usr/share/fonts |
380 |
--with-xkb-output=/var/lib/xkb |
381 |
--without-dtrace |
382 |
${conf_opts}" |
383 |
|
384 |
# (#121394) Causes window corruption |
385 |
filter-flags -fweb |
386 |
|
387 |
# Incompatible with GCC 3.x SSP on x86, bug #244352 |
388 |
if use x86 ; then |
389 |
if [[ $(gcc-major-version) -lt 4 ]]; then |
390 |
filter-flags -fstack-protector |
391 |
fi |
392 |
fi |
393 |
|
394 |
OLD_IMPLEM="$(eselect opengl show)" |
395 |
eselect opengl set --impl-headers ${OPENGL_DIR} |
396 |
} |
397 |
|
398 |
src_prepare() { |
399 |
x-modular_patch_source |
400 |
|
401 |
if use hal; then |
402 |
sed -i \ |
403 |
-e "s:^\(dbusconfigdir = \).*\(dbus-1.*\):\1/etc/\2:g" \ |
404 |
"${S}"/config/Makefile.am \ |
405 |
|| die "failed to fix DBUS config directory" |
406 |
SNAPSHOT="yes" |
407 |
fi |
408 |
|
409 |
x-modular_reconf_source |
410 |
} |
411 |
|
412 |
src_install() { |
413 |
x-modular_src_install |
414 |
|
415 |
dynamic_libgl_install |
416 |
|
417 |
server_based_install |
418 |
|
419 |
# Install video mode files for system-config-display |
420 |
insinto /usr/share/xorg |
421 |
doins hw/xfree86/common/{extra,vesa}modes \ |
422 |
|| die "couldn't install extra modes" |
423 |
|
424 |
# Bug #151421 - this file is not built with USE="minimal" |
425 |
# Bug #151670 - this file is also not build if USE="-xorg" |
426 |
if ! use minimal && use xorg; then |
427 |
# Install xorg.conf.example |
428 |
insinto /etc/X11 |
429 |
doins hw/xfree86/xorg.conf.example \ |
430 |
|| die "couldn't install xorg.conf.example" |
431 |
fi |
432 |
} |
433 |
|
434 |
pkg_postinst() { |
435 |
switch_opengl_implem |
436 |
|
437 |
# Bug #135544 |
438 |
ewarn "Users of reduced blanking now need:" |
439 |
ewarn " Option \"ReducedBlanking\"" |
440 |
ewarn "In the relevant Monitor section(s)." |
441 |
ewarn "Make sure your reduced blanking modelines are safe!" |
442 |
|
443 |
echo |
444 |
ewarn "You must rebuild all drivers if upgrading from xorg-server 1.5" |
445 |
ewarn "or earlier, because the ABI changed. If you cannot start X because" |
446 |
ewarn "of module version mismatch errors, this is your problem." |
447 |
|
448 |
echo |
449 |
ewarn "You can generate a list of all installed packages in the x11-drivers" |
450 |
ewarn "category using this command:" |
451 |
ewarn "emerge portage-utils; qlist -I -C x11-drivers/" |
452 |
|
453 |
ebeep 5 |
454 |
epause 10 |
455 |
} |
456 |
|
457 |
pkg_postrm() { |
458 |
# Get rid of module dir to ensure opengl-update works properly |
459 |
if ! has_version x11-base/xorg-server; then |
460 |
if [[ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then |
461 |
rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules |
462 |
fi |
463 |
fi |
464 |
} |
465 |
|
466 |
dynamic_libgl_install() { |
467 |
# next section is to setup the dynamic libGL stuff |
468 |
ebegin "Moving GL files for dynamic switching" |
469 |
dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions |
470 |
local x="" |
471 |
for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri}*; do |
472 |
if [ -f ${x} -o -L ${x} ]; then |
473 |
mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions |
474 |
fi |
475 |
done |
476 |
eend 0 |
477 |
} |
478 |
|
479 |
server_based_install() { |
480 |
if ! use xorg; then |
481 |
rm "${D}"/usr/share/man/man1/Xserver.1x \ |
482 |
"${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \ |
483 |
"${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
484 |
"${D}"/usr/share/man/man1/Xserver.1x |
485 |
fi |
486 |
} |
487 |
|
488 |
switch_opengl_implem() { |
489 |
# Switch to the xorg implementation. |
490 |
# Use new opengl-update that will not reset user selected |
491 |
# OpenGL interface ... |
492 |
echo |
493 |
eselect opengl set ${OLD_IMPLEM} |
494 |
} |
495 |
|
496 |
ensure_a_server_is_building() { |
497 |
for server in ${IUSE_SERVERS}; do |
498 |
use ${server} && return; |
499 |
done |
500 |
eerror "You need to specify at least one server to build." |
501 |
eerror "Valid servers are: ${IUSE_SERVERS}." |
502 |
die "No servers were specified to build." |
503 |
} |