mirrors
/
tigervnc
镜像自地址 https://github.com/TigerVNC/tigervnc.git
关注 1
点赞 0
派生 0
代码 工单 0 版本发布 37 百科 动态
浏览代码

Raise base Xorg requirement to 1.7 

We're not testing or maintaining anything older than that.
tags/v1.4.90
Pierre Ossman 9 年前
父节点
56610fb847
当前提交
6330d1465c
共有 8 个文件被更改，包括 6 次插入 和 510 次删除
分列视图 显示文件统计
  1. 3
    20
      BUILDING.txt
  2. 1
    15
      unix/build-xorg
  3. 0
    84
      unix/download-xorg-7.4
  4. 0
    97
      unix/xorg-7.4-patches/0001-Add-dridir-param.patch
  5. 0
    33
      unix/xorg-7.4-patches/0001-Add-xkbcompdir-param.patch
  6. 2
    4
      unix/xserver/hw/vnc/xorg-version.h
  7. 0
    158
      unix/xserver15.patch
  8. 0
    99
      unix/xserver16.patch

+ 3
- 20
BUILDING.txt 查看文件

@@ -31,27 +31,9 @@ Build Requirements (Unix)
-- Non-Mac platforms:
* X11 development kit

* autoconf 2.57 or later
* automake 1.7 or later
* libtool 1.4 or later
* OpenSSL v0.9.7 or later
* Python v2.3 or later
* zlib v1.2 or later

* pkgconfig 0.20 or later
If you are using an older RPM-based system which does not meet this
minimum requirement (such as Red Hat Enterprise Linux 4), then you can
build pkgconfig 0.20 from the Fedora 5 source RPM:
http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/source/SRPMS/pkgconfig-0.20-2.2.1.src.rpm

* gettext 0.14.4 or later
If you are using an older RPM-based system which does not meet this
minimum requirement (such as Red Hat Enterprise Linux 4), then you can
build gettext 0.14.5 from the Fedora 5 source RPM:
http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/source/SRPMS/gettext-0.14.5-3.src.rpm
NOTE: gcj and libgcj are required when building the above source RPM.

-- If building Xvnc/libvnc.so:
* Xorg server source code, 1.7 or never
* All build requirements Xorg imposes (see its documentation)

============================
Build Requirements (Windows)

+ 1
- 15
unix/build-xorg 查看文件

@@ -9,7 +9,7 @@ set -e
PREFIX=
MAKE="make"
PARALLEL_MAKE=0
XORG_VERSION=7.4
XORG_VERSION=7.5
XONLY=0
CFGHOST=
SRCDIR=`dirname $0`/..
@@ -55,9 +55,6 @@ modules="dri2proto \
libpciaccess \
pixman"

modules74="fontcacheproto \
evieext"

init()
{
update_modules
@@ -72,11 +69,7 @@ init()

pushd xserver

if [ "$XORG_VERSION" = "7.4" ]; then
patch -p1 < $SRCDIR/unix/xserver16.patch
else
patch -p1 < $SRCDIR/unix/xserver18.patch
fi
for all in `find $SRCDIR/unix/xorg-$XORG_VERSION-patches/ -type f |grep '.*\.patch$'`; do
echo Applying $all
patch -p1 < $all
@@ -244,7 +237,6 @@ do
xbuild) MODE=build; XONLY=1 ;;
rebuild) MODE=rebuild ;;
update) MODE=update ;;
-version) XORG_VERSION=$2; shift ;;
-parallel) PARALLEL_MAKE=1; ;;
-srcdir) SRCDIR=$2; shift ;;
*) break ;;
@@ -252,12 +244,6 @@ do
shift
done

case "$XORG_VERSION" in
7.4) modules=$modules" "$modules74 ;;
7.5) ;;
*) if [ ! "$MODE" = "rebuild" ]; then usage; fi ;;
esac

pushd $SRCDIR
SRCDIR=`pwd`
echo "*** Using TigerVNC source tree at $SRCDIR ***"

+ 0
- 84
unix/download-xorg-7.4 查看文件

@@ -1,84 +0,0 @@
#!/usr/bin/env python
# -*-mode: python; coding: UTF-8 -*-

import os
import glob

