1 # This is the patch from tigervnc-1.0.0/unix/xserver16.patch |
|
2 # modified to apply to the xserver 1.7.x sources used in our builds |
|
3 |
|
4 # Only changes needed to make the patch apply should happen in |
|
5 # this patch - other bug fixes & customizations should go into |
|
6 # separate patches, so they aren't lost when this patch is |
|
7 # replaced with new versions from upstream. |
|
8 |
|
9 diff -urp -x '*~' -x '*.orig' unix/xserver/configure.ac unix/xserver/configure.ac |
|
10 --- unix/xserver/configure.ac 2010-01-07 18:27:12.367254728 -0800 |
|
11 +++ unix/xserver/configure.ac 2010-01-07 18:27:15.429140493 -0800 |
|
12 @@ -30,7 +30,6 @@ AC_INIT([xorg-server], 1.7.4, [https://b |
|
13 RELEASE_DATE="2010-01-08" |
|
14 AC_CONFIG_SRCDIR([Makefile.am]) |
|
15 AM_INIT_AUTOMAKE([dist-bzip2 foreign]) |
|
16 -AM_MAINTAINER_MODE |
|
17 |
|
18 AC_CONFIG_FILES([ |
|
19 shave |
|
20 @@ -64,6 +63,7 @@ dnl forcing an entire recompile.x |
|
21 AC_CONFIG_HEADERS(include/version-config.h) |
|
22 |
|
23 AC_PROG_CC |
|
24 +AC_PROG_CXX |
|
25 AM_PROG_AS |
|
26 AC_PROG_INSTALL |
|
27 AC_PROG_LN_S |
|
28 @@ -1401,6 +1401,9 @@ if test "x$XVFB" = xyes; then |
|
29 AC_SUBST([XVFB_SYS_LIBS]) |
|
30 fi |
|
31 |
|
32 +dnl Xvnc DDX |
|
33 +AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XEXT_INC $FB_INC $MI_INC $RENDER_INC $RANDR_INC"]) |
|
34 +AC_SUBST([XVNC_LIBS], ["$MAIN_LIB $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"]) |
|
35 |
|
36 dnl Xnest DDX |
|
37 |
|
38 @@ -1441,6 +1444,8 @@ xorg_bus_linuxpci=no |
|
39 xorg_bus_bsdpci=no |
|
40 xorg_bus_sparc=no |
|
41 |
|
42 +AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) |
|
43 + |
|
44 if test "x$XORG" = xyes; then |
|
45 XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common' |
|
46 XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os' |
|
47 @@ -1683,7 +1688,6 @@ if test "x$XORG" = xyes; then |
|
48 AC_DEFINE(XORGSERVER, 1, [Building Xorg server]) |
|
49 AC_DEFINE(XFree86Server, 1, [Building XFree86 server]) |
|
50 AC_DEFINE(XFree86LOADER, 1, [Building loadable XFree86 server]) |
|
51 - AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) |
|
52 AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs]) |
|
53 AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions]) |
|
54 AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server]) |
|
55 @@ -2129,6 +2133,7 @@ hw/dmx/input/Makefile |
|
56 hw/dmx/glxProxy/Makefile |
|
57 hw/dmx/Makefile |
|
58 hw/vfb/Makefile |
|
59 +hw/vnc/Makefile |
|
60 hw/xnest/Makefile |
|
61 hw/xwin/Makefile |
|
62 hw/xquartz/Makefile |
|
63 diff -urp -x '*~' -x '*.orig' unix/xserver/hw/Makefile.am unix/xserver/hw/Makefile.am |
|
64 --- unix/xserver/hw/Makefile.am 2009-01-07 15:14:46.000000000 -0800 |
|
65 +++ unix/xserver/hw/Makefile.am 2010-01-07 18:27:15.429299239 -0800 |
|
66 @@ -33,7 +33,8 @@ SUBDIRS = \ |
|
67 $(XNEST_SUBDIRS) \ |
|
68 $(DMX_SUBDIRS) \ |
|
69 $(KDRIVE_SUBDIRS) \ |
|
70 - $(XQUARTZ_SUBDIRS) |
|
71 + $(XQUARTZ_SUBDIRS) \ |
|
72 + vnc |
|
73 |
|
74 DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive |
|
75 |
|
76 diff -urp -x '*~' -x '*.orig' unix/xserver/mi/miinitext.c unix/xserver/mi/miinitext.c |
|
77 --- unix/xserver/mi/miinitext.c 2010-01-07 18:27:12.377142821 -0800 |
|
78 +++ unix/xserver/mi/miinitext.c 2010-01-07 18:27:15.429639241 -0800 |
|
79 @@ -290,6 +290,7 @@ extern void GEExtensionInit(INITARGS); |
|
80 #ifdef SolarisIAExtension |
|
81 extern void IAExtensionInit(void); |
|
82 #endif |
|
83 +extern void vncExtensionInit(INITARGS); |
|
84 |
|
85 /* The following is only a small first step towards run-time |
|
86 * configurable extensions. |
|
87 @@ -476,6 +477,7 @@ InitExtensions(int argc, char *argv[]) |
|
88 #ifdef XF86BIGFONT |
|
89 if (!noXFree86BigfontExtension) XFree86BigfontExtensionInit(); |
|
90 #endif |
|
91 + vncExtensionInit(); |
|
92 #if !defined(NO_HW_ONLY_EXTS) |
|
93 #if defined(XF86VIDMODE) |
|
94 if (!noXFree86VidModeExtension) XFree86VidModeExtensionInit(); |
|