Contents of /trunk/vnc/patches/vnc-server-xorg-3.patch
Parent Directory | Revision Log
Revision 813 -
(show annotations)
(download)
Tue May 19 15:55:25 2009 UTC (15 years, 4 months ago) by niro
File size: 2527 byte(s)
Tue May 19 15:55:25 2009 UTC (15 years, 4 months ago) by niro
File size: 2527 byte(s)
-re-diffed against xorg-1.6.1
1 | diff -Naur vnc-4_1_3-unixsrc/unix/xorg-x11-server-source/configure.ac vnc-4_1_3-unixsrc-magellan/unix/xorg-x11-server-source/configure.ac |
2 | --- vnc-4_1_3-unixsrc/unix/xorg-x11-server-source/configure.ac 2009-04-14 19:15:16.000000000 +0200 |
3 | +++ vnc-4_1_3-unixsrc-magellan/unix/xorg-x11-server-source/configure.ac 2009-05-19 18:34:36.000000000 +0200 |
4 | @@ -29,7 +29,6 @@ |
5 | AC_INIT([xorg-server], 1.6.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) |
6 | AC_CONFIG_SRCDIR([Makefile.am]) |
7 | AM_INIT_AUTOMAKE([dist-bzip2 foreign]) |
8 | -AM_MAINTAINER_MODE |
9 | |
10 | RELEASE_DATE="2009-4-14" |
11 | |
12 | @@ -1199,6 +1198,9 @@ |
13 | AC_SUBST([XVFB_SYS_LIBS]) |
14 | fi |
15 | |
16 | +dnl Xvnc DDX |
17 | +AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XEXT_INC $FB_INC $MI_INC $RENDER_INC"]) |
18 | +AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB"]) |
19 | |
20 | dnl Xnest DDX |
21 | |
22 | @@ -1875,6 +1877,7 @@ |
23 | hw/dmx/glxProxy/Makefile |
24 | hw/dmx/Makefile |
25 | hw/vfb/Makefile |
26 | +hw/vnc/Makefile |
27 | hw/xnest/Makefile |
28 | hw/xwin/Makefile |
29 | hw/xquartz/Makefile |
30 | diff -Naur vnc-4_1_3-unixsrc/unix/xorg-x11-server-source/hw/Makefile.am vnc-4_1_3-unixsrc-magellan/unix/xorg-x11-server-source/hw/Makefile.am |
31 | --- vnc-4_1_3-unixsrc/unix/xorg-x11-server-source/hw/Makefile.am 2008-12-16 23:43:11.000000000 +0100 |
32 | +++ vnc-4_1_3-unixsrc-magellan/unix/xorg-x11-server-source/hw/Makefile.am 2009-05-19 18:32:59.000000000 +0200 |
33 | @@ -33,7 +33,8 @@ |
34 | $(XNEST_SUBDIRS) \ |
35 | $(DMX_SUBDIRS) \ |
36 | $(KDRIVE_SUBDIRS) \ |
37 | - $(XQUARTZ_SUBDIRS) |
38 | + $(XQUARTZ_SUBDIRS) \ |
39 | + vnc |
40 | |
41 | DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive |
42 | |
43 | diff -Naur vnc-4_1_3-unixsrc/unix/xorg-x11-server-source/mi/miinitext.c vnc-4_1_3-unixsrc-magellan/unix/xorg-x11-server-source/mi/miinitext.c |
44 | --- vnc-4_1_3-unixsrc/unix/xorg-x11-server-source/mi/miinitext.c 2009-04-14 19:14:57.000000000 +0200 |
45 | +++ vnc-4_1_3-unixsrc-magellan/unix/xorg-x11-server-source/mi/miinitext.c 2009-05-19 18:32:00.000000000 +0200 |
46 | @@ -205,6 +205,7 @@ |
47 | extern void XTestExtensionInit(INITARGS); |
48 | #endif |
49 | extern void BigReqExtensionInit(INITARGS); |
50 | +extern void vncExtensionInit(INITARGS); |
51 | #ifdef SCREENSAVER |
52 | extern void ScreenSaverExtensionInit (INITARGS); |
53 | #endif |
54 | @@ -406,6 +407,7 @@ |
55 | if (!noTestExtensions) XTestExtensionInit(); |
56 | #endif |
57 | BigReqExtensionInit(); |
58 | + vncExtensionInit(); |
59 | #if defined(SCREENSAVER) |
60 | if (!noScreenSaverExtension) ScreenSaverExtensionInit (); |
61 | #endif |