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

Diff of /eclass/virtualx.eclass

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

Revision 1.21 Revision 1.30
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.21 2005/07/06 19:58:37 agriffis Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.30 2009/10/19 21:12:07 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
9ECLASS=virtualx 9# Is a dependency on xorg-server and xhost needed?
10DEPEND="X? ( virtual/x11 )" 10# Valid values are "always", "tests", and "manual"
11IUSE="X" 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? ( ${VIRTUAX_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
12 39
13DESCRIPTION="Based on the $ECLASS eclass" 40DESCRIPTION="Based on the $ECLASS eclass"
14 41
15# 42#
16# Brian Harring <ferringb@gentoo.org> 11/04/2004 43# Brian Harring <ferringb@gentoo.org> 11/04/2004
33 ( [[ -z ${DISPLAY} ]] || ! (${XHOST} &>/dev/null) ) ; then 60 ( [[ -z ${DISPLAY} ]] || ! (${XHOST} &>/dev/null) ) ; then
34 export XAUTHORITY= 61 export XAUTHORITY=
35 # The following is derived from Mandrake's hack to allow 62 # The following is derived from Mandrake's hack to allow
36 # compiling without the X display 63 # compiling without the X display
37 64
38 einfo "Scanning for a open DISPLAY to start Xvfb ..." 65 einfo "Scanning for an open DISPLAY to start Xvfb ..."
39 66
40 # We really do not want SANDBOX enabled here 67 # We really do not want SANDBOX enabled here
41 export SANDBOX_DISABLED="1" 68 export SANDBOX_DISABLED="1"
42 69
43 local i=0 70 local i=0
44 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})
45 72
46 # 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
47 # 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
48 # 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
49 # Xvfb is started, else bump the display number 76 # Xvfb is started, else bump the display number
50 # 77 #
54 # 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.
55 # For now only depths up to 24-bit are supported. 82 # For now only depths up to 24-bit are supported.
56 # 83 #
57 # Sven Wegener <swegener@gentoo.org> - 22 Aug 2004 84 # Sven Wegener <swegener@gentoo.org> - 22 Aug 2004
58 # 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)
59 ${XVFB} :${XDISPLAY} -screen 0 800x600x24 &>/dev/null & 91 ${XVFB} :${XDISPLAY} -fp built-ins -screen 0 800x600x24 &>/dev/null &
60 sleep 2 92 sleep 2
61 93
62 local start=${XDISPLAY} 94 local start=${XDISPLAY}
63 while [[ ! -f /tmp/.X${XDISPLAY}-lock ]] ; do 95 while [[ ! -f /tmp/.X${XDISPLAY}-lock ]] ; do
64 # Stop trying after 15 tries 96 # Stop trying after 15 tries
65 if [[ $((${XDISPLAY} - ${start})) -gt 15 ]] ; then 97 if ((XDISPLAY - start > 15)) ; then
66 98
67 eerror "" 99 eerror ""
68 eerror "Unable to start Xvfb." 100 eerror "Unable to start Xvfb."
69 eerror "" 101 eerror ""
70 eerror "'/usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x24' returns:" 102 eerror "'${XVFB} :${XDISPLAY} -fp built-ins -screen 0 800x600x24' returns:"
71 eerror "" 103 eerror ""
72 ${XVFB} :${XDISPLAY} -screen 0 800x600x24 104 ${XVFB} :${XDISPLAY} -fp built-ins -screen 0 800x600x24
73 eerror "" 105 eerror ""
74 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."
75 eerror "" 107 eerror ""
76 die 108 die
77 fi 109 fi
78 110
79 XDISPLAY=$((${XDISPLAY}+1)) 111 ((XDISPLAY++))
80 ${XVFB} :${XDISPLAY} -screen 0 800x600x24 &>/dev/null & 112 ${XVFB} :${XDISPLAY} -fp built-ins -screen 0 800x600x24 &>/dev/null &
81 sleep 2 113 sleep 2
82 done 114 done
83 115
84 # Now enable SANDBOX again if needed. 116 # Now enable SANDBOX again if needed.
85 export SANDBOX_DISABLED="${OLD_SANDBOX_DISABLED}" 117 export SANDBOX_DISABLED="${OLD_SANDBOX_DISABLED}"
86 118
87 einfo "Starting Xvfb on \$DISPLAY=${XDISPLAY} ..." 119 einfo "Starting Xvfb on \$DISPLAY=${XDISPLAY} ..."
88 120
89 export DISPLAY=:${XDISPLAY} 121 export DISPLAY=:${XDISPLAY}
90 #Do not break on error, but setup $retval, as we need 122 #Do not break on error, but setup $retval, as we need
91 #to kill Xvfb 123 #to kill Xvfb
92 ${maketype} $* 124 ${maketype} "$@"
93 retval=$? 125 retval=$?
94 126
95 #Now kill Xvfb 127 #Now kill Xvfb
96 kill $(cat /tmp/.X${XDISPLAY}-lock) 128 kill $(cat /tmp/.X${XDISPLAY}-lock)
97 else 129 else
98 #Normal make if we can connect to an X display 130 #Normal make if we can connect to an X display
99 ${maketype} $* 131 ${maketype} "$@"
100 retval=$? 132 retval=$?
101 fi 133 fi
102 134
103 return ${retval} 135 return ${retval}
104} 136}
105 137
106#Same as "make", but setup the Xvfb hack if needed 138#Same as "make", but setup the Xvfb hack if needed
107Xmake() { 139Xmake() {
108 export maketype="make" 140 export maketype="make"
109 virtualmake "$*" 141 virtualmake "$@"
110} 142}
111 143
112#Same as "emake", but setup the Xvfb hack if needed 144#Same as "emake", but setup the Xvfb hack if needed
113Xemake() { 145Xemake() {
114 export maketype="emake" 146 export maketype="emake"
115 virtualmake "$*" 147 virtualmake "$@"
116} 148}
117 149
118#Same as "econf", but setup the Xvfb hack if needed 150#Same as "econf", but setup the Xvfb hack if needed
119Xeconf() { 151Xeconf() {
120 export maketype="econf" 152 export maketype="econf"
121 virtualmake "$*" 153 virtualmake "$@"
122} 154}

Legend:
Removed from v.1.21  
changed lines
  Added in v.1.30

  ViewVC Help
Powered by ViewVC 1.1.20