Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/tigervnc/patches/tigervnc-1.0.0-xserver17.patch

    Contents of /trunk/tigervnc/patches/tigervnc-1.0.0-xserver17.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 1115 - (show annotations) (download)
    Sun Aug 22 18:37:54 2010 UTC (13 years, 8 months ago) by niro
    File size: 3896 byte(s) 
    -added
    1 diff -Naur tigervnc-1.0.0/unix/xserver/configure.ac tigervnc-1.0.0-magellan/unix/xserver/configure.ac
    2 --- tigervnc-1.0.0/unix/xserver/configure.ac 2009-11-17 15:59:51.000000000 +0100
    3 +++ tigervnc-1.0.0-magellan/unix/xserver/configure.ac 2009-11-17 16:15:33.000000000 +0100
    4 @@ -30,7 +30,6 @@
    5 RELEASE_DATE="2009-10-23"
    6 AC_CONFIG_SRCDIR([Makefile.am])
    7 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
    8 -AM_MAINTAINER_MODE
    9
    10 AC_CONFIG_FILES([
    11 shave
    12 @@ -64,6 +63,7 @@
    13 AC_CONFIG_HEADERS(include/version-config.h)
    14
    15 AC_PROG_CC
    16 +AC_PROG_CXX
    17 AM_PROG_AS
    18 AC_PROG_INSTALL
    19 AC_PROG_LN_S
    20 @@ -1191,7 +1191,6 @@
    21 AC_DEFINE_UNQUOTED(XVENDORNAME, ["$VENDOR_NAME"], [Vendor name])
    22 AC_DEFINE_UNQUOTED(XVENDORNAMESHORT, ["$VENDOR_NAME_SHORT"], [Short vendor name])
    23 AC_DEFINE_UNQUOTED(XORG_DATE, ["$RELEASE_DATE"], [Vendor release])
    24 -AC_DEFINE_UNQUOTED(XORG_MAN_VERSION, ["$VENDOR_MAN_VERSION"], [Vendor man version])
    25 AC_DEFINE_UNQUOTED(BUILDERADDR, ["$BUILDERADDR"], [Builder address])
    26
    27 if test -z "$OSNAME"; then
    28 @@ -1383,9 +1382,11 @@
    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], ["$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 PKG_CHECK_MODULES(XNESTMODULES, [xfont $LIBXEXT x11 xau $XDMCP_MODULES], [have_xnest=yes], [have_xnest=no])
    39 AC_MSG_CHECKING([whether to build Xnest DDX])
    40 if test "x$XNEST" = xauto; then
    41 @@ -1421,6 +1422,8 @@
    42 xorg_bus_bsdpci=no
    43 xorg_bus_sparc=no
    44
    45 +AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
    46 +
    47 if test "x$XORG" = xyes; then
    48 XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common'
    49 XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
    50 @@ -1649,7 +1652,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 - AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
    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 @@ -2090,6 +2092,7 @@
    59 hw/dmx/glxProxy/Makefile
    60 hw/dmx/Makefile
    61 hw/vfb/Makefile
    62 +hw/vnc/Makefile
    63 hw/xnest/Makefile
    64 hw/xwin/Makefile
    65 hw/xquartz/Makefile
    66 diff -Naur tigervnc-1.0.0/unix/xserver/hw/Makefile.am tigervnc-1.0.0-magellan/unix/xserver/hw/Makefile.am
    67 --- tigervnc-1.0.0/unix/xserver/hw/Makefile.am 2009-11-17 15:59:51.000000000 +0100
    68 +++ tigervnc-1.0.0-magellan/unix/xserver/hw/Makefile.am 2009-11-17 15:22:23.000000000 +0100
    69 @@ -33,7 +33,8 @@
    70 $(XNEST_SUBDIRS) \
    71 $(DMX_SUBDIRS) \
    72 $(KDRIVE_SUBDIRS) \
    73 - $(XQUARTZ_SUBDIRS)
    74 + $(XQUARTZ_SUBDIRS) \
    75 + vnc
    76
    77 DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive
    78
    79 diff -Naur tigervnc-1.0.0/unix/xserver/mi/miinitext.c tigervnc-1.0.0-magellan/unix/xserver/mi/miinitext.c
    80 --- tigervnc-1.0.0/unix/xserver/mi/miinitext.c 2009-11-17 15:59:51.000000000 +0100
    81 +++ tigervnc-1.0.0-magellan/unix/xserver/mi/miinitext.c 2009-11-17 15:23:24.000000000 +0100
    82 @@ -274,6 +274,7 @@
    83 extern void CompositeExtensionInit(INITARGS);
    84 #endif
    85 extern void GEExtensionInit(INITARGS);
    86 +extern void vncExtensionInit(INITARGS);
    87
    88 /* The following is only a small first step towards run-time
    89 * configurable extensions.
    90 @@ -454,6 +455,7 @@
    91 #ifdef XF86BIGFONT
    92 if (!noXFree86BigfontExtension) XFree86BigfontExtensionInit();
    93 #endif
    94 + vncExtensionInit();
    95 #if !defined(NO_HW_ONLY_EXTS)
    96 #if defined(XF86VIDMODE)
    97 if (!noXFree86VidModeExtension) XFree86VidModeExtensionInit();