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

Diff of /eclass/virtualx.eclass

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

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

Legend:
Removed from v.1.11  
changed lines
  Added in v.1.35

  ViewVC Help
Powered by ViewVC 1.1.20