Annotation of /trunk/tigervnc/patches/tigervnc-1.0.90_svn4323-xserver110-patch-fix.patch
Parent Directory | Revision Log
Revision 1297 -
(hide annotations)
(download)
Fri Mar 4 19:53:12 2011 UTC (13 years, 6 months ago) by niro
File size: 4062 byte(s)
Fri Mar 4 19:53:12 2011 UTC (13 years, 6 months ago) by niro
File size: 4062 byte(s)
added patch fix against xorg-1.10.0
1 | niro | 1297 | --- /mnt/mcore-buildroot-i486/var/tmp/magebuild/tigervnc-1.0.90_svn4323/unix/xserver110.patch 2011-03-04 19:11:39.000000000 +0100 |
2 | +++ xserver110.patch 2011-03-04 21:06:37.000000000 +0100 | ||
3 | @@ -1,23 +1,23 @@ | ||
4 | -diff -up xserver/configure.ac.vnc xserver/configure.ac | ||
5 | ---- xserver/configure.ac.vnc 2010-12-08 17:09:34.459198307 +0100 | ||
6 | -+++ xserver/configure.ac 2010-12-08 17:09:46.789193164 +0100 | ||
7 | -@@ -30,7 +30,6 @@ AC_INIT([xorg-server], 1.9.99.1, [https: | ||
8 | - RELEASE_DATE="2010-10-01" | ||
9 | +diff -Naur xorg-server-1.10.0/configure.ac xorg-server-1.10.0-magellan/configure.ac | ||
10 | +--- xorg-server-1.10.0/configure.ac 2011-02-26 06:13:47.000000000 +0100 | ||
11 | ++++ xorg-server-1.10.0-magellan/configure.ac 2011-03-04 21:01:49.000000000 +0100 | ||
12 | +@@ -30,7 +30,6 @@ | ||
13 | + RELEASE_DATE="2011-2-25" | ||
14 | AC_CONFIG_SRCDIR([Makefile.am]) | ||
15 | AM_INIT_AUTOMAKE([foreign dist-bzip2]) | ||
16 | -AM_MAINTAINER_MODE | ||
17 | |||
18 | # Require xorg-macros minimum of 1.10 for XORG_CHECK_SGML_DOCTOOLS | ||
19 | m4_ifndef([XORG_MACROS_VERSION], | ||
20 | -@@ -65,6 +64,7 @@ dnl forcing an entire recompile.x | ||
21 | +@@ -64,6 +63,7 @@ | ||
22 | + dnl forcing an entire recompile.x | ||
23 | AC_CONFIG_HEADERS(include/version-config.h) | ||
24 | |||
25 | - AC_PROG_CC | ||
26 | +AC_PROG_CXX | ||
27 | AM_PROG_AS | ||
28 | - AC_PROG_INSTALL | ||
29 | AC_PROG_LN_S | ||
30 | -@@ -1511,6 +1511,13 @@ if test "x$XVFB" = xyes; then | ||
31 | + AC_LIBTOOL_WIN32_DLL | ||
32 | +@@ -1510,6 +1510,13 @@ | ||
33 | AC_SUBST([XVFB_SYS_LIBS]) | ||
34 | fi | ||
35 | |||
36 | @@ -31,7 +31,7 @@ | ||
37 | |||
38 | dnl Xnest DDX | ||
39 | |||
40 | -@@ -1549,6 +1556,8 @@ xorg_bus_linuxpci=no | ||
41 | +@@ -1548,6 +1555,8 @@ | ||
42 | xorg_bus_bsdpci=no | ||
43 | xorg_bus_sparc=no | ||
44 | |||
45 | @@ -40,7 +40,7 @@ | ||
46 | if test "x$XORG" = xyes; then | ||
47 | XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common' | ||
48 | XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os' | ||
49 | -@@ -1793,7 +1802,6 @@ if test "x$XORG" = xyes; then | ||
50 | +@@ -1794,7 +1803,6 @@ | ||
51 | AC_DEFINE(XORGSERVER, 1, [Building Xorg server]) | ||
52 | AC_DEFINE(XFree86Server, 1, [Building XFree86 server]) | ||
53 | AC_DEFINE(XFree86LOADER, 1, [Building loadable XFree86 server]) | ||
54 | @@ -48,18 +48,18 @@ | ||
55 | AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs]) | ||
56 | AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions]) | ||
57 | AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server]) | ||
58 | -@@ -2245,6 +2253,7 @@ hw/dmx/input/Makefile | ||
59 | - hw/dmx/glxProxy/Makefile | ||
60 | - hw/dmx/Makefile | ||
61 | +@@ -2256,6 +2264,7 @@ | ||
62 | + hw/dmx/man/Makefile | ||
63 | hw/vfb/Makefile | ||
64 | + hw/vfb/man/Makefile | ||
65 | +hw/vnc/Makefile | ||
66 | hw/xnest/Makefile | ||
67 | + hw/xnest/man/Makefile | ||
68 | hw/xwin/Makefile | ||
69 | - hw/xwin/glx/Makefile | ||
70 | -diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am | ||
71 | ---- xserver/hw/Makefile.am.vnc 2010-12-08 17:09:34.469198303 +0100 | ||
72 | -+++ xserver/hw/Makefile.am 2010-12-08 17:09:46.789193164 +0100 | ||
73 | -@@ -33,7 +33,8 @@ SUBDIRS = \ | ||
74 | +diff -Naur xorg-server-1.10.0/hw/Makefile.am xorg-server-1.10.0-magellan/hw/Makefile.am | ||
75 | +--- xorg-server-1.10.0/hw/Makefile.am 2010-06-06 03:16:46.000000000 +0200 | ||
76 | ++++ xorg-server-1.10.0-magellan/hw/Makefile.am 2011-03-04 21:02:17.000000000 +0100 | ||
77 | +@@ -33,7 +33,8 @@ | ||
78 | $(XNEST_SUBDIRS) \ | ||
79 | $(DMX_SUBDIRS) \ | ||
80 | $(KDRIVE_SUBDIRS) \ | ||
81 | @@ -69,10 +69,10 @@ | ||
82 | |||
83 | DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive | ||
84 | |||
85 | -diff -up xserver/mi/miinitext.c.vnc xserver/mi/miinitext.c | ||
86 | ---- xserver/mi/miinitext.c.vnc 2010-12-08 17:09:34.509198285 +0100 | ||
87 | -+++ xserver/mi/miinitext.c 2010-12-08 17:09:46.789193164 +0100 | ||
88 | -@@ -263,6 +263,7 @@ extern void DamageExtensionInit(INITARGS | ||
89 | +diff -Naur xorg-server-1.10.0/mi/miinitext.c xorg-server-1.10.0-magellan/mi/miinitext.c | ||
90 | +--- xorg-server-1.10.0/mi/miinitext.c 2011-01-21 06:16:24.000000000 +0100 | ||
91 | ++++ xorg-server-1.10.0-magellan/mi/miinitext.c 2011-03-04 21:03:15.000000000 +0100 | ||
92 | +@@ -263,6 +263,7 @@ | ||
93 | extern void CompositeExtensionInit(INITARGS); | ||
94 | #endif | ||
95 | extern void GEExtensionInit(INITARGS); | ||
96 | @@ -80,7 +80,7 @@ | ||
97 | |||
98 | /* The following is only a small first step towards run-time | ||
99 | * configurable extensions. | ||
100 | -@@ -435,6 +436,7 @@ InitExtensions(int argc, char *argv[]) | ||
101 | +@@ -433,6 +434,7 @@ | ||
102 | #ifdef XF86BIGFONT | ||
103 | if (!noXFree86BigfontExtension) XFree86BigfontExtensionInit(); | ||
104 | #endif |