#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.1.0.tar.bz2",
"fixesproto": PROTO + "fixesproto-4.0.tar.bz2",
"resourceproto": PROTO + "resourceproto-1.0.2.tar.bz2",
"fontsproto": PROTO + "fontsproto-2.0.2.tar.bz2",
"fontcacheproto" : PROTO + "fontcacheproto-0.1.2.tar.bz2",
"bigreqsproto": PROTO + "bigreqsproto-1.0.2.tar.bz2",
"kbproto": PROTO + "kbproto-1.0.3.tar.bz2",
"inputproto": PROTO + "inputproto-1.5.1.tar.bz2",
"glproto": PROTO + "glproto-1.4.9.tar.bz2",
"xineramaproto": PROTO + "xineramaproto-1.1.2.tar.bz2",
"randrproto": PROTO + "randrproto-1.3.2.tar.bz2",
"scrnsaverproto": PROTO + "scrnsaverproto-1.1.0.tar.bz2",
"renderproto": PROTO + "renderproto-0.9.3.tar.bz2",
"evieext": PROTO + "evieext-1.0.2.tar.bz2",
"xcmiscproto": PROTO + "xcmiscproto-1.1.2.tar.bz2",
"xextproto": PROTO + "xextproto-7.0.3.tar.bz2",
"xf86driproto": PROTO + "xf86driproto-2.0.4.tar.bz2",
"dri2proto": PROTO + "dri2proto-2.1.tar.bz2",
"compositeproto": PROTO + "compositeproto-0.4.tar.bz2",
"xf86vidmodeproto": PROTO + "xf86vidmodeproto-2.2.2.tar.bz2",
"videoproto": PROTO + "videoproto-2.2.2.tar.bz2",
"xproto": PROTO + "xproto-7.0.13.tar.bz2",

"libxkbfile": LIB + "libxkbfile-1.0.5.tar.bz2",
"libXxf86vm": LIB + "libXxf86vm-1.0.2.tar.bz2",
"libXext": LIB + "libXext-1.0.4.tar.bz2",
"libfontenc": LIB + "libfontenc-1.0.4.tar.bz2",
"libXau": LIB + "libXau-1.0.4.tar.bz2",
"libXfont": LIB + "libXfont-1.3.4.tar.bz2",
"libXfixes": LIB + "libXfixes-4.0.3.tar.bz2",
"libSM": LIB + "libSM-1.1.0.tar.bz2",
"libXi": LIB + "libXi-1.1.3.tar.bz2",
"libXmu": LIB + "libXmu-1.0.4.tar.bz2",
"libX11": LIB + "libX11-1.1.5.tar.bz2",
"libXdmcp": LIB + "libXdmcp-1.0.2.tar.bz2",
"xtrans": LIB + "xtrans-1.2.2.tar.bz2",
"libXt": LIB + "libXt-1.0.5.tar.bz2",
"libpciaccess": LIB + "libpciaccess-0.10.4.tar.bz2",
"libICE": LIB + "libICE-1.0.4.tar.bz2",
"pixman": LIB + "pixman-0.16.0.tar.bz2",
"libXdamage": LIB + "libXdamage-1.1.1.tar.bz2",

"util-macros": UTIL + "util-macros-1.1.6.tar.bz2",
"xorg-server": SERVER + "xorg-server-1.6.5.tar.bz2",

"libdrm": "http://dri.freedesktop.org/libdrm/libdrm-2.4.0.tar.bz2",
"Mesa": "http://downloads.sourceforge.net/mesa3d/MesaLib-7.2.tar.bz2",
"libpthread-stubs": "http://xcb.freedesktop.org/dist/libpthread-stubs-0.1.tar.bz2",
"freetype": "http://downloads.sourceforge.net/freetype/freetype-2.3.11.tar.bz2",
}



def main():
dir = os.path.expanduser("~")+"/.tigervnc-xorg-7.4"
cwd = os.getcwd()
if not os.path.exists(dir):
os.mkdir(dir)
os.chdir(dir)

for pkg in packages.keys():
loc = packages[pkg]
fname = pkg + ".tar.bz2"
if not os.path.exists(fname):
assert 0 == os.spawnvp(os.P_WAIT, "wget", ["-N", "-c", "-O", fname, loc])

os.chdir(cwd)
main()

+ 0
- 97
unix/xorg-7.4-patches/0001-Add-dridir-param.patch 查看文件

