1 From 6e3dad36c1e9a71eb0ee80fd86b7c452dbf1eea9 Mon Sep 17 00:00:00 2001 |
|
2 From: atkac <atkac@3789f03b-4d11-0410-bbf8-ca57d06f2519> |
|
3 Date: Fri, 22 Jan 2010 11:15:55 +0000 |
|
4 Subject: [PATCH] [Development] X.Org 1.8 codebase is now supported. Add xserver18.patch. |
|
5 |
|
6 git-svn-id: https://tigervnc.svn.sourceforge.net/svnroot/tigervnc/trunk@3954 3789f03b-4d11-0410-bbf8-ca57d06f2519 |
|
7 --- |
|
8 unix/xserver/hw/vnc/xorg-version.h | 4 +- |
|
9 unix/xserver18.patch | 87 ++++++++++++++++++++++++++++++++++++ |
|
10 2 files changed, 90 insertions(+), 1 deletions(-) |
|
11 create mode 100644 unix/xserver18.patch |
|
12 |
|
13 diff --git a/unix/xserver/hw/vnc/xorg-version.h b/unix/xserver/hw/vnc/xorg-version.h |
|
14 index 3d942fc..71f8553 100644 |
|
15 --- a/unix/xserver/hw/vnc/xorg-version.h |
|
16 +++ b/unix/xserver/hw/vnc/xorg-version.h |
|
17 @@ -30,8 +30,10 @@ |
|
18 #define XORG 16 |
|
19 #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (7 * 100000) + (99 * 1000)) |
|
20 #define XORG 17 |
|
21 +#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (8 * 100000) + (99 * 1000)) |
|
22 +#define XORG 18 |
|
23 #else |
|
24 -#error "X.Org newer than 1.7 is not supported" |
|
25 +#error "X.Org newer than 1.8 is not supported" |
|
26 #endif |
|
27 |
|
28 #endif |
|
29 diff --git a/unix/xserver18.patch b/unix/xserver18.patch |
|
30 new file mode 100644 |
|
31 index 0000000..3ac7c38 |
|
32 --- /dev/null |
|
33 +++ b/unix/xserver18.patch |
|
34 @@ -0,0 +1,87 @@ |
|
35 +diff -up xserver/configure.ac.vnc xserver/configure.ac |
|
36 +--- xserver/configure.ac.vnc 2010-01-22 11:23:04.524629373 +0100 |
|
37 ++++ xserver/configure.ac 2010-01-22 11:31:04.704638847 +0100 |
|
38 +@@ -30,7 +30,6 @@ AC_INIT([xorg-server], 1.7.99.3, [https: |
|
39 + RELEASE_DATE="(unreleased)" |
|
40 + AC_CONFIG_SRCDIR([Makefile.am]) |
|
41 + AM_INIT_AUTOMAKE([foreign dist-bzip2]) |
|
42 +-AM_MAINTAINER_MODE |
|
43 + |
|
44 + # Require xorg-macros: XORG_DEFAULT_OPTIONS |
|
45 + m4_ifndef([XORG_MACROS_VERSION], |
|
46 +@@ -63,6 +62,7 @@ dnl forcing an entire recompile.x |
|
47 + AC_CONFIG_HEADERS(include/version-config.h) |
|
48 + |
|
49 + AC_PROG_CC |
|
50 ++AC_PROG_CXX |
|
51 + AM_PROG_AS |
|
52 + AC_PROG_INSTALL |
|
53 + AC_PROG_LN_S |
|
54 +@@ -1486,6 +1486,10 @@ if test "x$XVFB" = xyes; then |
|
55 + AC_SUBST([XVFB_SYS_LIBS]) |
|
56 + fi |
|
57 + |
|
58 ++dnl Xvnc DDX |
|
59 ++AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XEXT_INC $FB_INC $MI_INC $RENDER_INC $RANDR_INC"]) |
|
60 ++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"]) |
|
61 ++AC_SUBST([LIBVNC_LIBS], ["$XI_LIB $DIX_LIB $XKB_LIB"]) |
|
62 + |
|
63 + dnl Xnest DDX |
|
64 + |
|
65 +@@ -1524,6 +1528,8 @@ xorg_bus_linuxpci=no |
|
66 + xorg_bus_bsdpci=no |
|
67 + xorg_bus_sparc=no |
|
68 + |
|
69 ++AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) |
|
70 ++ |
|
71 + if test "x$XORG" = xyes; then |
|
72 + XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common' |
|
73 + XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os' |
|
74 +@@ -1765,7 +1771,6 @@ if test "x$XORG" = xyes; then |
|
75 + AC_DEFINE(XORGSERVER, 1, [Building Xorg server]) |
|
76 + AC_DEFINE(XFree86Server, 1, [Building XFree86 server]) |
|
77 + AC_DEFINE(XFree86LOADER, 1, [Building loadable XFree86 server]) |
|
78 +- AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) |
|
79 + AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs]) |
|
80 + AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions]) |
|
81 + AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server]) |
|
82 +@@ -2195,6 +2200,7 @@ hw/dmx/input/Makefile |
|
83 + hw/dmx/glxProxy/Makefile |
|
84 + hw/dmx/Makefile |
|
85 + hw/vfb/Makefile |
|
86 ++hw/vnc/Makefile |
|
87 + hw/xnest/Makefile |
|
88 + hw/xwin/Makefile |
|
89 + hw/xquartz/Makefile |
|
90 +diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am |
|
91 +--- xserver/hw/Makefile.am.vnc 2010-01-22 11:23:04.560613962 +0100 |
|
92 ++++ xserver/hw/Makefile.am 2010-01-22 11:23:04.600597430 +0100 |
|
93 +@@ -33,7 +33,8 @@ SUBDIRS = \ |
|
94 + $(XNEST_SUBDIRS) \ |
|
95 + $(DMX_SUBDIRS) \ |
|
96 + $(KDRIVE_SUBDIRS) \ |
|
97 +- $(XQUARTZ_SUBDIRS) |
|
98 ++ $(XQUARTZ_SUBDIRS) \ |
|
99 ++ vnc |
|
100 + |
|
101 + DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive |
|
102 + |
|
103 +diff -up xserver/mi/miinitext.c.vnc xserver/mi/miinitext.c |
|
104 +--- xserver/mi/miinitext.c.vnc 2010-01-22 11:23:04.564613258 +0100 |
|
105 ++++ xserver/mi/miinitext.c 2010-01-22 11:23:04.600597430 +0100 |
|
106 +@@ -274,6 +274,7 @@ extern void DamageExtensionInit(INITARGS |
|
107 + extern void CompositeExtensionInit(INITARGS); |
|
108 + #endif |
|
109 + extern void GEExtensionInit(INITARGS); |
|
110 ++extern void vncExtensionInit(INITARGS); |
|
111 + |
|
112 + /* The following is only a small first step towards run-time |
|
113 + * configurable extensions. |
|
114 +@@ -454,6 +455,7 @@ InitExtensions(int argc, char *argv[]) |
|
115 + #ifdef XF86BIGFONT |
|
116 + if (!noXFree86BigfontExtension) XFree86BigfontExtensionInit(); |
|
117 + #endif |
|
118 ++ vncExtensionInit(); |
|
119 + #if !defined(NO_HW_ONLY_EXTS) |
|
120 + #if defined(XF86VIDMODE) |
|
121 + if (!noXFree86VidModeExtension) XFree86VidModeExtensionInit(); |
|
122 -- |
|
123 1.5.6.5 |
|
124 |
|