fix runforever/bpp #45845

5 files changed, 96 insertions, 1 deletions

diff --git a/net-misc/gemsvnc/ChangeLog b/net-misc/gemsvnc/ChangeLog
index 65a5377f6066..975a8274ef3e 100644
--- a/net-misc/gemsvnc/ChangeLog
+++ b/net-misc/gemsvnc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/gemsvnc
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gemsvnc/ChangeLog,v 1.4 2004/02/20 21:49:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gemsvnc/ChangeLog,v 1.5 2004/03/28 08:48:15 vapier Exp $
+
+*gemsvnc-2-r1 (28 Mar 2004)
+
+  28 Mar 2004; Mike Frysinger <vapier@gentoo.org> :
+  Don't disconnect after first client in daemon mode and fix
+  issues with running in bpp less than 32 #45845 by stamm@flashmail.com.
 
 *gemsvnc-2 (20 Feb 2004)
 
diff --git a/net-misc/gemsvnc/files/2-daemon-runforever.patch b/net-misc/gemsvnc/files/2-daemon-runforever.patch
new file mode 100644
index 000000000000..3a26a0fe3f6a
--- /dev/null
+++ b/net-misc/gemsvnc/files/2-daemon-runforever.patch
@@ -0,0 +1,23 @@
+--- gemsvnc.orig	2004-03-26 19:16:41.000000000 +0100
++++ gemsvnc.c	2004-03-27 00:22:26.179380632 +0100
+@@ -1734,6 +1734,12 @@
+ 
+       active = checkForImageUpdates();                           /* check for any changes to the framebuffer and relay them to the remote clients*/
+     } else {
++	if (disconnectAfterFirstClient == FALSE)
++	{							/* fix runforever & deamon-mode not to time out */
++	//printf ("runforever activated\n");
++	}
++	else
++	{							/* #end-patch# (by evrmnd) */ 
+       gettimeofday(&cur, NULL);
+       maxUsecsToConnect -= (cur.tv_usec - prev.tv_usec) +
+                            (cur.tv_sec - prev.tv_sec)*1000000;
+@@ -1743,6 +1749,7 @@
+         fprintf(stderr, "Maximum time to connect reached. Exiting.\n"); /* yes, bellyache about it */
+         XTestDiscard(dpy);                                       /* throw away any pending requests -- who cares anyway? */
+         exit(2);                                                 /* and quit */
++	}							/* #patch# (by evrmnd) */
+       }
+     }
+ 
diff --git a/net-misc/gemsvnc/files/2-many-bpp.patch b/net-misc/gemsvnc/files/2-many-bpp.patch
new file mode 100644
index 000000000000..3114ca6764cc
--- /dev/null
+++ b/net-misc/gemsvnc/files/2-many-bpp.patch
@@ -0,0 +1,23 @@
+--- gemsvnc.orig	2004-03-26 19:16:41.000000000 +0100
++++ gemsvnc.c	2004-03-27 00:08:32.906057432 +0100
+@@ -1486,7 +1486,19 @@
+   xscreen = DefaultScreen(dpy);                                  /* default screen of selected DISPLAY */
+   window = RootWindow(dpy, xscreen);                             /* root window of that screen */
+   depth = DefaultDepth(dpy, xscreen);                            /* depth in bits per pixel */
+-  depth = 32;                                                    /* FIXME crocked for debug */
++  	if (depth == 32)					/* patch-begin (by evrmd)*/
++	{							/* workaround to work with x-server */
++		depth = 32;					/* running less than 24bpp */
++	}
++	else if (depth == 24)
++		{
++			depth=32;
++		}
++		else
++		{
++		}
++	{
++	}							/* patch-end (by evrmd)*/
+   bpp = depth/8;                                                 /* bytes per pixel */
+   fb_high = DisplayHeight(dpy, xscreen);                         /* how many pixels high is the framebuffer */
+   fb_wide = DisplayWidth(dpy, xscreen);                          /* how many pixels wide is the framebuffer */
diff --git a/net-misc/gemsvnc/files/digest-gemsvnc-2-r1 b/net-misc/gemsvnc/files/digest-gemsvnc-2-r1
new file mode 100644
index 000000000000..409bc56f85ac
--- /dev/null
+++ b/net-misc/gemsvnc/files/digest-gemsvnc-2-r1
@@ -0,0 +1 @@
+MD5 b5a9e15d86ada8613087162d4674298e gemsvnc-2.tbz2 44013
diff --git a/net-misc/gemsvnc/gemsvnc-2-r1.ebuild b/net-misc/gemsvnc/gemsvnc-2-r1.ebuild
new file mode 100644
index 000000000000..c187186cfeb7
--- /dev/null
+++ b/net-misc/gemsvnc/gemsvnc-2-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gemsvnc/gemsvnc-2-r1.ebuild,v 1.1 2004/03/28 08:48:15 vapier Exp $
+
+inherit eutils gcc flag-o-matic
+
+DESCRIPTION="an X11 vnc server for remote control"
+HOMEPAGE="http://www.elilabs.com/~rj/gemsvnc/"
+#SRC_URI="http://www.elilabs.com/~rj/gemsvnc/${PN}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tbz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc"
+
+DEPEND=">=net-libs/libvncserver-0.6
+	virtual/x11
+	sys-libs/zlib
+	media-libs/jpeg"
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-daemon-runforever.patch
+	epatch ${FILESDIR}/${PV}-many-bpp.patch
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	dobin gemsvnc || die
+	dodoc CHANGES README TODO
+}
+
+pkg_postinst() {
+	ewarn "This vnc server may not work with X servers"
+	ewarn "running less than 24bpp."
+}