Magellan Linux

Annotation of /trunk/vnc/patches/vnc-server-xorg-1.6.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 816 - (hide annotations) (download)
Tue May 19 17:00:14 2009 UTC (15 years ago) by niro
File size: 1856 byte(s)
-added fixes for xorg-1.6.1

1 niro 816 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-05-19 19:33:12.000000000 +0200
3     +++ vnc-4_1_3-unixsrc-magellan/unix/xorg-x11-server-source/configure.ac 2009-05-19 19:40:08.000000000 +0200
4     @@ -1237,6 +1237,8 @@
5     xorg_bus_bsdpci=no
6     xorg_bus_sparc=no
7    
8     +AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
9     +
10     if test "x$XORG" = xyes; then
11     XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common'
12     XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
13     @@ -1424,7 +1426,6 @@
14     AC_DEFINE(XORGSERVER, 1, [Building Xorg server])
15     AC_DEFINE(XFree86Server, 1, [Building XFree86 server])
16     AC_DEFINE(XFree86LOADER, 1, [Building loadable XFree86 server])
17     - AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
18     AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs])
19     AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])
20     AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server])
21     diff -Naur vnc-4_1_3-unixsrc/unix/xorg-x11-server-source/hw/vnc/xf86vncModule.cc vnc-4_1_3-unixsrc-magellan/unix/xorg-x11-server-source/hw/vnc/xf86vncModule.cc
22     --- vnc-4_1_3-unixsrc/unix/xorg-x11-server-source/hw/vnc/xf86vncModule.cc 2008-10-16 17:16:20.000000000 +0200
23     +++ vnc-4_1_3-unixsrc-magellan/unix/xorg-x11-server-source/hw/vnc/xf86vncModule.cc 2009-05-19 19:38:39.000000000 +0200
24     @@ -58,7 +58,7 @@
25     "RealVNC Ltd",
26     MODINFOSTRING1,
27     MODINFOSTRING2,
28     - XF86_VERSION_CURRENT,
29     + XORG_VERSION_CURRENT,
30     1, 0, 0,
31     ABI_CLASS_EXTENSION, /* needs the server extension ABI */
32     ABI_EXTENSION_VERSION,