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

Diff of /eclass/virtualx.eclass

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

Revision 1.27 Revision 1.31
1# Copyright 1999-2004 Gentoo Foundation 1# Copyright 1999-2009 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.27 2007/10/28 12:05:34 eva Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.31 2009/10/19 23:52:39 abcd 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 x11-apps/xhost )" 9# Is a dependency on xorg-server and xhost needed?
10IUSE="X" 10# Valid values are "always", "tests", and "manual"
11VIRTUALX_REQUIRED="${VIRTUALX_REQUIRED:-tests}"
12
13# Dep string available for use outside of eclass, in case a more
14# complicated dep is needed
15VIRTUALX_DEPEND="x11-base/xorg-server
16 x11-apps/xhost"
17
18case ${VIRTUALX_REQUIRED} in
19 always)
20 DEPEND="${VIRTUALX_DEPEND}"
21 RDEPEND=""
22 ;;
23 tests)
24 DEPEND="test? ( ${VIRTUALX_DEPEND} )"
25 RDEPEND=""
26 IUSE="test"
27 ;;
28 manual)
29 ;;
30 *)
31 eerror "Invalid value (${VIRTUALX_REQUIRED}) for VIRTUALX_REQUIRED"
32 eerror "Valid values are:"
33 eerror " always"
34 eerror " tests"
35 eerror " manual"
36 die "Invalid value (${VIRTUALX_REQUIRED}) for VIRTUALX_REQUIRED"
37 ;;
38esac
11 39
12DESCRIPTION="Based on the $ECLASS eclass" 40DESCRIPTION="Based on the $ECLASS eclass"
13 41
14# 42#
15# Brian Harring <ferringb@gentoo.org> 11/04/2004 43# Brian Harring <ferringb@gentoo.org> 11/04/2004
38 66
39 # We really do not want SANDBOX enabled here 67 # We really do not want SANDBOX enabled here
40 export SANDBOX_DISABLED="1" 68 export SANDBOX_DISABLED="1"
41 69
42 local i=0 70 local i=0
43 XDISPLAY=$(i=0; while [[ -f /tmp/.X${i}-lock ]] ; do i=$((${i}+1));done; echo ${i}) 71 XDISPLAY=$(i=0; while [[ -f /tmp/.X${i}-lock ]] ; do ((i++));done; echo ${i})
44 72
45 # If we are in a chrooted environment, and there is already a 73 # If we are in a chrooted environment, and there is already a
46 # X server started outside of the chroot, Xvfb will fail to start 74 # X server started outside of the chroot, Xvfb will fail to start
47 # on the same display (most cases this is :0 ), so make sure 75 # on the same display (most cases this is :0 ), so make sure
48 # Xvfb is started, else bump the display number 76 # Xvfb is started, else bump the display number
53 # support has been dropped in Xvfb in the xorg-x11 pre-releases. 81 # support has been dropped in Xvfb in the xorg-x11 pre-releases.
54 # For now only depths up to 24-bit are supported. 82 # For now only depths up to 24-bit are supported.
55 # 83 #
56 # Sven Wegener <swegener@gentoo.org> - 22 Aug 2004 84 # Sven Wegener <swegener@gentoo.org> - 22 Aug 2004
57 # 85 #
86 # Use "-fp built-ins" because it's only part of the default font path
87 # for Xorg but not the other DDXs (Xvfb, Kdrive, etc). Temporarily fixes
88 # bug 278487 until xorg-server is properly patched
89 #
90 # RĂ©mi Cardona <remi@gentoo.org> (10 Aug 2009)
58 ${XVFB} :${XDISPLAY} -screen 0 800x600x24 &>/dev/null & 91 ${XVFB} :${XDISPLAY} -fp built-ins -screen 0 800x600x24 &>/dev/null &
59 sleep 2 92 sleep 2
60 93
61 local start=${XDISPLAY} 94 local start=${XDISPLAY}
62 while [[ ! -f /tmp/.X${XDISPLAY}-lock ]] ; do 95 while [[ ! -f /tmp/.X${XDISPLAY}-lock ]] ; do
63 # Stop trying after 15 tries 96 # Stop trying after 15 tries
64 if [[ $((${XDISPLAY} - ${start})) -gt 15 ]] ; then 97 if ((XDISPLAY - start > 15)) ; then
65 98
66 eerror "" 99 eerror ""
67 eerror "Unable to start Xvfb." 100 eerror "Unable to start Xvfb."
68 eerror "" 101 eerror ""
69 eerror "'/usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x24' returns:" 102 eerror "'${XVFB} :${XDISPLAY} -fp built-ins -screen 0 800x600x24' returns:"
70 eerror "" 103 eerror ""
71 ${XVFB} :${XDISPLAY} -screen 0 800x600x24 104 ${XVFB} :${XDISPLAY} -fp built-ins -screen 0 800x600x24
72 eerror "" 105 eerror ""
73 eerror "If possible, correct the above error and try your emerge again." 106 eerror "If possible, correct the above error and try your emerge again."
74 eerror "" 107 eerror ""
75 die 108 die
76 fi 109 fi
77 110
78 XDISPLAY=$((${XDISPLAY}+1)) 111 ((XDISPLAY++))
79 ${XVFB} :${XDISPLAY} -screen 0 800x600x24 &>/dev/null & 112 ${XVFB} :${XDISPLAY} -fp built-ins -screen 0 800x600x24 &>/dev/null &
80 sleep 2 113 sleep 2
81 done 114 done
82 115
83 # Now enable SANDBOX again if needed. 116 # Now enable SANDBOX again if needed.
84 export SANDBOX_DISABLED="${OLD_SANDBOX_DISABLED}" 117 export SANDBOX_DISABLED="${OLD_SANDBOX_DISABLED}"
86 einfo "Starting Xvfb on \$DISPLAY=${XDISPLAY} ..." 119 einfo "Starting Xvfb on \$DISPLAY=${XDISPLAY} ..."
87 120
88 export DISPLAY=:${XDISPLAY} 121 export DISPLAY=:${XDISPLAY}
89 #Do not break on error, but setup $retval, as we need 122 #Do not break on error, but setup $retval, as we need
90 #to kill Xvfb 123 #to kill Xvfb
91 ${maketype} $* 124 ${maketype} "$@"
92 retval=$? 125 retval=$?
93 126
94 #Now kill Xvfb 127 #Now kill Xvfb
95 kill $(cat /tmp/.X${XDISPLAY}-lock) 128 kill $(cat /tmp/.X${XDISPLAY}-lock)
96 else 129 else
97 #Normal make if we can connect to an X display 130 #Normal make if we can connect to an X display
98 ${maketype} $* 131 ${maketype} "$@"
99 retval=$? 132 retval=$?
100 fi 133 fi
101 134
102 return ${retval} 135 return ${retval}
103} 136}
104 137
105#Same as "make", but setup the Xvfb hack if needed 138#Same as "make", but setup the Xvfb hack if needed
106Xmake() { 139Xmake() {
107 export maketype="make" 140 export maketype="make"
108 virtualmake "$*" 141 virtualmake "$@"
109} 142}
110 143
111#Same as "emake", but setup the Xvfb hack if needed 144#Same as "emake", but setup the Xvfb hack if needed
112Xemake() { 145Xemake() {
113 export maketype="emake" 146 export maketype="emake"
114 virtualmake "$*" 147 virtualmake "$@"
115} 148}
116 149
117#Same as "econf", but setup the Xvfb hack if needed 150#Same as "econf", but setup the Xvfb hack if needed
118Xeconf() { 151Xeconf() {
119 export maketype="econf" 152 export maketype="econf"
120 virtualmake "$*" 153 virtualmake "$@"
121} 154}

Legend:
Removed from v.1.27  
changed lines
  Added in v.1.31

  ViewVC Help
Powered by ViewVC 1.1.20