publicWagsHome/KasmVNC
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolve KASM-6760 "Feature/ latest xorg"

Browse Source
This commit is contained in:
Ryan Kuba
2024-12-11 19:28:44 +00:00
committed by Matthew McClaskey
parent b3c93327d9
commit 586c33a454
15 changed files with 140 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
unix/xserver/hw/vnc/xorg-version.h
View File

@@ -54,8 +54,10 @@
#define XORG 119
#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (20 * 100000) + (99 * 1000))
#define XORG 120
#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (21 * 100000) + (99 * 1000))
#define XORG 121
#else
#error "X.Org newer than 1.20 is not supported"
#error "X.Org newer than 21 is not supported"
#endif
#endif

8
unix/xserver/hw/vnc/xvnc.c
View File

@@ -94,7 +94,6 @@ from the X Consortium.
#undef VENDOR_RELEASE
#undef VENDOR_STRING
#include "version-config.h"
#include "site.h"
#define XVNCVERSION "KasmVNC 1.3.3"
#define XVNCCOPYRIGHT ("Copyright (C) 1999-2018 KasmVNC Team and many others (see README.me)\n" \
@@ -164,7 +163,7 @@ const char *driNode = NULL;
static Bool displaySpecified = FALSE;
static char displayNumStr[16];
static int vncVerbose = DEFAULT_LOG_VERBOSITY;
static int vncVerbose = 0;
int unixrelays[MAX_UNIX_RELAYS];
char unixrelaynames[MAX_UNIX_RELAYS][MAX_UNIX_RELAY_NAME_LEN];
@@ -283,8 +282,13 @@ vncPrintBanner(void)
ErrorF("\nXvnc %s%s - built %s\n%s", XVNCVERSION,
sizeof(XVNCEXTRAVERSION) > 2 ? XVNCEXTRAVERSION : "",
buildtime, XVNCCOPYRIGHT);
// VENDOR_STRING was removed in 21
#ifdef VENDOR_STRING
ErrorF("Underlying X server release %d, %s\n\n", VENDOR_RELEASE,
VENDOR_STRING);
#else
ErrorF("Underlying X server release %d\n\n", VENDOR_RELEASE);
#endif
}
static void