svn commit: r431408 - in head: mail/thunderbird mail/thunderbird/files www/firefox-esr www/firefox-esr/files www/libxul www/libxul/files
Jan Beich
jbeich at FreeBSD.org
Fri Jan 13 17:59:05 UTC 2017
Author: jbeich
Date: Fri Jan 13 17:59:03 2017
New Revision: 431408
URL: https://svnweb.freebsd.org/changeset/ports/431408
Log:
www/firefox-esr: improve A/V sync with SNDIO=on
PR: 215867
Reported by: Sergey <kpect at protonmail.com>
Submitted by: Tobias Kortkamp <t at tobik.me>
Obtained from: upstream
MFH: 2017Q1
Added:
head/mail/thunderbird/files/patch-bug1153151 (contents, props changed)
head/mail/thunderbird/files/patch-bug1153179 (contents, props changed)
head/www/firefox-esr/files/patch-bug1153151 (contents, props changed)
head/www/firefox-esr/files/patch-bug1153179 (contents, props changed)
head/www/libxul/files/patch-bug1153151 (contents, props changed)
head/www/libxul/files/patch-bug1153179 (contents, props changed)
Modified:
head/mail/thunderbird/Makefile (contents, props changed)
head/www/firefox-esr/Makefile (contents, props changed)
head/www/libxul/Makefile (contents, props changed)
Modified: head/mail/thunderbird/Makefile
==============================================================================
--- head/mail/thunderbird/Makefile Fri Jan 13 17:56:10 2017 (r431407)
+++ head/mail/thunderbird/Makefile Fri Jan 13 17:59:03 2017 (r431408)
@@ -3,7 +3,7 @@
PORTNAME= thunderbird
DISTVERSION= 45.6.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail news net-im ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source
Added: head/mail/thunderbird/files/patch-bug1153151
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/mail/thunderbird/files/patch-bug1153151 Fri Jan 13 17:59:03 2017 (r431408)
@@ -0,0 +1,13 @@
+Bug 1153151 - make libcubeb sndio use non-blocking i/o
+
+--- mozilla/media/libcubeb/src/cubeb_sndio.c.orig 2017-01-12 17:53:15 UTC
++++ mozilla/media/libcubeb/src/cubeb_sndio.c
+@@ -187,7 +187,7 @@ sndio_stream_init(cubeb *context,
+ if (s == NULL)
+ return CUBEB_ERROR;
+ s->context = context;
+- s->hdl = sio_open(NULL, SIO_PLAY, 0);
++ s->hdl = sio_open(NULL, SIO_PLAY, 1);
+ if (s->hdl == NULL) {
+ free(s);
+ DPR("sndio_stream_init(), sio_open() failed\n");
Added: head/mail/thunderbird/files/patch-bug1153179
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/mail/thunderbird/files/patch-bug1153179 Fri Jan 13 17:59:03 2017 (r431408)
@@ -0,0 +1,40 @@
+Bug 1153179 - fix latency reporting in libcubeb sndio
+
+--- mozilla/media/libcubeb/src/cubeb_sndio.c.orig 2017-01-12 17:53:15 UTC
++++ mozilla/media/libcubeb/src/cubeb_sndio.c
+@@ -67,7 +67,7 @@ sndio_onmove(void *arg, int delta)
+ {
+ cubeb_stream *s = (cubeb_stream *)arg;
+
+- s->rdpos += delta;
++ s->rdpos += delta * s->bpf;
+ }
+
+ static void *
+@@ -135,7 +135,7 @@ sndio_mainloop(void *arg)
+ state = CUBEB_STATE_ERROR;
+ break;
+ }
+- s->wrpos = 0;
++ s->wrpos += n;
+ start += n;
+ }
+ }
+@@ -326,7 +336,7 @@ sndio_stream_get_position(cubeb_stream *
+ {
+ pthread_mutex_lock(&s->mtx);
+ DPR("sndio_stream_get_position() %lld\n", s->rdpos);
+- *p = s->rdpos;
++ *p = s->rdpos / s->bpf;
+ pthread_mutex_unlock(&s->mtx);
+ return CUBEB_OK;
+ }
+@@ -346,7 +356,7 @@ sndio_stream_get_latency(cubeb_stream *
+ {
+ // http://www.openbsd.org/cgi-bin/man.cgi?query=sio_open
+ // in the "Measuring the latency and buffers usage" paragraph.
+- *latency = stm->wrpos - stm->rdpos;
++ *latency = (stm->wrpos - stm->rdpos) / stm->bpf;
+ return CUBEB_OK;
+ }
+
Modified: head/www/firefox-esr/Makefile
==============================================================================
--- head/www/firefox-esr/Makefile Fri Jan 13 17:56:10 2017 (r431407)
+++ head/www/firefox-esr/Makefile Fri Jan 13 17:59:03 2017 (r431408)
@@ -4,7 +4,7 @@
PORTNAME= firefox
DISTVERSION= 45.6.0
DISTVERSIONSUFFIX=esr.source
-PORTREVISION= 4
+PORTREVISION= 5
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \
Added: head/www/firefox-esr/files/patch-bug1153151
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/firefox-esr/files/patch-bug1153151 Fri Jan 13 17:59:03 2017 (r431408)
@@ -0,0 +1,13 @@
+Bug 1153151 - make libcubeb sndio use non-blocking i/o
+
+--- media/libcubeb/src/cubeb_sndio.c.orig 2017-01-12 17:53:15 UTC
++++ media/libcubeb/src/cubeb_sndio.c
+@@ -187,7 +187,7 @@ sndio_stream_init(cubeb *context,
+ if (s == NULL)
+ return CUBEB_ERROR;
+ s->context = context;
+- s->hdl = sio_open(NULL, SIO_PLAY, 0);
++ s->hdl = sio_open(NULL, SIO_PLAY, 1);
+ if (s->hdl == NULL) {
+ free(s);
+ DPR("sndio_stream_init(), sio_open() failed\n");
Added: head/www/firefox-esr/files/patch-bug1153179
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/firefox-esr/files/patch-bug1153179 Fri Jan 13 17:59:03 2017 (r431408)
@@ -0,0 +1,40 @@
+Bug 1153179 - fix latency reporting in libcubeb sndio
+
+--- media/libcubeb/src/cubeb_sndio.c.orig 2017-01-12 17:53:15 UTC
++++ media/libcubeb/src/cubeb_sndio.c
+@@ -67,7 +67,7 @@ sndio_onmove(void *arg, int delta)
+ {
+ cubeb_stream *s = (cubeb_stream *)arg;
+
+- s->rdpos += delta;
++ s->rdpos += delta * s->bpf;
+ }
+
+ static void *
+@@ -135,7 +135,7 @@ sndio_mainloop(void *arg)
+ state = CUBEB_STATE_ERROR;
+ break;
+ }
+- s->wrpos = 0;
++ s->wrpos += n;
+ start += n;
+ }
+ }
+@@ -326,7 +336,7 @@ sndio_stream_get_position(cubeb_stream *
+ {
+ pthread_mutex_lock(&s->mtx);
+ DPR("sndio_stream_get_position() %lld\n", s->rdpos);
+- *p = s->rdpos;
++ *p = s->rdpos / s->bpf;
+ pthread_mutex_unlock(&s->mtx);
+ return CUBEB_OK;
+ }
+@@ -346,7 +356,7 @@ sndio_stream_get_latency(cubeb_stream *
+ {
+ // http://www.openbsd.org/cgi-bin/man.cgi?query=sio_open
+ // in the "Measuring the latency and buffers usage" paragraph.
+- *latency = stm->wrpos - stm->rdpos;
++ *latency = (stm->wrpos - stm->rdpos) / stm->bpf;
+ return CUBEB_OK;
+ }
+
Modified: head/www/libxul/Makefile
==============================================================================
--- head/www/libxul/Makefile Fri Jan 13 17:56:10 2017 (r431407)
+++ head/www/libxul/Makefile Fri Jan 13 17:59:03 2017 (r431408)
@@ -3,7 +3,7 @@
PORTNAME= libxul
DISTVERSION= 45.6.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= www devel
MASTER_SITES= MOZILLA/firefox/releases/${DISTVERSION}esr/source \
MOZILLA/firefox/candidates/${DISTVERSION}esr-candidates/build1/source
Added: head/www/libxul/files/patch-bug1153151
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/libxul/files/patch-bug1153151 Fri Jan 13 17:59:03 2017 (r431408)
@@ -0,0 +1,13 @@
+Bug 1153151 - make libcubeb sndio use non-blocking i/o
+
+--- media/libcubeb/src/cubeb_sndio.c.orig 2017-01-12 17:53:15 UTC
++++ media/libcubeb/src/cubeb_sndio.c
+@@ -187,7 +187,7 @@ sndio_stream_init(cubeb *context,
+ if (s == NULL)
+ return CUBEB_ERROR;
+ s->context = context;
+- s->hdl = sio_open(NULL, SIO_PLAY, 0);
++ s->hdl = sio_open(NULL, SIO_PLAY, 1);
+ if (s->hdl == NULL) {
+ free(s);
+ DPR("sndio_stream_init(), sio_open() failed\n");
Added: head/www/libxul/files/patch-bug1153179
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/libxul/files/patch-bug1153179 Fri Jan 13 17:59:03 2017 (r431408)
@@ -0,0 +1,40 @@
+Bug 1153179 - fix latency reporting in libcubeb sndio
+
+--- media/libcubeb/src/cubeb_sndio.c.orig 2017-01-12 17:53:15 UTC
++++ media/libcubeb/src/cubeb_sndio.c
+@@ -67,7 +67,7 @@ sndio_onmove(void *arg, int delta)
+ {
+ cubeb_stream *s = (cubeb_stream *)arg;
+
+- s->rdpos += delta;
++ s->rdpos += delta * s->bpf;
+ }
+
+ static void *
+@@ -135,7 +135,7 @@ sndio_mainloop(void *arg)
+ state = CUBEB_STATE_ERROR;
+ break;
+ }
+- s->wrpos = 0;
++ s->wrpos += n;
+ start += n;
+ }
+ }
+@@ -326,7 +336,7 @@ sndio_stream_get_position(cubeb_stream *
+ {
+ pthread_mutex_lock(&s->mtx);
+ DPR("sndio_stream_get_position() %lld\n", s->rdpos);
+- *p = s->rdpos;
++ *p = s->rdpos / s->bpf;
+ pthread_mutex_unlock(&s->mtx);
+ return CUBEB_OK;
+ }
+@@ -346,7 +356,7 @@ sndio_stream_get_latency(cubeb_stream *
+ {
+ // http://www.openbsd.org/cgi-bin/man.cgi?query=sio_open
+ // in the "Measuring the latency and buffers usage" paragraph.
+- *latency = stm->wrpos - stm->rdpos;
++ *latency = (stm->wrpos - stm->rdpos) / stm->bpf;
+ return CUBEB_OK;
+ }
+
More information about the svn-ports-head
mailing list