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