Attachment #188374 for bug #223934

Lines 2-8 Link Here

(-)www/palemoon/Makefile (-2 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= palemoon	4	PORTNAME= palemoon
5	DISTVERSION= 27.6.1	5	DISTVERSION= 27.6.2
6	DISTVERSIONSUFFIX=_Release	6	DISTVERSIONSUFFIX=_Release
7	CATEGORIES= www ipv6	7	CATEGORIES= www ipv6
8		8
Lines 42-48 Link Here
42	--enable-jemalloc-lib	42	--enable-jemalloc-lib
43		43
44	OPTIONS_DEFAULT= BUNDLED_CAIRO GTK2	44	OPTIONS_DEFAULT= BUNDLED_CAIRO GTK2
45	OPTIONS_EXCLUDE= DTRACE INTEGER_SAMPLES JACK SNDIO TEST	45	OPTIONS_EXCLUDE= DTRACE INTEGER_SAMPLES JACK TEST
46		46
47	.include "${.CURDIR}/../../www/firefox/Makefile.options"	47	.include "${.CURDIR}/../../www/firefox/Makefile.options"
48		48

Lines 1-3 Link Here

(-)www/palemoon/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1510878123	1	TIMESTAMP = 1511899017
2	SHA256 (MoonchildProductions-Pale-Moon-27.6.1_Release_GH0.tar.gz) = bf426f51274472178dec248b258bfc8f2f33fbecb1cb70c36ee36a46a4dd6926	2	SHA256 (MoonchildProductions-Pale-Moon-27.6.2_Release_GH0.tar.gz) = 124bee1630cf56f120220cdcadde4e24831b472db49d18da6480b7a847785d19
3	SIZE (MoonchildProductions-Pale-Moon-27.6.1_Release_GH0.tar.gz) = 179623221	3	SIZE (MoonchildProductions-Pale-Moon-27.6.2_Release_GH0.tar.gz) = 179622196




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");




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;
 }
 

Line 0 Link Here

(-)www/palemoon/files/patch-gfx_skia_moz.build (+11 lines)
	1	--- gfx/skia/moz.build.orig 2017-11-26 22:41:30 UTC
	2	+++ gfx/skia/moz.build
	3	@@ -961,7 +961,7 @@ elif CONFIG['CLANG_CL']:
	4	SOURCES['trunk/src/opts/SkBlurImage_opts_SSE4.cpp'].flags += ['-msse4.1']
	5
	6	if CONFIG['GNU_CXX'] and CONFIG['CPU_ARCH'] == 'arm':
	7	- SOURCES['skia/src/opts/SkBlitRow_opts_arm.cpp'].flags += ['-fomit-frame-pointer']
	8	+ SOURCES['trunk/src/opts/SkBlitRow_opts_arm.cpp'].flags += ['-fomit-frame-pointer']
	9
	10	DEFINES['SKIA_IMPLEMENTATION'] = 1
	11	DEFINES['GR_IMPLEMENTATION'] = 1

Return to bug 223934

Line 0 Link Here

(-)www/palemoon/files/patch-bug1153151 (+13 lines)
	1	Bug 1153151 - make libcubeb sndio use non-blocking i/o
	2
	3	--- media/libcubeb/src/cubeb_sndio.c.orig 2017-01-12 17:53:15 UTC
	4	+++ media/libcubeb/src/cubeb_sndio.c
	5	@@ -187,7 +187,7 @@ sndio_stream_init(cubeb *context,
	6	if (s == NULL)
	7	return CUBEB_ERROR;
	8	s->context = context;
	9	- s->hdl = sio_open(NULL, SIO_PLAY, 0);
	10	+ s->hdl = sio_open(NULL, SIO_PLAY, 1);
	11	if (s->hdl == NULL) {
	12	free(s);
	13	DPR("sndio_stream_init(), sio_open() failed\n");

Line 0 Link Here

(-)www/palemoon/files/patch-bug1153179 (+40 lines)
	1	Bug 1153179 - fix latency reporting in libcubeb sndio
	2
	3	--- media/libcubeb/src/cubeb_sndio.c.orig 2017-01-12 17:53:15 UTC
	4	+++ media/libcubeb/src/cubeb_sndio.c
	5	@@ -67,7 +67,7 @@ sndio_onmove(void *arg, int delta)
	6	{
	7	cubeb_stream s = (cubeb_stream )arg;
	8
	9	- s->rdpos += delta;
	10	+ s->rdpos += delta * s->bpf;
	11	}
	12
	13	static void *
	14	@@ -135,7 +135,7 @@ sndio_mainloop(void *arg)
	15	state = CUBEB_STATE_ERROR;
	16	break;
	17	}
	18	- s->wrpos = 0;
	19	+ s->wrpos += n;
	20	start += n;
	21	}
	22	}
	23	@@ -326,7 +336,7 @@ sndio_stream_get_position(cubeb_stream *
	24	{
	25	pthread_mutex_lock(&s->mtx);
	26	DPR("sndio_stream_get_position() %lld\n", s->rdpos);
	27	- *p = s->rdpos;
	28	+ *p = s->rdpos / s->bpf;
	29	pthread_mutex_unlock(&s->mtx);
	30	return CUBEB_OK;
	31	}
	32	@@ -346,7 +356,7 @@ sndio_stream_get_latency(cubeb_stream *
	33	{
	34	// http://www.openbsd.org/cgi-bin/man.cgi?query=sio_open
	35	// in the "Measuring the latency and buffers usage" paragraph.
	36	- *latency = stm->wrpos - stm->rdpos;
	37	+ *latency = (stm->wrpos - stm->rdpos) / stm->bpf;
	38	return CUBEB_OK;
	39	}
	40