Annotation of /trunk/tigervnc/patches/tigervnc-1.0.1-r3926.patch
Parent Directory
| 
Revision Log
Revision 1201 -
(hide annotations)
(download)
Mon Nov 22 23:25:59 2010 UTC (13 years, 5 months ago) by niro
File size: 3923 byte(s)
Mon Nov 22 23:25:59 2010 UTC (13 years, 5 months ago) by niro
File size: 3923 byte(s)
-patches for 1.0.1 against xorg-server-1.7
| 1 | niro | 1201 | Index: unix/README |
| 2 | =================================================================== | ||
| 3 | --- unix/README (revision 3925) | ||
| 4 | +++ unix/README (revision 3926) | ||
| 5 | @@ -97,8 +97,8 @@ | ||
| 6 | % cd <path_to_tigervnc_source>/unix/xserver | ||
| 7 | % patch -p1 < ../xserver15.patch | ||
| 8 | |||
| 9 | -- note: you can use server-1.6-branch. Simply checkout it as written above | ||
| 10 | - and use xserver16.patch | ||
| 11 | +- note: you can use server-1.X-branch. Simply checkout it as written above | ||
| 12 | + and use xserver1X.patch | ||
| 13 | |||
| 14 | After that you have to regenerate configure script and Makefile.in: | ||
| 15 | |||
| 16 | Index: unix/xserver17.patch | ||
| 17 | =================================================================== | ||
| 18 | --- unix/xserver17.patch (revision 0) | ||
| 19 | +++ unix/xserver17.patch (revision 3926) | ||
| 20 | @@ -0,0 +1,83 @@ | ||
| 21 | +--- xserver/configure.ac.vnc 2009-12-16 18:53:17.208009726 +0000 | ||
| 22 | ++++ xserver/configure.ac 2009-12-16 19:00:56.624009167 +0000 | ||
| 23 | +@@ -30,7 +30,6 @@ AC_INIT([xorg-server], 1.7.3.901, [https | ||
| 24 | + RELEASE_DATE="2009-12-11" | ||
| 25 | + AC_CONFIG_SRCDIR([Makefile.am]) | ||
| 26 | + AM_INIT_AUTOMAKE([dist-bzip2 foreign]) | ||
| 27 | +-AM_MAINTAINER_MODE | ||
| 28 | + | ||
| 29 | + AC_CONFIG_FILES([ | ||
| 30 | + shave | ||
| 31 | +@@ -64,6 +63,7 @@ dnl forcing an entire recompile.x | ||
| 32 | + AC_CONFIG_HEADERS(include/version-config.h) | ||
| 33 | + | ||
| 34 | + AC_PROG_CC | ||
| 35 | ++AC_PROG_CXX | ||
| 36 | + AM_PROG_AS | ||
| 37 | + AC_PROG_INSTALL | ||
| 38 | + AC_PROG_LN_S | ||
| 39 | +@@ -1383,6 +1383,9 @@ if test "x$XVFB" = xyes; then | ||
| 40 | + AC_SUBST([XVFB_SYS_LIBS]) | ||
| 41 | + fi | ||
| 42 | + | ||
| 43 | ++dnl Xvnc DDX | ||
| 44 | ++AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XEXT_INC $FB_INC $MI_INC $RENDER_INC $RANDR_INC"]) | ||
| 45 | ++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"]) | ||
| 46 | + | ||
| 47 | + dnl Xnest DDX | ||
| 48 | + | ||
| 49 | +@@ -1421,6 +1424,8 @@ xorg_bus_linuxpci=no | ||
| 50 | + xorg_bus_bsdpci=no | ||
| 51 | + xorg_bus_sparc=no | ||
| 52 | + | ||
| 53 | ++AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) | ||
| 54 | ++ | ||
| 55 | + if test "x$XORG" = xyes; then | ||
| 56 | + XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common' | ||
| 57 | + XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os' | ||
| 58 | +@@ -1649,7 +1654,6 @@ if test "x$XORG" = xyes; then | ||
| 59 | + AC_DEFINE(XORGSERVER, 1, [Building Xorg server]) | ||
| 60 | + AC_DEFINE(XFree86Server, 1, [Building XFree86 server]) | ||
| 61 | + AC_DEFINE(XFree86LOADER, 1, [Building loadable XFree86 server]) | ||
| 62 | +- AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) | ||
| 63 | + AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs]) | ||
| 64 | + AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions]) | ||
| 65 | + AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server]) | ||
| 66 | +@@ -2094,6 +2098,7 @@ hw/dmx/input/Makefile | ||
| 67 | + hw/dmx/glxProxy/Makefile | ||
| 68 | + hw/dmx/Makefile | ||
| 69 | + hw/vfb/Makefile | ||
| 70 | ++hw/vnc/Makefile | ||
| 71 | + hw/xnest/Makefile | ||
| 72 | + hw/xwin/Makefile | ||
| 73 | + hw/xquartz/Makefile | ||
| 74 | +--- xserver/mi/miinitext.c.vnc 2009-12-16 18:53:20.864010515 +0000 | ||
| 75 | ++++ xserver/mi/miinitext.c 2009-12-16 19:01:23.664009203 +0000 | ||
| 76 | +@@ -274,6 +274,7 @@ extern void DamageExtensionInit(INITARGS | ||
| 77 | + extern void CompositeExtensionInit(INITARGS); | ||
| 78 | + #endif | ||
| 79 | + extern void GEExtensionInit(INITARGS); | ||
| 80 | ++extern void vncExtensionInit(INITARGS); | ||
| 81 | + | ||
| 82 | + /* The following is only a small first step towards run-time | ||
| 83 | + * configurable extensions. | ||
| 84 | +@@ -454,6 +455,7 @@ InitExtensions(int argc, char *argv[]) | ||
| 85 | + #ifdef XF86BIGFONT | ||
| 86 | + if (!noXFree86BigfontExtension) XFree86BigfontExtensionInit(); | ||
| 87 | + #endif | ||
| 88 | ++ vncExtensionInit(); | ||
| 89 | + #if !defined(NO_HW_ONLY_EXTS) | ||
| 90 | + #if defined(XF86VIDMODE) | ||
| 91 | + if (!noXFree86VidModeExtension) XFree86VidModeExtensionInit(); | ||
| 92 | +--- xserver/hw/Makefile.am.vnc 2009-12-16 18:53:17.816009029 +0000 | ||
| 93 | ++++ xserver/hw/Makefile.am 2009-12-16 19:01:31.064009345 +0000 | ||
| 94 | +@@ -33,7 +33,8 @@ SUBDIRS = \ | ||
| 95 | + $(XNEST_SUBDIRS) \ | ||
| 96 | + $(DMX_SUBDIRS) \ | ||
| 97 | + $(KDRIVE_SUBDIRS) \ | ||
| 98 | +- $(XQUARTZ_SUBDIRS) | ||
| 99 | ++ $(XQUARTZ_SUBDIRS) \ | ||
| 100 | ++ vnc | ||
| 101 | + | ||
| 102 | + DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive | ||
| 103 | + |