From: Adam Tkac <atkac@redhat.com>
Date: Mon, 21 Dec 2009 09:13:55 +0000 (+0000)
Subject: [Development] Add xserver17.patch (Thanks to adq_dvb at lidskialf dot net).
X-Git-Tag: v1.0.90~370
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=51268fd7996d6ef285fd57a7c9c5e1093fccf34f;p=tigervnc.git

[Development] Add xserver17.patch (Thanks to adq_dvb at lidskialf dot net).


git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@3926 3789f03b-4d11-0410-bbf8-ca57d06f2519
---

diff --git a/unix/README b/unix/README
index 20bd3485..4c166010 100644
--- a/unix/README
+++ b/unix/README
@@ -97,8 +97,8 @@ Then you have to apply a patch to some files in the X source tree:
   % cd <path_to_tigervnc_source>/unix/xserver
   % patch -p1 < ../xserver15.patch
 
-- note: you can use server-1.6-branch. Simply checkout it as written above
-  and use xserver16.patch
+- note: you can use server-1.X-branch. Simply checkout it as written above
+  and use xserver1X.patch
 
 After that you have to regenerate configure script and Makefile.in:
 
diff --git a/unix/xserver17.patch b/unix/xserver17.patch
new file mode 100644
index 00000000..36c96ec7
--- /dev/null
+++ b/unix/xserver17.patch
@@ -0,0 +1,83 @@
+--- xserver/configure.ac.vnc	2009-12-16 18:53:17.208009726 +0000
++++ xserver/configure.ac	2009-12-16 19:00:56.624009167 +0000
+@@ -30,7 +30,6 @@ AC_INIT([xorg-server], 1.7.3.901, [https
+ RELEASE_DATE="2009-12-11"
+ AC_CONFIG_SRCDIR([Makefile.am])
+ AM_INIT_AUTOMAKE([dist-bzip2 foreign])
+-AM_MAINTAINER_MODE
+ 
+ AC_CONFIG_FILES([
+ 	shave
+@@ -64,6 +63,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
+@@ -1383,6 +1383,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 $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"])
+ 
+ dnl Xnest DDX
+ 
+@@ -1421,6 +1424,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'
+@@ -1649,7 +1654,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])
+@@ -2094,6 +2098,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
+--- xserver/mi/miinitext.c.vnc	2009-12-16 18:53:20.864010515 +0000
++++ xserver/mi/miinitext.c	2009-12-16 19:01:23.664009203 +0000
+@@ -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();
+--- xserver/hw/Makefile.am.vnc	2009-12-16 18:53:17.816009029 +0000
++++ xserver/hw/Makefile.am	2009-12-16 19:01:31.064009345 +0000
+@@ -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
+