Added missing media-Ãlibs/jpeg dependancy. Closes bug #176959. Added new revision where mouse support is optionl via a new USE flag. Closes bug #176970.

(Portage version: 2.1.2.9)

5 files changed, 138 insertions, 3 deletions

diff --git a/net-misc/directvnc/ChangeLog b/net-misc/directvnc/ChangeLog
index 4484a31e7c57..945239e3f7a1 100644
--- a/net-misc/directvnc/ChangeLog
+++ b/net-misc/directvnc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/directvnc
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/directvnc/ChangeLog,v 1.19 2007/01/08 16:00:37 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/directvnc/ChangeLog,v 1.20 2007/07/20 15:42:44 s4t4n Exp $
+
+*directvnc-0.7.5-r1 (20 Jul 2007)
+
+  20 Jul 2007; Michele Noberasco <s4t4n@gentoo.org> +directvnc-0.7.5-r1.ebuild:
+  Revision bump, with patch to make mouse support optional. Closes bug #176970.
+  directvnc-0.7.5.ebuild:
+  Added missing media-libs/jpeg dependancy. Closes bug #176959.
 
   08 Jan 2007; Michele Noberasco <s4t4n@gentoo.org> directvnc-0.7.5.ebuild:
   Added missing x11-proto/xproto dependancy. Fixed DEPEND and RDEPEND.
diff --git a/net-misc/directvnc/directvnc-0.7.5-r1.ebuild b/net-misc/directvnc/directvnc-0.7.5-r1.ebuild
new file mode 100644
index 000000000000..c9735b005871
--- /dev/null
+++ b/net-misc/directvnc/directvnc-0.7.5-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/directvnc/directvnc-0.7.5-r1.ebuild,v 1.1 2007/07/20 15:42:44 s4t4n Exp $
+
+inherit eutils
+
+DESCRIPTION="Very thin VNC client for unix framebuffer systems"
+HOMEPAGE="http://adam-lilienthal.de/directvnc/"
+SRC_URI="http://www.adam-lilienthal.de/directvnc/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE="mouse"
+
+RDEPEND="dev-libs/DirectFB
+	>=media-libs/jpeg-6b-r7"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=sys-apps/sed-4
+	x11-proto/xproto"
+
+src_unpack() {
+	unpack "${A}"
+
+	# Make mouse support optional
+	cd "${S}/src"
+	use mouse || epatch "${FILESDIR}/${PN}-mouse.patch"
+}
+
+src_compile() {
+	econf || die
+
+	# Fix bug #116148, DFBGraphicsDeviceDescription is no longer present in
+	# newer DirectFB version, but the application never uses it :-/
+	local comment_out="DFBCardCapabilities caps;"
+	sed -i -e "s:${comment_out}://${comment_out}:" src/dfb.c
+
+	emake DEBUGFLAGS="${CFLAGS}" || die
+}
+
+src_install() {
+	make install DESTDIR=${D} || die
+	rm -rf ${D}/usr/doc
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+}
diff --git a/net-misc/directvnc/directvnc-0.7.5.ebuild b/net-misc/directvnc/directvnc-0.7.5.ebuild
index ff3b592033b0..00d53e7cce1a 100644
--- a/net-misc/directvnc/directvnc-0.7.5.ebuild
+++ b/net-misc/directvnc/directvnc-0.7.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/directvnc/directvnc-0.7.5.ebuild,v 1.8 2007/01/08 16:00:37 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/directvnc/directvnc-0.7.5.ebuild,v 1.9 2007/07/20 15:42:44 s4t4n Exp $
 
 inherit eutils
 
@@ -13,7 +13,8 @@ SLOT="0"
 KEYWORDS="x86 ppc ~amd64"
 IUSE=""
 
