svn commit: r370874 - in head/net/mediastreamer: . files

[Tijl Coosemans]

Author: tijl
Date: Tue Oct 14 17:49:06 2014
New Revision: 370874
URL: https://svnweb.freebsd.org/changeset/ports/370874
QAT: https://qat.redports.org/buildarchive/r370874/

Log:
  - Patch OSS backend to remove latency
  - Remove USE_GNOME=gnomehier and @dirrm (handled by pkg)
  
  PR:		194346
  Submitted by:	hselasky

Added:
  head/net/mediastreamer/files/patch-src__audiofilters__oss.c   (contents, props changed)
Modified:
  head/net/mediastreamer/Makefile
  head/net/mediastreamer/pkg-plist

Modified: head/net/mediastreamer/Makefile
==============================================================================
--- head/net/mediastreamer/Makefile	Tue Oct 14 17:47:34 2014	(r370873)
+++ head/net/mediastreamer/Makefile	Tue Oct 14 17:49:06 2014	(r370874)
@@ -3,7 +3,7 @@
 
 PORTNAME=	mediastreamer
 PORTVERSION=	2.10.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net
 MASTER_SITES=	SAVANNAH/linphone/mediastreamer
 
@@ -25,7 +25,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 USES=		gmake libtool pathfix pkgconfig
-USE_GNOME=	gnomehier intlhack
+USE_GNOME=	intlhack
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=		IPV6 NLS UPNP VIDEO

Added: head/net/mediastreamer/files/patch-src__audiofilters__oss.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/mediastreamer/files/patch-src__audiofilters__oss.c	Tue Oct 14 17:49:06 2014	(r370874)
@@ -0,0 +1,15 @@
+--- src/audiofilters/oss.c.orig
++++ src/audiofilters/oss.c
+@@ -364,7 +364,11 @@
+ 			}
+ 		}
+ 		if (d->pcmfd_write>=0){
+-			if (d->write_started){
++			int bufsize = 0;
++			ioctl(d->pcmfd_write, SNDCTL_DSP_GETODELAY, &bufsize);
++			if (bufsize >= bsize){
++				/* wait for buffer to empty */
++			}else if (d->write_started){
+ 				err=ms_bufferizer_read(d->bufferizer,wtmpbuff,bsize);
+ 				if (err==bsize){
+ 					err=write(d->pcmfd_write,wtmpbuff,bsize);

Modified: head/net/mediastreamer/pkg-plist
==============================================================================
--- head/net/mediastreamer/pkg-plist	Tue Oct 14 17:47:34 2014	(r370873)
+++ head/net/mediastreamer/pkg-plist	Tue Oct 14 17:49:06 2014	(r370874)
@@ -55,4 +55,3 @@ share/images/nowebcamCIF.jpg
 %%NLS%%share/locale/ru/LC_MESSAGES/mediastreamer.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/mediastreamer.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/mediastreamer.mo
- at dirrm include/mediastreamer2