Contents of /trunk/vnc/patches/vnc-server-xorg-2.patch
Parent Directory | Revision Log
Revision 647 -
(show annotations)
(download)
Tue Jun 3 23:10:35 2008 UTC (16 years, 3 months ago) by niro
File size: 2021 byte(s)
Tue Jun 3 23:10:35 2008 UTC (16 years, 3 months ago) by niro
File size: 2021 byte(s)
-re-diffed for xorg-server-1.4.0.99
1 | --- mi/miinitext.c.orig 2008-06-04 01:09:38.000000000 +0200 |
2 | +++ mi/miinitext.c 2008-06-04 01:10:12.000000000 +0200 |
3 | @@ -283,6 +283,7 @@ extern void BigReqExtensionInit(INITARGS |
4 | #ifdef MITMISC |
5 | extern void MITMiscExtensionInit(INITARGS); |
6 | #endif |
7 | +extern void vncExtensionInit(INITARGS); |
8 | #ifdef XIDLE |
9 | extern void XIdleExtensionInit(INITARGS); |
10 | #endif |
11 | @@ -563,6 +564,7 @@ InitExtensions(argc, argv) |
12 | #ifdef MITMISC |
13 | if (!noMITMiscExtension) MITMiscExtensionInit(); |
14 | #endif |
15 | + vncExtensionInit(); |
16 | #ifdef XIDLE |
17 | if (!noXIdleExtension) XIdleExtensionInit(); |
18 | #endif |
19 | --- hw/Makefile.am.orig 2008-06-04 01:10:20.000000000 +0200 |
20 | +++ hw/Makefile.am 2008-06-04 01:10:39.000000000 +0200 |
21 | @@ -51,7 +51,8 @@ SUBDIRS = \ |
22 | $(XNEST_SUBDIRS) \ |
23 | $(DMX_SUBDIRS) \ |
24 | $(KDRIVE_SUBDIRS) \ |
25 | - $(XPRINT_SUBDIRS) |
26 | + $(XPRINT_SUBDIRS) \ |
27 | + vnc |
28 | |
29 | DIST_SUBDIRS = dmx xfree86 vfb xnest xwin darwin kdrive xgl xprint |
30 | |
31 | --- configure.ac.orig 2008-06-04 01:11:01.000000000 +0200 |
32 | +++ configure.ac 2008-06-04 01:12:24.000000000 +0200 |
33 | @@ -29,7 +29,6 @@ AC_PREREQ(2.57) |
34 | AC_INIT([xorg-server], 1.4.0.90, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) |
35 | AC_CONFIG_SRCDIR([Makefile.am]) |
36 | AM_INIT_AUTOMAKE([dist-bzip2 foreign]) |
37 | -AM_MAINTAINER_MODE |
38 | |
39 | dnl this gets generated by autoheader, and thus contains all the defines. we |
40 | dnl don't ever actually use it, internally. |
41 | @@ -1174,6 +1173,9 @@ if test "x$XVFB" = xyes; then |
42 | AC_SUBST([XVFB_LIBS]) |
43 | fi |
44 | |
45 | +dnl Xvnc DDX |
46 | +AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XEXT_INC $FB_INC $MI_INC $RENDER_INC"]) |
47 | +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"]) |
48 | |
49 | dnl Xnest DDX |
50 | |
51 | @@ -2073,6 +2075,7 @@ hw/dmx/input/Makefile |
52 | hw/dmx/glxProxy/Makefile |
53 | hw/dmx/Makefile |
54 | hw/vfb/Makefile |
55 | +hw/vnc/Makefile |
56 | hw/xgl/Makefile |
57 | hw/xgl/egl/Makefile |
58 | hw/xgl/egl/module/Makefile |