diff options
| author | Adam Tkac <atkac@redhat.com> | 2011-05-11 10:22:24 +0000 |
|---|---|---|
| committer | Adam Tkac <atkac@redhat.com> | 2011-05-11 10:22:24 +0000 |
| commit | c65827f247f8d376e0ece49f4bbadb067f61afee (patch) | |
| tree | fdf926ee4afa7185a9a9a2f18291be8103b914ea /unix/xserver17.patch | |
| parent | ce6c8b097f0d5b161039dc8c8208aff078d433ff (diff) | |
| download | tigervnc-c65827f247f8d376e0ece49f4bbadb067f61afee.tar.gz tigervnc-c65827f247f8d376e0ece49f4bbadb067f61afee.zip | |
Initialize VNC extension inside #ifdef statement to allow to build TigerVNC inside
X.Org tree.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4402 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'unix/xserver17.patch')
| -rw-r--r-- | unix/xserver17.patch | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/unix/xserver17.patch b/unix/xserver17.patch index 87957e50..ae99bd75 100644 --- a/unix/xserver17.patch +++ b/unix/xserver17.patch @@ -1,6 +1,6 @@ diff -up xserver/configure.ac.vnc xserver/configure.ac ---- xserver/configure.ac.vnc 2010-05-18 15:41:05.768168838 +0200 -+++ xserver/configure.ac 2010-05-18 15:41:24.398165924 +0200 +--- 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]) @@ -57,8 +57,8 @@ diff -up xserver/configure.ac.vnc xserver/configure.ac hw/xwin/Makefile hw/xquartz/Makefile diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am ---- xserver/hw/Makefile.am.vnc 2010-05-18 15:41:05.860665804 +0200 -+++ xserver/hw/Makefile.am 2010-05-18 15:41:16.068165053 +0200 +--- 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) \ @@ -70,21 +70,25 @@ diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am 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 2010-05-18 15:41:05.870666372 +0200 -+++ xserver/mi/miinitext.c 2010-05-18 15:41:16.068165053 +0200 -@@ -274,6 +274,7 @@ extern void DamageExtensionInit(INITARGS +--- 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 +455,7 @@ InitExtensions(int argc, char *argv[]) +@@ -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(); |