diff options
| author | Adam Tkac <atkac@redhat.com> | 2009-01-05 15:33:13 +0000 |
|---|---|---|
| committer | Adam Tkac <atkac@redhat.com> | 2009-01-05 15:33:13 +0000 |
| commit | 43df913540af0385231ac2d6081a222a4e4b83fc (patch) | |
| tree | 81253779212f0fe72c05c1aa79f1cc6b32679f51 /unix/xserver15.patch | |
| parent | c25caf9d72230bb2775c1d92bbac4e1e59afcad4 (diff) | |
| download | tigervnc-43df913540af0385231ac2d6081a222a4e4b83fc.tar.gz tigervnc-43df913540af0385231ac2d6081a222a4e4b83fc.zip | |
[Development] Renamed xserver.patch to xserver15.patch and added xserver16.patch
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@3521 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'unix/xserver15.patch')
| -rw-r--r-- | unix/xserver15.patch | 69 |
1 files changed, 69 insertions, 0 deletions
diff --git a/unix/xserver15.patch b/unix/xserver15.patch new file mode 100644 index 00000000..15b3beef --- /dev/null +++ b/unix/xserver15.patch @@ -0,0 +1,69 @@ +diff -up xserver/configure.ac.vnc xserver/configure.ac +--- xserver/configure.ac.vnc 2008-11-20 14:21:34.000000000 +0100 ++++ xserver/configure.ac 2008-11-20 14:22:17.000000000 +0100 +@@ -31,7 +31,6 @@ 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 + + dnl this gets generated by autoheader, and thus contains all the defines. we + dnl don't ever actually use it, internally. +@@ -54,6 +53,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 +@@ -1215,6 +1215,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"]) ++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 + +@@ -2179,6 +2182,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 2008-11-20 14:21:34.000000000 +0100 ++++ xserver/hw/Makefile.am 2008-11-20 14:21:38.000000000 +0100 +@@ -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 2008-11-20 14:21:37.000000000 +0100 ++++ xserver/mi/miinitext.c 2008-11-20 14:21:38.000000000 +0100 +@@ -292,6 +292,7 @@ extern void BigReqExtensionInit(INITARGS + #ifdef MITMISC + extern void MITMiscExtensionInit(INITARGS); + #endif ++extern void vncExtensionInit(INITARGS); + #ifdef XIDLE + extern void XIdleExtensionInit(INITARGS); + #endif +@@ -566,6 +567,7 @@ InitExtensions(argc, argv) + #ifdef MITMISC + if (!noMITMiscExtension) MITMiscExtensionInit(); + #endif ++ vncExtensionInit(); + #ifdef XIDLE + if (!noXIdleExtension) XIdleExtensionInit(); + #endif |