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

Diff of /eclass/virtualx.eclass

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

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

Legend:
Removed from v.1.12  
changed lines
  Added in v.1.33

  ViewVC Help
Powered by ViewVC 1.1.20