/[gentoo-x86]/eclass/virtualx.eclass
Gentoo

Diff of /eclass/virtualx.eclass

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

Revision 1.26 Revision 1.29
1# Copyright 1999-2004 Gentoo Foundation 1# Copyright 1999-2004 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/eclass/virtualx.eclass,v 1.26 2007/03/26 19:59:20 drac Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.29 2009/08/10 15:44:37 remi Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 6#
7# This eclass can be used for packages that needs a working X environment to build 7# This eclass can be used for packages that needs a working X environment to build
8 8
9DEPEND="X? ( x11-base/xorg-server )" 9DEPEND="X? ( x11-base/xorg-server x11-apps/xhost )"
10IUSE="X" 10IUSE="X"
11 11
12DESCRIPTION="Based on the $ECLASS eclass" 12DESCRIPTION="Based on the $ECLASS eclass"
13 13
14# 14#
53 # support has been dropped in Xvfb in the xorg-x11 pre-releases. 53 # support has been dropped in Xvfb in the xorg-x11 pre-releases.
54 # For now only depths up to 24-bit are supported. 54 # For now only depths up to 24-bit are supported.
55 # 55 #
56 # Sven Wegener <swegener@gentoo.org> - 22 Aug 2004 56 # Sven Wegener <swegener@gentoo.org> - 22 Aug 2004
57 # 57 #
58 # Use "-fp built-ins" because it's only part of the default font path
59 # for Xorg but not the other DDXs (Xvfb, Kdrive, etc). Temporarily fixes
60 # bug 278487 until xorg-server is properly patched
61 #
62 # RĂ©mi Cardona <remi@gentoo.org> (10 Aug 2009)
58 ${XVFB} :${XDISPLAY} -screen 0 800x600x24 &>/dev/null & 63 ${XVFB} :${XDISPLAY} -fp built-ins -screen 0 800x600x24 &>/dev/null &
59 sleep 2 64 sleep 2
60 65
61 local start=${XDISPLAY} 66 local start=${XDISPLAY}
62 while [[ ! -f /tmp/.X${XDISPLAY}-lock ]] ; do 67 while [[ ! -f /tmp/.X${XDISPLAY}-lock ]] ; do
63 # Stop trying after 15 tries 68 # Stop trying after 15 tries
64 if [[ $((${XDISPLAY} - ${start})) -gt 15 ]] ; then 69 if [[ $((${XDISPLAY} - ${start})) -gt 15 ]] ; then
65 70
66 eerror "" 71 eerror ""
67 eerror "Unable to start Xvfb." 72 eerror "Unable to start Xvfb."
68 eerror "" 73 eerror ""
69 eerror "'/usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x24' returns:" 74 eerror "'/usr/bin/Xvfb :${XDISPLAY} -fp built-ins -screen 0 800x600x24' returns:"
70 eerror "" 75 eerror ""
71 ${XVFB} :${XDISPLAY} -screen 0 800x600x24 76 ${XVFB} :${XDISPLAY} -fp built-ins -screen 0 800x600x24
72 eerror "" 77 eerror ""
73 eerror "If possible, correct the above error and try your emerge again." 78 eerror "If possible, correct the above error and try your emerge again."
74 eerror "" 79 eerror ""
75 die 80 die
76 fi 81 fi
77 82
78 XDISPLAY=$((${XDISPLAY}+1)) 83 XDISPLAY=$((${XDISPLAY}+1))
79 ${XVFB} :${XDISPLAY} -screen 0 800x600x24 &>/dev/null & 84 ${XVFB} :${XDISPLAY} -fp built-ins -screen 0 800x600x24 &>/dev/null &
80 sleep 2 85 sleep 2
81 done 86 done
82 87
83 # Now enable SANDBOX again if needed. 88 # Now enable SANDBOX again if needed.
84 export SANDBOX_DISABLED="${OLD_SANDBOX_DISABLED}" 89 export SANDBOX_DISABLED="${OLD_SANDBOX_DISABLED}"

Legend:
Removed from v.1.26  
changed lines
  Added in v.1.29

  ViewVC Help
Powered by ViewVC 1.1.20