/[gentoo-x86]/x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild
Gentoo

Diff of /x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.6 Revision 1.18
1# Copyright 1999-2006 Gentoo Foundation 1# Copyright 1999-2006 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/Attic/xorg-server-1.1.1-r1.ebuild,v 1.6 2006/09/16 14:35:50 hanno Exp $ 3# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/Attic/xorg-server-1.1.1-r1.ebuild,v 1.18 2006/10/25 07:18:47 dberkholz Exp $
4 4
5# Must be before x-modular eclass is inherited 5# Must be before x-modular eclass is inherited
6SNAPSHOT="yes" 6SNAPSHOT="yes"
7 7
8inherit x-modular multilib 8inherit x-modular multilib
11 11
12MESA_PN="Mesa" 12MESA_PN="Mesa"
13MESA_PV="6.5.1" 13MESA_PV="6.5.1"
14MESA_P="${MESA_PN}-${MESA_PV}" 14MESA_P="${MESA_PN}-${MESA_PV}"
15MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}" 15MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}"
16
17PATCHES="${FILESDIR}/01-no-move-damage.patch
18 ${FILESDIR}/02-dont-backfill-bg-none.patch
19 ${FILESDIR}/03-tfp-damage.patch
20 ${FILESDIR}/04-mesa-copy-sub-buffer.patch
21 ${FILESDIR}/05-offscreen-pixmaps.patch
22 ${FILESDIR}/06-aiglx-happy-vt-switch.patch
23 ${FILESDIR}/xorg-x11-server-1.1.1-mesa-6.5.1.patch
24 ${FILESDIR}/${P}-install-libxf86config-headers.patch
25 ${FILESDIR}/${PV}-fix-xrandr-zoom-keys.patch
26 ${FILESDIR}/${PV}-sparc64-ati-lockups.patch"
27
28 16
29SRC_URI="${SRC_URI} 17SRC_URI="${SRC_URI}
30 mirror://sourceforge/mesa3d/${MESA_SRC_P}.tar.bz2 18 mirror://sourceforge/mesa3d/${MESA_SRC_P}.tar.bz2
31 http://xorg.freedesktop.org/releases/individual/xserver/${P}.tar.bz2" 19 http://xorg.freedesktop.org/releases/individual/xserver/${P}.tar.bz2"
32DESCRIPTION="X.Org X servers" 20DESCRIPTION="X.Org X servers"
33# It's suid and has lazy bindings, so FEATURES="stricter" doesn't work 21# It's suid and has lazy bindings, so FEATURES="stricter" doesn't work
34RESTRICT="stricter" 22RESTRICT="stricter"
35KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 mips ppc ppc64 sh sparc ~x86 ~x86-fbsd" 23KEYWORDS="alpha amd64 arm ~hppa ia64 mips ppc ppc64 sh sparc x86 ~x86-fbsd"
36IUSE_INPUT_DEVICES=" 24IUSE_INPUT_DEVICES="
37 input_devices_acecad 25 input_devices_acecad
38 input_devices_aiptek 26 input_devices_aiptek
39 input_devices_calcomp 27 input_devices_calcomp
40 input_devices_citron 28 input_devices_citron
117IUSE_SERVERS="dmx kdrive xorg" 105IUSE_SERVERS="dmx kdrive xorg"
118IUSE="${IUSE_VIDEO_CARDS} 106IUSE="${IUSE_VIDEO_CARDS}
119 ${IUSE_INPUT_DEVICES} 107 ${IUSE_INPUT_DEVICES}
120 ${IUSE_SERVERS} 108 ${IUSE_SERVERS}
121 3dfx 109 3dfx
110 aiglx
122 dri ipv6 minimal nptl sdl xprint" 111 dri ipv6 minimal nptl sdl xprint"
123RDEPEND="x11-libs/libXfont 112RDEPEND="x11-libs/libXfont
124 x11-libs/xtrans 113 x11-libs/xtrans
125 x11-libs/libXau 114 x11-libs/libXau
126 x11-libs/libXext 115 x11-libs/libXext
149 dmx? ( x11-libs/libdmx ) 138 dmx? ( x11-libs/libdmx )
150 !minimal? ( x11-libs/libXtst 139 !minimal? ( x11-libs/libXtst
151 x11-libs/libXres ) 140 x11-libs/libXres )
152 >=x11-libs/libxkbui-1.0.2 141 >=x11-libs/libxkbui-1.0.2
153 x11-libs/liblbxutil 142 x11-libs/liblbxutil
154 kdrive? ( sdl? ( media-libs/libsdl ) ) 143 kdrive? ( sdl? ( media-libs/libsdl ) )"
155 !media-video/nvidia-glx"
156 # Xres is dmx-dependent, xkbui is xorgcfg-dependent 144 # Xres is dmx-dependent, xkbui is xorgcfg-dependent
157 # Xaw is dmx- and xorgcfg-dependent 145 # Xaw is dmx- and xorgcfg-dependent
158 # Xpm is dmx- and xorgcfg-dependent, pulls in Xt 146 # Xpm is dmx- and xorgcfg-dependent, pulls in Xt
159 # Xxf86misc and Xxf86vm are xorgcfg-dependent 147 # Xxf86misc and Xxf86vm are xorgcfg-dependent
160 # liblbxutil is lbx- dependent 148 # liblbxutil is lbx- dependent
181 x11-proto/fontsproto 169 x11-proto/fontsproto
182 >=x11-proto/kbproto-1.0-r1 170 >=x11-proto/kbproto-1.0-r1
183 x11-proto/inputproto 171 x11-proto/inputproto
184 x11-proto/bigreqsproto 172 x11-proto/bigreqsproto
185 x11-proto/xcmiscproto 173 x11-proto/xcmiscproto
186 >=x11-proto/glproto-1.4.6 174 >=x11-proto/glproto-1.4.8
187 dmx? ( x11-proto/dmxproto ) 175 dmx? ( x11-proto/dmxproto )
188 dri? ( x11-proto/xf86driproto 176 dri? ( x11-proto/xf86driproto
189 >=x11-libs/libdrm-2 ) 177 >=x11-libs/libdrm-2 )
190 xprint? ( x11-proto/printproto 178 xprint? ( x11-proto/printproto
191 x11-apps/mkfontdir 179 x11-apps/mkfontdir
283LICENSE="${LICENSE} MIT" 271LICENSE="${LICENSE} MIT"
284 272
285pkg_setup() { 273pkg_setup() {
286 use minimal || ensure_a_server_is_building 274 use minimal || ensure_a_server_is_building
287 275
288 # Bug #145274 - anything that uses vm86.h is broken on AMD64 276 PATCHES="${FILESDIR}/xorg-x11-server-1.1.1-mesa-6.5.1.patch
289 if use kdrive && use amd64 && use video_cards_vesa; then 277 ${FILESDIR}/${P}-install-libxf86config-headers.patch
290 eerror "kdrive's VESA driver does not build on AMD64 because it uses" 278 ${FILESDIR}/${PV}-fix-xrandr-zoom-keys.patch
291 eerror "vm86.h. Please build kdrive without VIDEO_CARDS=\"vesa\"." 279 ${FILESDIR}/${PV}-sparc64-ati-lockups.patch
292 die "kdrive's VESA driver does not build on AMD64." 280 ${FILESDIR}/xorg-conf-example.patch"
281
282 # Patches required for compiz to work with AIGLX,
283 # but they slow EXA down (bug #147841).
284 if use aiglx; then
285 einfo "AIGLX patches will be applied."
286 ewarn "These patches are known to cause problems with EXA enabled."
287 PATCHES="${FILESDIR}/01-no-move-damage.patch
288 ${FILESDIR}/02-dont-backfill-bg-none.patch
289 ${FILESDIR}/03-tfp-damage.patch
290 ${FILESDIR}/04-mesa-copy-sub-buffer.patch
291 ${FILESDIR}/05-offscreen-pixmaps.patch
292 ${FILESDIR}/06-aiglx-happy-vt-switch.patch
293 ${PATCHES}"
293 fi 294 fi
294 295
295 # SDL only available in kdrive build 296 # SDL only available in kdrive build
296 if use kdrive && use sdl; then 297 if use kdrive && use sdl; then
297 conf_opts="${conf_opts} --enable-xsdl" 298 conf_opts="${conf_opts} --enable-xsdl"
322 $(use_enable xprint) 323 $(use_enable xprint)
323 $(use_enable nptl glx-tls) 324 $(use_enable nptl glx-tls)
324 --sysconfdir=/etc/X11 325 --sysconfdir=/etc/X11
325 --localstatedir=/var 326 --localstatedir=/var
326 --enable-install-setuid 327 --enable-install-setuid
327 --with-default-font-path=/usr/share/fonts/misc,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/TTF,/usr/share/fonts/Type1 328 --with-fontdir=/usr/share/fonts
328 ${conf_opts}" 329 ${conf_opts}"
329 330
330 local diemsg="You must build xorg-server and mesa with the same nptl USE setting." 331 local diemsg="You must build xorg-server and mesa with the same nptl USE setting."
331 if built_with_use media-libs/mesa nptl; then 332 if built_with_use media-libs/mesa nptl; then
332 use nptl || die "${diemsg}" 333 use nptl || die "${diemsg}"
351 352
352 # Set up kdrive servers to build 353 # Set up kdrive servers to build
353 if use kdrive; then 354 if use kdrive; then
354 einfo "Removing unused kdrive drivers ..." 355 einfo "Removing unused kdrive drivers ..."
355 for card in ${IUSE_VIDEO_CARDS}; do 356 for card in ${IUSE_VIDEO_CARDS}; do
356 # (bug #136370) Radeon needs fbdev and vesa
357 if use video_cards_radeon; then
358 if [[ ${card} = video_cards_fbdev ]] \
359 || [[ ${card} = video_cards_vesa ]]; then
360 continue
361 fi
362 fi
363
364 real_card=${card#video_cards_} 357 real_card=${card#video_cards_}
365 358
366 # Differences between VIDEO_CARDS name and kdrive server name 359 # Differences between VIDEO_CARDS name and kdrive server name
367 real_card=${real_card/glint/pm2} 360 real_card=${real_card/glint/pm2}
368 real_card=${real_card/radeon/ati} 361 real_card=${real_card/radeon/ati}
369 real_card=${real_card/%nv/nvidia} 362 real_card=${real_card/%nv/nvidia}
370 real_card=${real_card/siliconmotion/smi} 363 real_card=${real_card/siliconmotion/smi}
371 real_card=${real_card/%sis/sis300} 364 real_card=${real_card/%sis/sis300}
365
366 disable_card=0
367
368 # Check whether it's a valid kdrive server before we waste time
369 # on the rest of this
370 if ! grep -q -o "\b${real_card}\b" ${S}/hw/kdrive/Makefile.am; then
371 continue
372 fi
373
372 if ! use ${card}; then 374 if ! use ${card}; then
375 # (bug #136370) Radeon needs fbdev and vesa
376 if use x86 \
377 && use video_cards_radeon; then
378 if [[ ${real_card} = fbdev ]] \
379 || [[ ${real_card} = vesa ]]; then
380 continue
381 fi
382 fi
383 disable_card=1
384 # Bug #150052
385 # fbdev is the only VIDEO_CARDS setting that works on non-x86
386 elif ! use x86 \
387 && [[ ${real_card} != fbdev ]]; then
388 ewarn " $real_card does not work on your architecture; disabling."
389 disable_card=1
390 fi
391
392 if [[ $disable_card = 1 ]]; then
373 ebegin " ${real_card}" 393 ebegin " ${real_card}"
374 sed -i \ 394 sed -i \
375 -e "s:\b${real_card}\b::g" \ 395 -e "s:\b${real_card}\b::g" \
376 ${S}/hw/kdrive/Makefile.am \ 396 ${S}/hw/kdrive/Makefile.am \
377 || die "sed of ${real_card} failed" 397 || die "sed of ${real_card} failed"
408 428
409 # Install video mode files for system-config-display 429 # Install video mode files for system-config-display
410 insinto /usr/share/xorg 430 insinto /usr/share/xorg
411 doins hw/xfree86/common/{extra,vesa}modes \ 431 doins hw/xfree86/common/{extra,vesa}modes \
412 || die "couldn't install extra modes" 432 || die "couldn't install extra modes"
433
434 # Bug #151421 - this file is not built with USE="minimal"
435 # Bug #151670 - this file is also not build if USE="-xorg"
436 if ! use minimal && use xorg; then
437 # Install xorg.conf.example
438 insinto /etc/X11
439 doins hw/xfree86/xorg.conf.example \
440 || die "couldn't install xorg.conf.example"
441 fi
413} 442}
414 443
415pkg_postinst() { 444pkg_postinst() {
416 switch_opengl_implem 445 switch_opengl_implem
417 446

Legend:
Removed from v.1.6  
changed lines
  Added in v.1.18

  ViewVC Help
Powered by ViewVC 1.1.20