/[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.18 Revision 1.19
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.18 2006/10/25 07:18:47 dberkholz Exp $ 3# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/Attic/xorg-server-1.1.1-r1.ebuild,v 1.19 2006/10/25 18:25:24 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
351 x-modular_patch_source 351 x-modular_patch_source
352 352
353 # Set up kdrive servers to build 353 # Set up kdrive servers to build
354 if use kdrive; then 354 if use kdrive; then
355 einfo "Removing unused kdrive drivers ..." 355 einfo "Removing unused kdrive drivers ..."
356
357 # Some kdrive servers require fbdev and vesa
358 local kdrive_fbdev="radeon neomagic sis siliconmotion"
359 # Some kdrive servers require just vesa
360 local kdrive_vesa="chips mach64 mga nv glint r128 via"
361
356 for card in ${IUSE_VIDEO_CARDS}; do 362 for card in ${IUSE_VIDEO_CARDS}; do
357 real_card=${card#video_cards_} 363 real_card=${card#video_cards_}
358 364
359 # Differences between VIDEO_CARDS name and kdrive server name 365 # Differences between VIDEO_CARDS name and kdrive server name
360 real_card=${real_card/glint/pm2} 366 real_card=${real_card/glint/pm2}
370 if ! grep -q -o "\b${real_card}\b" ${S}/hw/kdrive/Makefile.am; then 376 if ! grep -q -o "\b${real_card}\b" ${S}/hw/kdrive/Makefile.am; then
371 continue 377 continue
372 fi 378 fi
373 379
374 if ! use ${card}; then 380 if ! use ${card}; then
375 # (bug #136370) Radeon needs fbdev and vesa
376 if use x86 \ 381 if use x86; then
382 # Some kdrive servers require fbdev and vesa
383 for i in ${kdrive_fbdev}; do
377 && use video_cards_radeon; then 384 if use video_cards_${i}; then
378 if [[ ${real_card} = fbdev ]] \ 385 if [[ ${real_card} = fbdev ]] \
379 || [[ ${real_card} = vesa ]]; then 386 || [[ ${real_card} = vesa ]]; then
380 continue 387 continue 2 # Don't disable
388 fi
381 fi 389 fi
390 done
391
392 # Some kdrive servers require just vesa
393 for i in ${kdrive_vesa}; do
394 if use video_cards_${i}; then
395 if [[ ${real_card} = vesa ]]; then
396 continue 2 # Don't disable
397 fi
398 fi
399 done
382 fi 400 fi
383 disable_card=1 401 disable_card=1
384 # Bug #150052 402 # Bug #150052
385 # fbdev is the only VIDEO_CARDS setting that works on non-x86 403 # fbdev is the only VIDEO_CARDS setting that works on non-x86
386 elif ! use x86 \ 404 elif ! use x86 \

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

  ViewVC Help
Powered by ViewVC 1.1.20