Version bump.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 117 insertions, 6 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/Manifest b/media-video/guvcview/Manifest
index 9910ae44a60d..53732ef0138f 100644
--- a/media-video/guvcview/Manifest
+++ b/media-video/guvcview/Manifest
@@ -2,20 +2,27 @@
 Hash: SHA512
 
 AUX guvcview-1.5.1-loops.patch 1486 RMD160 a814b2b556c0f88dc68d40bcc54b434041548e2d SHA1 d14f9a22acc3098f7210ce0488913b9344211bbe SHA256 70a7aa5434c136ba25f0e8e38d25169fd5f5ee62416b745e21f4f9d5728215fb
+AUX guvcview-1.5.2-pulse.patch 1619 RMD160 f74cca0c06aeba2277568b5c41b4a0557256caaa SHA1 f1f3d7da68a8a37c17ac2a8f82cb5095ab4464fa SHA256 9fd361415f81ec64182f7f893c249a7ce31025f5f2971acc7b01f998c7995ec5
 DIST guvcview-src-1.4.2.tar.gz 687308 RMD160 62e9cec948934646f2603660d986cd44c66f3b1c SHA1 615a475ca9c35942c45e78a674e5b47a5da51b48 SHA256 c5acf5739cfda6e9499ba2dab38a70a3df03b3d04a79f510a42dd1add1c3ac92
 DIST guvcview-src-1.4.4.tar.gz 691304 RMD160 d7979c27cb55463a5c2525422c28ba2452039c7d SHA1 7034178db51fe9bdbb1ed5a94baba52beed1f8d6 SHA256 3356a303d960071174e3aa8a1f1a07157927d4674fa81414a6e651526765de02
 DIST guvcview-src-1.5.0.tar.gz 498336 RMD160 bbae3b1ed256c853255ccdd8057daba57af3c694 SHA1 8a0c99c2f33a868d026ca03601f5f477c778ec7a SHA256 03d60801794f9134a398c58c02e308d1dac010c61ed18fb72171a680a277a340
 DIST guvcview-src-1.5.1.tar.gz 491950 RMD160 bfd705010fa379339f9d838f8ea1a3181dbe5df0 SHA1 6c7ef291fa5cc823d8111b8c094df26dec179ef3 SHA256 e127830108262a4e466c5b9159f78f2481fffe37f02a4d31245fa1471d37ca0e
+DIST guvcview-src-1.5.2.tar.gz 503427 RMD160 29a42e0674eab37c3ed2ea88d3db74c53b2ec4eb SHA1 d08078896b64cf6ccaf612d0127de7106288e019 SHA256 d563763852f80f13fb838c6b919c0a1c3be6783f2aa7df47dee4b3c979f724a1
 EBUILD guvcview-1.4.2.ebuild 991 RMD160 fbea6907a834c4c6fef0290bee92704b949dfc08 SHA1 3f037b460b367e7cd64a6555ccefa809f4d35a81 SHA256 570d69a76bdcf61f6967b48836c87a54e2342ae414b1d0ab0062f7750a98fbb2
 EBUILD guvcview-1.4.4.ebuild 1006 RMD160 c26a9610c5eb63c827f7d480bc64dc2461ac1567 SHA1 33a7b2a2ad1f1afd723aa9a1db8ada50f7642ce6 SHA256 a7b429e97b40992389a17082aa67fb7f8fd05e4216915e71b8502c287f384719
 EBUILD guvcview-1.5.0.ebuild 962 RMD160 d38018c1d0257a1210d9c1ea87e57ff30fc93c6f SHA1 0951163e8998057620a3b3fd2502439e05d02bc0 SHA256 ff7ba85043a24e28b1903a5da111193efc1bcb46cf678cc80fb3e2f0ed58787f
 EBUILD guvcview-1.5.1.ebuild 1004 RMD160 eeda49441843747e08b80af30d91d22e2354de32 SHA1 388e3b5cfd2e5675a48033032155ae42a54efa1b SHA256 5db67b3ee51d7b1f9e80373ab169420a502672be7cbc97afb6be242a9648bcc0
-MISC ChangeLog 3859 RMD160 9a107feab28d8e0f0c17396690915acca1a23fd5 SHA1 7033fb82220d542143cb41c2c6f163eae9715df8 SHA256 825a0c8e5126c8855736a5f6351b438916cde9b23f00f30c95b19d77204a9e60
+EBUILD guvcview-1.5.2.ebuild 1005 RMD160 0b147fdbe9b787a670cbe00303ddbbbab5e0a975 SHA1 758b8c9683b8f4bbbb013a22030f1e8cdd07e2fb SHA256 72be9405cabc04928c3faed03d5060f25b9203786861f21066e51c13642cc0a8
+MISC ChangeLog 4016 RMD160 ef65f68c274d44219b9e692c24090a7d8b74d6a0 SHA1 b0dbfecbe50bf847dca6b0b8066c5ec12fdbf3fc SHA256 2dc76d78dc9d165f621e2172b5251fd5759ea798d8b05706d2cc4605436f1975
 MISC metadata.xml 228 RMD160 3071d739d8e15041d594882afdfc434453568466 SHA1 06e3ee83b7a5a910d2d63ea77afb2e5a292606f6 SHA256 060670a1a67923937e4bf55598ae59368d5e716b0b618dedaf12b15f45e8e234
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk8kEzAACgkQuUQtlDBCeQKCkwCeI761qYBNwPLH0LdKNA5/uQpG
-Kb8AnRrMejstCn2c1xqMHBuzfbmjrdE1
-=WsJD
+iQEcBAEBCgAGBQJPOO00AAoJEEqz6FtPBkyjMw0IAKMLPfVC0d7Yb9/gEwb7LhbC
+L/MAosm1/r5SfmIuAZw8FMIuGHL/o+ixkNEOEuRqH0bipa3i6D5zZ7xxqwwV/Zh9
+uHgH0yARHQOx6gcvKLxhWTN5BTj2sTyoc8r3sDr8g/7/BN+hXETcuNw+D5qY9N9X
+RWR4PcnRUBEgIdLa0B2+7KqIgpIz8sDSv2aRY8pLPYtuYa9wWrfXgPsMKrmsPFnY
+NPb3t3LJxlWvCzuUsfHTtM7j7J2L8p239ndFU6T5autY/IylqXGBvm/0vrIbCy9O
++NML1zweYFxiOTyqlh1IuTC6dPjfmPH5c+3k2hSzwCssb5kVZ36+VtfD0Gnk5Og=
+=NFLd
 -----END PGP SIGNATURE-----
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)
+}