@@ -1,97 +0,0 @@
*** a/glx/glxdri.c 2011-02-16 14:00:53.000000000 -0600
--- b/glx/glxdri.c 2011-02-16 13:56:09.000000000 -0600
***************
*** 838,843 ****
- static const char dri_driver_path[] = DRI_DRIVER_PATH;
-
static Bool
glxDRIEnterVT (int index, int flags)
--- 838,841 ----
diff -r -C2 a/glx/glxdriswrast.c b/glx/glxdriswrast.c
*** a/glx/glxdriswrast.c 2011-02-16 14:00:53.000000000 -0600
--- b/glx/glxdriswrast.c 2011-02-16 13:56:29.000000000 -0600
***************
*** 448,453 ****
}
- static const char dri_driver_path[] = DRI_DRIVER_PATH;
-
static __GLXscreen *
__glXDRIscreenProbe(ScreenPtr pScreen)
--- 448,451 ----
diff -r -C2 a/glx/glxext.c b/glx/glxext.c
*** a/glx/glxext.c 2011-02-16 14:00:54.000000000 -0600
--- b/glx/glxext.c 2011-02-16 13:58:39.000000000 -0600
***************
*** 520,521 ****
--- 520,548 ----
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 -r -C2 a/glx/glxserver.h b/glx/glxserver.h
*** a/glx/glxserver.h 2011-02-16 14:00:54.000000000 -0600
--- b/glx/glxserver.h 2011-02-16 14:01:44.000000000 -0600
***************
*** 264,266 ****
--- 264,269 ----
GLint alignment);
+ extern char *dri_driver_path;
+ extern int GlxProcessArguments(int argc, char *argv[], int i);
+
#endif /* !__GLX_server_h__ */
Only in b/os: ._utils.c
diff -r -C2 a/os/utils.c b/os/utils.c
*** a/os/utils.c 2011-02-16 14:01:18.000000000 -0600
--- b/os/utils.c 2011-02-16 14:04:11.000000000 -0600
***************
*** 159,162 ****
--- 159,163 ----
_X_EXPORT Bool noGlxExtension = FALSE;
_X_EXPORT Bool noGlxVisualInit = FALSE;
+ extern int GlxProcessArguments(int argc, char *argv[], int i);
#endif
#ifdef SCREENSAVER
***************
*** 854,857 ****
--- 855,866 ----
}
#endif
+ #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)

+ 0
- 33
unix/xorg-7.4-patches/0001-Add-xkbcompdir-param.patch 查看文件

@@ -1,33 +0,0 @@
Only in b/xkb: ._xkbInit.c
diff -r -C2 a/xkb/xkbInit.c b/xkb/xkbInit.c
*** a/xkb/xkbInit.c 2011-02-16 14:07:03.000000000 -0600
--- b/xkb/xkbInit.c 2011-02-16 14:08:08.000000000 -0600
***************
*** 875,879 ****
--- 875,900 ----
}
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 */

+ 2
- 4
unix/xserver/hw/vnc/xorg-version.h 查看文件

@@ -24,10 +24,8 @@
#include <dix-config.h>
#endif

#if XORG_VERSION_CURRENT < ((1 * 10000000) + (5 * 100000) + (99 * 1000))
#define XORG 15
#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (6 * 100000) + (99 * 1000))
#define XORG 16
#if XORG_VERSION_CURRENT < ((1 * 10000000) + (6 * 100000) + (99 * 1000))
#error "X.Org older than 1.7 is not supported"
#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (7 * 100000) + (99 * 1000))
#define XORG 17
#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (8 * 100000) + (99 * 1000))

+ 0
- 158
unix/xserver15.patch 查看文件

