No current distribution ship anything this ancient anyway.tags/v1.10.90
@@ -35,7 +35,7 @@ Build Requirements (Unix) | |||
* PAM | |||
-- If building Xvnc/libvnc.so: | |||
* Xorg server source code, 1.7 or never | |||
* Xorg server source code, 1.16 or never | |||
* All build requirements Xorg imposes (see its documentation) | |||
============================ | |||
@@ -95,15 +95,14 @@ of TigerVNC on 64-bit systems. | |||
make | |||
Building the TigerVNC Server on Modern Unix/Linux Systems | |||
--------------------------------------------------------- | |||
Building the TigerVNC Server on Unix/Linux Systems | |||
-------------------------------------------------- | |||
Building the TigerVNC Server (Xvnc) is a bit trickier. On newer systems | |||
containing Xorg 7.4 or later (such as Fedora), Xvnc is typically built to use | |||
the X11 shared libraries provided with the system. The procedure for this is | |||
system-specific, since it requires specifying such things as font directories, | |||
but the general outline is as follows (this procedure assumes that the viewer | |||
has already been built, per above.) | |||
Building the TigerVNC Server (Xvnc) is a bit trickier. Xvnc is typically built | |||
to use the X11 shared libraries provided with the system. The procedure for | |||
this is system-specific, since it requires specifying such things as font | |||
directories, but the general outline is as follows (this procedure assumes | |||
that the viewer has already been built, per above.) | |||
> cd {build_directory} | |||
@@ -121,7 +120,7 @@ has already been built, per above.) | |||
> cd unix/xserver/ | |||
> patch -p1 < {source_directory}/unix/xserver{version}.patch | |||
(where {version} matches the X server version you are building, such as | |||
"17" for version 1.7.x.) | |||
"120" for version 1.20.x.) | |||
> autoreconf -fiv | |||
> ./configure --with-pic --without-dtrace --disable-static --disable-dri \ | |||
@@ -145,45 +144,6 @@ has already been built, per above.) | |||
> make TIGERVNC_SRCDIR={source_directory} | |||
Building the TigerVNC Server on Legacy Unix/Linux Systems | |||
--------------------------------------------------------- | |||
Those using systems with older versions of Xorg must build a "legacy-friendly" | |||
version of the TigerVNC Server. This is accomplished by downloading and | |||
building the more recent Xorg modules in a local directory and then building | |||
Xvnc such that it links against the local build of these libraries, not the X11 | |||
libraries installed on the system. The "build-xorg" script in the TigerVNC | |||
source distribution (located under contrib/xorg/) automates this process. | |||
The following procedure will build both the TigerVNC Viewer and a | |||
"legacy-friendly" version of the TigerVNC Server: | |||
cd {build_directory} | |||
bash {source_directory}/contrib/xorg/build-xorg init | |||
bash {source_directory}/contrib/xorg/build-xorg build [additional CMake flags] | |||
build-xorg generates a version of Xvnc that has no external dependencies on the | |||
X11 shared libraries or any other distribution-specific shared libraries. This | |||
version of Xvnc should be transportable across multiple O/S distributions. | |||
build-xorg should work on Red Hat Enterprise 4, its contemporaries, and later | |||
systems. It probably will not work on older systems. It has not been tested | |||
on non-Linux systems (yet). | |||
build-xorg can also be used to rebuild just the TigerVNC Server and Viewer, | |||
once the X11 modules and other dependencies have been built for the first time. | |||
This is convenient for testing changes that just apply to the TigerVNC source | |||
code. To accomplish this, run: | |||
sh {source_directory}/contrib/xorg/build-xorg rebuild [additional make flags] | |||
For instance, | |||
sh {source_directory}/contrib/xorg/build-xorg rebuild clean | |||
will clean both the Xvnc and vncviewer builds without destroying any of the | |||
build configuration or module dependencies. | |||
Building the Windows TigerVNC Viewer with MinGW | |||
----------------------------------------------- | |||
@@ -1,347 +0,0 @@ | |||
#!/bin/bash | |||
# -*- mode: shell-script; coding: UTF-8 -*- | |||
# | |||
# Build Xvnc with Xorg 7.4 or 7.5 | |||
# | |||
set -e | |||
PREFIX= | |||
MAKE="make" | |||
PARALLEL_MAKE=0 | |||
XORG_VERSION=7.5 | |||
XONLY=0 | |||
CFGHOST= | |||
SRCDIR=`dirname $0`/../.. | |||
modules="dri2proto \ | |||
libpthread-stubs \ | |||
glproto \ | |||
xf86vidmodeproto \ | |||
xextproto \ | |||
xproto \ | |||
kbproto \ | |||
inputproto \ | |||
xcmiscproto \ | |||
bigreqsproto \ | |||
fixesproto \ | |||
damageproto \ | |||
xf86driproto \ | |||
randrproto \ | |||
renderproto \ | |||
scrnsaverproto \ | |||
resourceproto \ | |||
fontsproto \ | |||
videoproto \ | |||
compositeproto \ | |||
xineramaproto \ | |||
libdrm \ | |||
libXau \ | |||
xtrans \ | |||
libXdmcp \ | |||
libX11 \ | |||
libXext \ | |||
libXxf86vm \ | |||
libICE \ | |||
libSM \ | |||
libXt \ | |||
libXmu \ | |||
libXfixes \ | |||
libXdamage \ | |||
libXi \ | |||
libxkbfile \ | |||
libfontenc \ | |||
libXfont \ | |||
libpciaccess \ | |||
pixman" | |||
init() | |||
{ | |||
update_modules | |||
pushd xorg | |||
tar jxf ~/.tigervnc-xorg-$XORG_VERSION/util-macros.tar.bz2 | |||
pushd util-macros-* | |||
echo "Building macros" | |||
./configure --prefix=${PREFIX} | |||
($MAKE install) | |||
popd | |||
pushd xserver | |||
patch -p1 < $SRCDIR/unix/xserver18.patch | |||
for all in `find $SRCDIR/contrib/xorg/xorg-$XORG_VERSION-patches/ -type f |grep '.*\.patch$'`; do | |||
echo Applying $all | |||
patch -p1 < $all | |||
done | |||
popd | |||
popd | |||
} | |||
update_modules() | |||
{ | |||
if [ -d xorg ]; then rm -rf xorg; fi | |||
if [ -d xorg.build ]; then rm -rf xorg.build; fi | |||
mkdir xorg | |||
pushd xorg | |||
$SRCDIR/contrib/xorg/download-xorg-$XORG_VERSION | |||
for module in ${modules}; do | |||
tar jxf ~/.tigervnc-xorg-$XORG_VERSION/${module}.tar.bz2 | |||
done | |||
[ -r ~/.tigervnc-xorg-$XORG_VERSION/Mesa.tar.bz2 ] && \ | |||
tar jxf ~/.tigervnc-xorg-$XORG_VERSION/Mesa.tar.bz2 | |||
[ -r ~/.tigervnc-xorg-$XORG_VERSION/Mesa.tar.gz ] && \ | |||
tar zxf ~/.tigervnc-xorg-$XORG_VERSION/Mesa.tar.gz | |||
tar jxf ~/.tigervnc-xorg-$XORG_VERSION/freetype.tar.bz2 | |||
tar jxf ~/.tigervnc-xorg-$XORG_VERSION/xorg-server.tar.bz2 | |||
cp -r $SRCDIR/unix/xserver xserver | |||
cp -r xorg-server-1.*/* xserver | |||
popd | |||
} | |||
build () | |||
{ | |||
if [ $XONLY -eq 0 ]; then | |||
# Build VNC | |||
echo "*** Building VNC ***" | |||
cmake -G"Unix Makefiles" ${1+"$@"} -DBUILD_STATIC=1 $SRCDIR | |||
$MAKE | |||
# Build Xorg | |||
echo "*** Building Xorg ***" | |||
pushd xorg | |||
# build freetype | |||
echo "*** Building freetype ***" | |||
pushd freetype-* | |||
./configure ${CFGHOST} --prefix=${PREFIX} --enable-static --disable-shared | |||
if [ $? -ne 0 ]; then | |||
echo "Failed to configure freetype." | |||
exit | |||
fi | |||
$MAKE install | |||
popd | |||
for module in ${modules}; do | |||
extraoptions="" | |||
cd ${module}-* | |||
echo ====================== | |||
echo configuring ${module} | |||
echo ====================== | |||
if [ "${module}" = "libX11" ]; then | |||
extraoptions="${extraoptions} --without-xcb --disable-specs" | |||
fi | |||
if [ "${module}" = "libSM" ]; then | |||
extraoptions="${extraoptions} --without-libuuid" | |||
fi | |||
if [ "${module}" = "pixman" ]; then | |||
extraoptions="${extraoptions} --disable-gtk" | |||
fi | |||
if [ "${module}" = "libXfont" ]; then | |||
extraoptions="${extraoptions} --with-freetype-config=${PREFIX}/bin/freetype-config" | |||
fi | |||
OLD_CFLAGS=${CFLAGS} | |||
OLD_CXXFLAGS=${CXXFLAGS} | |||
CFLAGS=${CFLAGS}' -fPIC' | |||
CXXFLAGS=${CXXFLAGS}' -fPIC' | |||
export CFLAGS CXXFLAGS | |||
./configure ${CFGHOST} --prefix="${PREFIX}" ${extraoptions} --enable-static --disable-shared | |||
CFLAGS=${OLD_CFLAGS} | |||
CXXFLAGS=${OLD_CXXFLAGS} | |||
export CFLAGS CXXFLAGS | |||
echo ====================== | |||
echo building ${module} | |||
echo ====================== | |||
if [ $? -ne 0 ]; then | |||
echo "Failed to configure ${module}." | |||
exit | |||
fi | |||
$MAKE install | |||
cd .. | |||
done | |||
# build mesa | |||
echo "*** Building Mesa ***" | |||
pushd Mesa-* | |||
./configure ${CFGHOST} --prefix=${PREFIX} --disable-driglx-direct --with-dri-drivers=swrast --with-driver=dri --disable-glut --without-demos | |||
if [ $? -ne 0 ]; then | |||
echo "Failed to configure Mesa." | |||
exit | |||
fi | |||
$MAKE | |||
$MAKE install | |||
popd | |||
popd | |||
fi # XONLY | |||
# build xserver | |||
echo "*** Building xserver ***" | |||
pushd xorg/xserver | |||
autoreconf -fiv | |||
XORGCFGFLAGS="--disable-dri --enable-dri2 --disable-composite --disable-xinerama --disable-xvfb --disable-xnest --disable-xorg --disable-dmx --disable-xwin --disable-xephyr --disable-kdrive --disable-config-dbus --disable-config-hal --disable-config-udev --with-sha1=libgcrypt SHA1_LIB=-lcrypto --disable-shared --enable-static ${XORGCFGFLAGS}" | |||
./configure ${CFGHOST} --prefix=${PREFIX} ${XORGCFGFLAGS} | |||
if [ $? -ne 0 ]; then | |||
echo "Failed to configure X server." | |||
exit | |||
fi | |||
$MAKE TIGERVNC_SRCDIR=$SRCDIR install | |||
popd | |||
} | |||
rebuild () | |||
{ | |||
# Build VNC | |||
echo "*** Building VNC ***" | |||
$MAKE ${1+"$@"} | |||
# build xserver | |||
echo "*** Building xserver ***" | |||
pushd xorg/xserver | |||
$MAKE TIGERVNC_SRCDIR=$SRCDIR install ${1+"$@"} | |||
popd | |||
} | |||
usage () | |||
{ | |||
echo "Usage: $0 init [-version <7.4 | 7.5>]" | |||
echo | |||
echo " $0 build [-version <7.4 | 7.5>]" | |||
echo " [additional CMake flags]" | |||
echo | |||
echo " $0 rebuild [additional make options]" | |||
echo | |||
echo " $0 update [-version <7.4 | 7.5>]" | |||
echo | |||
exit 1 | |||
} | |||
if [ -x '/usr/bin/getconf' -a "$PARALLEL_MAKE" = "1" ]; then | |||
MAKE_PARALLEL=`/usr/bin/getconf _NPROCESSORS_ONLN 2>&1` | |||
[ "$MAKE_PARALLEL" -gt 1 ] && MAKE="$MAKE -j$MAKE_PARALLEL" | |||
fi | |||
while [ $# -gt 0 ] | |||
do | |||
case "$1" in | |||
init) MODE=init ;; | |||
build) MODE=build ;; | |||
xbuild) MODE=build; XONLY=1 ;; | |||
rebuild) MODE=rebuild ;; | |||
update) MODE=update ;; | |||
-parallel) PARALLEL_MAKE=1; ;; | |||
-srcdir) SRCDIR=$2; shift ;; | |||
*) break ;; | |||
esac | |||
shift | |||
done | |||
pushd $SRCDIR | |||
SRCDIR=`pwd` | |||
echo "*** Using TigerVNC source tree at $SRCDIR ***" | |||
popd | |||
if [ "`pwd`" = "$SRCDIR/unix" ]; then | |||
cd $SRCDIR | |||
fi | |||
if [ "$PREFIX" = "" ]; then | |||
PREFIX=`pwd`/xorg.build | |||
fi | |||
if [ "$MODE" = "build" ]; then | |||
if [ ! -d ./xorg.build/syslib ]; then | |||
mkdir -p ./xorg.build/syslib | |||
fi | |||
for i in "$@"; do | |||
case "$i" in | |||
CC=*) CC=`echo $i | sed s/^CC=//g` ;; | |||
CXX=*) CXX=`echo $i | sed s/^CXX=//g` ;; | |||
CFLAGS=*) CFLAGS=`echo $i | sed s/^CFLAGS=//g` ;; | |||
CXXFLAGS=*) CXXFLAGS=`echo $i | sed s/^CXXFLAGS=//g` ;; | |||
LDFLAGS=*) LDFLAGS=`echo $i | sed s/^LDFLAGS=//g` ;; | |||
esac | |||
done | |||
if [ "$CC" = "" ]; then | |||
CC=gcc | |||
fi | |||
if [ "$CXX" = "" ]; then | |||
CXX=g++ | |||
fi | |||
if [ "$CFLAGS" = "" ]; then | |||
CFLAGS=-O3 | |||
fi | |||
if [ "$CXXFLAGS" = "" ]; then | |||
CXXFLAGS=-O3 | |||
fi | |||
CFLAGS="$CFLAGS -fPIC" | |||
CXXFLAGS="$CXXFLAGS -fPIC" | |||
LDFLAGS="$LDFLAGS -static-libgcc -L`pwd`/xorg.build/syslib" | |||
echo CC = $CC | |||
echo CXX = $CXX | |||
echo CFLAGS = $CFLAGS | |||
echo CXXFLAGS = $CXXFLAGS | |||
echo LDFLAGS = $LDFLAGS | |||
if [[ $CFLAGS = *-m32* ]]; then | |||
CFGHOST="--host i686-pc-linux-gnu" | |||
fi | |||
STATICLIBS='libcrypto.a libz.a' | |||
for lib in $STATICLIBS; do | |||
if [ -f ./xorg.build/syslib/$lib ]; then | |||
rm -f ./xorg.build/syslib/$lib | |||
fi | |||
done | |||
IS64BIT=`echo -e "#ifdef __x86_64__\nis64bit_yes\n#else\nis64bit_no\n#endif" | $CC $CFLAGS -E - | grep is64bit` | |||
STATICLIBDIR= | |||
case $IS64BIT in | |||
is64bit_yes) | |||
if [ -d /usr/lib64 ]; then STATICLIBDIR=lib64; | |||
else STATICLIBDIR=lib; fi | |||
;; | |||
is64bit_no) | |||
if [ -d /usr/lib32 ]; then STATICLIBDIR=lib32; | |||
else STATICLIBDIR=lib; fi | |||
;; | |||
*) | |||
echo "Cannot determine whether compiler output is 64-bit or 32-bit. Are you using GCC?" | |||
exit 1 | |||
;; | |||
esac | |||
for lib in $STATICLIBS; do | |||
if [ -f /usr/$STATICLIBDIR/$lib ]; then | |||
ln -fs /usr/$STATICLIBDIR/$lib ./xorg.build/syslib | |||
else | |||
if [ -f /$STATICLIBDIR/$lib ]; then | |||
ln -fs /$STATICLIBDIR/$lib ./xorg.build/syslib | |||
else | |||
DYLIB=`echo $lib | sed s/\\\.a/\\.so/g` | |||
if [ -f /usr/$STATICLIBDIR/$DYLIB -o -f /$STATICLIBDIR/$DYLIB ]; then | |||
echo WARNING: Cannot find suitable $lib. Xvnc will depend on $DYLIB. | |||
fi | |||
fi | |||
fi | |||
done | |||
fi | |||
export ACLOCAL="aclocal -I ${PREFIX}/share/aclocal" | |||
export PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig:${PREFIX}/share/pkgconfig" | |||
case "$MODE" in | |||
init) init ;; | |||
build) | |||
export CFLAGS CXXFLAGS LDFLAGS | |||
build ${1+"$@"}; | |||
;; | |||
rebuild) rebuild ${1+"$@"} ;; | |||
update) update ;; | |||
*) usage ;; | |||
esac |
@@ -1,120 +0,0 @@ | |||
#!/usr/bin/env python2 | |||
# -*-mode: python; coding: utf-8 -*- | |||
import os | |||
import glob | |||
import sys | |||
import urllib2 | |||
#INDI = "http://ftp.sunet.se/pub/X11/ftp.x.org/individual" | |||
INDI = "http://ftp.x.org/pub/individual/" | |||
PROTO = INDI + "proto/" | |||
LIB = INDI + "lib/" | |||
SERVER = INDI + "xserver/" | |||
UTIL = INDI + "util/" | |||
DATA = INDI + "data/" | |||
APP = INDI + "app/" | |||
packages = { | |||
"damageproto": PROTO + "damageproto-1.2.0.tar.bz2", | |||
"fixesproto": PROTO + "fixesproto-4.1.1.tar.bz2", | |||
"resourceproto": PROTO + "resourceproto-1.1.0.tar.bz2", | |||
"fontsproto": PROTO + "fontsproto-2.1.0.tar.bz2", | |||
"bigreqsproto": PROTO + "bigreqsproto-1.1.0.tar.bz2", | |||
"kbproto": PROTO + "kbproto-1.0.4.tar.bz2", | |||
"inputproto": PROTO + "inputproto-2.0.tar.bz2", | |||
"glproto": PROTO + "glproto-1.4.12.tar.bz2", | |||
"xineramaproto": PROTO + "xineramaproto-1.2.tar.bz2", | |||
"randrproto": PROTO + "randrproto-1.3.1.tar.bz2", | |||
"scrnsaverproto": PROTO + "scrnsaverproto-1.2.0.tar.bz2", | |||
"renderproto": PROTO + "renderproto-0.11.tar.bz2", | |||
"xcmiscproto": PROTO + "xcmiscproto-1.2.0.tar.bz2", | |||
"xextproto": PROTO + "xextproto-7.1.1.tar.bz2", | |||
"xf86driproto": PROTO + "xf86driproto-2.1.0.tar.bz2", | |||
"dri2proto": PROTO + "dri2proto-2.1.tar.bz2", | |||
"compositeproto": PROTO + "compositeproto-0.4.1.tar.bz2", | |||
"xf86vidmodeproto": PROTO + "xf86vidmodeproto-2.3.tar.bz2", | |||
"videoproto": PROTO + "videoproto-2.3.0.tar.bz2", | |||
"xproto": PROTO + "xproto-7.0.16.tar.bz2", | |||
"libxkbfile": LIB + "libxkbfile-1.0.6.tar.bz2", | |||
"libXxf86vm": LIB + "libXxf86vm-1.1.0.tar.bz2", | |||
"libXext": LIB + "libXext-1.1.2.tar.bz2", | |||
"libfontenc": LIB + "libfontenc-1.0.5.tar.bz2", | |||
"libXau": LIB + "libXau-1.0.6.tar.bz2", | |||
"libXfont": LIB + "libXfont-1.4.2.tar.bz2", | |||
"libXfixes": LIB + "libXfixes-4.0.5.tar.bz2", | |||
"libSM": LIB + "libSM-1.1.1.tar.bz2", | |||
"libXi": LIB + "libXi-1.3.2.tar.bz2", | |||
"libXmu": LIB + "libXmu-1.0.5.tar.bz2", | |||
"libX11": LIB + "libX11-1.3.5.tar.bz2", | |||
"libXdmcp": LIB + "libXdmcp-1.0.3.tar.bz2", | |||
"xtrans": LIB + "xtrans-1.2.5.tar.bz2", | |||
"libXt": LIB + "libXt-1.0.8.tar.bz2", | |||
"libpciaccess": LIB + "libpciaccess-0.12.0.tar.bz2", | |||
"libICE": LIB + "libICE-1.0.6.tar.bz2", | |||
"pixman": LIB + "pixman-0.19.2.tar.bz2", | |||
"libXdamage": LIB + "libXdamage-1.1.3.tar.bz2", | |||
"util-macros": UTIL + "util-macros-1.10.0.tar.bz2", | |||
"xorg-server": SERVER + "xorg-server-1.8.2.tar.bz2", | |||
"libdrm": "http://dri.freedesktop.org/libdrm/libdrm-2.4.21.tar.bz2", | |||
"Mesa": "ftp://ftp.freedesktop.org/pub/mesa/older-versions/7.x/7.9/MesaLib-7.9.tar.bz2", | |||
"libpthread-stubs": "http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.bz2", | |||
"freetype": "http://downloads.sourceforge.net/freetype/freetype-2.4.2.tar.bz2", | |||
} | |||
# Python-based replacement for wget, which allows us to catch exceptions | |||
def webget(url, file_name): | |||
file_name = "%s/%s" % (os.getcwd(), file_name) | |||
print "Downloading: %s" % (url) | |||
try: | |||
u = urllib2.urlopen(url) | |||
except urllib2.URLError: | |||
print sys.exc_info()[0] | |||
sys.exit("ERROR: Unable to open URL: %s" % url) | |||
try: | |||
f = open(file_name, 'wb') | |||
except IOError: | |||
sys.exit("ERROR: Unable to save to: %s" % file_name) | |||
else: | |||
meta = u.info() | |||
file_size = int(meta.getheaders("Content-Length")[0]) | |||
print " Saving as: %s Bytes: %s" % (file_name, file_size) | |||
file_size_dl = 0 | |||
block_sz = 4096 | |||
while True: | |||
buffer = u.read(block_sz) | |||
if not buffer: | |||
break | |||
file_size_dl += len(buffer) | |||
f.write(buffer) | |||
status = r" Progress: %7d [%3.2f%%]" % (file_size_dl, file_size_dl * 100. / file_size) | |||
status = status + chr(8)*(len(status)+1) | |||
print status, | |||
f.close() | |||
print status | |||
def main(): | |||
dir = os.path.expanduser("~")+"/.tigervnc-xorg-7.5" | |||
cwd = os.getcwd() | |||
if not os.path.exists(dir): | |||
os.mkdir(dir) | |||
os.chdir(dir) | |||
for pkg in packages.keys(): | |||
loc = packages[pkg] | |||
if ".tar.bz2" in loc: | |||
fname = pkg + ".tar.bz2" | |||
else : | |||
fname = pkg + ".tar.gz" | |||
if not os.path.exists(fname): | |||
webget(loc, fname) | |||
os.chdir(cwd) | |||
main() |
@@ -1,131 +0,0 @@ | |||
From 0acffdd6f443198378012405e7f814f5abf278b3 Mon Sep 17 00:00:00 2001 | |||
From: Adam Tkac <atkac@redhat.com> | |||
Date: Wed, 15 Sep 2010 15:37:01 +0200 | |||
Subject: [PATCH] Add -dridir parameter to specify DRI drivers directory from command line. | |||
Signed-off-by: Adam Tkac <atkac@redhat.com> | |||
--- | |||
glx/glxdri.c | 2 -- | |||
glx/glxdri2.c | 2 -- | |||
glx/glxdriswrast.c | 2 -- | |||
glx/glxext.c | 27 +++++++++++++++++++++++++++ | |||
glx/glxserver.h | 3 +++ | |||
os/utils.c | 9 +++++++++ | |||
6 files changed, 39 insertions(+), 6 deletions(-) | |||
diff --git a/glx/glxdri.c b/glx/glxdri.c | |||
index 5b78cec..ce29ae2 100644 | |||
--- a/glx/glxdri.c | |||
+++ b/glx/glxdri.c | |||
@@ -860,8 +860,6 @@ static const __DRIextension *loader_extensions[] = { | |||
-static const char dri_driver_path[] = DRI_DRIVER_PATH; | |||
- | |||
static Bool | |||
glxDRIEnterVT (int index, int flags) | |||
{ | |||
diff --git a/glx/glxdri2.c b/glx/glxdri2.c | |||
index 2d6090c..49265ec 100644 | |||
--- a/glx/glxdri2.c | |||
+++ b/glx/glxdri2.c | |||
@@ -579,8 +579,6 @@ static const __DRIextension *loader_extensions[] = { | |||
NULL | |||
}; | |||
-static const char dri_driver_path[] = DRI_DRIVER_PATH; | |||
- | |||
static Bool | |||
glxDRIEnterVT (int index, int flags) | |||
{ | |||
diff --git a/glx/glxdriswrast.c b/glx/glxdriswrast.c | |||
index 6a34393..37c1dce 100644 | |||
--- a/glx/glxdriswrast.c | |||
+++ b/glx/glxdriswrast.c | |||
@@ -438,8 +438,6 @@ initializeExtensions(__GLXDRIscreen *screen) | |||
} | |||
} | |||
-static const char dri_driver_path[] = DRI_DRIVER_PATH; | |||
- | |||
static __GLXscreen * | |||
__glXDRIscreenProbe(ScreenPtr pScreen) | |||
{ | |||
diff --git a/glx/glxext.c b/glx/glxext.c | |||
index 89e58b0..5e7cf23 100644 | |||
--- a/glx/glxext.c | |||
+++ b/glx/glxext.c | |||
@@ -608,3 +608,30 @@ static int __glXDispatch(ClientPtr client) | |||
return retval; | |||
} | |||
+ | |||
+char *dri_driver_path = DRI_DRIVER_PATH; | |||
+ | |||
+int GlxProcessArguments(int argc, char *argv[], int i) | |||
+{ | |||
+ if (strncmp(argv[i], "-dridir", 7) == 0) { | |||
+ if (++i < argc) { | |||
+#if !defined(WIN32) && !defined(__CYGWIN__) | |||
+ if (getuid() != geteuid()) { | |||
+ LogMessage(X_WARNING, "-dridir is not available for setuid X servers\n"); | |||
+ return -1; | |||
+ } else | |||
+#endif | |||
+ { | |||
+ if (strlen(argv[i]) < PATH_MAX) { | |||
+ dri_driver_path = argv[i]; | |||
+ return 2; | |||
+ } else { | |||
+ LogMessage(X_ERROR, "-dridir pathname too long\n"); | |||
+ return -1; | |||
+ } | |||
+ } | |||
+ } | |||
+ } | |||
+ | |||
+ return 0; | |||
+} | |||
diff --git a/glx/glxserver.h b/glx/glxserver.h | |||
index 1daf977..082ff82 100644 | |||
--- a/glx/glxserver.h | |||
+++ b/glx/glxserver.h | |||
@@ -251,4 +251,7 @@ extern unsigned glxMinorVersion; | |||
extern int __glXEventBase; | |||
+extern char *dri_driver_path; | |||
+extern int GlxProcessArguments(int argc, char *argv[], int i); | |||
+ | |||
#endif /* !__GLX_server_h__ */ | |||
diff --git a/os/utils.c b/os/utils.c | |||
index 13d3b3f..ff97c86 100644 | |||
--- a/os/utils.c | |||
+++ b/os/utils.c | |||
@@ -141,6 +141,7 @@ Bool noDPMSExtension = FALSE; | |||
#ifdef GLXEXT | |||
Bool noGlxExtension = FALSE; | |||
Bool noGlxVisualInit = FALSE; | |||
+extern int GlxProcessArguments(int argc, char *argv[], int i); | |||
#endif | |||
#ifdef SCREENSAVER | |||
Bool noScreenSaverExtension = FALSE; | |||
@@ -721,6 +722,14 @@ ProcessCommandLine(int argc, char *argv[]) | |||
i+= skip-1; | |||
else UseMsg(); | |||
} | |||
+#ifdef GLXEXT | |||
+ else if ((skip = GlxProcessArguments(argc,argv,i)) != 0) { | |||
+ if (skip > 0) | |||
+ i += skip - 1; | |||
+ else | |||
+ UseMsg(); | |||
+ } | |||
+#endif | |||
#ifdef RLIMIT_DATA | |||
else if ( strcmp( argv[i], "-ld") == 0) | |||
{ | |||
1.7.3.2 | |||
@@ -1,46 +0,0 @@ | |||
From 5e6e99eaef3ca346c78a3e520ed58ec8b8100b41 Mon Sep 17 00:00:00 2001 | |||
From: Adam Tkac <atkac@redhat.com> | |||
Date: Thu, 2 Sep 2010 17:24:38 +0200 | |||
Subject: [PATCH] Add -xkbcompdir parameter to modify "xkbcomp" path from commandline. | |||
Signed-off-by: Adam Tkac <atkac@redhat.com> | |||
--- | |||
xkb/xkbInit.c | 21 +++++++++++++++++++++ | |||
1 files changed, 21 insertions(+), 0 deletions(-) | |||
diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c | |||
index fbf8f14..29fb33e 100644 | |||
--- a/xkb/xkbInit.c | |||
+++ b/xkb/xkbInit.c | |||
@@ -742,7 +742,28 @@ XkbProcessArguments(int argc,char *argv[],int i) | |||
} | |||
} | |||
return j; | |||
+ } else if (strncmp(argv[i], "-xkbcompdir", 11)==0) { | |||
+ if (++i < argc) { | |||
+#if !defined(WIN32) && !defined(__CYGWIN__) | |||
+ if (getuid() != geteuid()) { | |||
+ LogMessage(X_WARNING, "-xkbdir is not available for setuid X servers\n"); | |||
+ return -1; | |||
+ } else | |||
+#endif | |||
+ { | |||
+ if (strlen(argv[i]) < PATH_MAX) { | |||
+ XkbBinDirectory = argv[i]; | |||
+ return 2; | |||
+ } else { | |||
+ LogMessage(X_ERROR, "-xkbcompdir pathname too long\n"); | |||
+ return -1; | |||
+ } | |||
+ } | |||
+ } else { | |||
+ return -1; | |||
+ } | |||
} | |||
+ | |||
if ((strcmp(argv[i], "-ardelay") == 0) || | |||
(strcmp (argv[i], "-ar1") == 0)) { /* -ardelay int */ | |||
if (++i >= argc) UseMsg (); | |||
1.7.2.3 | |||
@@ -1,91 +0,0 @@ | |||
diff -up xserver/configure.ac.vnc xserver/configure.ac | |||
--- xserver/configure.ac.vnc 2011-05-11 11:19:24.410708163 +0200 | |||
+++ xserver/configure.ac 2011-05-11 11:19:26.409635824 +0200 | |||
@@ -30,7 +30,6 @@ AC_INIT([xorg-server], 1.10.1.901, [http | |||
RELEASE_DATE="2011-05-06" | |||
AC_CONFIG_SRCDIR([Makefile.am]) | |||
AM_INIT_AUTOMAKE([foreign dist-bzip2]) | |||
-AM_MAINTAINER_MODE | |||
# Require xorg-macros minimum of 1.10 for XORG_CHECK_SGML_DOCTOOLS | |||
m4_ifndef([XORG_MACROS_VERSION], | |||
@@ -65,6 +64,7 @@ dnl forcing an entire recompile.x | |||
AC_CONFIG_HEADERS(include/version-config.h) | |||
AM_PROG_AS | |||
+AC_PROG_CXX | |||
AC_PROG_LN_S | |||
AC_LIBTOOL_WIN32_DLL | |||
AC_DISABLE_STATIC | |||
@@ -1513,6 +1513,10 @@ if test "x$XVFB" = xyes; then | |||
AC_SUBST([XVFB_SYS_LIBS]) | |||
fi | |||
+dnl Xvnc DDX | |||
+AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XEXT_INC $FB_INC $MI_INC $RENDER_INC $RANDR_INC"]) | |||
+AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"]) | |||
+AC_SUBST([XVNC_SYS_LIBS], ["$GLX_SYS_LIBS"]) | |||
dnl Xnest DDX | |||
@@ -1551,6 +1555,8 @@ xorg_bus_linuxpci=no | |||
xorg_bus_bsdpci=no | |||
xorg_bus_sparc=no | |||
+AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) | |||
+ | |||
if test "x$XORG" = xyes; then | |||
XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common' | |||
XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os' | |||
@@ -1797,7 +1803,6 @@ if test "x$XORG" = xyes; then | |||
AC_DEFINE(XORGSERVER, 1, [Building Xorg server]) | |||
AC_DEFINE(XFree86Server, 1, [Building XFree86 server]) | |||
AC_DEFINE(XFree86LOADER, 1, [Building loadable XFree86 server]) | |||
- AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) | |||
AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs]) | |||
AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions]) | |||
AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server]) | |||
@@ -2259,6 +2264,7 @@ hw/dmx/Makefile | |||
hw/dmx/man/Makefile | |||
hw/vfb/Makefile | |||
hw/vfb/man/Makefile | |||
+hw/vnc/Makefile | |||
hw/xnest/Makefile | |||
hw/xnest/man/Makefile | |||
hw/xwin/Makefile | |||
diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am | |||
--- xserver/hw/Makefile.am.vnc 2011-05-11 11:19:24.476705776 +0200 | |||
+++ xserver/hw/Makefile.am 2011-05-11 11:19:26.409635824 +0200 | |||
@@ -33,7 +33,8 @@ SUBDIRS = \ | |||
$(XNEST_SUBDIRS) \ | |||
$(DMX_SUBDIRS) \ | |||
$(KDRIVE_SUBDIRS) \ | |||
- $(XQUARTZ_SUBDIRS) | |||
+ $(XQUARTZ_SUBDIRS) \ | |||
+ vnc | |||
DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive | |||
diff -up xserver/mi/miinitext.c.vnc xserver/mi/miinitext.c | |||
--- xserver/mi/miinitext.c.vnc 2011-05-11 11:19:24.549703133 +0200 | |||
+++ xserver/mi/miinitext.c 2011-05-11 11:19:42.022070885 +0200 | |||
@@ -263,6 +263,9 @@ extern void DamageExtensionInit(INITARGS | |||
extern void CompositeExtensionInit(INITARGS); | |||
#endif | |||
extern void GEExtensionInit(INITARGS); | |||
+#ifdef TIGERVNC | |||
+extern void vncExtensionInit(INITARGS); | |||
+#endif | |||
/* The following is only a small first step towards run-time | |||
* configurable extensions. | |||
@@ -433,6 +436,9 @@ InitExtensions(int argc, char *argv[]) | |||
#ifdef XF86BIGFONT | |||
if (!noXFree86BigfontExtension) XFree86BigfontExtensionInit(); | |||
#endif | |||
+#ifdef TIGERVNC | |||
+ vncExtensionInit(); | |||
+#endif | |||
#if !defined(NO_HW_ONLY_EXTS) | |||
#if defined(XF86VIDMODE) | |||
if (!noXFree86VidModeExtension) XFree86VidModeExtensionInit(); |
@@ -1,91 +0,0 @@ | |||
diff -up xserver/configure.ac.vnc xserver/configure.ac | |||
--- xserver/configure.ac.vnc 2012-08-28 14:08:11.523694314 +0200 | |||
+++ xserver/configure.ac 2012-08-28 14:08:59.122696574 +0200 | |||
@@ -30,7 +30,6 @@ AC_INIT([xorg-server], 1.11.4, [https:// | |||
RELEASE_DATE="2012-01-27" | |||
AC_CONFIG_SRCDIR([Makefile.am]) | |||
AM_INIT_AUTOMAKE([foreign dist-bzip2]) | |||
-AM_MAINTAINER_MODE | |||
# Require xorg-macros minimum of 1.14 for XORG_COMPILER_BRAND in XORG_DEFAULT_OPTIONS | |||
m4_ifndef([XORG_MACROS_VERSION], | |||
@@ -72,6 +71,7 @@ dnl forcing an entire recompile.x | |||
AC_CONFIG_HEADERS(include/version-config.h) | |||
AM_PROG_AS | |||
+AC_PROG_CXX | |||
AC_PROG_LN_S | |||
AC_LIBTOOL_WIN32_DLL | |||
AC_DISABLE_STATIC | |||
@@ -1476,6 +1476,10 @@ if test "x$XVFB" = xyes; then | |||
AC_SUBST([XVFB_SYS_LIBS]) | |||
fi | |||
+dnl Xvnc DDX | |||
+AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XEXT_INC $FB_INC $MI_INC $RENDER_INC $RANDR_INC"]) | |||
+AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"]) | |||
+AC_SUBST([XVNC_SYS_LIBS], ["$GLX_SYS_LIBS"]) | |||
dnl Xnest DDX | |||
@@ -1514,6 +1518,8 @@ xorg_bus_linuxpci=no | |||
xorg_bus_bsdpci=no | |||
xorg_bus_sparc=no | |||
+AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) | |||
+ | |||
if test "x$XORG" = xyes; then | |||
XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common' | |||
XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os' | |||
@@ -1750,7 +1756,6 @@ if test "x$XORG" = xyes; then | |||
AC_DEFINE(XORGSERVER, 1, [Building Xorg server]) | |||
AC_DEFINE(XFree86Server, 1, [Building XFree86 server]) | |||
AC_DEFINE(XFree86LOADER, 1, [Building loadable XFree86 server]) | |||
- AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) | |||
AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs]) | |||
AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions]) | |||
AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server]) | |||
@@ -2217,6 +2222,7 @@ hw/dmx/Makefile | |||
hw/dmx/man/Makefile | |||
hw/vfb/Makefile | |||
hw/vfb/man/Makefile | |||
+hw/vnc/Makefile | |||
hw/xnest/Makefile | |||
hw/xnest/man/Makefile | |||
hw/xwin/Makefile | |||
diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am | |||
--- xserver/hw/Makefile.am.vnc 2012-08-28 14:08:12.554694327 +0200 | |||
+++ xserver/hw/Makefile.am 2012-08-28 14:08:59.123696574 +0200 | |||
@@ -33,7 +33,8 @@ SUBDIRS = \ | |||
$(XNEST_SUBDIRS) \ | |||
$(DMX_SUBDIRS) \ | |||
$(KDRIVE_SUBDIRS) \ | |||
- $(XQUARTZ_SUBDIRS) | |||
+ $(XQUARTZ_SUBDIRS) \ | |||
+ vnc | |||
DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive | |||
diff -up xserver/mi/miinitext.c.vnc xserver/mi/miinitext.c | |||
--- xserver/mi/miinitext.c.vnc 2012-08-28 14:08:13.063694337 +0200 | |||
+++ xserver/mi/miinitext.c 2012-08-28 14:08:59.123696574 +0200 | |||
@@ -263,6 +263,9 @@ extern void DamageExtensionInit(INITARGS | |||
extern void CompositeExtensionInit(INITARGS); | |||
#endif | |||
extern void GEExtensionInit(INITARGS); | |||
+#ifdef TIGERVNC | |||
+extern void vncExtensionInit(INITARGS); | |||
+#endif | |||
/* The following is only a small first step towards run-time | |||
* configurable extensions. | |||
@@ -433,6 +436,9 @@ InitExtensions(int argc, char *argv[]) | |||
#ifdef XF86BIGFONT | |||
if (!noXFree86BigfontExtension) XFree86BigfontExtensionInit(); | |||
#endif | |||
+#ifdef TIGERVNC | |||
+ vncExtensionInit(); | |||
+#endif | |||
#if !defined(NO_HW_ONLY_EXTS) | |||
#if defined(XF86VIDMODE) | |||
if (!noXFree86VidModeExtension) XFree86VidModeExtensionInit(); |
@@ -1,91 +0,0 @@ | |||
diff -up xserver/configure.ac.vnc xserver/configure.ac | |||
--- xserver/configure.ac.vnc 2012-08-28 15:01:35.142325880 +0200 | |||
+++ xserver/configure.ac 2012-08-28 15:02:06.292300682 +0200 | |||
@@ -30,7 +30,6 @@ AC_INIT([xorg-server], 1.12.4, [https:// | |||
RELEASE_DATE="2012-08-27" | |||
AC_CONFIG_SRCDIR([Makefile.am]) | |||
AM_INIT_AUTOMAKE([foreign dist-bzip2]) | |||
-AM_MAINTAINER_MODE | |||
# Require xorg-macros minimum of 1.14 for XORG_COMPILER_BRAND in XORG_DEFAULT_OPTIONS | |||
m4_ifndef([XORG_MACROS_VERSION], | |||
@@ -72,6 +71,7 @@ dnl forcing an entire recompile.x | |||
AC_CONFIG_HEADERS(include/version-config.h) | |||
AM_PROG_AS | |||
+AC_PROG_CXX | |||
AC_PROG_LN_S | |||
AC_LIBTOOL_WIN32_DLL | |||
AC_DISABLE_STATIC | |||
@@ -1493,6 +1493,10 @@ if test "x$XVFB" = xyes; then | |||
AC_SUBST([XVFB_SYS_LIBS]) | |||
fi | |||
+dnl Xvnc DDX | |||
+AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XEXT_INC $FB_INC $MI_INC $RENDER_INC $RANDR_INC"]) | |||
+AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"]) | |||
+AC_SUBST([XVNC_SYS_LIBS], ["$GLX_SYS_LIBS"]) | |||
dnl Xnest DDX | |||
@@ -1527,6 +1531,8 @@ if test "x$XORG" = xauto; then | |||
fi | |||
AC_MSG_RESULT([$XORG]) | |||
+AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) | |||
+ | |||
if test "x$XORG" = xyes; then | |||
XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common' | |||
XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os' | |||
@@ -1743,7 +1749,6 @@ if test "x$XORG" = xyes; then | |||
AC_DEFINE(XORGSERVER, 1, [Building Xorg server]) | |||
AC_DEFINE(XFree86Server, 1, [Building XFree86 server]) | |||
AC_DEFINE(XFree86LOADER, 1, [Building loadable XFree86 server]) | |||
- AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) | |||
AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs]) | |||
AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions]) | |||
AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server]) | |||
@@ -2209,6 +2214,7 @@ hw/dmx/Makefile | |||
hw/dmx/man/Makefile | |||
hw/vfb/Makefile | |||
hw/vfb/man/Makefile | |||
+hw/vnc/Makefile | |||
hw/xnest/Makefile | |||
hw/xnest/man/Makefile | |||
hw/xwin/Makefile | |||
diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am | |||
--- xserver/hw/Makefile.am.vnc 2012-08-28 15:01:35.225325813 +0200 | |||
+++ xserver/hw/Makefile.am 2012-08-28 15:02:06.292300682 +0200 | |||
@@ -33,7 +33,8 @@ SUBDIRS = \ | |||
$(XNEST_SUBDIRS) \ | |||
$(DMX_SUBDIRS) \ | |||
$(KDRIVE_SUBDIRS) \ | |||
- $(XQUARTZ_SUBDIRS) | |||
+ $(XQUARTZ_SUBDIRS) \ | |||
+ vnc | |||
DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive | |||
diff -up xserver/mi/miinitext.c.vnc xserver/mi/miinitext.c | |||
--- xserver/mi/miinitext.c.vnc 2012-08-28 15:01:35.311325743 +0200 | |||
+++ xserver/mi/miinitext.c 2012-08-28 15:02:06.293300681 +0200 | |||
@@ -266,6 +266,9 @@ extern void DamageExtensionInit(INITARGS | |||
extern void CompositeExtensionInit(INITARGS); | |||
#endif | |||
extern void GEExtensionInit(INITARGS); | |||
+#ifdef TIGERVNC | |||
+extern void vncExtensionInit(INITARGS); | |||
+#endif | |||
/* The following is only a small first step towards run-time | |||
* configurable extensions. | |||
@@ -449,6 +452,9 @@ InitExtensions(int argc, char *argv[]) | |||
if (!noXFree86BigfontExtension) | |||
XFree86BigfontExtensionInit(); | |||
#endif | |||
+#ifdef TIGERVNC | |||
+ vncExtensionInit(); | |||
+#endif | |||
#if !defined(NO_HW_ONLY_EXTS) | |||
#if defined(XF86VIDMODE) | |||
if (!noXFree86VidModeExtension) |
@@ -1,92 +0,0 @@ | |||
diff -up xserver/configure.ac.vnc xserver/configure.ac | |||
--- xserver/configure.ac.vnc 2012-08-28 15:35:23.778810954 +0200 | |||
+++ xserver/configure.ac 2012-08-28 15:54:46.396743431 +0200 | |||
@@ -31,7 +31,6 @@ RELEASE_DATE="2012-08-21" | |||
RELEASE_NAME="Splashing Orca" | |||
AC_CONFIG_SRCDIR([Makefile.am]) | |||
AM_INIT_AUTOMAKE([foreign dist-bzip2]) | |||
-AM_MAINTAINER_MODE | |||
# Require xorg-macros minimum of 1.14 for XORG_COMPILER_BRAND in XORG_DEFAULT_OPTIONS | |||
m4_ifndef([XORG_MACROS_VERSION], | |||
@@ -73,6 +72,7 @@ dnl forcing an entire recompile.x | |||
AC_CONFIG_HEADERS(include/version-config.h) | |||
AM_PROG_AS | |||
+AC_PROG_CXX | |||
AC_PROG_LN_S | |||
AC_LIBTOOL_WIN32_DLL | |||
AC_DISABLE_STATIC | |||
@@ -1561,6 +1561,10 @@ if test "x$XVFB" = xyes; then | |||
AC_SUBST([XVFB_SYS_LIBS]) | |||
fi | |||
+dnl Xvnc DDX | |||
+AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"]) | |||
+AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"]) | |||
+AC_SUBST([XVNC_SYS_LIBS], ["$GLX_SYS_LIBS"]) | |||
dnl Xnest DDX | |||
@@ -1596,6 +1600,8 @@ if test "x$XORG" = xauto; then | |||
fi | |||
AC_MSG_RESULT([$XORG]) | |||
+AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) | |||
+ | |||
if test "x$XORG" = xyes; then | |||
XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common' | |||
XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os' | |||
@@ -1815,7 +1821,6 @@ if test "x$XORG" = xyes; then | |||
AC_DEFINE(XORG_SERVER, 1, [Building Xorg server]) | |||
AC_DEFINE(XORGSERVER, 1, [Building Xorg server]) | |||
AC_DEFINE(XFree86Server, 1, [Building XFree86 server]) | |||
- AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) | |||
AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs]) | |||
AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions]) | |||
AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server]) | |||
@@ -2280,6 +2285,7 @@ hw/dmx/Makefile | |||
hw/dmx/man/Makefile | |||
hw/vfb/Makefile | |||
hw/vfb/man/Makefile | |||
+hw/vnc/Makefile | |||
hw/xnest/Makefile | |||
hw/xnest/man/Makefile | |||
hw/xwin/Makefile | |||
diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am | |||
--- xserver/hw/Makefile.am.vnc 2012-08-28 15:35:23.856810890 +0200 | |||
+++ xserver/hw/Makefile.am 2012-08-28 15:35:42.272795917 +0200 | |||
@@ -33,7 +33,8 @@ SUBDIRS = \ | |||
$(XNEST_SUBDIRS) \ | |||
$(DMX_SUBDIRS) \ | |||
$(KDRIVE_SUBDIRS) \ | |||
- $(XQUARTZ_SUBDIRS) | |||
+ $(XQUARTZ_SUBDIRS) \ | |||
+ vnc | |||
DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive | |||
diff -up xserver/mi/miinitext.c.vnc xserver/mi/miinitext.c | |||
--- xserver/mi/miinitext.c.vnc 2012-08-28 15:35:23.000000000 +0200 | |||
+++ xserver/mi/miinitext.c 2012-09-05 15:07:40.714953972 +0200 | |||
@@ -112,6 +112,10 @@ SOFTWARE. | |||
#include "micmap.h" | |||
#include "globals.h" | |||
+#ifdef TIGERVNC | |||
+extern void vncExtensionInit(void); | |||
+#endif | |||
+ | |||
/* The following is only a small first step towards run-time | |||
* configurable extensions. | |||
*/ | |||
@@ -238,6 +242,9 @@ EnableDisableExtensionError(const char * | |||
/* List of built-in (statically linked) extensions */ | |||
static ExtensionModule staticExtensions[] = { | |||
+#ifdef TIGERVNC | |||
+ {vncExtensionInit, "VNC-EXTENSION", NULL}, | |||
+#endif | |||
{GEExtensionInit, "Generic Event Extension", &noGEExtension}, | |||
{ShapeExtensionInit, "SHAPE", NULL}, | |||
#ifdef MITSHM |
@@ -1,137 +0,0 @@ | |||
diff -up xserver/configure.ac.vnc xserver/configure.ac | |||
--- xserver/configure.ac.vnc 2013-04-09 16:35:38.000000000 +0200 | |||
+++ xserver/configure.ac 2013-04-09 18:16:31.000000000 +0200 | |||
@@ -72,6 +72,7 @@ dnl forcing an entire recompile.x | |||
AC_CONFIG_HEADERS(include/version-config.h) | |||
AM_PROG_AS | |||
+AC_PROG_CXX | |||
AC_PROG_LN_S | |||
AC_LIBTOOL_WIN32_DLL | |||
AC_DISABLE_STATIC | |||
@@ -1573,6 +1574,10 @@ if test "x$XVFB" = xyes; then | |||
AC_SUBST([XVFB_SYS_LIBS]) | |||
fi | |||
+dnl Xvnc DDX | |||
+AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"]) | |||
+AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"]) | |||
+AC_SUBST([XVNC_SYS_LIBS], ["$GLX_SYS_LIBS"]) | |||
dnl Xnest DDX | |||
@@ -1608,6 +1613,8 @@ if test "x$XORG" = xauto; then | |||
fi | |||
AC_MSG_RESULT([$XORG]) | |||
+AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) | |||
+ | |||
if test "x$XORG" = xyes; then | |||
XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common' | |||
XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os' | |||
@@ -1827,7 +1834,6 @@ if test "x$XORG" = xyes; then | |||
AC_DEFINE(XORG_SERVER, 1, [Building Xorg server]) | |||
AC_DEFINE(XORGSERVER, 1, [Building Xorg server]) | |||
AC_DEFINE(XFree86Server, 1, [Building XFree86 server]) | |||
- AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) | |||
AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs]) | |||
AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions]) | |||
AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server]) | |||
@@ -2292,6 +2298,7 @@ hw/dmx/Makefile | |||
hw/dmx/man/Makefile | |||
hw/vfb/Makefile | |||
hw/vfb/man/Makefile | |||
+hw/vnc/Makefile | |||
hw/xnest/Makefile | |||
hw/xnest/man/Makefile | |||
hw/xwin/Makefile | |||
diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am | |||
--- xserver/hw/Makefile.am.vnc 2013-04-09 16:36:46.000000000 +0200 | |||
+++ xserver/hw/Makefile.am 2013-04-09 18:16:31.000000000 +0200 | |||
@@ -33,7 +33,8 @@ SUBDIRS = \ | |||
$(XNEST_SUBDIRS) \ | |||
$(DMX_SUBDIRS) \ | |||
$(KDRIVE_SUBDIRS) \ | |||
- $(XQUARTZ_SUBDIRS) | |||
+ $(XQUARTZ_SUBDIRS) \ | |||
+ vnc | |||
DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive | |||
diff -up xserver/mi/miinitext.c.vnc xserver/mi/miinitext.c | |||
--- xserver/mi/miinitext.c.vnc 2013-04-09 16:37:21.000000000 +0200 | |||
+++ xserver/mi/miinitext.c 2013-04-09 18:16:31.000000000 +0200 | |||
@@ -112,6 +112,10 @@ SOFTWARE. | |||
#include "micmap.h" | |||
#include "globals.h" | |||
+#ifdef TIGERVNC | |||
+extern void vncExtensionInit(void); | |||
+#endif | |||
+ | |||
/* The following is only a small first step towards run-time | |||
* configurable extensions. | |||
*/ | |||
@@ -238,6 +242,9 @@ EnableDisableExtensionError(const char * | |||
/* List of built-in (statically linked) extensions */ | |||
static ExtensionModule staticExtensions[] = { | |||
+#ifdef TIGERVNC | |||
+ {vncExtensionInit, "VNC-EXTENSION", NULL}, | |||
+#endif | |||
{GEExtensionInit, "Generic Event Extension", &noGEExtension}, | |||
{ShapeExtensionInit, "SHAPE", NULL}, | |||
#ifdef MITSHM | |||
diff -up xserver/os/WaitFor.c.vnc xserver/os/WaitFor.c | |||
--- xserver/os/WaitFor.c.vnc 2013-04-10 14:51:13.000000000 +0200 | |||
+++ xserver/os/WaitFor.c 2013-04-10 14:55:40.000000000 +0200 | |||
@@ -124,6 +124,9 @@ static void DoTimer(OsTimerPtr timer, CA | |||
static void CheckAllTimers(void); | |||
static OsTimerPtr timers = NULL; | |||
+extern void vncWriteBlockHandler(fd_set *fds); | |||
+extern void vncWriteWakeupHandler(int nfds, fd_set *fds); | |||
+ | |||
/***************** | |||
* WaitForSomething: | |||
* Make the server suspend until there is | |||
@@ -149,6 +152,7 @@ WaitForSomething(int *pClientsReady) | |||
INT32 timeout = 0; | |||
fd_set clientsReadable; | |||
fd_set clientsWritable; | |||
+ fd_set socketsWritable; | |||
int curclient; | |||
int selecterr; | |||
static int nready; | |||
@@ -207,6 +211,9 @@ WaitForSomething(int *pClientsReady) | |||
XFD_COPYSET(&AllSockets, &LastSelectMask); | |||
} | |||
+ FD_ZERO(&socketsWritable); | |||
+ vncWriteBlockHandler(&socketsWritable); | |||
+ | |||
BlockHandler((pointer) &wt, (pointer) &LastSelectMask); | |||
if (NewOutputPending) | |||
FlushAllOutput(); | |||
@@ -218,10 +225,20 @@ WaitForSomething(int *pClientsReady) | |||
i = Select(MaxClients, &LastSelectMask, &clientsWritable, NULL, wt); | |||
} | |||
else { | |||
- i = Select(MaxClients, &LastSelectMask, NULL, NULL, wt); | |||
+ if (AnyClientsWriteBlocked) | |||
+ XFD_ORSET(&socketsWritable, &ClientsWriteBlocked, &socketsWritable); | |||
+ | |||
+ if (XFD_ANYSET(&socketsWritable)) { | |||
+ i = Select (MaxClients, &LastSelectMask, &socketsWritable, NULL, wt); | |||
+ if (AnyClientsWriteBlocked) | |||
+ XFD_ANDSET(&clientsWritable, &socketsWritable, &ClientsWriteBlocked); | |||
+ } else { | |||
+ i = Select (MaxClients, &LastSelectMask, NULL, NULL, wt); | |||
+ } | |||
} | |||
selecterr = GetErrno(); | |||
WakeupHandler(i, (pointer) &LastSelectMask); | |||
+ vncWriteWakeupHandler(i, &socketsWritable); | |||
if (i <= 0) { /* An error or timeout occurred */ | |||
if (dispatchException) | |||
return 0; |
@@ -1,137 +0,0 @@ | |||
diff -up xserver/configure.ac.vnc xserver/configure.ac | |||
--- xserver/configure.ac.vnc 2013-04-09 16:35:38.000000000 +0200 | |||
+++ xserver/configure.ac 2013-04-09 18:16:31.000000000 +0200 | |||
@@ -72,6 +72,7 @@ dnl forcing an entire recompile.x | |||
AC_CONFIG_HEADERS(include/version-config.h) | |||
AM_PROG_AS | |||
+AC_PROG_CXX | |||
AC_PROG_LN_S | |||
AC_LIBTOOL_WIN32_DLL | |||
AC_DISABLE_STATIC | |||
@@ -1573,6 +1573,10 @@ if test "x$XVFB" = xyes; then | |||
AC_SUBST([XVFB_SYS_LIBS]) | |||
fi | |||
+dnl Xvnc DDX | |||
+AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"]) | |||
+AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $DRI3_LIB $PRESENT_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"]) | |||
+AC_SUBST([XVNC_SYS_LIBS], ["$GLX_SYS_LIBS"]) | |||
dnl Xnest DDX | |||
@@ -1608,6 +1612,8 @@ if test "x$XORG" = xauto; then | |||
fi | |||
AC_MSG_RESULT([$XORG]) | |||
+AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) | |||
+ | |||
if test "x$XORG" = xyes; then | |||
XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common' | |||
XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os' | |||
@@ -1827,7 +1833,6 @@ if test "x$XORG" = xyes; then | |||
AC_DEFINE(XORG_SERVER, 1, [Building Xorg server]) | |||
AC_DEFINE(XORGSERVER, 1, [Building Xorg server]) | |||
AC_DEFINE(XFree86Server, 1, [Building XFree86 server]) | |||
- AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) | |||
AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs]) | |||
AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions]) | |||
AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server]) | |||
@@ -2292,6 +2297,7 @@ hw/dmx/Makefile | |||
hw/dmx/man/Makefile | |||
hw/vfb/Makefile | |||
hw/vfb/man/Makefile | |||
+hw/vnc/Makefile | |||
hw/xnest/Makefile | |||
hw/xnest/man/Makefile | |||
hw/xwin/Makefile | |||
diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am | |||
--- xserver/hw/Makefile.am.vnc 2013-04-09 16:36:46.000000000 +0200 | |||
+++ xserver/hw/Makefile.am 2013-04-09 18:16:31.000000000 +0200 | |||
@@ -33,7 +33,8 @@ SUBDIRS = \ | |||
$(XNEST_SUBDIRS) \ | |||
$(DMX_SUBDIRS) \ | |||
$(KDRIVE_SUBDIRS) \ | |||
- $(XQUARTZ_SUBDIRS) | |||
+ $(XQUARTZ_SUBDIRS) \ | |||
+ vnc | |||
DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive | |||
diff -up xserver/mi/miinitext.c.vnc xserver/mi/miinitext.c | |||
--- xserver/mi/miinitext.c.vnc 2013-04-09 16:37:21.000000000 +0200 | |||
+++ xserver/mi/miinitext.c 2013-04-09 18:16:31.000000000 +0200 | |||
@@ -112,6 +112,10 @@ SOFTWARE. | |||
#include "micmap.h" | |||
#include "globals.h" | |||
+#ifdef TIGERVNC | |||
+extern void vncExtensionInit(void); | |||
+#endif | |||
+ | |||
/* The following is only a small first step towards run-time | |||
* configurable extensions. | |||
*/ | |||
@@ -238,6 +242,9 @@ EnableDisableExtensionError(const char * | |||
/* List of built-in (statically linked) extensions */ | |||
static ExtensionModule staticExtensions[] = { | |||
+#ifdef TIGERVNC | |||
+ {vncExtensionInit, "VNC-EXTENSION", NULL}, | |||
+#endif | |||
{GEExtensionInit, "Generic Event Extension", &noGEExtension}, | |||
{ShapeExtensionInit, "SHAPE", NULL}, | |||
#ifdef MITSHM | |||
diff -up xserver/os/WaitFor.c.vnc xserver/os/WaitFor.c | |||
--- xserver/os/WaitFor.c.vnc 2013-04-10 14:51:13.000000000 +0200 | |||
+++ xserver/os/WaitFor.c 2013-04-10 14:55:40.000000000 +0200 | |||
@@ -124,6 +124,9 @@ static void DoTimer(OsTimerPtr timer, CA | |||
static void CheckAllTimers(void); | |||
static OsTimerPtr timers = NULL; | |||
+extern void vncWriteBlockHandler(fd_set *fds); | |||
+extern void vncWriteWakeupHandler(int nfds, fd_set *fds); | |||
+ | |||
/***************** | |||
* WaitForSomething: | |||
* Make the server suspend until there is | |||
@@ -149,6 +152,7 @@ WaitForSomething(int *pClientsReady) | |||
INT32 timeout = 0; | |||
fd_set clientsReadable; | |||
fd_set clientsWritable; | |||
+ fd_set socketsWritable; | |||
int curclient; | |||
int selecterr; | |||
static int nready; | |||
@@ -207,6 +211,9 @@ WaitForSomething(int *pClientsReady) | |||
XFD_COPYSET(&AllSockets, &LastSelectMask); | |||
} | |||
+ FD_ZERO(&socketsWritable); | |||
+ vncWriteBlockHandler(&socketsWritable); | |||
+ | |||
BlockHandler((pointer) &wt, (pointer) &LastSelectMask); | |||
if (NewOutputPending) | |||
FlushAllOutput(); | |||
@@ -218,10 +225,20 @@ WaitForSomething(int *pClientsReady) | |||
i = Select(MaxClients, &LastSelectMask, &clientsWritable, NULL, wt); | |||
} | |||
else { | |||
- i = Select(MaxClients, &LastSelectMask, NULL, NULL, wt); | |||
+ if (AnyClientsWriteBlocked) | |||
+ XFD_ORSET(&socketsWritable, &ClientsWriteBlocked, &socketsWritable); | |||
+ | |||
+ if (XFD_ANYSET(&socketsWritable)) { | |||
+ i = Select (MaxClients, &LastSelectMask, &socketsWritable, NULL, wt); | |||
+ if (AnyClientsWriteBlocked) | |||
+ XFD_ANDSET(&clientsWritable, &socketsWritable, &ClientsWriteBlocked); | |||
+ } else { | |||
+ i = Select (MaxClients, &LastSelectMask, NULL, NULL, wt); | |||
+ } | |||
} | |||
selecterr = GetErrno(); | |||
WakeupHandler(i, (pointer) &LastSelectMask); | |||
+ vncWriteWakeupHandler(i, &socketsWritable); | |||
if (i <= 0) { /* An error or timeout occurred */ | |||
if (dispatchException) | |||
return 0; |
@@ -1,90 +0,0 @@ | |||
diff -up xserver/configure.ac.vnc xserver/configure.ac | |||
--- xserver/configure.ac.vnc 2011-05-11 11:09:24.923425002 +0200 | |||
+++ xserver/configure.ac 2011-05-11 11:09:32.512150522 +0200 | |||
@@ -30,7 +30,6 @@ AC_INIT([xorg-server], 1.7.7, [https://b | |||
RELEASE_DATE="2010-05-04" | |||
AC_CONFIG_SRCDIR([Makefile.am]) | |||
AM_INIT_AUTOMAKE([dist-bzip2 foreign]) | |||
-AM_MAINTAINER_MODE | |||
AC_CONFIG_FILES([ | |||
shave | |||
@@ -64,6 +63,7 @@ dnl forcing an entire recompile.x | |||
AC_CONFIG_HEADERS(include/version-config.h) | |||
AC_PROG_CC | |||
+AC_PROG_CXX | |||
AM_PROG_AS | |||
AC_PROG_INSTALL | |||
AC_PROG_LN_S | |||
@@ -1383,6 +1383,9 @@ if test "x$XVFB" = xyes; then | |||
AC_SUBST([XVFB_SYS_LIBS]) | |||
fi | |||
+dnl Xvnc DDX | |||
+AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XEXT_INC $FB_INC $MI_INC $RENDER_INC $RANDR_INC"]) | |||
+AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"]) | |||
dnl Xnest DDX | |||
@@ -1421,6 +1424,8 @@ xorg_bus_linuxpci=no | |||
xorg_bus_bsdpci=no | |||
xorg_bus_sparc=no | |||
+AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) | |||
+ | |||
if test "x$XORG" = xyes; then | |||
XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common' | |||
XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os' | |||
@@ -1663,7 +1668,6 @@ if test "x$XORG" = xyes; then | |||
AC_DEFINE(XORGSERVER, 1, [Building Xorg server]) | |||
AC_DEFINE(XFree86Server, 1, [Building XFree86 server]) | |||
AC_DEFINE(XFree86LOADER, 1, [Building loadable XFree86 server]) | |||
- AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) | |||
AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs]) | |||
AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions]) | |||
AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server]) | |||
@@ -2108,6 +2112,7 @@ hw/dmx/input/Makefile | |||
hw/dmx/glxProxy/Makefile | |||
hw/dmx/Makefile | |||
hw/vfb/Makefile | |||
+hw/vnc/Makefile | |||
hw/xnest/Makefile | |||
hw/xwin/Makefile | |||
hw/xquartz/Makefile | |||
diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am | |||
--- xserver/hw/Makefile.am.vnc 2011-05-11 11:09:24.989422617 +0200 | |||
+++ xserver/hw/Makefile.am 2011-05-11 11:09:32.512150522 +0200 | |||
@@ -33,7 +33,8 @@ SUBDIRS = \ | |||
$(XNEST_SUBDIRS) \ | |||
$(DMX_SUBDIRS) \ | |||
$(KDRIVE_SUBDIRS) \ | |||
- $(XQUARTZ_SUBDIRS) | |||
+ $(XQUARTZ_SUBDIRS) \ | |||
+ vnc | |||
DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive | |||
diff -up xserver/mi/miinitext.c.vnc xserver/mi/miinitext.c | |||
--- xserver/mi/miinitext.c.vnc 2011-05-11 11:09:25.089418999 +0200 | |||
+++ xserver/mi/miinitext.c 2011-05-11 11:09:50.102514343 +0200 | |||
@@ -274,6 +274,9 @@ extern void DamageExtensionInit(INITARGS | |||
extern void CompositeExtensionInit(INITARGS); | |||
#endif | |||
extern void GEExtensionInit(INITARGS); | |||
+#ifdef TIGERVNC | |||
+extern void vncExtensionInit(INITARGS); | |||
+#endif | |||
/* The following is only a small first step towards run-time | |||
* configurable extensions. | |||
@@ -454,6 +457,9 @@ InitExtensions(int argc, char *argv[]) | |||
#ifdef XF86BIGFONT | |||
if (!noXFree86BigfontExtension) XFree86BigfontExtensionInit(); | |||
#endif | |||
+#ifdef TIGERVNC | |||
+ vncExtensionInit(); | |||
+#endif | |||
#if !defined(NO_HW_ONLY_EXTS) | |||
#if defined(XF86VIDMODE) | |||
if (!noXFree86VidModeExtension) XFree86VidModeExtensionInit(); |
@@ -1,90 +0,0 @@ | |||
diff -up xserver/configure.ac.vnc xserver/configure.ac | |||
--- xserver/configure.ac.vnc 2011-05-11 11:11:33.803760465 +0200 | |||
+++ xserver/configure.ac 2011-05-11 11:11:40.998500216 +0200 | |||
@@ -30,7 +30,6 @@ AC_INIT([xorg-server], 1.8.2, [https://b | |||
RELEASE_DATE="2010-07-01" | |||
AC_CONFIG_SRCDIR([Makefile.am]) | |||
AM_INIT_AUTOMAKE([foreign dist-bzip2]) | |||
-AM_MAINTAINER_MODE | |||
# Require xorg-macros: XORG_DEFAULT_OPTIONS | |||
m4_ifndef([XORG_MACROS_VERSION], | |||
@@ -64,6 +63,7 @@ dnl forcing an entire recompile.x | |||
AC_CONFIG_HEADERS(include/version-config.h) | |||
AC_PROG_CC | |||
+AC_PROG_CXX | |||
AM_PROG_AS | |||
AC_PROG_INSTALL | |||
AC_PROG_LN_S | |||
@@ -1505,6 +1505,9 @@ if test "x$XVFB" = xyes; then | |||
AC_SUBST([XVFB_SYS_LIBS]) | |||
fi | |||
+dnl Xvnc DDX | |||
+AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XEXT_INC $FB_INC $MI_INC $RENDER_INC $RANDR_INC"]) | |||
+AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"]) | |||
dnl Xnest DDX | |||
@@ -1543,6 +1546,8 @@ xorg_bus_linuxpci=no | |||
xorg_bus_bsdpci=no | |||
xorg_bus_sparc=no | |||
+AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) | |||
+ | |||
if test "x$XORG" = xyes; then | |||
XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common' | |||
XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os' | |||
@@ -1787,7 +1792,6 @@ if test "x$XORG" = xyes; then | |||
AC_DEFINE(XORGSERVER, 1, [Building Xorg server]) | |||
AC_DEFINE(XFree86Server, 1, [Building XFree86 server]) | |||
AC_DEFINE(XFree86LOADER, 1, [Building loadable XFree86 server]) | |||
- AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) | |||
AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs]) | |||
AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions]) | |||
AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server]) | |||
@@ -2231,6 +2235,7 @@ hw/dmx/input/Makefile | |||
hw/dmx/glxProxy/Makefile | |||
hw/dmx/Makefile | |||
hw/vfb/Makefile | |||
+hw/vnc/Makefile | |||
hw/xnest/Makefile | |||
hw/xwin/Makefile | |||
hw/xquartz/Makefile | |||
diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am | |||
--- xserver/hw/Makefile.am.vnc 2011-05-11 11:11:33.867758149 +0200 | |||
+++ xserver/hw/Makefile.am 2011-05-11 11:11:40.998500216 +0200 | |||
@@ -33,7 +33,8 @@ SUBDIRS = \ | |||
$(XNEST_SUBDIRS) \ | |||
$(DMX_SUBDIRS) \ | |||
$(KDRIVE_SUBDIRS) \ | |||
- $(XQUARTZ_SUBDIRS) | |||
+ $(XQUARTZ_SUBDIRS) \ | |||
+ vnc | |||
DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive | |||
diff -up xserver/mi/miinitext.c.vnc xserver/mi/miinitext.c | |||
--- xserver/mi/miinitext.c.vnc 2011-05-11 11:11:33.941755471 +0200 | |||
+++ xserver/mi/miinitext.c 2011-05-11 11:12:04.454651752 +0200 | |||
@@ -274,6 +274,9 @@ extern void DamageExtensionInit(INITARGS | |||
extern void CompositeExtensionInit(INITARGS); | |||
#endif | |||
extern void GEExtensionInit(INITARGS); | |||
+#ifdef TIGERVNC | |||
+extern void vncExtensionInit(INITARGS); | |||
+#endif | |||
/* The following is only a small first step towards run-time | |||
* configurable extensions. | |||
@@ -454,6 +457,9 @@ InitExtensions(int argc, char *argv[]) | |||
#ifdef XF86BIGFONT | |||
if (!noXFree86BigfontExtension) XFree86BigfontExtensionInit(); | |||
#endif | |||
+#ifdef TIGERVNC | |||
+ vncExtensionInit(); | |||
+#endif | |||
#if !defined(NO_HW_ONLY_EXTS) | |||
#if defined(XF86VIDMODE) | |||
if (!noXFree86VidModeExtension) XFree86VidModeExtensionInit(); |
@@ -1,90 +0,0 @@ | |||
diff -up xserver/configure.ac.vnc xserver/configure.ac | |||
--- xserver/configure.ac.vnc 2011-05-11 11:16:50.764292985 +0200 | |||
+++ xserver/configure.ac 2011-05-11 11:16:55.675101840 +0200 | |||
@@ -30,7 +30,6 @@ AC_INIT([xorg-server], 1.9.5, [https://b | |||
RELEASE_DATE="2011-03-17" | |||
AC_CONFIG_SRCDIR([Makefile.am]) | |||
AM_INIT_AUTOMAKE([foreign dist-bzip2]) | |||
-AM_MAINTAINER_MODE | |||
# Require xorg-macros minimum of 1.10 for XORG_CHECK_SGML_DOCTOOLS | |||
m4_ifndef([XORG_MACROS_VERSION], | |||
@@ -65,6 +64,7 @@ dnl forcing an entire recompile.x | |||
AC_CONFIG_HEADERS(include/version-config.h) | |||
AC_PROG_CC | |||
+AC_PROG_CXX | |||
AM_PROG_AS | |||
AC_PROG_INSTALL | |||
AC_PROG_LN_S | |||
@@ -1514,6 +1514,9 @@ if test "x$XVFB" = xyes; then | |||
AC_SUBST([XVFB_SYS_LIBS]) | |||
fi | |||
+dnl Xvnc DDX | |||
+AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XEXT_INC $FB_INC $MI_INC $RENDER_INC $RANDR_INC"]) | |||
+AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"]) | |||
dnl Xnest DDX | |||
@@ -1552,6 +1555,8 @@ xorg_bus_linuxpci=no | |||
xorg_bus_bsdpci=no | |||
xorg_bus_sparc=no | |||
+AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) | |||
+ | |||
if test "x$XORG" = xyes; then | |||
XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common' | |||
XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os' | |||
@@ -1798,7 +1803,6 @@ if test "x$XORG" = xyes; then | |||
AC_DEFINE(XORGSERVER, 1, [Building Xorg server]) | |||
AC_DEFINE(XFree86Server, 1, [Building XFree86 server]) | |||
AC_DEFINE(XFree86LOADER, 1, [Building loadable XFree86 server]) | |||
- AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) | |||
AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs]) | |||
AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions]) | |||
AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server]) | |||
@@ -2252,6 +2256,7 @@ hw/dmx/input/Makefile | |||
hw/dmx/glxProxy/Makefile | |||
hw/dmx/Makefile | |||
hw/vfb/Makefile | |||
+hw/vnc/Makefile | |||
hw/xnest/Makefile | |||
hw/xwin/Makefile | |||
hw/xwin/glx/Makefile | |||
diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am | |||
--- xserver/hw/Makefile.am.vnc 2011-05-11 11:16:50.836290382 +0200 | |||
+++ xserver/hw/Makefile.am 2011-05-11 11:16:55.675101840 +0200 | |||
@@ -33,7 +33,8 @@ SUBDIRS = \ | |||
$(XNEST_SUBDIRS) \ | |||
$(DMX_SUBDIRS) \ | |||
$(KDRIVE_SUBDIRS) \ | |||
- $(XQUARTZ_SUBDIRS) | |||
+ $(XQUARTZ_SUBDIRS) \ | |||
+ vnc | |||
DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive | |||
diff -up xserver/mi/miinitext.c.vnc xserver/mi/miinitext.c | |||
--- xserver/mi/miinitext.c.vnc 2011-05-11 11:16:50.916287489 +0200 | |||
+++ xserver/mi/miinitext.c 2011-05-11 11:17:12.758477353 +0200 | |||
@@ -263,6 +263,9 @@ extern void DamageExtensionInit(INITARGS | |||
extern void CompositeExtensionInit(INITARGS); | |||
#endif | |||
extern void GEExtensionInit(INITARGS); | |||
+#ifdef TIGERVNC | |||
+extern void vncExtensionInit(INITARGS); | |||
+#endif | |||
/* The following is only a small first step towards run-time | |||
* configurable extensions. | |||
@@ -435,6 +438,9 @@ InitExtensions(int argc, char *argv[]) | |||
#ifdef XF86BIGFONT | |||
if (!noXFree86BigfontExtension) XFree86BigfontExtensionInit(); | |||
#endif | |||
+#ifdef TIGERVNC | |||
+ vncExtensionInit(); | |||
+#endif | |||
#if !defined(NO_HW_ONLY_EXTS) | |||
#if defined(XF86VIDMODE) | |||
if (!noXFree86VidModeExtension) XFree86VidModeExtensionInit(); |