diff options
author | Det | 2015-06-14 04:13:28 +0300 |
---|---|---|
committer | Det | 2015-06-14 04:14:16 +0300 |
commit | 60068ea156705ab234c7ff969bbafb8fdef0b700 (patch) | |
tree | caa1702a56b0092612a9c214086b96aa167555a0 | |
download | aur-60068ea156705ab234c7ff969bbafb8fdef0b700.tar.gz |
Initial import: 1.17.0.158.r14799.gfa12f2c-3
-rw-r--r-- | .SRCINFO | 191 | ||||
-rw-r--r-- | PKGBUILD | 259 | ||||
-rw-r--r-- | nvidia-drm-outputclass.conf | 6 | ||||
-rw-r--r-- | xorg-server-git.install | 22 | ||||
-rwxr-xr-x | xvfb-run | 180 | ||||
-rw-r--r-- | xvfb-run.1 | 282 |
6 files changed, 940 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 000000000000..d2e94b0d485e --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,191 @@ +pkgbase = xorg-server-git + pkgver = 1.17.0.158.r14799.gfa12f2c + pkgrel = 3 + url = http://cgit.freedesktop.org/xorg/xserver/ + arch = i686 + arch = x86_64 + license = custom + makedepends = pixman + makedepends = libx11 + makedepends = mesa + makedepends = libgl + makedepends = xf86driproto + makedepends = xcmiscproto + makedepends = xtrans + makedepends = bigreqsproto + makedepends = randrproto + makedepends = inputproto + makedepends = fontsproto + makedepends = videoproto + makedepends = presentproto + makedepends = compositeproto + makedepends = recordproto + makedepends = scrnsaverproto + makedepends = resourceproto + makedepends = xineramaproto + makedepends = libxkbfile + makedepends = libxfont + makedepends = renderproto + makedepends = libpciaccess + makedepends = libxv + makedepends = xf86dgaproto + makedepends = libxmu + makedepends = libxrender + makedepends = libxi + makedepends = dmxproto + makedepends = libxaw + makedepends = libdmx + makedepends = libxtst + makedepends = libxres + makedepends = xorg-xkbcomp + makedepends = xorg-util-macros + makedepends = xorg-font-util + makedepends = glproto + makedepends = dri2proto + makedepends = libgcrypt + makedepends = libepoxy + makedepends = xcb-util + makedepends = xcb-util-image + makedepends = xcb-util-renderutil + makedepends = xcb-util-wm + makedepends = xcb-util-keysyms + makedepends = dri3proto + makedepends = libxshmfence + makedepends = libunwind + makedepends = git + source = git://anongit.freedesktop.org/xorg/xserver + source = nvidia-drm-outputclass.conf + source = xvfb-run + source = xvfb-run.1 + sha256sums = SKIP + sha256sums = af1c3d2ea5de7f6a6b5f7c60951a189a4749d1495e5462f3157ae7ac8fe1dc56 + sha256sums = ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9 + sha256sums = 2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776 + +pkgname = xorg-server-git + pkgdesc = Xorg X server - Git + install = xorg-server-git.install + groups = xorg + depends = libepoxy + depends = libxdmcp + depends = libxfont + depends = libpciaccess + depends = libdrm + depends = pixman + depends = libgcrypt + depends = libxau + depends = xorg-server-common-git + depends = xf86-input-evdev + depends = libxshmfence + depends = libgl + provides = X-ABI-VIDEODRV_VERSION= + provides = X-ABI-XINPUT_VERSION= + provides = X-ABI-EXTENSION_VERSION= + provides = x-server + provides = xorg-server + conflicts = nvidia-utils<=331.20 + conflicts = glamor-egl + conflicts = xf86-video-modesetting + conflicts = xorg-server + replaces = glamor-egl + replaces = xf86-video-modesetting + +pkgname = xorg-server-xephyr-git + pkgdesc = A nested X server that runs as an X application - Git + depends = libxfont + depends = libgl + depends = libepoxy + depends = libgcrypt + depends = libxv + depends = pixman + depends = xorg-server-common + depends = xcb-util-image + depends = xcb-util-renderutil + depends = xcb-util-wm + depends = xcb-util-keysyms + provides = xorg-server-xephyr + conflicts = xorg-server-xephyr + +pkgname = xorg-server-xdmx-git + pkgdesc = Distributed Multihead X Server and utilities - Git + depends = libxfont + depends = libxi + depends = libgcrypt + depends = libxaw + depends = libxrender + depends = libdmx + depends = libxfixes + depends = pixman + depends = xorg-server-common-git + provides = xorg-server-xdmx + conflicts = xorg-server-xdmx + +pkgname = xorg-server-xvfb-git + pkgdesc = Virtual framebuffer X server - Git + depends = libxfont + depends = libxdmcp + depends = libxau + depends = libgcrypt + depends = pixman + depends = xorg-server-common-git + depends = xorg-xauth + depends = libgl + provides = xorg-server-xvfb + conflicts = xorg-server-xvfb + +pkgname = xorg-server-xnest-git + pkgdesc = A nested X server that runs as an X application - Git + depends = libxfont + depends = libxext + depends = libgcrypt + depends = pixman + depends = xorg-server-common-git + depends = libsystemd + provides = xorg-server-xnest + conflicts = xorg-server-xnest + +pkgname = xorg-server-xwayland-git + pkgdesc = Run X clients under Wayland - Git + depends = libxfont + depends = libepoxy + depends = libgl + depends = pixman + depends = xorg-server-common-git + provides = xorg-server-xwayland + conflicts = xorg-server-xwayland + +pkgname = xorg-server-common-git + pkgdesc = Xorg server common files - Git + depends = xkeyboard-config + depends = xorg-xkbcomp + depends = xorg-setxkbmap + depends = xorg-fonts-misc + depends = libunwind + provides = xorg-server-common + conflicts = xorg-server-common + +pkgname = xorg-server-devel-git + pkgdesc = Development files for the X.Org X server - Git + depends = xproto + depends = randrproto + depends = renderproto + depends = xextproto + depends = inputproto + depends = kbproto + depends = fontsproto + depends = pixman + depends = videoproto + depends = xf86driproto + depends = glproto + depends = mesa + depends = dri2proto + depends = dri3proto + depends = xineramaproto + depends = libpciaccess + depends = resourceproto + depends = scrnsaverproto + depends = presentproto + depends = xorg-util-macros + provides = xorg-server-devel + conflicts = xorg-server-devel + diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 000000000000..d99fdc5a90cb --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,259 @@ +# Maintainer: Det <nimetonmaili g-mail> +# Contributors: SpeedVin, FoxBuru, Federico Cinelli +# Based on xorg-server-dev: https://aur.archlinux.org/packages/xorg-server-dev/ + +pkgname=('xorg-server-git' 'xorg-server-xephyr-git' 'xorg-server-xdmx-git' 'xorg-server-xvfb-git' 'xorg-server-xnest-git' 'xorg-server-xwayland-git' 'xorg-server-common-git' 'xorg-server-devel-git') +pkgver=1.17.0.158.r14799.gfa12f2c +pkgrel=3 +arch=('i686' 'x86_64') +license=('custom') +url="http://cgit.freedesktop.org/xorg/xserver/" +makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' + 'inputproto' 'fontsproto' 'videoproto' 'presentproto' 'compositeproto' 'recordproto' 'scrnsaverproto' + 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' 'libxv' + 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' + 'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'glproto' 'dri2proto' 'libgcrypt' 'libepoxy' + 'xcb-util' 'xcb-util-image' 'xcb-util-renderutil' 'xcb-util-wm' 'xcb-util-keysyms' 'dri3proto' + 'libxshmfence' 'libunwind' 'git') +source=(git://anongit.freedesktop.org/xorg/xserver + nvidia-drm-outputclass.conf + xvfb-run + xvfb-run.1) +sha256sums=('SKIP' + 'af1c3d2ea5de7f6a6b5f7c60951a189a4749d1495e5462f3157ae7ac8fe1dc56' + 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9' + '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776') + +pkgver() { + cd xserver + + echo $(git describe --long | cut -d "-" -f3-4 | tr - .).r$(git rev-list HEAD --count).$(git describe --long | cut -d "-" -f5) +} + +build() { + cd xserver + + msg2 "Starting autoreconf..." + autoreconf -fi + + msg2 "Starting ./configure..." + ./configure --prefix=/usr \ + --enable-ipv6 \ + --enable-dri \ + --enable-dmx \ + --enable-xvfb \ + --enable-xnest \ + --enable-composite \ + --enable-xcsecurity \ + --enable-libunwind \ + --enable-xorg \ + --enable-xephyr \ + --enable-glamor \ + --enable-xwayland \ + --enable-glx-tls \ + --enable-kdrive \ + --enable-kdrive-evdev \ + --enable-kdrive-kbd \ + --enable-kdrive-mouse \ + --enable-config-udev \ + --enable-systemd-logind \ + --enable-suid-wrapper \ + --disable-install-setuid \ + --enable-record \ + --disable-xfbdev \ + --disable-xfake \ + --disable-static \ + --libexecdir=/usr/lib/xorg-server \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --with-xkb-path=/usr/share/X11/xkb \ + --with-xkb-output=/var/lib/xkb \ + --with-fontrootdir=/usr/share/fonts \ + --with-sha1=libgcrypt + +# --without-dtrace \ +# --disable-linux-acpi --disable-linux-apm \ + + msg2 "Starting make..." + make + + # Disable subdirs for make install rule to make splitting easier + sed -e 's/^DMX_SUBDIRS =.*/DMX_SUBDIRS =/' \ + -e 's/^XVFB_SUBDIRS =.*/XVFB_SUBDIRS =/' \ + -e 's/^XNEST_SUBDIRS =.*/XNEST_SUBDIRS = /' \ + -e 's/^KDRIVE_SUBDIRS =.*/KDRIVE_SUBDIRS =/' \ + -e 's/^XWAYLAND_SUBDIRS =.*/XWAYLAND_SUBDIRS =/' \ + -i hw/Makefile +} + +package_xorg-server-common-git() { + pkgdesc="Xorg server common files - Git" + depends=('xkeyboard-config' 'xorg-xkbcomp' 'xorg-setxkbmap' 'xorg-fonts-misc' + 'libunwind') + provides=('xorg-server-common') + conflicts=('xorg-server-common') + + cd xserver + install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-common" + install -m644 COPYING "${pkgdir}/usr/share/licenses/xorg-server-common" + + msg2 "Starting make install-data..." + make -C xkb DESTDIR="${pkgdir}" install-data + + install -m755 -d "${pkgdir}/usr/share/man/man1" + install -m644 man/Xserver.1 "${pkgdir}/usr/share/man/man1/" + + install -m755 -d "${pkgdir}/usr/lib/xorg" + install -m644 dix/protocol.txt "${pkgdir}/usr/lib/xorg/" +} + +package_xorg-server-git() { + pkgdesc="Xorg X server - Git" + depends=(libepoxy libxdmcp libxfont libpciaccess libdrm pixman libgcrypt libxau xorg-server-common-git xf86-input-evdev libxshmfence libgl) + # see src/xserver/hw/xfree86/common/xf86Module.h for ABI versions - we provide major numbers that drivers can depend on + # and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel-git pkg + _ABI_VIDEODRV="$(grep -Po "VIDEODRV_V.*\(\K[^)]*" xserver/hw/xfree86/common/xf86Module.h | sed "s/, /./")" + _ABI_XINPUT="$(grep -Po "XINPUT_V.*\(\K[^)]*" xserver/hw/xfree86/common/xf86Module.h | sed "s/, /./")" + _ABI_EXTENSION="$(grep -Po "EXTENSION_V.*\(\K[^)]*" xserver/hw/xfree86/common/xf86Module.h | sed "s/, /./")" + provides=("X-ABI-VIDEODRV_VERSION=$_ABI_VIDEODRV" + "X-ABI-XINPUT_VERSION=$_ABI_XINPUT" + "X-ABI-EXTENSION_VERSION=$_ABI_EXTENSION" + 'x-server' 'xorg-server') + groups=('xorg') + conflicts=('nvidia-utils<=331.20' 'glamor-egl' 'xf86-video-modesetting' 'xorg-server') + replaces=('glamor-egl' 'xf86-video-modesetting') + install=xorg-server-git.install + + cd xserver + + msg2 "Starting make install..." + make DESTDIR="${pkgdir}" install + + # distro specific files must be installed in /usr/share/X11/xorg.conf.d + install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d" + install -m644 "${srcdir}/nvidia-drm-outputclass.conf" "${pkgdir}/usr/share/X11/xorg.conf.d/" + + # Needed for non-mesa drivers, libgl will restore it + mv "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" \ + "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.xorg" + + rm -rf "${pkgdir}/var" + + rm -f "${pkgdir}/usr/share/man/man1/Xserver.1" + rm -f "${pkgdir}/usr/lib/xorg/protocol.txt" + + install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server" + ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server/COPYING" + + rm -rf "${pkgdir}/usr/lib/pkgconfig" + rm -rf "${pkgdir}/usr/include" + rm -rf "${pkgdir}/usr/share/aclocal" +} + +package_xorg-server-xephyr-git() { + pkgdesc="A nested X server that runs as an X application - Git" + depends=(libxfont libgl libepoxy libgcrypt libxv pixman xorg-server-common 'xcb-util-image' + 'xcb-util-renderutil' 'xcb-util-wm' 'xcb-util-keysyms') + provides=(xorg-server-xephyr) + conflicts=(xorg-server-xephyr) + + cd xserver/hw/kdrive + + msg2 "Starting make install..." + make DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xephyr" + ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xephyr/COPYING" +} + +package_xorg-server-xvfb-git() { + pkgdesc="Virtual framebuffer X server - Git" + depends=(libxfont libxdmcp libxau libgcrypt pixman xorg-server-common-git xorg-xauth libgl) + provides=(xorg-server-xvfb) + conflicts=(xorg-server-xvfb) + + cd xserver/hw/vfb + + msg2 "Starting make install..." + make DESTDIR="${pkgdir}" install + + install -m755 "${srcdir}/xvfb-run" "${pkgdir}/usr/bin/" + install -m644 "${srcdir}/xvfb-run.1" "${pkgdir}/usr/share/man/man1/" + + install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xvfb" + ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xvfb/COPYING" +} + +package_xorg-server-xnest-git() { + pkgdesc="A nested X server that runs as an X application - Git" + depends=(libxfont libxext libgcrypt pixman xorg-server-common-git libsystemd) + provides=(xorg-server-xnest) + conflicts=(xorg-server-xnest) + + cd xserver/hw/xnest + + msg2 "Starting make install..." + make DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xnest" + ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xnest/COPYING" +} + +package_xorg-server-xdmx-git() { + pkgdesc="Distributed Multihead X Server and utilities - Git" + depends=(libxfont libxi libgcrypt libxaw libxrender libdmx libxfixes pixman xorg-server-common-git) + provides=(xorg-server-xdmx) + conflicts=(xorg-server-xdmx) + + cd xserver/hw/dmx + + msg2 "Starting make install..." + make DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xdmx" + ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xdmx/COPYING" +} + +package_xorg-server-xwayland-git() { + pkgdesc="Run X clients under Wayland - Git" + depends=(libxfont libepoxy libgl pixman xorg-server-common-git) + provides=(xorg-server-xwayland) + conflicts=(xorg-server-xwayland) + + cd xserver/hw/xwayland + + msg2 "Starting make install..." + make DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xwayland" + ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xwayland/COPYING" +} + +package_xorg-server-devel-git() { + pkgdesc="Development files for the X.Org X server - Git" + depends=(# see pkgdir/usr/lib/pkgconfig/xorg-server.pc + xproto randrproto renderproto xextproto inputproto kbproto + fontsproto pixman videoproto xf86driproto glproto + mesa dri2proto dri3proto xineramaproto libpciaccess + resourceproto scrnsaverproto presentproto + # not technically required but almost every Xorg pkg needs it to build + xorg-util-macros) + provides=(xorg-server-devel) + conflicts=(xorg-server-devel) + + cd xserver + + msg2 "Starting make install..." + make DESTDIR="${pkgdir}" install + + rm -rf "${pkgdir}/usr/bin" + rm -rf "${pkgdir}/usr/share/man" + rm -rf "${pkgdir}/usr/share/doc" + rm -rf "${pkgdir}/usr/share/X11" + rm -rf "${pkgdir}/usr/lib/xorg" + rm -rf "${pkgdir}/usr/lib/xorg-server" + rm -rf "${pkgdir}/var" + + install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-devel-git" + ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-devel-git/COPYING" +} diff --git a/nvidia-drm-outputclass.conf b/nvidia-drm-outputclass.conf new file mode 100644 index 000000000000..40c1e08b5f41 --- /dev/null +++ b/nvidia-drm-outputclass.conf @@ -0,0 +1,6 @@ +Section "OutputClass" + Identifier "nvidia" + MatchDriver "nvidia-drm" + Driver "nvidia" +EndSection + diff --git a/xorg-server-git.install b/xorg-server-git.install new file mode 100644 index 000000000000..d4bd71ef3347 --- /dev/null +++ b/xorg-server-git.install @@ -0,0 +1,22 @@ +post_upgrade() { + if (( $(vercmp $2 1.16.0-3) < 0 )); then + post_install + echo + fi + + echo ":: This package may work better with other X stack Git + components (e.g. xf86-input-*-git, xf86-video-*-git)." +} + +post_install() { + cat <<MSG +>>> xorg-server has now the ability to run without root rights with + the help of systemd-logind. xserver will fail to run if not launched + from the same virtual terminal as was used to log in. + Without root rights, log files will be in ~/.local/share/xorg/ directory. + + Old behavior can be restored through Xorg.wrap config file. + See Xorg.wrap man page (man xorg.wrap). +MSG +} + diff --git a/xvfb-run b/xvfb-run new file mode 100755 index 000000000000..4c2f4e0d3a4d --- /dev/null +++ b/xvfb-run @@ -0,0 +1,180 @@ +#!/bin/sh + +# $Id: xvfb-run 2027 2004-11-16 14:54:16Z branden $ + +# This script starts an instance of Xvfb, the "fake" X server, runs a command +# with that server available, and kills the X server when done. The return +# value of the command becomes the return value of this script. +# +# If anyone is using this to build a Debian package, make sure the package +# Build-Depends on xvfb, xbase-clients, and xfonts-base. + +set -e + +PROGNAME=xvfb-run +SERVERNUM=99 +AUTHFILE= +ERRORFILE=/dev/null +STARTWAIT=3 +XVFBARGS="-screen 0 640x480x8" +LISTENTCP="-nolisten tcp" +XAUTHPROTO=. + +# Query the terminal to establish a default number of columns to use for +# displaying messages to the user. This is used only as a fallback in the event +# the COLUMNS variable is not set. ($COLUMNS can react to SIGWINCH while the +# script is running, and this cannot, only being calculated once.) +DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true +if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then + DEFCOLUMNS=80 +fi + +# Display a message, wrapping lines at the terminal width. +message () { + echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS} +} + +# Display an error message. +error () { + message "error: $*" >&2 +} + +# Display a usage message. +usage () { + if [ -n "$*" ]; then + message "usage error: $*" + fi + cat <<EOF +Usage: $PROGNAME [OPTION ...] COMMAND +Run COMMAND (usually an X client) in a virtual X server environment. +Options: +-a --auto-servernum try to get a free server number, starting at + --server-num +-e FILE --error-file=FILE file used to store xauth errors and Xvfb + output (default: $ERRORFILE) +-f FILE --auth-file=FILE file used to store auth cookie + (default: ./.Xauthority) +-h --help display this usage message and exit +-n NUM --server-num=NUM server number to use (default: $SERVERNUM) +-l --listen-tcp enable TCP port listening in the X server +-p PROTO --xauth-protocol=PROTO X authority protocol name to use + (default: xauth command's default) +-s ARGS --server-args=ARGS arguments (other than server number and + "-nolisten tcp") to pass to the Xvfb server + (default: "$XVFBARGS") +-w DELAY --wait=DELAY delay in seconds to wait for Xvfb to start + before running COMMAND (default: $STARTWAIT) +EOF +} + +# Find a free server number by looking at .X*-lock files in /tmp. +find_free_servernum() { + # Sadly, the "local" keyword is not POSIX. Leave the next line commented in + # the hope Debian Policy eventually changes to allow it in /bin/sh scripts + # anyway. + #local i + + i=$SERVERNUM + while [ -f /tmp/.X$i-lock ]; do + i=$(($i + 1)) + done + echo $i +} + +# Clean up files +clean_up() { + if [ -e "$AUTHFILE" ]; then + XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >>"$ERRORFILE" 2>&1 + fi + if [ -n "$XVFB_RUN_TMPDIR" ]; then + if ! rm -r "$XVFB_RUN_TMPDIR"; then + error "problem while cleaning up temporary directory" + exit 5 + fi + fi +} + +# Parse the command line. +ARGS=$(getopt --options +ae:f:hn:lp:s:w: \ + --long auto-servernum,error-file:,auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \ + --name "$PROGNAME" -- "$@") +GETOPT_STATUS=$? + +if [ $GETOPT_STATUS -ne 0 ]; then + error "internal error; getopt exited with status $GETOPT_STATUS" + exit 6 +fi + +eval set -- "$ARGS" + +while :; do + case "$1" in + -a|--auto-servernum) SERVERNUM=$(find_free_servernum) ;; + -e|--error-file) ERRORFILE="$2"; shift ;; + -f|--auth-file) AUTHFILE="$2"; shift ;; + -h|--help) SHOWHELP="yes" ;; + -n|--server-num) SERVERNUM="$2"; shift ;; + -l|--listen-tcp) LISTENTCP="" ;; + -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;; + -s|--server-args) XVFBARGS="$2"; shift ;; + -w|--wait) STARTWAIT="$2"; shift ;; + --) shift; break ;; + *) error "internal error; getopt permitted \"$1\" unexpectedly" + exit 6 + ;; + esac + shift +done + +if [ "$SHOWHELP" ]; then + usage + exit 0 +fi + +if [ -z "$*" ]; then + usage "need a command to run" >&2 + exit 2 +fi + +if ! which xauth >/dev/null; then + error "xauth command not found" + exit 3 +fi + +# tidy up after ourselves +trap clean_up EXIT + +# If the user did not specify an X authorization file to use, set up a temporary +# directory to house one. +if [ -z "$AUTHFILE" ]; then + XVFB_RUN_TMPDIR="$(mktemp -d -t $PROGNAME.XXXXXX)" + AUTHFILE="$XVFB_RUN_TMPDIR/Xauthority" +fi + +# Start Xvfb. +MCOOKIE=$(mcookie) +XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1 +add :$SERVERNUM $XAUTHPROTO $MCOOKIE +EOF +XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \ + 2>&1 & +XVFBPID=$! +sleep "$STARTWAIT" +if ! kill -0 $XVFBPID 2>/dev/null; then + echo "Xvfb failed to start" >&2 + exit 1 +fi + +# Start the command and save its exit status. +set +e +DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@" 2>&1 +RETVAL=$? +set -e + +# Kill Xvfb now that the command has exited. +kill $XVFBPID + +# Return the executed command's exit status. +exit $RETVAL + +# vim:set ai et sts=4 sw=4 tw=80: diff --git a/xvfb-run.1 b/xvfb-run.1 new file mode 100644 index 000000000000..137d3a1967e5 --- /dev/null +++ b/xvfb-run.1 @@ -0,0 +1,282 @@ +.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $ +.\" +.\" Copyright 1998-2004 Branden Robinson <branden@debian.org>. +.\" +.\" This is free software; you may redistribute it and/or modify +.\" it under the terms of the GNU General Public License as +.\" published by the Free Software Foundation; either version 2, +.\" or (at your option) any later version. +.\" +.\" This is distributed in the hope that it will be useful, but +.\" WITHOUT ANY WARRANTY; without even the implied warranty of +.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.\" GNU General Public License for more details. +.\" +.\" You should have received a copy of the GNU General Public License with +.\" the Debian operating system, in /usr/share/common-licenses/GPL; if +.\" not, write to the Free Software Foundation, Inc., 59 Temple Place, +.\" Suite 330, Boston, MA 02111-1307 USA +.\" +.\" We need the URL macro from groff's www macro package, but also want +.\" things to work all right for people who don't have it. So we define +.\" our own URL macro and let the www macro package override it if it's +.\" available. +.de URL +\\$2 \(laURL: \\$1 \(ra\\$3 +.. +.if \n[.g] .mso www.tmac +.TH xvfb\-run 1 "2004\-11\-12" "Debian Project" +.SH NAME +xvfb\-run \- run specified X client or command in a virtual X server environment +.SH SYNOPSIS +.B xvfb\-run +[ +.I options +] +.I command +.SH DESCRIPTION +.B xvfb\-run +is a wrapper for the +.BR Xvfb (1x) +command which simplifies the task of running commands (typically an X +client, or a script containing a list of clients to be run) within a virtual +X server environment. +.PP +.B xvfb\-run +sets up an X authority file (or uses an existing user\-specified one), +writes a cookie to it (see +.BR xauth (1x)) +and then starts the +.B Xvfb +X server as a background process. +The process ID of +.B Xvfb +is stored for later use. +The specified +.I command +is then run using the X display corresponding to the +.B Xvfb +server +just started and the X authority file created earlier. +.PP +When the +.I command +exits, its status is saved, the +.B Xvfb +server is killed (using the process ID stored earlier), the X authority +cookie removed, and the authority file deleted (if the user did not specify +one to use). +.B xvfb\-run +then exits with the exit status of +.IR command . +.PP +.B xvfb\-run +requires the +.B xauth +command to function. +.SH OPTIONS +.TP +.B \-a\fR,\fB \-\-auto\-servernum +Try to get a free server number, starting at 99, or the argument to +.BR \-\-server\-num . +.TP +.BI \-e\ file \fR,\fB\ \-\-error\-file= file +Store output from +.B xauth +and +.B Xvfb +in +.IR file . +The default is +.IR /dev/null . +.TP +.BI \-f\ file \fR,\fB\ \-\-auth\-file= file +Store X authentication data in +.IR file . +By default, a temporary directory called +.IR xvfb\-run. PID +(where PID is the process ID of +.B xvfb\-run +itself) is created in the directory specified by the environment variable +.B TMPDIR +(or +.I /tmp +if that variable is null or unset), and the +.BR tempfile (1) +command is used to create a file in that temporary directory called +.IR Xauthority . +.TP +.B \-h\fR,\fB \-\-help +Display a usage message and exit. +.TP +.BI \-n\ servernumber \fR,\fB\ \-\-server\-num= servernumber +Use +.I servernumber +as the server number (but see the +.B \-a\fR,\fB \-\-auto\-servernum +option above). +The default is 99. +.TP +.B \-l\fR,\fB \-\-listen\-tcp +Enable TCP port listening in the X server. +For security reasons (to avoid denial\-of\-service attacks or exploits), +TCP port listening is disabled by default. +.TP +.BI \-p\ protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname +Use +.I protocolname +as the X authority protocol to use. +The default is \(oq.\(cq, which +.B xauth +interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1. +.TP +.BI \-s\ arguments \fR,\fB\ \-\-server\-args= arguments +Pass +.I arguments +to the +.B Xvfb +server. +Be careful to quote any whitespace characters that may occur within +.I arguments +to prevent them from regarded as separators for +.BR xvfb\-run 's +own arguments. +Also, note that specification of \(oq\-nolisten tcp\(cq in +.I arguments +may override the function of +.BR xvfb\-run 's +own +.B \-l\fR,\fB \-\-listen\-tcp +option, and that specification of the server number (e.g., \(oq:1\(cq) may +be ignored because of the way the X server parses its argument list. +Use the +.B xvfb\-run +option +.BI \-n\ servernumber \fR,\fB\ \-\-server\-num= servernumber +to achieve the latter function. +The default is \(oq\-screen 0 640x480x8\(cq. +.TP +.BI \-w\ delay \fR,\fB\ \-\-wait= delay +Wait +.I delay +seconds after launching +.B Xvfb +before attempting to start the specified command. +The default is 3. +.SH ENVIRONMENT +.TP +.B COLUMNS +indicates the width of the terminal device in character cells. +This value is used for formatting diagnostic messages. +If not set, the terminal is queried using +.BR stty (1) +to determine its width. +If that fails, a value of \(oq80\(cq is assumed. +.TP +.B TMPDIR +specifies the directory in which to place +.BR xvfb\-run 's +temporary directory for storage of the X authority file; only used if the +.B \-f +or +.B \-\-auth\-file +options are not specified. +.SH "OUTPUT FILES" +.PP +Unless the +.B \-f +or +.B \-\-auth\-file +options are specified, a temporary +directory and file within it are created (and deleted) to store the X +authority cookies used by the +.B Xvfb +server and client(s) run under it. +See +.BR tempfile (1). +If \-f or \-\-auth\-file are used, then the specified X authority file is +only written to, not created or deleted (though +.B xauth +creates an authority file itself if told to use use that does not already +exist). +.PP +An error file with a user\-specified name is also created if the +.B \-e +or +.B \-\-error\-file +options are specifed; see above. +.SH "EXIT STATUS" +.B xvfb\-run +uses its exit status as well as output to standard error to communicate +diagnostics. +The exit status of \(oq1\(cq is not used, and should be interpreted as failure +of the specified command. +.TP +0 +.B xvfb\-run +only uses this exit status if the +.B \-h\fR,\fB \-\-help +option is given. +In all other situations, this may be interpreted as success of the specified +command. +.TP +2 +No command to run was specified. +.TP +3 +The +.B xauth +command is not available. +.TP +4 +The temporary directory that was going to be used already exists; since +.B xvfb\-run +produces a uniquely named directory, this may indicate an attempt by another +process on the system to exploit a temporary file race condition. +.TP +5 +A problem was encountered while cleaning up the temporary directory. +.TP +6 +A problem was encountered while using +.BR getopt (1) +to parse the command\-line arguments. +.SH EXAMPLES +.TP +.B xvfb\-run \-\-auto\-servernum \-\-server\-num=1 xlogo +runs the +.BR xlogo (1x) +demonstration client inside the +.B Xvfb +X server on the first available server number greater than or equal to 1. +.TP +.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces +runs the +.BR ico (1x) +demonstration client (and passes it the +.B \-faces +argument) inside the +.B Xvfb +X server, configured with a root window of 1024 by 768 pixels and a color +depth of 24 bits. +.PP +Note that the demo X clients used in the above examples will not exit on +their own, so they will have to be killed before +.B xvfb\-run +will exit. +.SH BUGS +See +.URL "http://bugs.debian.org/xvfb" "the Debian Bug Tracking System" . +If you wish to report a bug in +.BR xvfb\-run , +please use the +.BR reportbug (1) +command. +.SH AUTHOR +.B xfvb\-run +was written by Branden Robinson and Jeff Licquia with sponsorship from +Progeny Linux Systems. +.SH "SEE ALSO" +.BR Xvfb (1x), +.BR xauth (1x) +.\" vim:set et tw=80: |