Revision bump. Depend on new system libvncserver supporting the threads USE flags. Fix missing xshm includes, bug #290827 by Wolfgang Draxinger and Fabiano.

(Portage version: 2.2_rc48/cvs/Linux x86_64)

3 files changed, 92 insertions, 1 deletions

diff --git a/x11-misc/x11vnc/ChangeLog b/x11-misc/x11vnc/ChangeLog
index 91ce0f92bb8d..db3430e5856f 100644
--- a/x11-misc/x11vnc/ChangeLog
+++ b/x11-misc/x11vnc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-misc/x11vnc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/ChangeLog,v 1.70 2009/08/13 17:49:56 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/ChangeLog,v 1.71 2009/11/06 21:54:33 swegener Exp $
+
+*x11vnc-0.9.8-r1 (06 Nov 2009)
+
+  06 Nov 2009; Sven Wegener <swegener@gentoo.org> +x11vnc-0.9.8-r1.ebuild,
+  +files/x11vnc-0.9.8-xshm-header-fix.patch:
+  Revision bump. Depend on new system libvncserver supporting the threads
+  USE flags. Fix missing xshm includes, bug #290827 by Wolfgang Draxinger
+  and Fabiano.
 
 *x11vnc-0.9.8 (13 Aug 2009)
 
diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.8-xshm-header-fix.patch b/x11-misc/x11vnc/files/x11vnc-0.9.8-xshm-header-fix.patch
new file mode 100644
index 000000000000..b25f2ed2baca
--- /dev/null
+++ b/x11-misc/x11vnc/files/x11vnc-0.9.8-xshm-header-fix.patch
@@ -0,0 +1,13 @@
+--- x11vnc-0.9.8/x11vnc/x11vnc.h
++++ x11vnc-0.9.8/x11vnc/x11vnc.h
+@@ -76,6 +76,10 @@
+ #include <X11/keysym.h>
+ #include <X11/Xatom.h>
+ 
++#include <X11/Xmd.h>
++#include <X11/extensions/shm.h>
++#include <X11/extensions/shmproto.h>
++
+ #else
+ 
+ #define NO_X11 1
diff --git a/x11-misc/x11vnc/x11vnc-0.9.8-r1.ebuild b/x11-misc/x11vnc/x11vnc-0.9.8-r1.ebuild
new file mode 100644
index 000000000000..69f330fb4cb5
--- /dev/null
+++ b/x11-misc/x11vnc/x11vnc-0.9.8-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.9.8-r1.ebuild,v 1.1 2009/11/06 21:54:33 swegener Exp $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="A VNC server for real X displays"
+HOMEPAGE="http://www.karlrunge.com/x11vnc/"
+SRC_URI="mirror://sourceforge/libvncserver/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="+jpeg +zlib threads ssl crypt v4l xinerama avahi system-libvncserver"
+
+RDEPEND="system-libvncserver? ( >=net-libs/libvncserver-0.9.7[threads=] )
+	zlib? ( sys-libs/zlib )
+	jpeg? (	media-libs/jpeg )
+	ssl? ( dev-libs/openssl )
+	avahi? ( >=net-dns/avahi-0.6.4 )
+	xinerama? ( x11-libs/libXinerama )
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libX11
+	x11-libs/libXtst
+	x11-libs/libXdamage
+	x11-libs/libXext"
+
+DEPEND="${RDEPEND}
+	x11-libs/libXt
+	xinerama? ( x11-proto/xineramaproto )
+	x11-proto/inputproto
+	x11-proto/trapproto
+	x11-proto/recordproto
+	x11-proto/xproto
+	x11-proto/xextproto"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-xshm-header-fix.patch"
+}
+
+pkg_setup() {
+	if use avahi && ! use threads && ! use system-libvncserver
+	then
+		ewarn "Non-native avahi support has been enabled."
+		ewarn "Native avahi support can be enabled by also enabling the threads USE flag."
+	fi
+}
+
+src_configure() {
+	econf \
+		$(use_with system-libvncserver) \
+		$(use_with avahi) \
+		$(use_with xinerama) \
+		$(use_with ssl) \
+		$(use_with ssl crypto) \
+		$(use_with crypt) \
+		$(use_with v4l) \
+		$(use_with jpeg) \
+		$(use_with zlib) \
+		$(use_with threads pthread) \
+		|| die "econf failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc x11vnc/{ChangeLog,README}
+}