mirror of
https://github.com/archlinux-jerry/pkgbuilds
synced 2024-11-25 15:30:40 +08:00
remove package: xorg-server-git
This commit is contained in:
Archlinux-Jerry Build Bot
parent
fdcf7f0dca
commit
d32266e99c
9 changed files with 0 additions and 767 deletions
6
xorg-server-git/.gitignore
vendored
6
xorg-server-git/.gitignore
vendored
|
|
@ -1,6 +0,0 @@
|
||||||
xserver/
|
|
||||||
src/
|
|
||||||
pkg/
|
|
||||||
*.pkg.*
|
|
||||||
*.log
|
|
||||||
PKG-orig
|
|
||||||
|
|
@ -1,243 +0,0 @@
|
||||||
# Maintainer: Yurii Kolesnykov <root@yurikoles.com>
|
|
||||||
# Contributor: AndyRTR <andyrtr@archlinux.org>
|
|
||||||
# Contributor: Jan de Groot <jgc@archlinux.org>
|
|
||||||
|
|
||||||
pkgbase=xorg-server-git
|
|
||||||
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')
|
|
||||||
_pkgbase='xserver'
|
|
||||||
pkgver=1.20.0.r419.g7d0e660e0
|
|
||||||
pkgrel=1
|
|
||||||
arch=('x86_64')
|
|
||||||
license=('custom')
|
|
||||||
groups=('xorg')
|
|
||||||
url="https://gitlab.freedesktop.org/xorg/xserver.git"
|
|
||||||
makedepends=('xorgproto' 'pixman' 'libx11' 'mesa' 'xtrans'
|
|
||||||
'libxkbfile' 'libxfont2' 'libpciaccess' 'libxv'
|
|
||||||
'libxmu' 'libxrender' 'libxi' 'libxaw' 'libdmx' 'libxtst' 'libxres'
|
|
||||||
'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'libepoxy'
|
|
||||||
'xcb-util' 'xcb-util-image' 'xcb-util-renderutil' 'xcb-util-wm' 'xcb-util-keysyms'
|
|
||||||
'libxshmfence' 'libunwind' 'systemd' 'wayland-protocols' 'egl-wayland' 'meson' 'git')
|
|
||||||
source=(git+https://gitlab.freedesktop.org/xorg/xserver.git
|
|
||||||
xvfb-run
|
|
||||||
xvfb-run.1)
|
|
||||||
sha256sums=('SKIP'
|
|
||||||
'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
|
|
||||||
'2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776')
|
|
||||||
|
|
||||||
pkgver() {
|
|
||||||
cd "${_pkgbase}"
|
|
||||||
# cutting off 'xorg.server.' prefix that presents in the git tag
|
|
||||||
git describe --long --tags| sed 's/^xorg.server.//;s/\([^-]*-g\)/r\1/;s/-/./g'
|
|
||||||
}
|
|
||||||
|
|
||||||
prepare() {
|
|
||||||
# Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf
|
|
||||||
# With them, module fail to load with undefined symbol.
|
|
||||||
# See https://bugs.archlinux.org/task/55102 / https://bugs.archlinux.org/task/54845
|
|
||||||
export CFLAGS=${CFLAGS/-fno-plt}
|
|
||||||
export CXXFLAGS=${CXXFLAGS/-fno-plt}
|
|
||||||
export LDFLAGS=${LDFLAGS/,-z,now}
|
|
||||||
|
|
||||||
export CFLAGS="$CFLAGS -fplt -fno-lto"
|
|
||||||
export CXXFLAGS="$CXXFLAGS -fplt -fno-lto"
|
|
||||||
export LDFLAGS="$LDFLAGS,-fno-lto"
|
|
||||||
|
|
||||||
arch-meson ${_pkgbase} build \
|
|
||||||
$mesonFlags \
|
|
||||||
-D os_vendor="Arch Linux" \
|
|
||||||
-D ipv6=true \
|
|
||||||
-D dmx=true \
|
|
||||||
-D xvfb=true \
|
|
||||||
-D xnest=true \
|
|
||||||
-D xcsecurity=true \
|
|
||||||
-D xorg=true \
|
|
||||||
-D xephyr=true \
|
|
||||||
-D xwayland=true \
|
|
||||||
-D xwayland_eglstream=true \
|
|
||||||
-D glamor=true \
|
|
||||||
-D udev=true \
|
|
||||||
-D systemd_logind=true \
|
|
||||||
-D suid_wrapper=true \
|
|
||||||
-D xkb_dir=/usr/share/X11/xkb \
|
|
||||||
-D xkb_output_dir=/var/lib/xkb \
|
|
||||||
-D b_lto=false \
|
|
||||||
-D b_lundef=false
|
|
||||||
|
|
||||||
# Print config
|
|
||||||
meson configure build
|
|
||||||
}
|
|
||||||
|
|
||||||
build() {
|
|
||||||
msg2 "Please confirm"
|
|
||||||
for VAR in VIDEODRV XINPUT EXTENSION; do
|
|
||||||
echo "X-ABI-${VAR}_VERSION=$(grep -Po "${VAR}_V.*\(\K[^)]*" xserver/hw/xfree86/common/xf86Module.h |& sed 's/, /./')"
|
|
||||||
done
|
|
||||||
|
|
||||||
export CFLAGS=${CFLAGS/-fno-plt}
|
|
||||||
export CXXFLAGS=${CXXFLAGS/-fno-plt}
|
|
||||||
export LDFLAGS=${LDFLAGS/,-z,now}
|
|
||||||
|
|
||||||
ninja -C build
|
|
||||||
|
|
||||||
# fake installation to be seperated into packages
|
|
||||||
DESTDIR="${srcdir}/fakeinstall" ninja -C build install
|
|
||||||
}
|
|
||||||
|
|
||||||
_install() {
|
|
||||||
local src f dir
|
|
||||||
for src; do
|
|
||||||
f="${src#fakeinstall/}"
|
|
||||||
dir="${pkgdir}/${f%/*}"
|
|
||||||
install -m755 -d "${dir}"
|
|
||||||
mv -v "${src}" "${dir}/"
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
package_xorg-server-common-git() {
|
|
||||||
_pkgname='xorg-server-common'
|
|
||||||
provides=('xorg-server-common')
|
|
||||||
conflicts=('xorg-server-common')
|
|
||||||
pkgdesc="Xorg server common files (git version)"
|
|
||||||
depends=(xkeyboard-config xorg-xkbcomp xorg-setxkbmap)
|
|
||||||
|
|
||||||
_install fakeinstall/usr/lib/xorg/protocol.txt
|
|
||||||
_install fakeinstall/usr/share/man/man1/Xserver.1
|
|
||||||
|
|
||||||
install -m644 -Dt "${pkgdir}/var/lib/xkb/" "${_pkgbase}"/xkb/README.compiled
|
|
||||||
# license
|
|
||||||
install -m644 -Dt "${pkgdir}/usr/share/licenses/${_pkgname}" "${_pkgbase}"/COPYING
|
|
||||||
}
|
|
||||||
|
|
||||||
package_xorg-server-git() {
|
|
||||||
_pkgname='xorg-server'
|
|
||||||
pkgdesc="Xorg X server (git version)"
|
|
||||||
depends=(libepoxy libxfont2 pixman xorg-server-common-git libunwind
|
|
||||||
dbus libgl xf86-input-libinput nettle
|
|
||||||
libpciaccess libdrm libxshmfence) # FS#52949
|
|
||||||
|
|
||||||
# see xorg-server-*/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 pkg
|
|
||||||
provides=('xorg-server' 'X-ABI-VIDEODRV_VERSION=24.0' 'X-ABI-XINPUT_VERSION=24.1' 'X-ABI-EXTENSION_VERSION=10.0' 'x-server')
|
|
||||||
conflicts=('xorg-server' 'nvidia-utils<=331.20' 'glamor-egl' 'xf86-video-modesetting')
|
|
||||||
replaces=('glamor-egl' 'xf86-video-modesetting')
|
|
||||||
install=xorg-server.install
|
|
||||||
|
|
||||||
_install fakeinstall/usr/bin/{Xorg,cvt,gtf}
|
|
||||||
ln -s /usr/bin/Xorg "${pkgdir}/usr/bin/X"
|
|
||||||
_install fakeinstall/usr/lib/Xorg{,.wrap}
|
|
||||||
_install fakeinstall/usr/lib/xorg/modules/*
|
|
||||||
_install fakeinstall/usr/share/X11/xorg.conf.d/10-quirks.conf
|
|
||||||
_install fakeinstall/usr/share/man/man1/{Xorg,Xorg.wrap,cvt,gtf}.1
|
|
||||||
_install fakeinstall/usr/share/man/man4/{exa,fbdevhw,modesetting}.4
|
|
||||||
_install fakeinstall/usr/share/man/man5/{Xwrapper.config,xorg.conf,xorg.conf.d}.5
|
|
||||||
|
|
||||||
# distro specific files must be installed in /usr/share/X11/xorg.conf.d
|
|
||||||
install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
|
|
||||||
|
|
||||||
# license
|
|
||||||
install -m644 -Dt "${pkgdir}/usr/share/licenses/${_pkgname}" "${_pkgbase}"/COPYING
|
|
||||||
}
|
|
||||||
|
|
||||||
package_xorg-server-xephyr-git() {
|
|
||||||
_pkgname='xorg-server-xephyr'
|
|
||||||
provides=('xorg-server-xephyr')
|
|
||||||
conflicts=('xorg-server-xephyr')
|
|
||||||
pkgdesc="A nested X server that runs as an X application (git version)"
|
|
||||||
depends=(libxfont2 libgl libepoxy libunwind systemd-libs libxv pixman xorg-server-common-git
|
|
||||||
xcb-util-image xcb-util-renderutil xcb-util-wm xcb-util-keysyms
|
|
||||||
nettle libtirpc)
|
|
||||||
|
|
||||||
_install fakeinstall/usr/bin/Xephyr
|
|
||||||
_install fakeinstall/usr/share/man/man1/Xephyr.1
|
|
||||||
|
|
||||||
# license
|
|
||||||
install -m644 -Dt "${pkgdir}/usr/share/licenses/${_pkgname}" "${_pkgbase}"/COPYING
|
|
||||||
}
|
|
||||||
|
|
||||||
package_xorg-server-xvfb-git() {
|
|
||||||
_pkgname='org-server-xvfb'
|
|
||||||
provides=('xorg-server-xvfb')
|
|
||||||
conflicts=('xorg-server-xvfb')
|
|
||||||
pkgdesc="Virtual framebuffer X server (git version)"
|
|
||||||
depends=(libxfont2 libunwind pixman xorg-server-common-git xorg-xauth libgl nettle)
|
|
||||||
|
|
||||||
_install fakeinstall/usr/bin/Xvfb
|
|
||||||
_install fakeinstall/usr/share/man/man1/Xvfb.1
|
|
||||||
|
|
||||||
install -m755 "${srcdir}/xvfb-run" "${pkgdir}/usr/bin/"
|
|
||||||
install -m644 "${srcdir}/xvfb-run.1" "${pkgdir}/usr/share/man/man1/" # outda
|
|
||||||
|
|
||||||
# license
|
|
||||||
install -m644 -Dt "${pkgdir}/usr/share/licenses/${_pkgname}" "${_pkgbase}"/COPYING
|
|
||||||
}
|
|
||||||
|
|
||||||
package_xorg-server-xnest-git() {
|
|
||||||
_pkgname='xorg-server-xnest'
|
|
||||||
provides=('xorg-server-xnest')
|
|
||||||
conflicts=('xorg-server-xnest')
|
|
||||||
pkgdesc="A nested X server that runs as an X application (git version)"
|
|
||||||
depends=(libxfont2 libxext pixman xorg-server-common-git nettle libtirpc)
|
|
||||||
|
|
||||||
_install fakeinstall/usr/bin/Xnest
|
|
||||||
_install fakeinstall/usr/share/man/man1/Xnest.1
|
|
||||||
|
|
||||||
# license
|
|
||||||
install -m644 -Dt "${pkgdir}/usr/share/licenses/${_pkgname}" "${_pkgbase}"/COPYING
|
|
||||||
}
|
|
||||||
|
|
||||||
package_xorg-server-xdmx-git() {
|
|
||||||
_pkgname='xorg-server-xdmx'
|
|
||||||
provides=('xorg-server-xdmx')
|
|
||||||
conflicts=('xorg-server-xdmx')
|
|
||||||
pkgdesc="Distributed Multihead X Server and utilities (git version)"
|
|
||||||
depends=(libxfont2 libxi libxaw libxrender libdmx libxfixes
|
|
||||||
pixman xorg-server-common-git nettle)
|
|
||||||
|
|
||||||
_install fakeinstall/usr/bin/{Xdmx,dmx*,vdltodmx,xdmxconfig}
|
|
||||||
_install fakeinstall/usr/share/man/man1/{Xdmx,dmxtodmx,vdltodmx,xdmxconfig}.1
|
|
||||||
|
|
||||||
# license
|
|
||||||
install -m644 -Dt "${pkgdir}/usr/share/licenses/${_pkgname}" "${_pkgbase}"/COPYING
|
|
||||||
}
|
|
||||||
|
|
||||||
package_xorg-server-xwayland-git() {
|
|
||||||
_pkgname='xorg-server-xwayland'
|
|
||||||
provides=('xorg-server-xwayland')
|
|
||||||
conflicts=('xorg-server-xwayland')
|
|
||||||
pkgdesc="run X clients under wayland (git version)"
|
|
||||||
depends=(libxfont2 libepoxy libunwind systemd-libs libgl pixman xorg-server-common-git
|
|
||||||
nettle libtirpc)
|
|
||||||
|
|
||||||
_install fakeinstall/usr/bin/Xwayland
|
|
||||||
|
|
||||||
# license
|
|
||||||
install -m644 -Dt "${pkgdir}/usr/share/licenses/${_pkgname}" "${_pkgbase}"/COPYING
|
|
||||||
}
|
|
||||||
|
|
||||||
package_xorg-server-devel-git() {
|
|
||||||
_pkgname='xorg-server-devel'
|
|
||||||
provides=('xorg-server-devel')
|
|
||||||
conflicts=('xorg-server-devel')
|
|
||||||
pkgdesc="Development files for the X.Org X server (git version)"
|
|
||||||
depends=('xorgproto' 'mesa' 'libpciaccess'
|
|
||||||
# not technically required but almost every Xorg pkg needs it to build
|
|
||||||
'xorg-util-macros')
|
|
||||||
|
|
||||||
_install fakeinstall/usr/include/xorg/*
|
|
||||||
_install fakeinstall/usr/lib/pkgconfig/xorg-server.pc
|
|
||||||
_install fakeinstall/usr/share/aclocal/xorg-server.m4
|
|
||||||
|
|
||||||
# license
|
|
||||||
install -m644 -Dt "${pkgdir}/usr/share/licenses/${_pkgname}" "${_pkgbase}"/COPYING
|
|
||||||
|
|
||||||
# make sure there are no files left to install
|
|
||||||
find fakeinstall -depth -print0 | xargs -0 rmdir
|
|
||||||
}
|
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
# xorg-server-git
|
|
||||||
Package for Arch AUR
|
|
||||||
|
|
||||||
|
|
||||||
## Build
|
|
||||||
|
|
||||||
* Clone this repository
|
|
||||||
* launch `makepkg -si`
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
type:
|
|
||||||
auto
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
Section "OutputClass"
|
|
||||||
Identifier "nvidia"
|
|
||||||
MatchDriver "nvidia-drm"
|
|
||||||
Driver "nvidia"
|
|
||||||
EndSection
|
|
||||||
|
|
||||||
|
|
@ -1,22 +0,0 @@
|
||||||
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
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
@ -1,18 +0,0 @@
|
||||||
post_upgrade() {
|
|
||||||
if (( $(vercmp $2 1.16.0-3) < 0 )); then
|
|
||||||
post_install
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
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
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
@ -1,180 +0,0 @@
|
||||||
#!/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:
|
|
||||||
|
|
@ -1,282 +0,0 @@
|
||||||
.\" $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:
|
|
||||||
Loading…
Reference in a new issue