Attachment 188364 Details for Bug 223934 – palemoon_sndio.diff

[patch] palemoon_sndio.diff

palemoon_sndio.diff (text/plain), 4.04 KB, created by Tobias Kortkamp on 2017-11-28 19:47:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias Kortkamp

Created: 2017-11-28 19:47:00 UTC

Size: 4.04 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 455040)
>+++ Makefile	(working copy)
>@@ -42,7 +42,7 @@
> 		--enable-jemalloc-lib
> 
> OPTIONS_DEFAULT=	BUNDLED_CAIRO GTK2
>-OPTIONS_EXCLUDE=	DTRACE INTEGER_SAMPLES JACK SNDIO TEST
>+OPTIONS_EXCLUDE=	DTRACE INTEGER_SAMPLES JACK TEST
> 
> .include "${.CURDIR}/../../www/firefox/Makefile.options"
> 
>Index: files/patch-bug1153151
>===================================================================
>--- files/patch-bug1153151	(nonexistent)
>+++ files/patch-bug1153151	(working copy)
>@@ -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");
>
>Property changes on: files/patch-bug1153151
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-bug1153179
>===================================================================
>--- files/patch-bug1153179	(nonexistent)
>+++ files/patch-bug1153179	(working copy)
>@@ -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;
>+ }
>+ 
>
>Property changes on: files/patch-bug1153179
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-gfx_skia_moz.build
>===================================================================
>--- files/patch-gfx_skia_moz.build	(nonexistent)
>+++ files/patch-gfx_skia_moz.build	(working copy)
>@@ -0,0 +1,11 @@
>+--- gfx/skia/moz.build.orig	2017-11-26 22:41:30 UTC
>++++ gfx/skia/moz.build
>+@@ -961,7 +961,7 @@ elif CONFIG['CLANG_CL']:
>+     SOURCES['trunk/src/opts/SkBlurImage_opts_SSE4.cpp'].flags += ['-msse4.1']
>+ 
>+ if CONFIG['GNU_CXX'] and CONFIG['CPU_ARCH'] == 'arm':
>+-    SOURCES['skia/src/opts/SkBlitRow_opts_arm.cpp'].flags += ['-fomit-frame-pointer']
>++    SOURCES['trunk/src/opts/SkBlitRow_opts_arm.cpp'].flags += ['-fomit-frame-pointer']
>+ 
>+ DEFINES['SKIA_IMPLEMENTATION'] = 1
>+ DEFINES['GR_IMPLEMENTATION'] = 1
>
>Property changes on: files/patch-gfx_skia_moz.build
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Flags:

tobik: maintainer-approval? (lichray)

Actions: View | Diff

Attachments on bug 223934: 188346 | 188364 | 188374