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