diff options
author | Mike Frysinger <vapier@gentoo.org> | 2005-12-30 23:52:41 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2005-12-30 23:52:41 +0000 |
commit | 4c52a8052d191fb874d4c76909c6c690d3d78f43 (patch) | |
tree | bf14381ef739add3acd7eb611fa128c32e16c167 /net-misc/rfb | |
parent | Version bump to include nios2 support. (diff) | |
download | gentoo-2-4c52a8052d191fb874d4c76909c6c690d3d78f43.tar.gz gentoo-2-4c52a8052d191fb874d4c76909c6c690d3d78f43.tar.bz2 gentoo-2-4c52a8052d191fb874d4c76909c6c690d3d78f43.zip |
use x11vnc
Diffstat (limited to 'net-misc/rfb')
-rw-r--r-- | net-misc/rfb/ChangeLog | 28 | ||||
-rw-r--r-- | net-misc/rfb/Manifest | 7 | ||||
-rw-r--r-- | net-misc/rfb/files/digest-rfb-0.6.1 | 1 | ||||
-rw-r--r-- | net-misc/rfb/files/digest-rfb-0.6.1-r2 | 1 | ||||
-rw-r--r-- | net-misc/rfb/files/rfb-0.6.1-daemon.patch | 237 | ||||
-rw-r--r-- | net-misc/rfb/files/rfb-0.6.1-gcc3.x.patch | 211 | ||||
-rw-r--r-- | net-misc/rfb/rfb-0.6.1-r2.ebuild | 43 | ||||
-rw-r--r-- | net-misc/rfb/rfb-0.6.1.ebuild | 38 |
8 files changed, 0 insertions, 566 deletions
diff --git a/net-misc/rfb/ChangeLog b/net-misc/rfb/ChangeLog deleted file mode 100644 index 91fe3e2d5c3b..000000000000 --- a/net-misc/rfb/ChangeLog +++ /dev/null @@ -1,28 +0,0 @@ -# ChangeLog for net-misc/rfb -# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/rfb/ChangeLog,v 1.8 2004/06/25 00:08:46 agriffis Exp $ - -*rfb-0.6.1-r2 (27 Jun 2003) - - 27 Jun 2003; Mike Frysinger <vapier@gentoo.org> : - Updated the daemon to be a real daemon ;) - This one actually unbinds std{in,out,err} and all that stuff. - THX WWOODS YOU MAST0R OF C - -*rfb-0.6.1-r1 (25 Mar 2003) - - 25 Mar 2003; Rajiv Manglani <rajiv@gentoo.org> rfb-0.6.1-r1.ebuild : - fixed homepage url. - -*rfb-0.6.1 (18 Jan 2003) - - 25 Mar 2003; Rajiv Manglani <rajiv@gentoo.org> rfb-0.6.1.ebuild : - fixed homepage url. - - 18 Jan 2003; Mike Frysinger <vapier@gentoo.org> : - Added a patch to support a '-daemon' switch ... sexy :) - -*rfb-0.6.1 (23 Oct 2002) - - 23 Oct 2002; Mike Frysinger <vapier@gentoo.org> : - Initial import. Ebuild submitted by me. diff --git a/net-misc/rfb/Manifest b/net-misc/rfb/Manifest deleted file mode 100644 index 80ec7e44d885..000000000000 --- a/net-misc/rfb/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -MD5 c46886283a320e5e195c213f2ea2510b rfb-0.6.1.ebuild 985 -MD5 4c72ae8aca935b156153cee0e7f743de rfb-0.6.1-r2.ebuild 1066 -MD5 153948c0daab0cd9fc6647da5287330e ChangeLog 889 -MD5 193705142d6cc32a958886b33bed5257 files/digest-rfb-0.6.1-r2 61 -MD5 8d0a143c99a1923432f70c970ccbde92 files/rfb-0.6.1-gcc3.x.patch 5981 -MD5 193705142d6cc32a958886b33bed5257 files/digest-rfb-0.6.1 61 -MD5 9a0937d122c4d19ed38529f120d3a6c1 files/rfb-0.6.1-daemon.patch 6506 diff --git a/net-misc/rfb/files/digest-rfb-0.6.1 b/net-misc/rfb/files/digest-rfb-0.6.1 deleted file mode 100644 index f83cf7181f22..000000000000 --- a/net-misc/rfb/files/digest-rfb-0.6.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 1b5c806cd98f90501ec234784d5ffd0d rfb-0.6.1.tar.gz 324505 diff --git a/net-misc/rfb/files/digest-rfb-0.6.1-r2 b/net-misc/rfb/files/digest-rfb-0.6.1-r2 deleted file mode 100644 index f83cf7181f22..000000000000 --- a/net-misc/rfb/files/digest-rfb-0.6.1-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 1b5c806cd98f90501ec234784d5ffd0d rfb-0.6.1.tar.gz 324505 diff --git a/net-misc/rfb/files/rfb-0.6.1-daemon.patch b/net-misc/rfb/files/rfb-0.6.1-daemon.patch deleted file mode 100644 index cdcebf51d4f7..000000000000 --- a/net-misc/rfb/files/rfb-0.6.1-daemon.patch +++ /dev/null @@ -1,237 +0,0 @@ ---- lib/rfbServer.cc.orig 2003-06-27 16:39:09.000000000 -0400 -+++ lib/rfbServer.cc 2003-06-27 16:39:58.000000000 -0400 -@@ -29,9 +29,11 @@ - using std::cout; - using std::endl; - --namespace rfb { -+bool isdaemon = false; - -+namespace rfb { - -+void Server::toggleDaemon(bool t) { isdaemon = t; } - - Server::Server() - : stateProtocolVersion( this ) -@@ -142,6 +144,7 @@ - blocksX = (framebuffer->width + blockWidth - 1) / blockWidth; - blocksY = (framebuffer->height + blockHeight - 1) / blockHeight; - blocks = (Block*) malloc( sizeof(Block) * blocksX * blocksY ); -+ if (!isdaemon) { - cerr << "framebuffer->width: " << framebuffer->width << endl; - cerr << "framebuffer->height: " << framebuffer->height << endl; - cerr << "blockWidth: " << blockWidth << endl; -@@ -149,6 +152,7 @@ - cerr << "blocksX: " << blocksX << endl; - cerr << "blocksY: " << blocksY << endl; - cerr << "blocks: " << blocks << endl; -+ } - // ResetBlocks(); - } - -@@ -234,8 +238,10 @@ - - void Server::handleClientInitialisation( ClientInitialisation &clientInitialisation ) - { -+ if (!isdaemon) { - cout << "-> handleClientInitialisation" << endl; - cout << "shared flag: " << (int) clientInitialisation.shared_flag << endl; -+ } - - ServerInitialisation serverInitialisation; - getServerInitialisation( serverInitialisation ); -@@ -674,6 +680,7 @@ - } - if ( size == 4 ) { - if ( offset == size ) { -+ if (!isdaemon) - cerr << "encoding: " << (int) encodings.encoding[encodings.count] << endl; - encodings.count = encodings.count + 1; - data = (unsigned char*) &(encodings.encoding[encodings.count]); ---- include/rfbServer.h.orig 2003-06-27 16:39:19.000000000 -0400 -+++ include/rfbServer.h 2003-06-27 16:39:58.000000000 -0400 -@@ -342,6 +342,7 @@ - void ResetBlocks(); - void DeleteBlocks(); - void BlocksToHints(); -+ void toggleDaemon(bool); - - Block *blocks; - unsigned int blockWidth, blockHeight; ---- x0rfbserver/x0rfbserver.cc.orig 2003-06-27 16:39:25.000000000 -0400 -+++ x0rfbserver/x0rfbserver.cc 2003-06-27 16:43:54.000000000 -0400 -@@ -72,6 +72,7 @@ - OXClient *clientX; - const OXWindow *root; - Display *dpy; -+extern bool isdaemon; - - - namespace rfb { -@@ -347,11 +348,13 @@ - - void OXServerMainFrame::CreateFramebuffer() - { -+ if (!isdaemon) { - cerr << "CreateFramebuffer() start" << endl; - cerr << "dpy" << dpy << endl; - cerr << "id " << root->GetId() << endl; - cerr << "w " << clientX->GetDisplayWidth() << endl; - cerr << "h " << clientX->GetDisplayHeight() << endl; -+ } - framebufferImage = XGetImage( dpy, - root->GetId(), - 0, -@@ -360,6 +363,7 @@ - clientX->GetDisplayHeight(), - AllPlanes, - ZPixmap ); -+ if (!isdaemon) - cerr << "FI " << framebufferImage << endl; - framebuffer.width = framebufferImage->width; - framebuffer.height = framebufferImage->height; -@@ -397,9 +401,11 @@ - } - scanner = new XUpdateScanner( dpy, root->GetId(), &framebuffer ); - -+ if (!isdaemon) { - cerr << "fpf " << int(framebuffer.pixelFormat.bits_per_pixel) << endl; - - cerr << "CreateFramebuffer() end" << endl; -+ } - } - - -@@ -616,6 +622,7 @@ - event.same_screen = True; - event.state = modifier; - event.keycode = kc; -+ if (!isdaemon) - cerr << "XSendEvent (XKeyEvent)" << endl; - if ( kc != NoSymbol ) - XSendEvent( dpy, -@@ -703,6 +710,7 @@ - } - } - else { -+ if (!isdaemon) - cerr << "XWarpPointer" << endl; - XWarpPointer( dpy, - None, -@@ -751,9 +759,11 @@ - #ifdef USE_ZLIB_WARREN - void BaseServer::handleEnableZlib( CARD8 level ) - { -+ if (!isdaemon) - cerr << "EnableZlib: level " << (int) level << endl; - Server::handleEnableZlib( level ); - bufferedConnection->enableSenderDeflation( level ); -+ if (!isdaemon) - cerr << "Zlib enabled" << endl; - } - #endif // USE_ZLIB_WARREN -@@ -803,6 +813,8 @@ - , key_Hyper_L( 0 ) - , key_Hyper_R( 0 ) - { -+ toggleDaemon(isdaemon); -+ if (!isdaemon) - cerr << "BaseServer() start" << endl; - memcpy( password, "\0\0\0\0\0\0\0\0", 8 ); - strncpy( password, properties.password, 8 ); -@@ -820,12 +832,14 @@ - fh = new OSocketFileHandler( mainFrame, fd, XCM_READABLE | XCM_WRITABLE ); - mainFrame->RegisterServer( this ); - connection->send( (unsigned char*) RFB_PROTOCOL_VERSION, 12 ); -+ if (!isdaemon) - cerr << "BaseServer() end" << endl; - } - - - BaseServer::~BaseServer() - { -+ if (!isdaemon) - cerr << "~BaseServer() start" << endl; - DeleteBlocks(); - mainFrame->UnregisterServer( this ); -@@ -833,6 +847,7 @@ - delete fh; - shutdown( fd, 2 ); - close( fd ); -+ if (!isdaemon) - cerr << "~BaseServer() end" << endl; - } - -@@ -860,6 +875,7 @@ - << " x0rfbserver -stdio" << endl - << " x0rfbserver -about" << endl - << " x0rfbserver -help" << endl -+ << " x0rfbserver -daemon" << endl - << endl - << "<options>" << endl - << " -shared" << endl -@@ -871,7 +887,7 @@ - - void parseCommandLine_x0rfbserver( int argc, char **argv ) - { -- enum { UNDEF, ABOUT, STDIO } mode; -+ enum { UNDEF, ABOUT, STDIO, DAEMON } mode; - mode = UNDEF; - - int i = 1; -@@ -891,6 +907,13 @@ - if ( mode == UNDEF ) mode = STDIO; - else printHelp_x0rfbserver(); - i++; -+ } else -+ -+ if ( !strcmp( argv[i], "-daemon" ) ) { -+ if ( mode == UNDEF ) mode = DAEMON; -+ else printHelp_x0rfbserver(); -+ isdaemon = true; -+ i++; - } else printHelp_x0rfbserver(); - } - -@@ -920,6 +943,21 @@ - break; - - -+ case DAEMON: { -+ if (fork()) { return; } -+ setsid(); -+ if (fork()) { exit(0); } -+ chdir("/"); -+ close(0); -+ close(1); -+ close(2); -+ clientX = new OXClient; -+ root = clientX->GetRoot(); -+ dpy = root->GetDisplay(); -+ new rfb::OXServerMainFrame( 48, 48 ); -+ exit( 0 ); -+ } -+ break; - - case STDIO: { - clientX = new OXClient; ---- x0rfbserver/XUpdateScanner.cc.orig 2003-06-27 16:39:30.000000000 -0400 -+++ x0rfbserver/XUpdateScanner.cc 2003-06-27 16:39:58.000000000 -0400 -@@ -386,6 +386,7 @@ - } - } - -+ if (!isdaemon) - cerr << "TILES: " << tilec << endl; - - if ( properties.showMousePointer ) { ---- x0rfbserver/XUpdateScanner.h.orig 2002-02-12 18:57:01.000000000 -0500 -+++ x0rfbserver/XUpdateScanner.h 2003-06-27 16:39:58.000000000 -0400 -@@ -23,6 +23,7 @@ - - - #include "rfbServer.h" -+extern bool isdaemon; - - - namespace rfb { diff --git a/net-misc/rfb/files/rfb-0.6.1-gcc3.x.patch b/net-misc/rfb/files/rfb-0.6.1-gcc3.x.patch deleted file mode 100644 index 46ba396f619b..000000000000 --- a/net-misc/rfb/files/rfb-0.6.1-gcc3.x.patch +++ /dev/null @@ -1,211 +0,0 @@ ---- lib/Framebuffer.cc.orig 2002-09-29 17:27:45.000000000 -0400 -+++ lib/Framebuffer.cc 2002-09-29 17:28:37.000000000 -0400 -@@ -161,7 +161,7 @@ - unsigned int r, - unsigned int g, - unsigned int b, -- unsigned int m = 255 ) -+ unsigned int m ) - { - FramebufferPixel(this,x,y).setColor(r,g,b,m); - } -@@ -172,7 +172,7 @@ - unsigned int &r, - unsigned int &g, - unsigned int &b, -- unsigned int m = 255 ) -+ unsigned int m ) - { - FramebufferPixel(this,x,y).getColor(r,g,b,m); - } -@@ -181,7 +181,7 @@ - void FramebufferPixel::setColor( unsigned int r, - unsigned int g, - unsigned int b, -- unsigned int m = 255 ) -+ unsigned int m ) - { - unsigned int r_max = fb->pixelFormat.red_max; - unsigned int g_max = fb->pixelFormat.green_max; -@@ -246,7 +246,7 @@ - void FramebufferPixel::getColor( unsigned int &r, - unsigned int &g, - unsigned int &b, -- unsigned int m = 255 ) -+ unsigned int m ) - { - unsigned int r_max = fb->pixelFormat.red_max; - unsigned int g_max = fb->pixelFormat.green_max; -@@ -288,10 +288,10 @@ - - - int saveFramebufferAsPPM( int file, Framebuffer *fb, -- int x0 = 0, -- int y0 = 0, -- int width = -1, -- int height = -1 ) { -+ int x0, -+ int y0, -+ int width, -+ int height ) { - if ( width < 0 ) width = fb->width; - if ( height < 0 ) height = fb->height; - char tmp[255] = ""; ---- lib/rfb.cc.orig 2002-09-29 17:34:41.000000000 -0400 -+++ lib/rfb.cc 2002-09-29 17:34:51.000000000 -0400 -@@ -28,7 +28,7 @@ - /* CARD16 */ - /**************************************************/ - --CARD16::CARD16( unsigned int _value = 0 ) -+CARD16::CARD16( unsigned int _value ) - { - value[1] = _value; - _value >>= 8; -@@ -55,7 +55,7 @@ - /* CARD32 */ - /**************************************************/ - --CARD32::CARD32( unsigned int _value = 0 ) -+CARD32::CARD32( unsigned int _value ) - { - value[3] = _value; - _value >>= 8; ---- lib/rfbServer.cc.orig 2002-09-29 17:37:06.000000000 -0400 -+++ lib/rfbServer.cc 2002-09-29 17:41:36.000000000 -0400 -@@ -22,8 +22,12 @@ - #include "rfbServer.h" - #include <stdlib.h> - #include <string.h> -+#include <iostream> - #include "d3des.h" - -+using std::cerr; -+using std::cout; -+using std::endl; - - namespace rfb { - ---- include/rfbServer.h.orig 2002-09-29 17:29:06.000000000 -0400 -+++ include/rfbServer.h 2002-09-29 17:34:19.000000000 -0400 -@@ -26,6 +26,7 @@ - #include "Framebuffer.h" - - #include <list> -+using std::list; - - namespace rfb { - ---- include/rfbClient.h.orig 2002-09-29 17:36:15.000000000 -0400 -+++ include/rfbClient.h 2002-09-29 17:36:33.000000000 -0400 -@@ -257,7 +257,7 @@ - - protected: - Rectangle rectangle; -- friend ClientStateDecodingRaw; -+ friend class rfb::ClientStateDecodingRaw; - }; - - ---- x0rfbserver/xclass++.h.orig 2002-09-29 17:49:18.000000000 -0400 -+++ x0rfbserver/xclass++.h 2002-09-29 17:49:24.000000000 -0400 -@@ -2,7 +2,7 @@ - #define _hexonet_xclass_plusplus_ - - #include <map> -- -+using std::map; - - #define LAYOUT_HINTS map< OXFrame*, OLayoutHints* > layoutHints - ---- x0rfbserver/XUpdateScanner.cc.orig 2002-09-29 17:50:40.000000000 -0400 -+++ x0rfbserver/XUpdateScanner.cc 2002-09-29 17:51:12.000000000 -0400 -@@ -18,6 +18,10 @@ - * USA. - */ - -+#include <iostream> -+using std::cerr; -+using std::endl; -+ - #include <sys/ipc.h> - #include <sys/shm.h> - #include <X11/Xlib.h> ---- x0rfbserver/x0rfbserver.cc.orig 2002-09-29 17:51:53.000000000 -0400 -+++ x0rfbserver/x0rfbserver.cc 2002-09-29 17:52:23.000000000 -0400 -@@ -18,6 +18,10 @@ - * USA. - */ - -+#include <iostream> -+using std::cerr; -+using std::endl; -+ - #include "rfbServer.h" - #include "version.h" - #include "OXAbout.h" ---- xrfbviewer/OXViewerApplet.h.orig 2002-09-29 17:44:49.000000000 -0400 -+++ xrfbviewer/OXViewerApplet.h 2002-09-29 17:45:02.000000000 -0400 -@@ -31,6 +31,7 @@ - #include "ConnectionInfo.h" - - #include <map> -+using std::map; - - class OXCompositeFrame; - ---- xrfbviewer/xclass++.h.orig 2002-09-29 17:44:53.000000000 -0400 -+++ xrfbviewer/xclass++.h 2002-09-29 17:45:10.000000000 -0400 -@@ -2,7 +2,7 @@ - #define _hexonet_xclass_plusplus_ - - #include <map> -- -+using std::map; - - #define LAYOUT_HINTS map< OXFrame*, OLayoutHints* > layoutHints - ---- xrfbviewer/OXViewerApplet.cc.orig 2002-09-29 17:47:01.000000000 -0400 -+++ xrfbviewer/OXViewerApplet.cc 2002-09-29 17:47:32.000000000 -0400 -@@ -25,6 +25,8 @@ - #include "OXConnectionDetails.h" - - #include <iostream> -+using std::cout; -+using std::endl; - - #include <sys/types.h> - #include <fcntl.h> ---- rfbcat/rfbcat.cc.orig 2002-09-29 17:54:27.000000000 -0400 -+++ rfbcat/rfbcat.cc 2002-09-29 17:54:43.000000000 -0400 -@@ -21,6 +21,8 @@ - #include "rfbClient.h" - - #include <iostream> -+using std::cerr; -+using std::endl; - #include <fstream> - - #include <stdio.h> ---- Makefile 2002-09-29 21:44:39.000000000 -0400 -+++ Makefile.orig 2002-09-29 21:44:29.000000000 -0400 -@@ -49,7 +49,7 @@ - rfbcat: librfb.a - cd rfbcat && $(MAKE) -e $(ENVIRONMENT) $@ - --xvncconnect: -+xvncconnect: librfb.a - cd xvncconnect && $(MAKE) -e $(ENVIRONMENT) $@ - - clean: ---- include/rfb.h.orig 2003-10-09 11:10:21.131479008 -0400 -+++ include/rfb.h 2003-10-09 11:10:30.480057808 -0400 -@@ -21,6 +21,8 @@ - #ifndef _hexonet_rfb_h_ - #define _hexonet_rfb_h_ - -+using namespace std; -+ - namespace rfb { - - diff --git a/net-misc/rfb/rfb-0.6.1-r2.ebuild b/net-misc/rfb/rfb-0.6.1-r2.ebuild deleted file mode 100644 index 424712f19680..000000000000 --- a/net-misc/rfb/rfb-0.6.1-r2.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/rfb/rfb-0.6.1-r2.ebuild,v 1.4 2004/07/15 03:23:31 agriffis Exp $ - -inherit eutils - -DESCRIPTION="comprehensive collection of rfb enabled tools and applications" -HOMEPAGE="http://forum.hexonet.com/" -SRC_URI="http://download.hexonet.com/software/rfb/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86 ~ppc ~sparc ~alpha" -IUSE="" - -DEPEND="x11-libs/xclass" - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/${P}-gcc3.x.patch - epatch ${FILESDIR}/${P}-daemon.patch -} - -src_compile() { - make depend || die "make depend failed" - make CXXFLAGS="-DUSE_ZLIB_WARREN -I../include ${CXXFLAGS}" || die "make failed" -} - -src_install() { -# dolib lib/librfb.a #does anything other than rfb use this ? - - dobin rfbcat/rfbcat x0rfbserver/x0rfbserver \ - xrfbviewer/{xplayfbs,xrfbviewer} - for f in rfbcat x0rfbserver xvncconnect xrfbviewer ; do - dobin ${f}/${f} - done - - doman man/man1/* - - dodoc README - dohtml rfm_fbs.1.0.html -} diff --git a/net-misc/rfb/rfb-0.6.1.ebuild b/net-misc/rfb/rfb-0.6.1.ebuild deleted file mode 100644 index 02d66cb4212d..000000000000 --- a/net-misc/rfb/rfb-0.6.1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/rfb/rfb-0.6.1.ebuild,v 1.11 2004/07/15 03:23:31 agriffis Exp $ - -inherit eutils - -DESCRIPTION="comprehensive collection of rfb enabled tools and applications" -HOMEPAGE="http://forum.hexonet.com/" -SRC_URI="http://download.hexonet.com/software/rfb/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="x86 ppc ~sparc ~alpha" -IUSE="" - -DEPEND="x11-libs/xclass" - -src_compile() { - epatch ${FILESDIR}/${P}-gcc3.x.patch - - make depend || die "make depend failed" - make CXXFLAGS="-DUSE_ZLIB_WARREN -I../include ${CXXFLAGS}" || die "make failed" -} - -src_install() { -# dolib lib/librfb.a #does anything other than rfb use this ? - - dobin rfbcat/rfbcat x0rfbserver/x0rfbserver \ - xrfbviewer/{xplayfbs,xrfbviewer} - for f in rfbcat x0rfbserver xvncconnect xrfbviewer ; do - dobin ${f}/${f} - done - - doman man/man1/* - - dodoc README - dohtml rfm_fbs.1.0.html -} |