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

Diff of /eclass/virtualx.eclass

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

Revision 1.9 Revision 1.17
1# Copyright 1999-2002 Gentoo Technologies, Inc. 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.17 2004/08/22 17:48:59 swegener Exp $
4#
3# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
4# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.9 2002/10/25 19:55:52 vapier Exp $ 6#
5# 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
6 8
7ECLASS=virtualx 9ECLASS=virtualx
8INHERITED="$INHERITED $ECLASS" 10INHERITED="$INHERITED $ECLASS"
9newdepend virtual/x11 11DEPEND="virtual/x11"
10 12
11DESCRIPTION="Based on the $ECLASS eclass" 13DESCRIPTION="Based on the $ECLASS eclass"
12 14
13[ -z "${SANDBOX_DISABLED}" ] && export SANDBOX_DISABLED="0" || : 15[ -z "${SANDBOX_DISABLED}" ] && export SANDBOX_DISABLED="0" || :
14 16
37 # on the same display (most cases this is :0 ), so make sure 39 # on the same display (most cases this is :0 ), so make sure
38 # Xvfb is started, else bump the display number 40 # Xvfb is started, else bump the display number
39 # 41 #
40 # Azarah - 5 May 2002 42 # Azarah - 5 May 2002
41 # 43 #
44 # Changed the mode from 800x600x32 to 800x600x24 because the mfb
45 # support has been dropped in Xvfb in the xorg-x11 pre-releases.
46 # For now only depths up to 24-bit are supported.
47 #
48 # Sven Wegener <swegener@gentoo.org> - 22 Aug 2004
49 #
42 /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x32 &>/dev/null & 50 /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x24 &>/dev/null &
43 sleep 2 51 sleep 2
44 52
53 local start=${XDISPLAY}
45 while [ ! -f /tmp/.X${XDISPLAY}-lock ] 54 while [ ! -f /tmp/.X${XDISPLAY}-lock ]
46 do 55 do
56 # Stop trying after 15 tries
57 if [ $((${XDISPLAY} - ${start})) -gt 15 ]; then
58
59 eerror ""
60 eerror "Unable to start Xvfb."
61 eerror ""
62 eerror "'/usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x24' returns:"
63 eerror ""
64 /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x24
65 eerror ""
66 eerror "If possible, correct the above error and try your emerge again."
67 eerror ""
68 die
69 fi
70
47 XDISPLAY=$((${XDISPLAY}+1)) 71 XDISPLAY=$((${XDISPLAY}+1))
48 /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x32 &>/dev/null & 72 /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x24 &>/dev/null &
49 sleep 2 73 sleep 2
50 done 74 done
51 75
52 # Now enable SANDBOX again if needed. 76 # Now enable SANDBOX again if needed.
53 export SANDBOX_DISABLED="${OLD_SANDBOX_DISABLED}" 77 export SANDBOX_DISABLED="${OLD_SANDBOX_DISABLED}"
81Xemake() { 105Xemake() {
82 export maketype="emake" 106 export maketype="emake"
83 virtualmake "$*" 107 virtualmake "$*"
84} 108}
85 109
110#Same as "econf", but setup the Xvfb hack if needed
111Xeconf() {
112 export maketype="econf"
113 virtualmake "$*"
114}

Legend:
Removed from v.1.9  
changed lines
  Added in v.1.17

  ViewVC Help
Powered by ViewVC 1.1.20