Annotation of /trunk/tigervnc/patches/tigervnc-1.0.1-xserver19.patch
Parent Directory
| 
Revision Log
Revision 1250 -
(hide annotations)
(download)
Fri Jan 21 00:43:20 2011 UTC (13 years, 4 months ago) by niro
File size: 3697 byte(s)
Fri Jan 21 00:43:20 2011 UTC (13 years, 4 months ago) by niro
File size: 3697 byte(s)
added xorg-1.9 patch
| 1 | niro | 1250 | diff -Naur tigervnc-1.0.1/unix/xserver19.patch tigervnc-1.0.1-magellan/unix/xserver19.patch |
| 2 | --- tigervnc-1.0.1/unix/xserver19.patch 1970-01-01 01:00:00.000000000 +0100 | ||
| 3 | +++ tigervnc-1.0.1-magellan/unix/xserver19.patch 2011-01-21 01:55:13.000000000 +0100 | ||
| 4 | @@ -0,0 +1,86 @@ | ||
| 5 | +diff -up xserver/configure.ac.vnc xserver/configure.ac | ||
| 6 | +--- xserver/configure.ac.vnc 2010-07-20 11:34:55.086181932 +0200 | ||
| 7 | ++++ xserver/configure.ac 2010-07-20 11:35:02.196706133 +0200 | ||
| 8 | +@@ -30,7 +30,6 @@ AC_INIT([xorg-server], 1.8.99.905, [http | ||
| 9 | + RELEASE_DATE="2010-07-14" | ||
| 10 | + AC_CONFIG_SRCDIR([Makefile.am]) | ||
| 11 | + AM_INIT_AUTOMAKE([foreign dist-bzip2]) | ||
| 12 | +-AM_MAINTAINER_MODE | ||
| 13 | + | ||
| 14 | + # Require xorg-macros: XORG_DEFAULT_OPTIONS | ||
| 15 | + m4_ifndef([XORG_MACROS_VERSION], | ||
| 16 | +@@ -64,6 +63,7 @@ dnl forcing an entire recompile.x | ||
| 17 | + AC_CONFIG_HEADERS(include/version-config.h) | ||
| 18 | + | ||
| 19 | + AC_PROG_CC | ||
| 20 | ++AC_PROG_CXX | ||
| 21 | + AM_PROG_AS | ||
| 22 | + AC_PROG_INSTALL | ||
| 23 | + AC_PROG_LN_S | ||
| 24 | +@@ -1512,6 +1512,9 @@ if test "x$XVFB" = xyes; then | ||
| 25 | + AC_SUBST([XVFB_SYS_LIBS]) | ||
| 26 | + fi | ||
| 27 | + | ||
| 28 | ++dnl Xvnc DDX | ||
| 29 | ++AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XEXT_INC $FB_INC $MI_INC $RENDER_INC $RANDR_INC"]) | ||
| 30 | ++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"]) | ||
| 31 | + | ||
| 32 | + dnl Xnest DDX | ||
| 33 | + | ||
| 34 | +@@ -1550,6 +1553,8 @@ xorg_bus_linuxpci=no | ||
| 35 | + xorg_bus_bsdpci=no | ||
| 36 | + xorg_bus_sparc=no | ||
| 37 | + | ||
| 38 | ++AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) | ||
| 39 | ++ | ||
| 40 | + if test "x$XORG" = xyes; then | ||
| 41 | + XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common' | ||
| 42 | + XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os' | ||
| 43 | +@@ -1796,7 +1801,6 @@ if test "x$XORG" = xyes; then | ||
| 44 | + AC_DEFINE(XORGSERVER, 1, [Building Xorg server]) | ||
| 45 | + AC_DEFINE(XFree86Server, 1, [Building XFree86 server]) | ||
| 46 | + AC_DEFINE(XFree86LOADER, 1, [Building loadable XFree86 server]) | ||
| 47 | +- AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) | ||
| 48 | + AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs]) | ||
| 49 | + AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions]) | ||
| 50 | + AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server]) | ||
| 51 | +@@ -2246,6 +2250,7 @@ hw/dmx/input/Makefile | ||
| 52 | + hw/dmx/glxProxy/Makefile | ||
| 53 | + hw/dmx/Makefile | ||
| 54 | + hw/vfb/Makefile | ||
| 55 | ++hw/vnc/Makefile | ||
| 56 | + hw/xnest/Makefile | ||
| 57 | + hw/xwin/Makefile | ||
| 58 | + hw/xwin/glx/Makefile | ||
| 59 | +diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am | ||
| 60 | +--- xserver/hw/Makefile.am.vnc 2010-07-20 11:34:55.276195912 +0200 | ||
| 61 | ++++ xserver/hw/Makefile.am 2010-07-20 11:35:02.196706133 +0200 | ||
| 62 | +@@ -33,7 +33,8 @@ SUBDIRS = \ | ||
| 63 | + $(XNEST_SUBDIRS) \ | ||
| 64 | + $(DMX_SUBDIRS) \ | ||
| 65 | + $(KDRIVE_SUBDIRS) \ | ||
| 66 | +- $(XQUARTZ_SUBDIRS) | ||
| 67 | ++ $(XQUARTZ_SUBDIRS) \ | ||
| 68 | ++ vnc | ||
| 69 | + | ||
| 70 | + DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive | ||
| 71 | + | ||
| 72 | +diff -up xserver/mi/miinitext.c.vnc xserver/mi/miinitext.c | ||
| 73 | +--- xserver/mi/miinitext.c.vnc 2010-07-20 11:34:55.286196649 +0200 | ||
| 74 | ++++ xserver/mi/miinitext.c 2010-07-20 11:35:02.196706133 +0200 | ||
| 75 | +@@ -263,6 +263,7 @@ extern void DamageExtensionInit(INITARGS | ||
| 76 | + extern void CompositeExtensionInit(INITARGS); | ||
| 77 | + #endif | ||
| 78 | + extern void GEExtensionInit(INITARGS); | ||
| 79 | ++extern void vncExtensionInit(INITARGS); | ||
| 80 | + | ||
| 81 | + /* The following is only a small first step towards run-time | ||
| 82 | + * configurable extensions. | ||
| 83 | +@@ -435,6 +436,7 @@ InitExtensions(int argc, char *argv[]) | ||
| 84 | + #ifdef XF86BIGFONT | ||
| 85 | + if (!noXFree86BigfontExtension) XFree86BigfontExtensionInit(); | ||
| 86 | + #endif | ||
| 87 | ++ vncExtensionInit(); | ||
| 88 | + #if !defined(NO_HW_ONLY_EXTS) | ||
| 89 | + #if defined(XF86VIDMODE) | ||
| 90 | + if (!noXFree86VidModeExtension) XFree86VidModeExtensionInit(); |