Annotation of /trunk/tigervnc/patches/tigervnc-1.7.0-xserver119.patch
Parent Directory
| 
Revision Log
Revision 2896 -
(hide annotations)
(download)
Fri Mar 31 13:08:41 2017 UTC (7 years, 2 months ago) by niro
File size: 3681 byte(s)
Fri Mar 31 13:08:41 2017 UTC (7 years, 2 months ago) by niro
File size: 3681 byte(s)
-fixed xorg-1.19 patches
| 1 | niro | 2896 | diff -up xserver/configure.ac.xserver116-rebased xserver/configure.ac |
| 2 | --- xserver/configure.ac.xserver116-rebased 2016-09-29 13:14:45.595441590 +0200 | ||
| 3 | +++ xserver/configure.ac 2016-09-29 13:14:45.631442006 +0200 | ||
| 4 | @@ -74,6 +74,7 @@ dnl forcing an entire recompile.x | ||
| 5 | AC_CONFIG_HEADERS(include/version-config.h) | ||
| 6 | niro | 2895 | |
| 7 | niro | 2896 | AM_PROG_AS |
| 8 | +AC_PROG_CXX | ||
| 9 | AC_PROG_LN_S | ||
| 10 | LT_PREREQ([2.2]) | ||
| 11 | LT_INIT([disable-static win32-dll]) | ||
| 12 | @@ -1863,6 +1864,10 @@ if test "x$XVFB" = xyes; then | ||
| 13 | AC_SUBST([XVFB_SYS_LIBS]) | ||
| 14 | fi | ||
| 15 | niro | 2895 | |
| 16 | niro | 2896 | +dnl Xvnc DDX |
| 17 | +AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"]) | ||
| 18 | +AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $DRI3_LIB $PRESENT_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"]) | ||
| 19 | +AC_SUBST([XVNC_SYS_LIBS], ["$GLX_SYS_LIBS"]) | ||
| 20 | niro | 2895 | |
| 21 | niro | 2896 | dnl Xnest DDX |
| 22 | niro | 2895 | |
| 23 | niro | 2896 | @@ -1898,6 +1903,8 @@ if test "x$XORG" = xauto; then |
| 24 | fi | ||
| 25 | AC_MSG_RESULT([$XORG]) | ||
| 26 | niro | 2895 | |
| 27 | niro | 2896 | +AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) |
| 28 | niro | 2895 | + |
| 29 | niro | 2896 | if test "x$XORG" = xyes; then |
| 30 | XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common' | ||
| 31 | XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os' | ||
| 32 | @@ -2116,7 +2123,6 @@ if test "x$XORG" = xyes; then | ||
| 33 | AC_DEFINE(XORG_SERVER, 1, [Building Xorg server]) | ||
| 34 | AC_DEFINE(XORGSERVER, 1, [Building Xorg server]) | ||
| 35 | AC_DEFINE(XFree86Server, 1, [Building XFree86 server]) | ||
| 36 | - AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) | ||
| 37 | AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs]) | ||
| 38 | AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions]) | ||
| 39 | AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server]) | ||
| 40 | @@ -2691,6 +2697,7 @@ hw/dmx/Makefile | ||
| 41 | hw/dmx/man/Makefile | ||
| 42 | hw/vfb/Makefile | ||
| 43 | hw/vfb/man/Makefile | ||
| 44 | +hw/vnc/Makefile | ||
| 45 | hw/xnest/Makefile | ||
| 46 | hw/xnest/man/Makefile | ||
| 47 | hw/xwin/Makefile | ||
| 48 | diff -up xserver/hw/Makefile.am.xserver116-rebased xserver/hw/Makefile.am | ||
| 49 | --- xserver/hw/Makefile.am.xserver116-rebased 2016-09-29 13:14:45.601441659 +0200 | ||
| 50 | +++ xserver/hw/Makefile.am 2016-09-29 13:14:45.631442006 +0200 | ||
| 51 | @@ -38,7 +38,8 @@ SUBDIRS = \ | ||
| 52 | $(DMX_SUBDIRS) \ | ||
| 53 | $(KDRIVE_SUBDIRS) \ | ||
| 54 | $(XQUARTZ_SUBDIRS) \ | ||
| 55 | - $(XWAYLAND_SUBDIRS) | ||
| 56 | + $(XWAYLAND_SUBDIRS) \ | ||
| 57 | + vnc | ||
| 58 | niro | 2895 | |
| 59 | niro | 2896 | DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive xwayland |
| 60 | niro | 2895 | |
| 61 | niro | 2896 | diff -up xserver/mi/miinitext.c.xserver116-rebased xserver/mi/miinitext.c |
| 62 | --- xserver/mi/miinitext.c.xserver116-rebased 2016-09-29 13:14:45.618441855 +0200 | ||
| 63 | +++ xserver/mi/miinitext.c 2016-09-29 13:14:45.631442006 +0200 | ||
| 64 | @@ -114,6 +114,10 @@ SOFTWARE. | ||
| 65 | #include "micmap.h" | ||
| 66 | #include "globals.h" | ||
| 67 | niro | 2895 | |
| 68 | niro | 2896 | +#ifdef TIGERVNC |
| 69 | +extern void vncExtensionInit(INITARGS); | ||
| 70 | niro | 2895 | +#endif |
| 71 | + | ||
| 72 | niro | 2896 | /* The following is only a small first step towards run-time |
| 73 | * configurable extensions. | ||
| 74 | */ | ||
| 75 | @@ -238,6 +242,9 @@ EnableDisableExtensionError(const char * | ||
| 76 | niro | 2895 | |
| 77 | niro | 2896 | /* List of built-in (statically linked) extensions */ |
| 78 | static const ExtensionModule staticExtensions[] = { | ||
| 79 | +#ifdef TIGERVNC | ||
| 80 | + {vncExtensionInit, "VNC-EXTENSION", NULL}, | ||
| 81 | niro | 2895 | +#endif |
| 82 | niro | 2896 | {GEExtensionInit, "Generic Event Extension", &noGEExtension}, |
| 83 | {ShapeExtensionInit, "SHAPE", NULL}, | ||
| 84 | #ifdef MITSHM | ||
| 85 | --- xserver/include/os.h~ 2016-10-03 09:07:29.000000000 +0200 | ||
| 86 | +++ xserver/include/os.h 2016-10-03 14:13:00.013654506 +0200 | ||
| 87 | @@ -621,7 +621,7 @@ | ||
| 88 | extern _X_EXPORT void | ||
| 89 | LogClose(enum ExitCode error); | ||
| 90 | extern _X_EXPORT Bool | ||
| 91 | -LogSetParameter(LogParameter param, int value); | ||
| 92 | +LogSetParameter(enum _LogParameter param, int value); | ||
| 93 | extern _X_EXPORT void | ||
| 94 | LogVWrite(int verb, const char *f, va_list args) | ||
| 95 | _X_ATTRIBUTE_PRINTF(2, 0); |