Date: Sat, 14 Jan 2017 00:12:29 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431453 - in branches/2017Q1: mail/thunderbird mail/thunderbird/files www/firefox-esr www/firefox-esr/files www/libxul www/libxul/files Message-ID: <201701140012.v0E0CT3Y047359@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Sat Jan 14 00:12:29 2017 New Revision: 431453 URL: https://svnweb.freebsd.org/changeset/ports/431453 Log: MFH: r431408 www/firefox-esr: improve A/V sync with SNDIO=on PR: 215867 Reported by: Sergey <kpect@protonmail.com> Submitted by: Tobias Kortkamp <t@tobik.me> Obtained from: upstream Approved by: ports-secteam (feld) Added: branches/2017Q1/mail/thunderbird/files/patch-bug1153151 - copied unchanged from r431408, head/mail/thunderbird/files/patch-bug1153151 branches/2017Q1/mail/thunderbird/files/patch-bug1153179 - copied unchanged from r431408, head/mail/thunderbird/files/patch-bug1153179 branches/2017Q1/www/firefox-esr/files/patch-bug1153151 - copied unchanged from r431408, head/www/firefox-esr/files/patch-bug1153151 branches/2017Q1/www/firefox-esr/files/patch-bug1153179 - copied unchanged from r431408, head/www/firefox-esr/files/patch-bug1153179 branches/2017Q1/www/libxul/files/patch-bug1153151 - copied unchanged from r431408, head/www/libxul/files/patch-bug1153151 branches/2017Q1/www/libxul/files/patch-bug1153179 - copied unchanged from r431408, head/www/libxul/files/patch-bug1153179 Modified: branches/2017Q1/mail/thunderbird/Makefile branches/2017Q1/www/firefox-esr/Makefile branches/2017Q1/www/libxul/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/mail/thunderbird/Makefile ============================================================================== --- branches/2017Q1/mail/thunderbird/Makefile Fri Jan 13 23:51:24 2017 (r431452) +++ branches/2017Q1/mail/thunderbird/Makefile Sat Jan 14 00:12:29 2017 (r431453) @@ -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 Copied: branches/2017Q1/mail/thunderbird/files/patch-bug1153151 (from r431408, head/mail/thunderbird/files/patch-bug1153151) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/mail/thunderbird/files/patch-bug1153151 Sat Jan 14 00:12:29 2017 (r431453, copy of r431408, head/mail/thunderbird/files/patch-bug1153151) @@ -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"); Copied: branches/2017Q1/mail/thunderbird/files/patch-bug1153179 (from r431408, head/mail/thunderbird/files/patch-bug1153179) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/mail/thunderbird/files/patch-bug1153179 Sat Jan 14 00:12:29 2017 (r431453, copy of r431408, head/mail/thunderbird/files/patch-bug1153179) @@ -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: branches/2017Q1/www/firefox-esr/Makefile ============================================================================== --- branches/2017Q1/www/firefox-esr/Makefile Fri Jan 13 23:51:24 2017 (r431452) +++ branches/2017Q1/www/firefox-esr/Makefile Sat Jan 14 00:12:29 2017 (r431453) @@ -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 \ Copied: branches/2017Q1/www/firefox-esr/files/patch-bug1153151 (from r431408, head/www/firefox-esr/files/patch-bug1153151) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/www/firefox-esr/files/patch-bug1153151 Sat Jan 14 00:12:29 2017 (r431453, copy of r431408, head/www/firefox-esr/files/patch-bug1153151) @@ -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"); Copied: branches/2017Q1/www/firefox-esr/files/patch-bug1153179 (from r431408, head/www/firefox-esr/files/patch-bug1153179) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/www/firefox-esr/files/patch-bug1153179 Sat Jan 14 00:12:29 2017 (r431453, copy of r431408, head/www/firefox-esr/files/patch-bug1153179) @@ -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: branches/2017Q1/www/libxul/Makefile ============================================================================== --- branches/2017Q1/www/libxul/Makefile Fri Jan 13 23:51:24 2017 (r431452) +++ branches/2017Q1/www/libxul/Makefile Sat Jan 14 00:12:29 2017 (r431453) @@ -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 Copied: branches/2017Q1/www/libxul/files/patch-bug1153151 (from r431408, head/www/libxul/files/patch-bug1153151) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/www/libxul/files/patch-bug1153151 Sat Jan 14 00:12:29 2017 (r431453, copy of r431408, head/www/libxul/files/patch-bug1153151) @@ -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"); Copied: branches/2017Q1/www/libxul/files/patch-bug1153179 (from r431408, head/www/libxul/files/patch-bug1153179) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/www/libxul/files/patch-bug1153179 Sat Jan 14 00:12:29 2017 (r431453, copy of r431408, head/www/libxul/files/patch-bug1153179) @@ -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; + } +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701140012.v0E0CT3Y047359>