mirror of
git://slackware.nl/current.git
synced 2025-01-16 15:41:42 +01:00
d31c50870d
Thu Jun 30 20:26:57 UTC 2016 Slackware 14.2 x86_64 stable is released! The long development cycle (the Linux community has lately been living in "interesting times", as they say) is finally behind us, and we're proud to announce the release of Slackware 14.2. The new release brings many updates and modern tools, has switched from udev to eudev (no systemd), and adds well over a hundred new packages to the system. Thanks to the team, the upstream developers, the dedicated Slackware community, and everyone else who pitched in to help make this release a reality. The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware project by picking up a copy from store.slackware.com. We're taking pre-orders now, and offer a discount if you sign up for a subscription. Have fun! :-)
137 lines
5.2 KiB
Diff
137 lines
5.2 KiB
Diff
diff -up xorg-server-1.17.1/configure.ac.vnc xorg-server-1.17.1/configure.ac
|
|
--- xorg-server-1.17.1/configure.ac.vnc 2015-02-10 22:43:52.000000000 +0000
|
|
+++ xorg-server-1.17.1/configure.ac 2015-02-13 16:14:05.074515927 +0000
|
|
@@ -74,6 +74,7 @@ dnl forcing an entire recompile.x
|
|
AC_CONFIG_HEADERS(include/version-config.h)
|
|
|
|
AM_PROG_AS
|
|
+AC_PROG_CXX
|
|
AC_PROG_LN_S
|
|
LT_PREREQ([2.2])
|
|
LT_INIT([disable-static win32-dll])
|
|
@@ -1795,6 +1796,10 @@ if test "x$XVFB" = xyes; then
|
|
AC_SUBST([XVFB_SYS_LIBS])
|
|
fi
|
|
|
|
+dnl Xvnc DDX
|
|
+AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"])
|
|
+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"])
|
|
+AC_SUBST([XVNC_SYS_LIBS], ["$GLX_SYS_LIBS"])
|
|
|
|
dnl Xnest DDX
|
|
|
|
@@ -1830,6 +1835,8 @@ if test "x$XORG" = xauto; then
|
|
fi
|
|
AC_MSG_RESULT([$XORG])
|
|
|
|
+AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
|
|
+
|
|
if test "x$XORG" = xyes; then
|
|
XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common'
|
|
XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
|
|
@@ -2059,7 +2066,6 @@ if test "x$XORG" = xyes; then
|
|
AC_DEFINE(XORG_SERVER, 1, [Building Xorg server])
|
|
AC_DEFINE(XORGSERVER, 1, [Building Xorg server])
|
|
AC_DEFINE(XFree86Server, 1, [Building XFree86 server])
|
|
- AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
|
|
AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs])
|
|
AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])
|
|
AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server])
|
|
@@ -2599,6 +2605,7 @@ hw/dmx/Makefile
|
|
hw/dmx/man/Makefile
|
|
hw/vfb/Makefile
|
|
hw/vfb/man/Makefile
|
|
+hw/vnc/Makefile
|
|
hw/xnest/Makefile
|
|
hw/xnest/man/Makefile
|
|
hw/xwin/Makefile
|
|
diff -up xorg-server-1.17.1/hw/Makefile.am.vnc xorg-server-1.17.1/hw/Makefile.am
|
|
--- xorg-server-1.17.1/hw/Makefile.am.vnc 2014-04-16 21:24:00.000000000 +0100
|
|
+++ xorg-server-1.17.1/hw/Makefile.am 2015-02-13 16:14:05.131516821 +0000
|
|
@@ -38,7 +38,8 @@ SUBDIRS = \
|
|
$(DMX_SUBDIRS) \
|
|
$(KDRIVE_SUBDIRS) \
|
|
$(XQUARTZ_SUBDIRS) \
|
|
- $(XWAYLAND_SUBDIRS)
|
|
+ $(XWAYLAND_SUBDIRS) \
|
|
+ vnc
|
|
|
|
DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive xwayland
|
|
|
|
diff -up xorg-server-1.17.1/mi/miinitext.c.vnc xorg-server-1.17.1/mi/miinitext.c
|
|
--- xorg-server-1.17.1/mi/miinitext.c.vnc 2015-01-17 23:42:52.000000000 +0000
|
|
+++ xorg-server-1.17.1/mi/miinitext.c 2015-02-13 16:14:05.131516821 +0000
|
|
@@ -111,6 +111,10 @@ SOFTWARE.
|
|
#include "micmap.h"
|
|
#include "globals.h"
|
|
|
|
+#ifdef TIGERVNC
|
|
+extern void vncExtensionInit(INITARGS);
|
|
+#endif
|
|
+
|
|
/* The following is only a small first step towards run-time
|
|
* configurable extensions.
|
|
*/
|
|
@@ -235,6 +239,9 @@ EnableDisableExtensionError(const char *
|
|
|
|
/* List of built-in (statically linked) extensions */
|
|
static const ExtensionModule staticExtensions[] = {
|
|
+#ifdef TIGERVNC
|
|
+ {vncExtensionInit, "VNC-EXTENSION", NULL},
|
|
+#endif
|
|
{GEExtensionInit, "Generic Event Extension", &noGEExtension},
|
|
{ShapeExtensionInit, "SHAPE", NULL},
|
|
#ifdef MITSHM
|
|
diff -up xorg-server-1.17.1/os/WaitFor.c.vnc xorg-server-1.17.1/os/WaitFor.c
|
|
--- xorg-server-1.17.1/os/WaitFor.c.vnc 2015-01-26 18:40:30.000000000 +0000
|
|
+++ xorg-server-1.17.1/os/WaitFor.c 2015-02-13 16:14:05.132516837 +0000
|
|
@@ -125,6 +125,9 @@ static void DoTimer(OsTimerPtr timer, CA
|
|
static void CheckAllTimers(void);
|
|
static volatile OsTimerPtr timers = NULL;
|
|
|
|
+extern void vncWriteBlockHandler(fd_set *fds);
|
|
+extern void vncWriteWakeupHandler(int nfds, fd_set *fds);
|
|
+
|
|
/*****************
|
|
* WaitForSomething:
|
|
* Make the server suspend until there is
|
|
@@ -150,6 +153,7 @@ WaitForSomething(int *pClientsReady)
|
|
INT32 timeout = 0;
|
|
fd_set clientsReadable;
|
|
fd_set clientsWritable;
|
|
+ fd_set socketsWritable;
|
|
int curclient;
|
|
int selecterr;
|
|
static int nready;
|
|
@@ -212,6 +216,9 @@ WaitForSomething(int *pClientsReady)
|
|
XFD_COPYSET(&AllSockets, &LastSelectMask);
|
|
}
|
|
|
|
+ FD_ZERO(&socketsWritable);
|
|
+ vncWriteBlockHandler(&socketsWritable);
|
|
+
|
|
BlockHandler((void *) &wt, (void *) &LastSelectMask);
|
|
if (NewOutputPending)
|
|
FlushAllOutput();
|
|
@@ -223,10 +230,20 @@ WaitForSomething(int *pClientsReady)
|
|
i = Select(MaxClients, &LastSelectMask, &clientsWritable, NULL, wt);
|
|
}
|
|
else {
|
|
- i = Select(MaxClients, &LastSelectMask, NULL, NULL, wt);
|
|
+ if (AnyClientsWriteBlocked)
|
|
+ XFD_ORSET(&socketsWritable, &ClientsWriteBlocked, &socketsWritable);
|
|
+
|
|
+ if (XFD_ANYSET(&socketsWritable)) {
|
|
+ i = Select(MaxClients, &LastSelectMask, &socketsWritable, NULL, wt);
|
|
+ if (AnyClientsWriteBlocked)
|
|
+ XFD_ANDSET(&clientsWritable, &socketsWritable, &ClientsWriteBlocked);
|
|
+ } else {
|
|
+ i = Select(MaxClients, &LastSelectMask, NULL, NULL, wt);
|
|
+ }
|
|
}
|
|
selecterr = GetErrno();
|
|
WakeupHandler(i, (void *) &LastSelectMask);
|
|
+ vncWriteWakeupHandler(i, &socketsWritable);
|
|
if (i <= 0) { /* An error or timeout occurred */
|
|
if (dispatchException)
|
|
return 0;
|