-RDEPEND="dev-libs/DirectFB"
+RDEPEND="dev-libs/DirectFB
+	>=media-libs/jpeg-6b-r7"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
diff --git a/net-misc/directvnc/files/digest-directvnc-0.7.5-r1 b/net-misc/directvnc/files/digest-directvnc-0.7.5-r1
new file mode 100644
index 000000000000..f344bc067cd6
--- /dev/null
+++ b/net-misc/directvnc/files/digest-directvnc-0.7.5-r1
@@ -0,0 +1,3 @@
+MD5 1fba84dc5450751bb402b68a9b9fb429 directvnc-0.7.5.tar.gz 253013
+RMD160 ea7703c5b904a2cccc3b049971e14189ce4b471c directvnc-0.7.5.tar.gz 253013
+SHA256 f604ce7c58fba00b3a8f72b153ca6e49c6b6b48f70840472204f86a28c94a071 directvnc-0.7.5.tar.gz 253013
diff --git a/net-misc/directvnc/files/directvnc-mouse.patch b/net-misc/directvnc/files/directvnc-mouse.patch
new file mode 100644
index 000000000000..4396aef6a9a1
--- /dev/null
+++ b/net-misc/directvnc/files/directvnc-mouse.patch
@@ -0,0 +1,77 @@
+*** dfb.c	2003-01-31 03:51:59.000000000 -0500
+--- dfb-new.c	2005-07-10 15:12:37.000000000 -0400
+***************
+*** 24,34 ****
+  /* DirectFB interfaces needed */
+  IDirectFB               *dfb = NULL;
+  IDirectFBSurface        *primary;
+  IDirectFBDisplayLayer   *layer;
+  IDirectFBInputDevice    *keyboard;
+! IDirectFBInputDevice    *mouse;
+  IDirectFBEventBuffer    *input_buffer;
+  DFBResult err;
+  DFBSurfaceDescription dsc;
+  DFBCardCapabilities caps;
+  DFBDisplayLayerConfig layer_config;
+--- 24,34 ----
+  /* DirectFB interfaces needed */
+  IDirectFB               *dfb = NULL;
+  IDirectFBSurface        *primary;
+  IDirectFBDisplayLayer   *layer;
+  IDirectFBInputDevice    *keyboard;
+! /* IDirectFBInputDevice    *mouse; */
+  IDirectFBEventBuffer    *input_buffer;
+  DFBResult err;
+  DFBSurfaceDescription dsc;
+  DFBCardCapabilities caps;
+  DFBDisplayLayerConfig layer_config;
+***************
+*** 64,74 ****
+       dsc.pixelformat = DSPF_RGB16;
+       DFBCHECK(dfb->CreateSurface(dfb, &dsc, &primary ));
+       primary->GetSize (primary, &opt.client.width, &opt.client.height);
+  
+       DFBCHECK(dfb->GetInputDevice( dfb, DIDID_KEYBOARD, &keyboard ));
+!      DFBCHECK(dfb->GetInputDevice( dfb, DIDID_MOUSE, &mouse ));
+       DFBCHECK (dfb->CreateInputEventBuffer (dfb, DICAPS_ALL, DFB_TRUE, &input_buffer));
+  }
+  
+  
+  /*
+--- 64,74 ----
+       dsc.pixelformat = DSPF_RGB16;
+       DFBCHECK(dfb->CreateSurface(dfb, &dsc, &primary ));
+       primary->GetSize (primary, &opt.client.width, &opt.client.height);
+  
+       DFBCHECK(dfb->GetInputDevice( dfb, DIDID_KEYBOARD, &keyboard ));
+!      /* DFBCHECK(dfb->GetInputDevice( dfb, DIDID_MOUSE, &mouse )); */
+       DFBCHECK (dfb->CreateInputEventBuffer (dfb, DICAPS_ALL, DFB_TRUE, &input_buffer));
+  }
+  
+  
+  /*
+***************
+*** 78,88 ****
+  dfb_deinit()
+  {
+       primary->Release( primary );
+       input_buffer->Release(input_buffer);
+       keyboard->Release( keyboard );
+!      mouse->Release( mouse );
+       layer->Release( layer );
+       dfb->Release( dfb ); 
+  }
+   
+  void
+--- 78,88 ----
+  dfb_deinit()
+  {
+       primary->Release( primary );
+       input_buffer->Release(input_buffer);
+       keyboard->Release( keyboard );
+!      /* mouse->Release( mouse ); */
+       layer->Release( layer );
+       dfb->Release( dfb ); 
+  }
+   
+  void