From 6e3dad36c1e9a71eb0ee80fd86b7c452dbf1eea9 Mon Sep 17 00:00:00 2001

From: atkac <atkac@3789f03b-4d11-0410-bbf8-ca57d06f2519>

Date: Fri, 22 Jan 2010 11:15:55 +0000

Subject: [PATCH] [Development] X.Org 1.8 codebase is now supported. Add xserver18.patch.

git-svn-id: https://tigervnc.svn.sourceforge.net/svnroot/tigervnc/trunk@3954 3789f03b-4d11-0410-bbf8-ca57d06f2519

---

 unix/xserver/hw/vnc/xorg-version.h |    4 +-

 unix/xserver18.patch               |   87 ++++++++++++++++++++++++++++++++++++

 2 files changed, 90 insertions(+), 1 deletions(-)

 create mode 100644 unix/xserver18.patch

diff --git a/unix/xserver/hw/vnc/xorg-version.h b/unix/xserver/hw/vnc/xorg-version.h

index 3d942fc..71f8553 100644

--- a/unix/xserver/hw/vnc/xorg-version.h

+++ b/unix/xserver/hw/vnc/xorg-version.h

@@ -30,8 +30,10 @@

 #define XORG 16

 #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (7 * 100000) + (99 * 1000))

 #define XORG 17

+#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (8 * 100000) + (99 * 1000))

+#define XORG 18

 #else

-#error "X.Org newer than 1.7 is not supported"

+#error "X.Org newer than 1.8 is not supported"

 #endif

 #endif

diff --git a/unix/xserver18.patch b/unix/xserver18.patch

new file mode 100644

index 0000000..3ac7c38

--- /dev/null

+++ b/unix/xserver18.patch

@@ -0,0 +1,87 @@

+diff -up xserver/configure.ac.vnc xserver/configure.ac

+--- xserver/configure.ac.vnc	2010-01-22 11:23:04.524629373 +0100

++++ xserver/configure.ac	2010-01-22 11:31:04.704638847 +0100

+@@ -30,7 +30,6 @@ AC_INIT([xorg-server], 1.7.99.3, [https:

+ RELEASE_DATE="(unreleased)"

+ AC_CONFIG_SRCDIR([Makefile.am])

+ AM_INIT_AUTOMAKE([foreign dist-bzip2])

+-AM_MAINTAINER_MODE

+ 

+ # Require xorg-macros: XORG_DEFAULT_OPTIONS

+ m4_ifndef([XORG_MACROS_VERSION],

+@@ -63,6 +62,7 @@ dnl forcing an entire recompile.x

+ AC_CONFIG_HEADERS(include/version-config.h)

+ 

+ AC_PROG_CC

++AC_PROG_CXX

+ AM_PROG_AS

+ AC_PROG_INSTALL

+ AC_PROG_LN_S

+@@ -1486,6 +1486,10 @@ 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 $MAIN_LIB"])

++AC_SUBST([LIBVNC_LIBS], ["$XI_LIB $DIX_LIB $XKB_LIB"])

+ 

+ dnl Xnest DDX

+ 

+@@ -1524,6 +1528,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'

+@@ -1765,7 +1771,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])

+@@ -2195,6 +2200,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	2010-01-22 11:23:04.560613962 +0100

++++ xserver/hw/Makefile.am	2010-01-22 11:23:04.600597430 +0100

+@@ -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	2010-01-22 11:23:04.564613258 +0100

++++ xserver/mi/miinitext.c	2010-01-22 11:23:04.600597430 +0100

+@@ -274,6 +274,7 @@ extern void DamageExtensionInit(INITARGS

+ extern void CompositeExtensionInit(INITARGS);

+ #endif

+ extern void GEExtensionInit(INITARGS);

++extern void vncExtensionInit(INITARGS);

+ 

+ /* The following is only a small first step towards run-time

+  * configurable extensions.

+@@ -454,6 +455,7 @@ InitExtensions(int argc, char *argv[])

+ #ifdef XF86BIGFONT

+     if (!noXFree86BigfontExtension) XFree86BigfontExtensionInit();

+ #endif

++    vncExtensionInit();

+ #if !defined(NO_HW_ONLY_EXTS)

+ #if defined(XF86VIDMODE)

+     if (!noXFree86VidModeExtension) XFree86VidModeExtensionInit();

-- 

1.5.6.5