@@ -1,158 +0,0 @@
diff -up xserver/configure.ac.vnc xserver/configure.ac
--- xserver/configure.ac.vnc 2011-05-11 11:02:51.229669941 +0200
+++ xserver/configure.ac 2011-05-11 11:03:07.754072695 +0200
@@ -31,7 +31,7 @@ RELEASE_DATE="5 November 2008"
REMEMBER_REMEMBER="The Fifth of November"
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([dist-bzip2 foreign])
-AM_MAINTAINER_MODE
+m4_pattern_allow([AC_DEFINE])
dnl this gets generated by autoheader, and thus contains all the defines. we
dnl don't ever actually use it, internally.
@@ -54,6 +54,7 @@ dnl kdrive-config.h covers the kdrive DD
AC_CONFIG_HEADERS(include/kdrive-config.h)
AC_PROG_CC
+AC_PROG_CXX
AM_PROG_AS
AC_PROG_INSTALL
AC_PROG_LN_S
@@ -1010,7 +1011,7 @@ AC_DEFINE(SHAPE, 1, [Support SHAPE exten
AC_DEFINE(XKB, 1, [Build XKB])
AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server])
-AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default])
+AC_DEFINE(XKB_DFLT_DISABLED, 1, [Disable XKB per default])
REQUIRED_MODULES="$REQUIRED_MODULES xkbfile"
XKB_LIB='$(top_builddir)/xkb/libxkb.la'
XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la'
@@ -1220,6 +1221,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 $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB"])
dnl Xnest DDX
@@ -1314,6 +1318,8 @@ xorg_bus_ppcpci=no
xorg_bus_sparcpci=no
xorg_bus_sparc=no
+AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
+
if test "x$XORG" = xyes -o "x$XGL" = 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'
@@ -1521,7 +1527,6 @@ if test "x$XORG" = xyes -o "x$XGL" = xye
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])
@@ -2184,6 +2189,7 @@ hw/dmx/input/Makefile
hw/dmx/glxProxy/Makefile
hw/dmx/Makefile
hw/vfb/Makefile
+hw/vnc/Makefile
hw/xgl/Makefile
hw/xgl/egl/Makefile
hw/xgl/egl/module/Makefile
diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am
--- xserver/hw/Makefile.am.vnc 2011-05-11 11:02:51.809648976 +0200
+++ xserver/hw/Makefile.am 2011-05-11 11:03:07.754072695 +0200
@@ -43,7 +43,8 @@ SUBDIRS = \
$(DMX_SUBDIRS) \
$(KDRIVE_SUBDIRS) \
$(XQUARTZ_SUBDIRS) \
- $(XPRINT_SUBDIRS)
+ $(XPRINT_SUBDIRS) \
+ vnc
DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive xgl xprint
diff -up xserver/mi/miinitext.c.vnc xserver/mi/miinitext.c
--- xserver/mi/miinitext.c.vnc 2011-05-11 11:02:53.156600294 +0200
+++ xserver/mi/miinitext.c 2011-05-11 11:03:31.079229673 +0200
@@ -292,6 +292,9 @@ extern void BigReqExtensionInit(INITARGS
#ifdef MITMISC
extern void MITMiscExtensionInit(INITARGS);
#endif
+#ifdef TIGERVNC
+extern void vncExtensionInit(INITARGS);
+#endif
#ifdef XIDLE
extern void XIdleExtensionInit(INITARGS);
#endif
@@ -566,6 +569,9 @@ InitExtensions(argc, argv)
#ifdef MITMISC
if (!noMITMiscExtension) MITMiscExtensionInit();
#endif
+#ifdef TIGERVNC
+ vncExtensionInit();
+#endif
#ifdef XIDLE
if (!noXIdleExtension) XIdleExtensionInit();
#endif
--- xserver/os/WaitFor.c.orig 2011-10-07 12:57:57.000000000 +0200
+++ xserver/os/WaitFor.c 2011-10-07 13:21:11.000000000 +0200
@@ -125,6 +125,9 @@
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
@@ -150,6 +153,7 @@
INT32 timeout = 0;
fd_set clientsReadable;
fd_set clientsWritable;
+ fd_set socketsWritable;
int curclient;
int selecterr;
int nready;
@@ -220,23 +224,29 @@
SmartScheduleStopTimer ();
#endif
+ FD_ZERO(&socketsWritable);
+ vncWriteBlockHandler(&socketsWritable);
BlockHandler((pointer)&wt, (pointer)&LastSelectMask);
if (NewOutputPending)
FlushAllOutput();
/* keep this check close to select() call to minimize race */
if (dispatchException)
i = -1;
- else if (AnyClientsWriteBlocked)
- {
- XFD_COPYSET(&ClientsWriteBlocked, &clientsWritable);
- i = Select (MaxClients, &LastSelectMask, &clientsWritable, NULL, wt);
- }
- else
- {
- i = Select (MaxClients, &LastSelectMask, NULL, NULL, wt);
+ else {
+ 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);
#ifdef SMART_SCHEDULE
SmartScheduleStartTimer ();
#endif

+ 0
- 99
unix/xserver16.patch 查看文件

@@ -1,99 +0,0 @@
diff -up xserver/configure.ac.vnc xserver/configure.ac
--- xserver/configure.ac.vnc 2011-05-11 11:06:29.966753119 +0200
+++ xserver/configure.ac 2011-05-11 11:06:37.286488408 +0200
@@ -29,7 +29,6 @@ AC_PREREQ(2.57)
AC_INIT([xorg-server], 1.6.5, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([dist-bzip2 foreign])
-AM_MAINTAINER_MODE
RELEASE_DATE="2009-10-11"
@@ -52,6 +51,7 @@ dnl kdrive-config.h covers the kdrive DD
AC_CONFIG_HEADERS(include/kdrive-config.h)
AC_PROG_CC
+AC_PROG_CXX
AM_PROG_AS
AC_PROG_INSTALL
AC_PROG_LN_S
@@ -995,7 +995,7 @@ AC_DEFINE(SHAPE, 1, [Support SHAPE exten
AC_DEFINE(XKB, 1, [Build XKB])
AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server])
-AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default])
+AC_DEFINE(XKB_DFLT_DISABLED, 1, [Disable XKB per default])
REQUIRED_MODULES="$REQUIRED_MODULES xkbfile"
XKB_LIB='$(top_builddir)/xkb/libxkb.la'
XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la'
@@ -1199,6 +1199,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"])
dnl Xnest DDX
@@ -1234,6 +1237,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'
@@ -1421,7 +1426,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])
@@ -1875,6 +1879,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:06:30.022751094 +0200
+++ xserver/hw/Makefile.am 2011-05-11 11:06:37.286488408 +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:06:30.127747296 +0200
+++ xserver/mi/miinitext.c 2011-05-11 11:07:10.182298769 +0200
@@ -272,6 +272,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.
@@ -438,6 +441,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();

撰写 预览
正在加载...
取消
保存