* [gentoo-commits] gentoo commit in src/patchsets/tigervnc/1.2.80_p5065: 001_cookie.patch 005_ldnow.patch 010_gethomedir.patch 015_rh692048.patch 020_setcursor-crash.patch 025_inetd-nowait.patch 030_manpages.patch 035_glx.patch
@ 2014-04-06 13:27 Raul Porcel (armin76)
0 siblings, 0 replies; only message in thread
From: Raul Porcel (armin76) @ 2014-04-06 13:27 UTC (permalink / raw
To: gentoo-commits
armin76 14/04/06 13:27:08
Added: 001_cookie.patch 005_ldnow.patch
010_gethomedir.patch 015_rh692048.patch
020_setcursor-crash.patch 025_inetd-nowait.patch
030_manpages.patch 035_glx.patch
Log:
Commit patchset for 1.2.80_p5065
Revision Changes Path
1.1 src/patchsets/tigervnc/1.2.80_p5065/001_cookie.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/tigervnc/1.2.80_p5065/001_cookie.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/tigervnc/1.2.80_p5065/001_cookie.patch?rev=1.1&content-type=text/plain
Index: 001_cookie.patch
===================================================================
diff -up tigervnc-1.0.90-20091221svn3929/unix/vncserver.cookie tigervnc-1.0.90-20091221svn3929/unix/vncserver
--- tigervnc-1.0.90-20091221svn3929/unix/vncserver.cookie 2009-11-12 11:39:54.000000000 +0100
+++ tigervnc-1.0.90-20091221svn3929/unix/vncserver 2009-12-21 16:15:01.907799091 +0100
@@ -189,27 +189,12 @@ $vncPort = 5900 + $displayNumber;
$desktopLog = "$vncUserDir/$host:$displayNumber.log";
unlink($desktopLog);
-# Make an X server cookie - use /dev/urandom on systems that have it,
-# otherwise use perl's random number generator, seeded with the sum
-# of the current time, our PID and part of the encrypted form of the password.
-
-my $cookie = "";
-if (open(URANDOM, '<', '/dev/urandom')) {
- my $randata;
- if (sysread(URANDOM, $randata, 16) == 16) {
- $cookie = unpack 'h*', $randata;
- }
- close(URANDOM);
-}
-if ($cookie eq "") {
- srand(time+$$+unpack("L",`cat $vncUserDir/passwd`));
- for (1..16) {
- $cookie .= sprintf("%02x", int(rand(256)) % 256);
- }
-}
-
-system("xauth -f $xauthorityFile add $host:$displayNumber . $cookie");
-system("xauth -f $xauthorityFile add $host/unix:$displayNumber . $cookie");
+# Make an X server cookie - use mcookie
+$cookie = `/usr/bin/mcookie`;
+open (XAUTH, "|xauth -f $xauthorityFile source -");
+print XAUTH "add $host:$displayNumber . $cookie\n";
+print XAUTH "add $host/unix:$displayNumber . $cookie\n";
+close XAUTH;
if ($opt{'-name'}) {
$desktopName = $opt{'-name'};
1.1 src/patchsets/tigervnc/1.2.80_p5065/005_ldnow.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/tigervnc/1.2.80_p5065/005_ldnow.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/tigervnc/1.2.80_p5065/005_ldnow.patch?rev=1.1&content-type=text/plain
Index: 005_ldnow.patch
===================================================================
diff -up tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am.ldnow tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am
--- tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am.ldnow 2011-10-31 09:14:40.000000000 +0100
+++ tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am 2012-08-22 15:51:47.013241342 +0200
@@ -53,7 +53,7 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I
-I$(top_srcdir)/include \
${XSERVERLIBS_CFLAGS} -I$(includedir)
-libvnc_la_LDFLAGS = -module -avoid-version
+libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now
libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS)
1.1 src/patchsets/tigervnc/1.2.80_p5065/010_gethomedir.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/tigervnc/1.2.80_p5065/010_gethomedir.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/tigervnc/1.2.80_p5065/010_gethomedir.patch?rev=1.1&content-type=text/plain
Index: 010_gethomedir.patch
===================================================================
diff -up tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am.gethomedir tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am
--- tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am.gethomedir 2012-08-22 15:52:01.876216608 +0200
+++ tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am 2012-08-22 15:52:45.973143684 +0200
@@ -5,6 +5,7 @@ RFB_LIB=$(LIB_DIR)/rfb/librfb.la
RDR_LIB=$(LIB_DIR)/rdr/librdr.la
NETWORK_LIB=$(LIB_DIR)/network/libnetwork.la
XREGION_LIB=$(LIB_DIR)/Xregion/libXregion.la
+OS_LIB=$(LIB_DIR)/os/libos.la
COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(XREGION_LIB)
noinst_LTLIBRARIES = libvnccommon.la
@@ -55,7 +56,7 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I
libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now
-libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS)
+libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) $(OS_LIB)
EXTRA_DIST = Xvnc.man
1.1 src/patchsets/tigervnc/1.2.80_p5065/015_rh692048.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/tigervnc/1.2.80_p5065/015_rh692048.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/tigervnc/1.2.80_p5065/015_rh692048.patch?rev=1.1&content-type=text/plain
Index: 015_rh692048.patch
===================================================================
diff -up tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityClient.cxx.rh690245 tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityClient.cxx
--- tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityClient.cxx.rh690245 2011-02-21 14:14:16.000000000 +0100
+++ tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityClient.cxx 2011-03-31 09:47:34.519099718 +0200
@@ -45,7 +45,7 @@ StringParameter SecurityClient::secTypes
("SecurityTypes",
"Specify which security scheme to use (None, VncAuth)",
#ifdef HAVE_GNUTLS
- "X509Plain,TLSPlain,X509Vnc,TLSVnc,X509None,TLSNone,VncAuth,None",
+ "VeNCrypt,X509Plain,TLSPlain,X509Vnc,TLSVnc,X509None,TLSNone,VncAuth,None",
#else
"VncAuth,None",
#endif
diff -up tigervnc-1.0.90-20110314svn4359/common/rfb/Security.cxx.rh690245 tigervnc-1.0.90-20110314svn4359/common/rfb/Security.cxx
--- tigervnc-1.0.90-20110314svn4359/common/rfb/Security.cxx.rh690245 2011-02-21 14:14:16.000000000 +0100
+++ tigervnc-1.0.90-20110314svn4359/common/rfb/Security.cxx 2011-03-31 09:47:34.519099718 +0200
@@ -67,7 +67,6 @@ const std::list<rdr::U8> Security::GetEn
list<rdr::U8> result;
list<U32>::iterator i;
- result.push_back(secTypeVeNCrypt);
for (i = enabledSecTypes.begin(); i != enabledSecTypes.end(); i++)
if (*i < 0x100)
result.push_back(*i);
@@ -105,8 +104,6 @@ bool Security::IsSupported(U32 secType)
for (i = enabledSecTypes.begin(); i != enabledSecTypes.end(); i++)
if (*i == secType)
return true;
- if (secType == secTypeVeNCrypt)
- return true;
return false;
}
diff -up tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityServer.cxx.rh690245 tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityServer.cxx
--- tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityServer.cxx.rh690245 2011-02-21 14:50:17.000000000 +0100
+++ tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityServer.cxx 2011-03-31 10:06:43.595362302 +0200
@@ -39,7 +39,7 @@ StringParameter SecurityServer::secTypes
("SecurityTypes",
"Specify which security scheme to use (None, VncAuth)",
#ifdef HAVE_GNUTLS
- "VncAuth,TLSVnc",
+ "VncAuth",
#else
"VncAuth",
#endif
1.1 src/patchsets/tigervnc/1.2.80_p5065/020_setcursor-crash.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/tigervnc/1.2.80_p5065/020_setcursor-crash.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/tigervnc/1.2.80_p5065/020_setcursor-crash.patch?rev=1.1&content-type=text/plain
Index: 020_setcursor-crash.patch
===================================================================
diff -up tigervnc-1.2.80-20130314svn5065/unix/xserver/hw/vnc/XserverDesktop.cc.jx tigervnc-1.2.80-20130314svn5065/unix/xserver/hw/vnc/XserverDesktop.cc
--- tigervnc-1.2.80-20130314svn5065/unix/xserver/hw/vnc/XserverDesktop.cc.jx 2012-08-27 09:02:47.000000000 -0400
+++ tigervnc-1.2.80-20130314svn5065/unix/xserver/hw/vnc/XserverDesktop.cc 2013-06-17 09:42:14.310725996 -0400
@@ -479,6 +479,9 @@ void XserverDesktop::setCursor(CursorPtr
}
} else {
#endif
+ if (!cmap)
+ return;
+
xColorItem fg, bg;
fg.red = cursor->foreRed;
fg.green = cursor->foreGreen;
1.1 src/patchsets/tigervnc/1.2.80_p5065/025_inetd-nowait.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/tigervnc/1.2.80_p5065/025_inetd-nowait.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/tigervnc/1.2.80_p5065/025_inetd-nowait.patch?rev=1.1&content-type=text/plain
Index: 025_inetd-nowait.patch
===================================================================
diff -up tigervnc-1.2.80-20130314svn5065/common/network/TcpSocket.cxx.inetd-nowait tigervnc-1.2.80-20130314svn5065/common/network/TcpSocket.cxx
--- tigervnc-1.2.80-20130314svn5065/common/network/TcpSocket.cxx.inetd-nowait 2013-05-23 12:20:35.836386218 +0100
+++ tigervnc-1.2.80-20130314svn5065/common/network/TcpSocket.cxx 2013-05-23 12:23:04.698003213 +0100
@@ -325,18 +325,12 @@ bool TcpSocket::cork(int sock, bool enab
#endif
}
-bool TcpSocket::isSocket(int sock)
+bool TcpSocket::isListening(int sock)
{
- struct sockaddr_in info;
- socklen_t info_size = sizeof(info);
- return getsockname(sock, (struct sockaddr *)&info, &info_size) >= 0;
-}
-
-bool TcpSocket::isConnected(int sock)
-{
- struct sockaddr_in info;
- socklen_t info_size = sizeof(info);
- return getpeername(sock, (struct sockaddr *)&info, &info_size) >= 0;
+ int listening = 0;
+ socklen_t listening_size = sizeof(listening);
+ return getsockopt(sock, SOL_SOCKET, SO_ACCEPTCONN, &listening,
+ &listening_size) >= 0 && listening;
}
int TcpSocket::getSockPort(int sock)
diff -up tigervnc-1.2.80-20130314svn5065/common/network/TcpSocket.h.inetd-nowait tigervnc-1.2.80-20130314svn5065/common/network/TcpSocket.h
--- tigervnc-1.2.80-20130314svn5065/common/network/TcpSocket.h.inetd-nowait 2013-05-23 12:20:35.835386220 +0100
+++ tigervnc-1.2.80-20130314svn5065/common/network/TcpSocket.h 2013-05-23 12:21:58.861730647 +0100
@@ -57,8 +57,7 @@ namespace network {
static bool enableNagles(int sock, bool enable);
static bool cork(int sock, bool enable);
- static bool isSocket(int sock);
- static bool isConnected(int sock);
+ static bool isListening(int sock);
static int getSockPort(int sock);
private:
bool closeFd;
diff -up tigervnc-1.2.80-20130314svn5065/unix/xserver/hw/vnc/vncExtInit.cc.inetd-nowait tigervnc-1.2.80-20130314svn5065/unix/xserver/hw/vnc/vncExtInit.cc
--- tigervnc-1.2.80-20130314svn5065/unix/xserver/hw/vnc/vncExtInit.cc.inetd-nowait 2013-03-14 17:11:22.000000000 +0000
+++ tigervnc-1.2.80-20130314svn5065/unix/xserver/hw/vnc/vncExtInit.cc 2013-05-23 12:21:10.545530308 +0100
@@ -225,8 +225,7 @@ void vncExtensionInit()
network::TcpListener* listener = 0;
network::TcpListener* httpListener = 0;
if (scr == 0 && vncInetdSock != -1) {
- if (network::TcpSocket::isSocket(vncInetdSock) &&
- !network::TcpSocket::isConnected(vncInetdSock))
+ if (network::TcpSocket::isListening(vncInetdSock))
{
listener = new network::TcpListener(NULL, 0, 0, vncInetdSock, true);
vlog.info("inetd wait");
1.1 src/patchsets/tigervnc/1.2.80_p5065/030_manpages.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/tigervnc/1.2.80_p5065/030_manpages.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/tigervnc/1.2.80_p5065/030_manpages.patch?rev=1.1&content-type=text/plain
Index: 030_manpages.patch
===================================================================
diff -up tigervnc-1.2.80-20130314svn5065/unix/vncserver.man.manpages tigervnc-1.2.80-20130314svn5065/unix/vncserver.man
--- tigervnc-1.2.80-20130314svn5065/unix/vncserver.man.manpages 2013-07-03 12:44:03.820392690 +0100
+++ tigervnc-1.2.80-20130314svn5065/unix/vncserver.man 2013-07-03 12:44:44.222587028 +0100
@@ -92,6 +92,10 @@ argument. Thus, you can invoke "vncserv
end of your xstartup file after a particular application exits.
.TP
+.B \-list
+Lists running VNC servers.
+
+.TP
.B \-fp \fIfont-path\fP
If the vncserver script detects that the X Font Server (XFS) is running, it
will attempt to start Xvnc and configure Xvnc to use XFS for font handling.
diff -up tigervnc-1.2.80-20130314svn5065/unix/vncserver.manpages tigervnc-1.2.80-20130314svn5065/unix/vncserver
--- tigervnc-1.2.80-20130314svn5065/unix/vncserver.manpages 2013-07-03 12:39:08.754980784 +0100
+++ tigervnc-1.2.80-20130314svn5065/unix/vncserver 2013-07-03 12:43:57.932364387 +0100
@@ -551,6 +551,7 @@ sub Usage
" [-geometry <width>x<height>]\n".
" [-pixelformat rgbNNN|bgrNNN]\n".
" [-fp <font-path>]\n".
+ " [-cc <visual>]\n".
" [-fg]\n".
" [-autokill]\n".
" <Xvnc-options>...\n\n".
diff -up tigervnc-1.2.80-20130314svn5065/unix/x0vncserver/x0vncserver.cxx.manpages tigervnc-1.2.80-20130314svn5065/unix/x0vncserver/x0vncserver.cxx
diff -up tigervnc-1.2.80-20130314svn5065/unix/x0vncserver/x0vncserver.man.manpages tigervnc-1.2.80-20130314svn5065/unix/x0vncserver/x0vncserver.man
--- tigervnc-1.2.80-20130314svn5065/unix/x0vncserver/x0vncserver.man.manpages 2013-07-03 12:46:17.814038117 +0100
+++ tigervnc-1.2.80-20130314svn5065/unix/x0vncserver/x0vncserver.man 2013-07-03 12:58:32.814621597 +0100
@@ -68,7 +68,13 @@ to accept connections from any IP addres
Specify which security scheme to use for incoming connections. Valid values
are \fBNone\fP and \fBVncAuth\fP. Default is \fBVncAuth\fP.
.TP
-.B PasswordFile
+.B pam_server
+Service name for pam password validation (default is "vnc").
+.TP
+.B PlainUsers
+Users permission to access via Plain security type.
+.TP
+.B PasswordFile, rfbauth
Password file for VNC authentication. There is no default, you should
specify the password file explicitly. Password file should be created with
the \fBvncpasswd\fP(1) utility.
@@ -113,6 +119,16 @@ Accept key press and release events from
.B AcceptPointerEvents
Accept pointer events from clients. Default is on.
.TP
+.B AcceptCutText
+Accept clipboard updates from clients. Default is on.
+.TP
+.B MaxCutText
+Maximum permitted length of an incoming clipboard update (default is
+262144).
+.TP
+.B SendCutText
+Send clipboard changes to clients. Default is on.
+.TP
.B RemapKeys
Comma-separated list of incoming keysyms to remap. Mappings are expressed as
two hex values, prefixed by \fB0x\fP, and separated by \fB->\fP (`dash' and
@@ -154,23 +170,6 @@ clients may choose video selection thems
\fBVideoArea\fP parameter will take effect. If the argument is empty, no
video area is set (this is the default).
.TP
-.B VideoPriority
-Specify the priority of sending video updates. \fBx0vncserver\fP can be
-instructed to treat certain rectangular part of the screen as a video area
-and handle it in a special way for improved performance (see documentation on
-the \fBVideoArea\fP parameter). \fBVideoPriority\fP value controls how often
-video area will be sent to clients as compared to the rest of the screen.
-The priority must be an integer between 0 and 8, and the default value is 2.
-
-\fBVideoPriority\fP set to 1 gives the same priority both to video and to
-other pixels. Higher values give more priority to video. For example, the
-value 5 specifies that the rate of sending video will be five times higher
-than the rate of updating the rest of the screen. If \fBVideoPriority\fP is
-set to 0, it gives equal priority to video and other updates (just like the
-value 1) and also disables special encoding for video data. In other words,
-\fBVideoPriority\fP video area will be sent as a part of other screen
-contents.
-.TP
.B CompareFB
Perform pixel comparison on framebuffer to reduce unnecessary updates.
Default is on.
@@ -185,15 +184,6 @@ This enables system-specific access to c
screen (the default X visual often provides 256 colors). Also, in overlay
mode, \fBx0vncserver\fP can show correct mouse cursor. Default is on.
.TP
-.B UseHardwareJPEG
-Use hardware-accelerated JPEG compressor for video if available.
-\fBx0vncserver\fP can be instructed to treat certain rectangular part of the
-screen as a video area and handle it in a special way for improved
-performance. If the client supports Tight encoding and JPEG compression,
-such video areas will be sent as JPEG-encoded rectangles. And if this option
-is on, compression will be hardware-accelerated (currently, supported only in
-SGI/IRIX equipped with appropriate hardware). Default is on.
-.TP
.B ZlibLevel
Zlib compression level for ZRLE encoding (it does not affect Tight encoding).
Acceptable values are between 0 and 9. Default is to use the standard
@@ -222,6 +212,18 @@ Terminate after \fIN\fP seconds of user
.B ClientWaitTimeMillis
The number of milliseconds to wait for a client which is no longer
responding. Default is 20000.
+.TP
+.B DeferUpdate
+Time in milliseconds to defer updates (default is 1).
+.TP
+.B AlwaysSetDeferUpdateTimer
+Always reset the defer update timer on every change.
+.TP
+.B x509key
+Path to key of the x509 certificate in PEM format.
+.TP
+.B 509cert
+Path to x509 certificate in PEM format.
.SH SEE ALSO
.BR Xvnc (1),
.BR vncpasswd (1),
diff -up tigervnc-1.2.80-20130314svn5065/vncviewer/vncviewer.cxx.manpages tigervnc-1.2.80-20130314svn5065/vncviewer/vncviewer.cxx
--- tigervnc-1.2.80-20130314svn5065/vncviewer/vncviewer.cxx.manpages 2013-07-03 12:00:58.005856116 +0100
+++ tigervnc-1.2.80-20130314svn5065/vncviewer/vncviewer.cxx 2013-07-03 12:04:26.083023050 +0100
@@ -261,6 +261,11 @@ static void usage(const char *programNam
" %s [parameters] -listen [port] [parameters]\n",
programName, programName);
fprintf(stderr,"\n"
+ "Options:\n\n"
+ " -display Xdisplay - Specifies the X display for the viewer window\n"
+ " -geometry geometry - Standard X position and sizing specification.\n");
+
+ fprintf(stderr,"\n"
"Parameters can be turned on with -<param> or off with -<param>=0\n"
"Parameters which take a value can be specified as "
"-<param> <value>\n"
diff -up tigervnc-1.2.80-20130314svn5065/vncviewer/vncviewer.man.manpages tigervnc-1.2.80-20130314svn5065/vncviewer/vncviewer.man
--- tigervnc-1.2.80-20130314svn5065/vncviewer/vncviewer.man.manpages 2013-07-03 11:40:48.905078300 +0100
+++ tigervnc-1.2.80-20130314svn5065/vncviewer/vncviewer.man 2013-07-03 12:00:13.116604372 +0100
@@ -113,12 +113,53 @@ Xvnc supports reverse connections with a
.B vncconfig.
.TP
-.B \-passwd \fIpassword-file\fP
+.B \-passwd \fIpassword-file\fP, \-PasswordFile \fIpassword-file\fP
If you are on a filesystem which gives you access to the password file used by
the server, you can specify it here to avoid typing it in. It will usually be
"~/.vnc/passwd".
.TP
+.B \-DotWhenNoCursor
+Show the dot cursor when the server sends an invisible cursor.
+
+.TP
+.B \-PointerEventInterval
+Time in milliseconds to rate-limit successive pointer events.
+
+.TP
+.B \-ImprovedHextile
+Try harder to compress data (default).
+
+.TP
+.B \-QualityLevel \fIlevel\fP
+JPEG quality level (default is 8).
+
+.TP
+.B \-NoJPEG
+Disable lossy JPEG compression in Tight encoding.
+
+.TP
+.B CompressLevel \fIlevel\fP
+Use specified compression level (default is 2).
+
+.TP
+.B CustomCompressLevel \fIlevel\fP
+Use custom compression level. Default is CompressLevel is specified.
+
+.TP
+.B \-SendPrimary
+Send the primary selection and cut buffer to the server as well as the
+clipboard selection (default).
+
+.TP
+.B \-SendClipboard
+Send clipboard changes to the server (default).
+
+.TP
+.B \-AcceptClipboard
+Accept clipboard changes from the server (default).
+
+.TP
.B \-Shared
When you make a connection to a VNC server, all other existing connections are
normally closed. This option requests that they be left open, allowing you to
@@ -140,6 +181,19 @@ Maximize viewer window.
Start in full-screen mode.
.TP
+.B \-FullScreenAllMonitors
+Enable full screen over all monitors (default).
+
+.TP
+.B \-FullscreenSystemKeys
+Pass special keys directly to the server in full-screen mode.
+
+.TP
+.B \-RemoteResize
+Dynamically resize the remote desktop size as the size of the local
+client window changes (default).
+
+.TP
.B \-DesktopSize \fIwidth\fPx\fIheight\fP
Instead of keeping the existing remote screen size, the client will attempt to
switch to the specified since when connecting. If the server does not support
@@ -214,6 +268,22 @@ command is executed with the environment
host, the port number on the remote host, and the gateway machine
respectively.
+.TP
+\fB\-ZlibLevel\fR \fIlevel\fR
+Zlib compression level.
+
+.TP
+.B \-x509crl \fIfile\fP
+X509 CRL file
+
+.TP
+.B \-x509ca \fIfile\fP
+X509 CA certificate
+
+.TP
+.B \-SecurityTypes \fItypes\fP
+Specify which security scheme to use.
+
.SH SEE ALSO
.BR Xvnc (1),
.BR vncpasswd (1),
1.1 src/patchsets/tigervnc/1.2.80_p5065/035_glx.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/tigervnc/1.2.80_p5065/035_glx.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/tigervnc/1.2.80_p5065/035_glx.patch?rev=1.1&content-type=text/plain
Index: 035_glx.patch
===================================================================
diff -up tigervnc-1.2.80-20120905svn4996/unix/xserver/hw/vnc/Makefile.am.jx tigervnc-1.2.80-20120905svn4996/unix/xserver/hw/vnc/Makefile.am
--- tigervnc-1.2.80-20120905svn4996/unix/xserver/hw/vnc/Makefile.am.jx 2012-09-28 13:24:53.000000000 -0400
+++ tigervnc-1.2.80-20120905svn4996/unix/xserver/hw/vnc/Makefile.am 2012-09-28 13:35:59.918561641 -0400
@@ -8,6 +8,10 @@ XREGION_LIB=$(LIB_DIR)/Xregion/libXregio
OS_LIB=$(LIB_DIR)/os/libos.la
COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(XREGION_LIB)
+if GLX
+GLX_LIB = $(top_srcdir)/glx/libglx.la
+endif
+
noinst_LTLIBRARIES = libvnccommon.la
HDRS = RegionHelper.h vncExtInit.h vncHooks.h XserverDesktop.h xorg-version.h \
@@ -35,7 +39,8 @@ Xvnc_CPPFLAGS = $(XVNC_CPPFLAGS) -DTIGER
-UHAVE_CONFIG_H \
-DXFree86Server -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \
-DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(TIGERVNC_SRCDIR)/common \
- -I$(top_srcdir)/include ${XSERVERLIBS_CFLAGS} -I$(includedir)
+ -I$(top_srcdir)/include ${XSERVERLIBS_CFLAGS} -I$(includedir) \
+ -I$(top_srcdir)/glx
Xvnc_LDADD = $(XVNC_LIBS) libvnccommon.la $(COMMON_LIBS) \
$(XSERVER_LIBS) $(XSERVER_SYS_LIBS) $(XVNC_SYS_LIBS) -lX11
@@ -56,7 +61,7 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I
libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now
-libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) $(OS_LIB)
+libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) $(OS_LIB) $(GLX_LIB)
EXTRA_DIST = Xvnc.man
--- tigervnc-1.2.80-20120905svn4996/unix/xserver/hw/vnc/xvnc.cc.jx 2012-09-05 09:29:19.000000000 -0400
+++ tigervnc-1.2.80-20120905svn4996/unix/xserver/hw/vnc/xvnc.cc 2012-09-28 13:39:41.178815125 -0400
@@ -87,6 +87,17 @@ extern "C" {
#include "version-config.h"
#include "site.h"
#endif
+
+#if XORG >= 113
+#ifdef GLXEXT
+/* C++ really is the worst */
+#define private _private
+#include "glxserver.h"
+#undef private
+#include "glx_extinit.h"
+#endif
+#endif
+
#undef class
#undef public
}
@@ -1562,6 +1573,16 @@ static void vfbClientStateChange(Callbac
dispatchException &= ~DE_RESET;
}
+#if XORG >= 113
+#ifdef GLXEXT
+static ExtensionModule vnc_glx_ext = {
+ GlxExtensionInit,
+ "GLX",
+ &noGlxExtension
+};
+#endif
+#endif
+
void
InitOutput(ScreenInfo *screenInfo, int argc, char **argv)
{
@@ -1571,6 +1592,13 @@ InitOutput(ScreenInfo *screenInfo, int a
int i;
int NumFormats = 0;
+#if XORG >= 113
+#ifdef GLXEXT
+ if (serverGeneration == 1)
+ LoadExtension(&vnc_glx_ext, TRUE);
+#endif
+#endif
+
/* initialize pixmap formats */
/* must have a pixmap depth to match every screen depth */
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-04-06 13:27 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-04-06 13:27 [gentoo-commits] gentoo commit in src/patchsets/tigervnc/1.2.80_p5065: 001_cookie.patch 005_ldnow.patch 010_gethomedir.patch 015_rh692048.patch 020_setcursor-crash.patch 025_inetd-nowait.patch 030_manpages.patch 035_glx.patch Raul Porcel (armin76)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox