[arch-commits] Commit in tigervnc/trunk (PKGBUILD xserver116.patch)

[Sergej Pupykin]

    Date: Tuesday, August 5, 2014 @ 12:10:14
  Author: spupykin
Revision: 116892

upgpkg: tigervnc 1.3.1-5

upd

Modified:
  tigervnc/trunk/PKGBUILD
  tigervnc/trunk/xserver116.patch

------------------+
 PKGBUILD         |    6 +++---
 xserver116.patch |   30 ++++++++++++++++++++++++++----
 2 files changed, 29 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-08-05 10:10:11 UTC (rev 116891)
+++ PKGBUILD	2014-08-05 10:10:14 UTC (rev 116892)
@@ -3,7 +3,7 @@
 
 pkgname=tigervnc
 pkgver=1.3.1
-pkgrel=4
+pkgrel=5
 _xorgver=1.16.0
 pkgdesc="Suite of VNC servers and clients. Based on the VNC 4 branch of TightVNC."
 arch=('i686' 'x86_64')
@@ -33,7 +33,7 @@
          '22f1523a0eca56ad79cfabd0db6e2cf6'
          'e056a2502dfe0cb3b02e08cab689482f'
          'e212f9d268a62af0349183a495bc55a5'
-         '8b735b553efedd34cdeafc600be50a2a')
+         '948218a19eac135484267d9990502bf6')
 
 prepare() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -62,7 +62,7 @@
 	--disable-xwin --disable-xephyr --disable-kdrive --disable-xwayland \
 	--disable-config-hal --disable-config-udev --with-pic \
 	--disable-unit-tests --disable-devel-docs --disable-selective-werror \
-	--disable-dri --enable-dri2 --disable-dri3 --enable-glx --enable-glx-tls
+	--disable-dri --enable-dri2 --enable-dri3 --enable-glx --enable-glx-tls
   make
 }
 

Modified: xserver116.patch
===================================================================
--- xserver116.patch	2014-08-05 10:10:11 UTC (rev 116891)
+++ xserver116.patch	2014-08-05 10:10:14 UTC (rev 116892)
@@ -1,6 +1,6 @@
 diff -ur xorg-server-1.16.0.orig/configure.ac xorg-server-1.16.0/configure.ac
 --- xorg-server-1.16.0.orig/configure.ac	2014-07-17 09:00:51.000000000 +0200
-+++ xorg-server-1.16.0/configure.ac	2014-07-19 00:46:53.492489158 +0200
++++ xorg-server-1.16.0/configure.ac	2014-08-04 20:43:26.856687998 +0200
 @@ -74,6 +74,7 @@
  AC_CONFIG_HEADERS(include/version-config.h)
  
@@ -47,7 +47,7 @@
  hw/xwin/Makefile
 diff -ur xorg-server-1.16.0.orig/hw/Makefile.am xorg-server-1.16.0/hw/Makefile.am
 --- xorg-server-1.16.0.orig/hw/Makefile.am	2014-04-16 22:24:00.000000000 +0200
-+++ xorg-server-1.16.0/hw/Makefile.am	2014-07-19 00:46:53.492489158 +0200
++++ xorg-server-1.16.0/hw/Makefile.am	2014-08-04 20:43:26.856687998 +0200
 @@ -38,7 +38,8 @@
  	$(DMX_SUBDIRS)		\
  	$(KDRIVE_SUBDIRS)	\
@@ -60,7 +60,7 @@
  
 diff -ur xorg-server-1.16.0.orig/mi/miinitext.c xorg-server-1.16.0/mi/miinitext.c
 --- xorg-server-1.16.0.orig/mi/miinitext.c	2014-04-16 22:24:00.000000000 +0200
-+++ xorg-server-1.16.0/mi/miinitext.c	2014-07-19 00:46:53.492489158 +0200
++++ xorg-server-1.16.0/mi/miinitext.c	2014-08-04 20:43:26.856687998 +0200
 @@ -111,6 +111,10 @@
  #include "micmap.h"
  #include "globals.h"
@@ -84,7 +84,7 @@
  #ifdef MITSHM
 diff -ur xorg-server-1.16.0.orig/os/WaitFor.c xorg-server-1.16.0/os/WaitFor.c
 --- xorg-server-1.16.0.orig/os/WaitFor.c	2014-02-05 04:08:57.000000000 +0100
-+++ xorg-server-1.16.0/os/WaitFor.c	2014-07-19 00:46:53.493489158 +0200
++++ xorg-server-1.16.0/os/WaitFor.c	2014-08-04 20:44:26.350690385 +0200
 @@ -125,6 +125,9 @@
  static void CheckAllTimers(void);
  static OsTimerPtr timers = NULL;
@@ -113,3 +113,25 @@
          BlockHandler((void *) &wt, (void *) &LastSelectMask);
          if (NewOutputPending)
              FlushAllOutput();
+@@ -223,10 +230,20 @@
+             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;