aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortijl <tijl@FreeBSD.org>2014-10-15 01:49:06 +0800
committertijl <tijl@FreeBSD.org>2014-10-15 01:49:06 +0800
commitba0b97c8860938f2c93dfa67a1e13c557ec2a9f7 (patch)
tree5361c24282f783b89bf67b2184aaa7a689f15540
parentfb1d830fa2210a7085c3ce53373574f1a60566e0 (diff)
downloadfreebsd-ports-gnome-ba0b97c8860938f2c93dfa67a1e13c557ec2a9f7.tar.gz
freebsd-ports-gnome-ba0b97c8860938f2c93dfa67a1e13c557ec2a9f7.tar.zst
freebsd-ports-gnome-ba0b97c8860938f2c93dfa67a1e13c557ec2a9f7.zip
- Patch OSS backend to remove latency
- Remove USE_GNOME=gnomehier and @dirrm (handled by pkg) PR: 194346 Submitted by: hselasky
-rw-r--r--net/mediastreamer/Makefile4
-rw-r--r--net/mediastreamer/files/patch-src__audiofilters__oss.c15
-rw-r--r--net/mediastreamer/pkg-plist1
3 files changed, 17 insertions, 3 deletions
diff --git a/net/mediastreamer/Makefile b/net/mediastreamer/Makefile
index 4cdbd67b8750..a87b9a272857 100644
--- a/net/mediastreamer/Makefile
+++ b/net/mediastreamer/Makefile
@@ -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
diff --git a/net/mediastreamer/files/patch-src__audiofilters__oss.c b/net/mediastreamer/files/patch-src__audiofilters__oss.c
new file mode 100644
index 000000000000..11848d059f9e
--- /dev/null
+++ b/net/mediastreamer/files/patch-src__audiofilters__oss.c
@@ -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);
diff --git a/net/mediastreamer/pkg-plist b/net/mediastreamer/pkg-plist
index 85b095ee953a..18f5a434fdfe 100644
--- a/net/mediastreamer/pkg-plist
+++ b/net/mediastreamer/pkg-plist
@@ -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
-@dirrm include/mediastreamer2