Version bump.

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

3 files changed, 105 insertions, 1 deletions

diff --git a/media-video/guvcview/ChangeLog b/media-video/guvcview/ChangeLog
index b6a70fa90a85..4993f07d7cc6 100644
--- a/media-video/guvcview/ChangeLog
+++ b/media-video/guvcview/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/guvcview
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/guvcview/ChangeLog,v 1.25 2012/01/28 15:24:26 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/guvcview/ChangeLog,v 1.26 2012/02/13 10:59:58 radhermit Exp $
+
+*guvcview-1.5.2 (13 Feb 2012)
+
+  13 Feb 2012; Tim Harder <radhermit@gentoo.org> +guvcview-1.5.2.ebuild,
+  +files/guvcview-1.5.2-pulse.patch:
+  Version bump.
 
   28 Jan 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> guvcview-1.5.1.ebuild:
   x86 stable wrt bug #399789
diff --git a/media-video/guvcview/files/guvcview-1.5.2-pulse.patch b/media-video/guvcview/files/guvcview-1.5.2-pulse.patch
new file mode 100644
index 000000000000..11f7b58e911c
--- /dev/null
+++ b/media-video/guvcview/files/guvcview-1.5.2-pulse.patch
@@ -0,0 +1,54 @@
+--- guvcview-src-1.5.2/src/pulse_audio.c.orig
++++ guvcview-src-1.5.2/src/pulse_audio.c
+@@ -29,11 +29,7 @@
+ 
+ #include <errno.h>
+ 
+-#if GLIB_MINOR_VERSION < 31
+-	#define __AMUTEX pdata->mutex
+-#else
+-	#define __AMUTEX &pdata->mutex
+-#endif
++#define __AMUTEX &pdata->mutex
+ 
+ //run in separate thread
+ static void* pulse_read_audio(void *userdata) 
+@@ -56,7 +52,7 @@
+ 		ss.channels = pdata->channels;
+ 	__UNLOCK_MUTEX(__AMUTEX);
+ 
+-	printf("starting pulse audio thread: %d hz- %d ch\n",ss.rate, ss.channels);
++	g_print("starting pulse audio thread: %d hz- %d ch\n",ss.rate, ss.channels);
+ 	if (!(pdata->pulse_simple = pa_simple_new(NULL, "Guvcview Video Capture", PA_STREAM_RECORD, NULL, "pcm.record", &ss, NULL, NULL, &error))) 
+ 	{
+ 		g_printerr(": pa_simple_new() failed: %s\n", pa_strerror(error));
+@@ -114,7 +110,7 @@
+ 	}
+ 
+ finish:
+-	printf("audio thread exited\n");
++	g_print("audio thread exited\n");
+ 	pdata->streaming = FALSE;
+ 	if (pdata->pulse_simple)
+ 		pa_simple_free(pdata->pulse_simple);
+@@ -126,19 +122,7 @@
+ pulse_init_audio(struct paRecordData* pdata)
+ {	
+ 	//start audio capture thread
+-#if GLIB_MINOR_VERSION < 31 
+-	if( (pdata->pulse_read_th = g_thread_create(
+-		(GThreadFunc) pulse_read_audio,
+-		pdata, //data
+-		FALSE,    //joinable - no need waiting for thread to finish
+-		NULL)    //error
+-		) == NULL)
+-#else
+-	if( (pdata->pulse_read_th = g_thread_new("pulse thread",
+-		(GThreadFunc) pulse_read_audio,
+-		pdata)
+-		) == NULL)
+-#endif  
++	if(__THREAD_CREATE(&pdata->pulse_read_th, (GThreadFunc) pulse_read_audio,pdata))  
+ 	{
+ 		g_printerr("Pulse thread creation failed\n");
+ 		return (-1);
diff --git a/media-video/guvcview/guvcview-1.5.2.ebuild b/media-video/guvcview/guvcview-1.5.2.ebuild
new file mode 100644
index 000000000000..7cedff15b7ad
--- /dev/null
+++ b/media-video/guvcview/guvcview-1.5.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/guvcview/guvcview-1.5.2.ebuild,v 1.1 2012/02/13 10:59:58 radhermit Exp $
+
+EAPI=4
+
+inherit autotools eutils
+
+MY_P=${PN}-src-${PV}
+DESCRIPTION="GTK+ UVC Viewer"
+HOMEPAGE="http://guvcview.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pulseaudio"
+
+RDEPEND=">=dev-libs/glib-2.10:2
+	virtual/ffmpeg
+	>=media-libs/libsdl-1.2.10
+	>=media-libs/libpng-1.4
+	media-libs/libv4l
+	>=media-libs/portaudio-19_pre
+	sys-fs/udev
+	x11-libs/gtk+:3
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	sys-devel/gettext"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	sed -i -e '/^guvcviewdocdir/,/^$/d' Makefile.am || die
+	epatch "${FILESDIR}"/${P}-pulse.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-debian-menu \
+		$(use_enable pulseaudio pulse)
+}